From MAILER-DAEMON Sun Apr 01 06:26:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HXxGv-0001Yh-9m
	for mharc-gnash-commit@gnu.org; Sun, 01 Apr 2007 06:26:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HXxGt-0001Ud-Jx
	for gnash-commit@gnu.org; Sun, 01 Apr 2007 06:26:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HXxGr-0001PE-Rh
	for gnash-commit@gnu.org; Sun, 01 Apr 2007 06:26:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HXxGr-0001Ok-Oa
	for gnash-commit@gnu.org; Sun, 01 Apr 2007 06:26:49 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HXxDw-0004fS-WD
	for gnash-commit@gnu.org; Sun, 01 Apr 2007 06:23:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HXxDv-0006dL-LW
	for gnash-commit@gnu.org; Sun, 01 Apr 2007 10:23:47 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HXxDv-0006dI-Cq
	for gnash-commit@gnu.org; Sun, 01 Apr 2007 10:23:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HXxDv-0006dI-Cq@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 01 Apr 2007 10:23:47 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Apr 2007 10:26:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/01 10:23:47

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (define_bits_jpeg_loader,
	          define_bits_jpeg2_loader, define_bits_lossless_2_loader):
	          Handle duplicate character id. "Fixes" bug #19474.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2739&r2=1.2740
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.82&r2=1.83

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2739
retrieving revision 1.2740
diff -u -b -r1.2739 -r1.2740
--- ChangeLog	31 Mar 2007 21:16:49 -0000	1.2739
+++ ChangeLog	1 Apr 2007 10:23:46 -0000	1.2740
@@ -1,3 +1,9 @@
+2007-04-01 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (define_bits_jpeg_loader,
+	  define_bits_jpeg2_loader, define_bits_lossless_2_loader):
+	  Handle duplicate character id. "Fixes" bug #19474.
+
 2007-03-31 Sandro Santilli <strk@keybit.net>
 
 	* gui/Makefile.am, testsuite/server/Makefile.am,

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/swf/tag_loaders.cpp	29 Mar 2007 07:36:17 -0000	1.82
+++ server/swf/tag_loaders.cpp	1 Apr 2007 10:23:47 -0000	1.83
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.82 2007/03/29 07:36:17 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.83 2007/04/01 10:23:47 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -251,8 +251,17 @@
 
 		bitmap_character_def* ch = new bitmap_character_def(im);
 
+		if ( m->get_bitmap_character_def(character_id) )
+		{
+			IF_VERBOSE_MALFORMED_SWF(
+			log_swferror("DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it", character_id);
+			);
+		}
+		else
+		{
 		m->add_bitmap_character_def(character_id, ch);
 	}
+	}
 
 }
 
@@ -288,10 +297,18 @@
 
     //assert(bi->get_ref_count() == 0);
 
+		if ( m->get_bitmap_character_def(character_id) )
+		{
+			IF_VERBOSE_MALFORMED_SWF(
+			log_swferror("DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it", character_id);
+			);
+		}
+		else
+		{
     bitmap_character_def* ch = new bitmap_character_def(im);
-
     m->add_bitmap_character_def(character_id, ch);
    	}
+   	}
 
 }
 
@@ -535,13 +552,20 @@
 			    delete [] buffer;
 			}
 
+			if ( m->get_bitmap_character_def(character_id) )
+			{
+				IF_VERBOSE_MALFORMED_SWF(
+				log_swferror("DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it", character_id);
+				);
+			}
+			else
+			{
 		    bitmap_character_def* ch = new bitmap_character_def(image);
-		    //bi = render::create_bitmap_info_rgb(image);
-		    //delete image;
 
  			// add image to movie, under character id.
  			m->add_bitmap_character_def(character_id, ch);
 		}
+		}
 	    else
 		{
 		    // RGBA image data.



From MAILER-DAEMON Mon Apr 02 02:21:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYFvM-0001dr-M1
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 02:21:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYFvL-0001db-GX
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 02:21:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYFvK-0001dP-28
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 02:21:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYFvJ-0001dM-SB
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 02:21:49 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HYFsJ-0007Ct-85
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 02:18:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYFsI-0000Yv-9x
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:18:42 +0000
Received: from zoulunkai by savannah.gnu.org with local (Exim 4.50)
	id 1HYFsH-0000Ys-Uu
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:18:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYFsH-0000Ys-Uu@savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 02 Apr 2007 06:18:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 06:21:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/02 06:18:41

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 
	server/swf     : tag_loaders.cpp 

Log message:
	improvement of reverse execution

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2740&r2=1.2741
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.213&r2=1.214
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2740
retrieving revision 1.2741
diff -u -b -r1.2740 -r1.2741
--- ChangeLog	1 Apr 2007 10:23:46 -0000	1.2740
+++ ChangeLog	2 Apr 2007 06:18:41 -0000	1.2741
@@ -1,3 +1,13 @@
+2007-04-02 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/sprite_instance.cpp, sprite_instance.h
+	add is_reverse_execution() to check if is reverse executing frame tags;
+	* server/tag_loaders.cpp
+	set "replace_if_depth_is_occupied" to true when reverse executing PlaceObject2.
+	fixed error messages with playing bombgame.swf, improved implementation of 
+	reverse execution.
+
+	  
 2007-04-01 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (define_bits_jpeg_loader,

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -b -r1.213 -r1.214
--- server/sprite_instance.cpp	30 Mar 2007 15:01:47 -0000	1.213
+++ server/sprite_instance.cpp	2 Apr 2007 06:18:41 -0000	1.214
@@ -2805,6 +2805,8 @@
 
 	assert(frame < m_def->get_frame_count());
 
+	m_is_reverse_execution = false;
+
 	if ( frame == 0 && has_looped() )
 	{
 		// Resort frame0 DisplayList as depth of
@@ -2900,6 +2902,8 @@
 
 	assert(frame < m_def->get_frame_count());
 
+	m_is_reverse_execution = true;
+
 	const PlayList& playlist = m_def->get_playlist(frame);
 
 	for (unsigned int i=0, n=playlist.size(); i<n; ++i)

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/sprite_instance.h	30 Mar 2007 07:23:19 -0000	1.83
+++ server/sprite_instance.h	2 Apr 2007 06:18:41 -0000	1.84
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.83 2007/03/30 07:23:19 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.84 2007/04/02 06:18:41 zoulunkai Exp $ */
 
 // Stateful live Sprite instance
 
@@ -250,6 +250,11 @@
 	/// frame is 0-based
 	void execute_frame_tags_reverse(size_t frame);
 
+	// return true is sprite is revserse executing frame tags
+	bool is_reverse_execution() const
+	{
+		return  m_is_reverse_execution;
+	}
 		
 	execute_tag* find_previous_replace_or_add_tag(int frame,
 		int depth, int id);
@@ -767,6 +772,8 @@
 	// true if this sprite reached the last frame and restarted
 	bool		m_has_looped;
 
+	// true if reverse executing frame tags
+	bool		m_is_reverse_execution;
 
 	// a bit-array class would be ideal for this
 	std::vector<bool>	m_init_actions_executed;

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/swf/tag_loaders.cpp	1 Apr 2007 10:23:47 -0000	1.83
+++ server/swf/tag_loaders.cpp	2 Apr 2007 06:18:41 -0000	1.84
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.83 2007/04/01 10:23:47 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.84 2007/04/02 06:18:41 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1111,7 +1111,7 @@
 		      m_name,
 		      m_event_handlers,
 		      m_depth,
-		      false, // m_tag_type != SWF::PLACEOBJECT,	// original place_object doesn't do replacement
+		      m->is_reverse_execution(),	// place_object doesn't do replacement when not in reverse execution
 		      m_color_transform,
 		      m_matrix,
 		      m_ratio,
@@ -1191,7 +1191,7 @@
 		uint32 depthid = 0;
 		if (m_place_type == PLACE || m_place_type == REPLACE)
 		{
-			int id = 0;
+			int id = -1;
 			if (m_tag_type == SWF::PLACEOBJECT)
 			{
 			    // Old-style PlaceObject; the corresponding Remove



From MAILER-DAEMON Mon Apr 02 03:55:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYHNt-0003c0-Jt
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 03:55:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYHNr-0003bn-UN
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 03:55:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYHNo-0003ba-Px
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 03:55:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYHNo-0003bX-Iu
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 03:55:20 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HYHKn-00033a-5X
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 03:52:13 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l327q3536454;
	Mon, 2 Apr 2007 09:52:03 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Mon, 2 Apr 2007 09:52:03 +0200
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
Message-ID: <20070402075203.GA24946@keybit.net>
Mail-Followup-To: gnash-commit@gnu.org
References: <E1HYFsH-0000Ys-Uu@savannah.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HYFsH-0000Ys-Uu@savannah.gnu.org>
X-detected-kernel: FreeBSD 2.0-4.2
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 07:55:24 -0000

On Mon, Apr 02, 2007 at 06:18:41AM +0000, Zou Lunkai wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Zou Lunkai <zoulunkai>	07/04/02 06:18:41
> 
> Modified files:
> 	.              : ChangeLog 
> 	server         : sprite_instance.cpp sprite_instance.h 
> 	server/swf     : tag_loaders.cpp 
> 
> Log message:
> 	improvement of reverse execution

Do we really need yet another sprite_instance private member for this ?
Since we're calling execute_state_reverse() when in reverse mode why
isn't that enough to know ?

--strk;



From MAILER-DAEMON Mon Apr 02 04:10:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYHcA-0006LJ-67
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 04:10:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYHc8-0006LB-UE
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:10:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYHc7-0006Kw-T5
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:10:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYHc7-0006Kt-LI
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:10:07 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYHZ6-0005Ir-DK
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:07:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYHZ4-0005jg-Hh
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 08:06:58 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYHZ4-0005jd-6O
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 08:06:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYHZ4-0005jd-6O@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 08:06:58 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 08:10:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 08:06:58

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	        * server/sprite_instance.cpp (goto_frame): remember to call
	          set_invalidated() before running display list tags!
	          (UdoG: is this correct?)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2741&r2=1.2742
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.214&r2=1.215

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2741
retrieving revision 1.2742
diff -u -b -r1.2741 -r1.2742
--- ChangeLog	2 Apr 2007 06:18:41 -0000	1.2741
+++ ChangeLog	2 Apr 2007 08:06:57 -0000	1.2742
@@ -1,3 +1,9 @@
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (goto_frame): remember to call
+	  set_invalidated() before running display list tags!
+	  (UdoG: is this correct?)
+
 2007-04-02 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/sprite_instance.cpp, sprite_instance.h

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -b -r1.214 -r1.215
--- server/sprite_instance.cpp	2 Apr 2007 06:18:41 -0000	1.214
+++ server/sprite_instance.cpp	2 Apr 2007 08:06:57 -0000	1.215
@@ -3002,6 +3002,8 @@
 	// Construct the DisplayList of the target frame
 	//
 
+	set_invalidated();
+
 	if (target_frame_number < m_current_frame)
 	// Go backward to a previous frame
 	{



From MAILER-DAEMON Mon Apr 02 04:47:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYICM-0004OH-PP
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 04:47:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYICK-0004LJ-Rq
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:47:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYICJ-0004K3-4x
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:47:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYICI-0004K0-QR
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:47:30 -0400
Received: from wr-out-0506.google.com ([64.233.184.229])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HYI9H-0001h1-J8
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 04:44:23 -0400
Received: by wr-out-0506.google.com with SMTP id i23so1366771wra
	for <gnash-commit@gnu.org>; Mon, 02 Apr 2007 01:44:23 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Vj7o3XmUEf/SQUfr1VgRVxnelKVDxC2QBxtkEWCVyxr9zzPgdURa95BM8LDKVvzuHRRLQmWMOeev8QPIoOq8OVqLLFxW6bDPuq7Jwm3kzpeCYam+/xloiOiPDcmpdTheQIzkITQxjwI1KWJ9m5SIlsdAew6Mvv6NWf2q8ucOUUE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=pisexqHY7yeQFgoR2dCM4UyOs196uN2ruw89fQm8tOpn9wTe5Fj7Y8sHAKo/wc1V6oeAofNQW6lEmOivC3L//4//mrP0dNchelkA0fAhxuLP7bmEDOD22yTXAu0nmmRviIC+RJDFkn2J9GGhcdqqeV0DNMuT8PQxG98TFuAnnvY=
Received: by 10.115.89.1 with SMTP id r1mr1726470wal.1175503462204;
	Mon, 02 Apr 2007 01:44:22 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Mon, 2 Apr 2007 01:44:22 -0700 (PDT)
Message-ID: <ca4b43ff0704020144n223cde23q8d0fce46d1c38a16@mail.gmail.com>
Date: Mon, 2 Apr 2007 16:44:22 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
In-Reply-To: <20070402075203.GA24946@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HYFsH-0000Ys-Uu@savannah.gnu.org>
	<20070402075203.GA24946@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 08:47:33 -0000

execute_state_reverse()  calls  execute_state(), and then
execute_state() calls execute().  so m->add_display_object() is always
called in execute(). How can we know if add_display_object()  is
called in reverse execution or not if we don't have a another
variable?

I know that class sprite_instance is already too big...

On 4/2/07, strk <strk@keybit.net> wrote:
> On Mon, Apr 02, 2007 at 06:18:41AM +0000, Zou Lunkai wrote:
> > CVSROOT:      /sources/gnash
> > Module name:  gnash
> > Changes by:   Zou Lunkai <zoulunkai>  07/04/02 06:18:41
> >
> > Modified files:
> >       .              : ChangeLog
> >       server         : sprite_instance.cpp sprite_instance.h
> >       server/swf     : tag_loaders.cpp
> >
> > Log message:
> >       improvement of reverse execution
>
> Do we really need yet another sprite_instance private member for this ?
> Since we're calling execute_state_reverse() when in reverse mode why
> isn't that enough to know ?
>
> --strk;
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Mon Apr 02 05:16:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYIdx-0004hh-88
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 05:16:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYIdu-0004c5-OE
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:16:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYIdr-0004Y4-L2
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:16:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYIdp-0004Xh-SH
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:15:58 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYIao-0005YO-5p
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:12:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYIan-0008VS-84
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:12:49 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYIam-0008VP-UT
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:12:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYIam-0008VP-UT@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 09:12:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/movie...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 09:16:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 09:12:48

Modified files:
	.              : ChangeLog 
	server         : character.h movie_root.cpp movie_root.h 
	                 sprite_instance.cpp sprite_instance.h 

Log message:
	        * server/: character.h, sprite_instance.{cpp,h}:
	          Moved the isUnloaded()/_unloaded logic from sprite_instance
	          up to character.
	        * server/movie_root.{cpp,h}: remove unloaded characters
	          from the keypress_listeners set (run at ::advance time).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2742&r2=1.2743
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.215&r2=1.216
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2742
retrieving revision 1.2743
diff -u -b -r1.2742 -r1.2743
--- ChangeLog	2 Apr 2007 08:06:57 -0000	1.2742
+++ ChangeLog	2 Apr 2007 09:12:48 -0000	1.2743
@@ -1,5 +1,13 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* server/: character.h, sprite_instance.{cpp,h}:
+	  Moved the isUnloaded()/_unloaded logic from sprite_instance
+	  up to character.
+	* server/movie_root.{cpp,h}: remove unloaded characters
+	  from the keypress_listeners set (run at ::advance time).
+
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp (goto_frame): remember to call
 	  set_invalidated() before running display list tags!
 	  (UdoG: is this correct?)

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/character.h	22 Mar 2007 16:56:36 -0000	1.59
+++ server/character.h	2 Apr 2007 09:12:48 -0000	1.60
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.59 2007/03/22 16:56:36 bjacques Exp $ */
+/* $Id: character.h,v 1.60 2007/04/02 09:12:48 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -80,6 +80,10 @@
 	/// Used to assign a name to unnamed instances
 	static unsigned int _lastUnnamedInstanceNum;
 
+	/// Set to yes when this instance has been unloaded
+	bool _unloaded;
+
+
 protected:
 
 	/// Used to assign a name to unnamed instances
@@ -197,6 +201,7 @@
 	m_clip_depth(0),
 	m_display_callback(NULL),
 	m_display_callback_user_ptr(NULL),
+	_unloaded(false),
 	m_visible(true),
 	m_parent(parent),
 	m_invalidated(true),
@@ -647,10 +652,11 @@
 	///
 	virtual void unload()
 	{
+		_unloaded = true;
 		on_event(event_id::UNLOAD);
 	}
 
-	
+	bool isUnloaded() { return _unloaded; }
 };
 
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/movie_root.cpp	30 Mar 2007 09:04:38 -0000	1.47
+++ server/movie_root.cpp	2 Apr 2007 09:12:48 -0000	1.48
@@ -481,6 +481,9 @@
 		}
 	}
 
+	// Cleanup keypress listeners (remove unloaded characters)
+	cleanup_keypress_listeners();
+
 	// random should go continuously that:
 	// 1. after restart of the player the situation has not repeated
 	// 2. by different machines the random gave different numbers
@@ -578,8 +581,30 @@
 	return _movie->call_method_args(method_name, method_arg_fmt, args);
 }
 
+void movie_root::cleanup_keypress_listeners()
+{
+	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
+			 iter != m_keypress_listeners.end(); )
+	{
+		// TODO: handle non-character objects too !
+		character* ch = dynamic_cast<character*>(iter->get());
+		if ( ch && ch->isUnloaded() )
+		{
+			ListenerSet::iterator toremove = iter;
+			++iter;
+			//log_msg("cleanup_keypress_listeners: Removing unloaded keypress listener %p", iter->get());
+			m_keypress_listeners.erase(toremove);
+		}
+		else
+		{
+			++iter;
+		}
+	}
+}
+
 void movie_root::notify_keypress_listeners(key::code k)
 {
+	//log_msg("Notifying %u keypress listeners", m_keypress_listeners.size());
 	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
 			 iter != m_keypress_listeners.end(); ++iter)
 	{
@@ -597,13 +622,22 @@
 
 void movie_root::add_keypress_listener(as_object* listener)
 {
-	m_keypress_listeners.insert(listener);
+	if ( m_keypress_listeners.insert(listener).second )
+	{
+		//log_msg("Added keypress listener %p", (void*)listener);
+	}
+	else
+	{
+		//log_msg("Keypress listener %p was already in the known set", (void*)listener);
+	}
 	assert(testInvariant());
 }
 
 void movie_root::remove_keypress_listener(as_object* listener)
 {
+	//log_msg("Removing keypress listener %p - %u listeners currently ", (void*)listener, m_keypress_listeners.size());
 	m_keypress_listeners.erase(listener);
+	//log_msg("After removing keypress listener %p, %u listeners are left", (void*)listener, m_keypress_listeners.size());
 	assert(testInvariant());
 }
 

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/movie_root.h	29 Mar 2007 12:37:31 -0000	1.42
+++ server/movie_root.h	2 Apr 2007 09:12:48 -0000	1.43
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.42 2007/03/29 12:37:31 strk Exp $ */
+/* $Id: movie_root.h,v 1.43 2007/04/02 09:12:48 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -413,6 +413,10 @@
 
 private:
 
+	/// Remove all listeners with a ref-count of 1
+	/// (only referenced as key listeners)
+	void cleanup_keypress_listeners();
+
 	/// Return the current Stage object
 	//
 	/// Can return NULL if it's been deleted or not

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -b -r1.215 -r1.216
--- server/sprite_instance.cpp	2 Apr 2007 08:06:57 -0000	1.215
+++ server/sprite_instance.cpp	2 Apr 2007 09:12:48 -0000	1.216
@@ -1561,7 +1561,6 @@
 		character* parent, int id)
 	:
 	character(parent, id),
-	_unloaded(false),
 	m_mouse_state(UP),
 	m_root(r),
 	m_display_list(),
@@ -3803,8 +3802,7 @@
 
 	UnloaderVisitor visitor;
 	m_display_list.visitForward(visitor);
-	on_event(event_id::UNLOAD); // if call_unload
-	_unloaded=true;
+	character::unload();
 
 }
 

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/sprite_instance.h	2 Apr 2007 06:18:41 -0000	1.84
+++ server/sprite_instance.h	2 Apr 2007 09:12:48 -0000	1.85
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.84 2007/04/02 06:18:41 zoulunkai Exp $ */
+/* $Id: sprite_instance.h,v 1.85 2007/04/02 09:12:48 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -693,8 +693,6 @@
 	/// @} Drawing API
 	
 
-	bool isUnloaded() { return _unloaded; }
-
 	typedef std::map<std::string, std::string> VariableMap;
 
 	/// Set all variables in the given map with their corresponding values
@@ -712,9 +710,6 @@
 	///
 	void queueActions(ActionList& action_list);
 
-	/// Set to yes when this instance has been unloaded
-	bool _unloaded;
-
 	/// Execute a single action buffer (DOACTION block)
 	void execute_action(action_buffer& ab);
 



From MAILER-DAEMON Mon Apr 02 05:18:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYIgh-0006Zw-NN
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 05:18:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYIgf-0006WO-Gs
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:18:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYIgb-0006Tq-NL
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:18:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYIgZ-0006TL-LD
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:18:47 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HYIdX-0005q4-Ri
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:15:40 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l329FbZ37602;
	Mon, 2 Apr 2007 11:15:37 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Mon, 2 Apr 2007 11:15:37 +0200
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
Message-ID: <20070402091537.GB24946@keybit.net>
Mail-Followup-To: gnash-commit@gnu.org
References: <E1HYFsH-0000Ys-Uu@savannah.gnu.org>
	<20070402075203.GA24946@keybit.net>
	<ca4b43ff0704020144n223cde23q8d0fce46d1c38a16@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704020144n223cde23q8d0fce46d1c38a16@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 09:18:54 -0000

On Mon, Apr 02, 2007 at 04:44:22PM +0800, zou lunkai wrote:
> execute_state_reverse()  calls  execute_state(), and then
> execute_state() calls execute().  so m->add_display_object() is always
> called in execute(). How can we know if add_display_object()  is
> called in reverse execution or not if we don't have a another
> variable?

What about adding an execute_state_reversed() to know we're being 
executed in "reverse" mode ?
It's still dirty, but moves the dirtiness where it's already dirty
enough :)

--strk;




From MAILER-DAEMON Mon Apr 02 05:35:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYIwO-0006Qp-W8
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 05:35:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYIwK-0006IV-4U
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:35:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYIwJ-0006FS-5t
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:35:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYIwI-0006F0-4A
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:35:02 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYItG-0007iz-6d
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:31:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYItF-0000nr-8Q
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:31:53 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYItE-0000nk-VM
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:31:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYItE-0000nk-VM@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 09:31:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.cpp server/dlist.h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 09:35:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 09:31:52

Modified files:
	.              : ChangeLog 
	server         : dlist.cpp dlist.h movie_root.cpp 

Log message:
	        * server/dlist.{cpp,h} (remove_display_object): call
	          unload on removed character.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2743&r2=1.2744
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2743
retrieving revision 1.2744
diff -u -b -r1.2743 -r1.2744
--- ChangeLog	2 Apr 2007 09:12:48 -0000	1.2743
+++ ChangeLog	2 Apr 2007 09:31:52 -0000	1.2744
@@ -1,5 +1,7 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* server/dlist.{cpp,h} (remove_display_object): call
+	  unload on removed character.
 	* server/: character.h, sprite_instance.{cpp,h}:
 	  Moved the isUnloaded()/_unloaded logic from sprite_instance
 	  up to character.

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/dlist.cpp	30 Mar 2007 13:41:10 -0000	1.54
+++ server/dlist.cpp	2 Apr 2007 09:31:52 -0000	1.55
@@ -368,14 +368,15 @@
 #endif
 
 	// TODO: optimize to take by-depth order into account
-	container_type::iterator new_end = remove_if(
+	container_type::iterator it = find_if(
 			_characters.begin(),
 			_characters.end(),
 			DepthEquals(depth));
 
-	if ( new_end != _characters.end() )
+	if ( it != _characters.end() )
 	{
-		_characters.erase(new_end, _characters.end());
+		(*it)->unload();
+		_characters.erase(it);
 
 	}
 

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/dlist.h	28 Feb 2007 17:25:26 -0000	1.29
+++ server/dlist.h	2 Apr 2007 09:31:52 -0000	1.30
@@ -126,7 +126,7 @@
 
 	/// Removes the object at the specified depth.
 	//
-	/// Does *not* calls UNLOAD event 
+	/// Calls unload on the removed character.
 	///
 	void	remove_display_object(uint16_t depth);
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/movie_root.cpp	2 Apr 2007 09:12:48 -0000	1.48
+++ server/movie_root.cpp	2 Apr 2007 09:31:52 -0000	1.49
@@ -604,7 +604,7 @@
 
 void movie_root::notify_keypress_listeners(key::code k)
 {
-	//log_msg("Notifying %u keypress listeners", m_keypress_listeners.size());
+	log_msg("Notifying %u keypress listeners", m_keypress_listeners.size());
 	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
 			 iter != m_keypress_listeners.end(); ++iter)
 	{



From MAILER-DAEMON Mon Apr 02 05:41:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYJ2V-0007u0-7v
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 05:41:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYJ2U-0007to-43
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:41:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYJ2T-0007tU-HH
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:41:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYJ2T-0007tR-CG
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:41:25 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYIzR-0000Gx-J1
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:38:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYIzR-0001v9-4J
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:38:17 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYIzQ-0001v6-Rn
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:38:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYIzQ-0001v6-Rn@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 09:38:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 09:41:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 09:38:16

Modified files:
	.              : ChangeLog 
	server         : movie_root.cpp 

Log message:
	        * server/movie_root.cpp (notify_keypress_listeners):
	          Skip event execution for unloaded characters
	          (they will be removed at next ::advance call)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2744&r2=1.2745
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2744
retrieving revision 1.2745
diff -u -b -r1.2744 -r1.2745
--- ChangeLog	2 Apr 2007 09:31:52 -0000	1.2744
+++ ChangeLog	2 Apr 2007 09:38:16 -0000	1.2745
@@ -1,5 +1,11 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* server/movie_root.cpp (notify_keypress_listeners):
+	  Skip event execution for unloaded characters
+	  (they will be removed at next ::advance call)
+
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
 	* server/dlist.{cpp,h} (remove_display_object): call
 	  unload on removed character.
 	* server/: character.h, sprite_instance.{cpp,h}:

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/movie_root.cpp	2 Apr 2007 09:31:52 -0000	1.49
+++ server/movie_root.cpp	2 Apr 2007 09:38:16 -0000	1.50
@@ -611,7 +611,7 @@
 		// sprite, button & input_edit_text characters
 		// TODO: invoke functions on non-characters !
 		character* ch = dynamic_cast<character*>(iter->get());
-		if ( ch )
+		if ( ch && ! ch->isUnloaded() )
 		{
 			ch->on_event(event_id(event_id::KEY_PRESS, k));
 		}



From MAILER-DAEMON Mon Apr 02 05:53:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYJEY-0004oj-Q7
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 05:53:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYJEW-0004j6-On
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:53:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYJEV-0004hq-RU
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:53:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYJEV-0004hd-Nm
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:53:51 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYJBU-0001kq-6m
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 05:50:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYJBT-0002BU-NC
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:50:43 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYJBT-0002BR-GX
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 09:50:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYJBT-0002BR-GX@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 09:50:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/samples/README testsu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 09:53:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 09:50:43

Modified files:
	.              : ChangeLog 
	testsuite/samples: README 
Added files:
	testsuite/samples: gotoFrameOnKeyEvent.swf 

Log message:
	        * testsuite/samples/: gotoFrameOnKeyEvent.swf, README:
	          Add new tests used to debug keypress listeners and
	          goto_frame. Provided by Dongdong <dedodong@163.com>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2745&r2=1.2746
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/README?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent.swf?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2745
retrieving revision 1.2746
diff -u -b -r1.2745 -r1.2746
--- ChangeLog	2 Apr 2007 09:38:16 -0000	1.2745
+++ ChangeLog	2 Apr 2007 09:50:43 -0000	1.2746
@@ -1,5 +1,8 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/samples/: gotoFrameOnKeyEvent.swf, README:
+	  Add new tests used to debug keypress listeners and
+	  goto_frame. Provided by Dongdong <dedodong@163.com>
 	* server/movie_root.cpp (notify_keypress_listeners):
 	  Skip event execution for unloaded characters
 	  (they will be removed at next ::advance call)

Index: testsuite/samples/README
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/README,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/samples/README	16 Feb 2007 13:54:11 -0000	1.5
+++ testsuite/samples/README	2 Apr 2007 09:50:43 -0000	1.6
@@ -1,3 +1,16 @@
+= [gotoFrameOnKeyEvent.swf] =
+
+== Origin == 
+
+Produced by dongdong <dedodong@163.com> (a friend of Zou Lunkai).
+Zou asked his permission to included the movie into Gnash testsuite.
+Dongdong reported bug #18916, now closed.
+
+== Description ==
+
+Executes gotoFrame actions in response to key events.
+Expected behaviour is described by textfields, so should be intuitive.
+
 = [sound1.swf] =
 
 == Origin == 

Index: testsuite/samples/gotoFrameOnKeyEvent.swf
===================================================================
RCS file: testsuite/samples/gotoFrameOnKeyEvent.swf
diff -N testsuite/samples/gotoFrameOnKeyEvent.swf
Binary files /dev/null and /tmp/cvspSzmi2 differ



From MAILER-DAEMON Mon Apr 02 06:04:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYJOl-0002Fe-5z
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 06:04:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYJOj-0002FE-EE
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:04:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYJOh-0002EZ-SN
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:04:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYJOh-0002EG-OV
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:04:23 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYJLg-0002m4-62
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:01:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYJLf-0002WH-5i
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:01:15 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYJLf-0002WE-06
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:01:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYJLf-0002WE-06@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 10:01:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/samples gotoFrameOnKeyEvent.swf
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 10:04:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 10:01:14

Removed files:
	testsuite/samples: gotoFrameOnKeyEvent.swf 

Log message:
	will add right back, just trying to get binary flag right

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent.swf?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: gotoFrameOnKeyEvent.swf
===================================================================
RCS file: gotoFrameOnKeyEvent.swf
diff -N gotoFrameOnKeyEvent.swf
Binary files /tmp/cvs3V4C9u and /dev/null differ



From MAILER-DAEMON Mon Apr 02 06:05:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYJPL-0002Qv-F8
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 06:05:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYJPK-0002QV-9R
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:05:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYJPJ-0002QC-Qo
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:05:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYJPJ-0002Q7-BT
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:05:01 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYJMH-0002qO-LO
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:01:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYJMH-0002XU-7Z
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:01:53 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYJMG-0002XR-W6
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:01:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYJMG-0002XR-W6@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 10:01:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/samples gotoFrameOnKeyEvent.swf
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 10:05:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 10:01:52

Added files:
	testsuite/samples: gotoFrameOnKeyEvent.swf 

Log message:
	readded, hopefully with binary flag set

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent.swf?cvsroot=gnash&rev=1.3

Patches:
Index: gotoFrameOnKeyEvent.swf
===================================================================
RCS file: gotoFrameOnKeyEvent.swf
diff -N gotoFrameOnKeyEvent.swf
Binary files /dev/null and /tmp/cvsbPQqnm differ



From MAILER-DAEMON Mon Apr 02 06:45:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYK2W-0004yB-Sj
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 06:45:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYK2W-0004v6-3c
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:45:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYK2V-0004sh-9u
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:45:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYK2V-0004sR-6z
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:45:31 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HYJzT-0000eZ-14
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:42:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYJzS-0004yV-Fw
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:42:22 +0000
Received: from bjacques by savannah.gnu.org with local (Exim 4.50)
	id 1HYJzS-0004yS-3q
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:42:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYJzS-0004yS-3q@savannah.gnu.org>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Mon, 02 Apr 2007 10:42:22 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 10:45:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/02 10:42:21

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	server/asobj   : Date.cpp Math.cpp 

Log message:
	        * server/as_value{.cpp, .h}: Declare NAN in the header
	        (and fix a typo in the declaration. Use that definition
	        instead of by using 0.0 / 0.0 to avoid compiler warnings.
	        * server/asobj/{Date.cpp, Math.cpp}: Don't redefine NAN.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2747&r2=1.2748
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Math.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2747
retrieving revision 1.2748
diff -u -b -r1.2747 -r1.2748
--- ChangeLog	2 Apr 2007 10:38:34 -0000	1.2747
+++ ChangeLog	2 Apr 2007 10:42:21 -0000	1.2748
@@ -1,3 +1,10 @@
+2007-04-02 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* server/as_value{.cpp, .h}: Declare NAN in the header
+	(and fix a typo in the declaration. Use that definition
+	instead of by using 0.0 / 0.0 to avoid compiler warnings.
+	* server/asobj/{Date.cpp, Math.cpp}: Don't redefine NAN.
+
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/ming_utils.{c,h}: fix compiler warnings.

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/as_value.cpp	30 Mar 2007 07:23:19 -0000	1.33
+++ server/as_value.cpp	2 Apr 2007 10:42:21 -0000	1.34
@@ -32,7 +32,6 @@
 #include "Boolean.h" // for automatic as_value::BOOLEAN => Boolean as object
 #include "action.h" // for call_method0
 
-#include <cmath>	// for NAN
 #include <boost/algorithm/string/case_conv.hpp>
 
 using namespace std;
@@ -43,12 +42,6 @@
 
 namespace gnash {
 
-#ifndef NAN
-//	If this makes your compiler die with div by zero,
-//	use "static double zzzero = 0.0;" and "(zzzero/zzzero)"
-#	define NAN std::numeric_limits<double>::quiet_NaN();
-#endif
-
 //
 // as_value -- ActionScript value type
 //

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/as_value.h	28 Mar 2007 08:46:43 -0000	1.39
+++ server/as_value.h	2 Apr 2007 10:42:21 -0000	1.40
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.39 2007/03/28 08:46:43 bjacques Exp $ */
+/* $Id: as_value.h,v 1.40 2007/04/02 10:42:21 bjacques Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -44,6 +44,11 @@
 # endif 
 #endif 
 
+#ifndef NAN
+#       define NAN (std::numeric_limits<double>::quiet_NaN())
+#endif
+
+
 #ifndef isnan
 # define isnan(x) \
 (sizeof (x) == sizeof (long double) ? isnan_ld (x) \
@@ -504,7 +509,7 @@
 	void	set_sprite(const std::string& path);
 	void	set_sprite(const sprite_instance& sp);
 	void	set_int(int val) { set_double(val); }
-	void	set_nan() { double x = 0.0; set_double(x/x); }
+	void	set_nan() { set_double(NAN); }
 
 	/// Make this value a NULL, OBJECT, MOVIECLIP or AS_FUNCTION value
 	//

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/Date.cpp	20 Mar 2007 15:01:20 -0000	1.37
+++ server/asobj/Date.cpp	2 Apr 2007 10:42:21 -0000	1.38
@@ -99,10 +99,6 @@
 # include <sys/time.h>
 #endif
 
-#ifndef NAN
-	#define NAN (0.0/0.0)
-#endif
-
 #ifndef trunc
 #define trunc(x) ( x < 0 ?  -(std::floor(-x)) : std::floor(x) )
 #endif

Index: server/asobj/Math.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Math.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/Math.cpp	19 Mar 2007 17:11:14 -0000	1.20
+++ server/asobj/Math.cpp	2 Apr 2007 10:42:21 -0000	1.21
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Math.cpp,v 1.20 2007/03/19 17:11:14 bjacques Exp $ */
+/* $Id: Math.cpp,v 1.21 2007/04/02 10:42:21 bjacques Exp $ */
 
 //
 // This file implements methods of the ActionScript Math class.
@@ -40,12 +40,6 @@
 #include "log.h"
 #include "builtin_function.h" 
 
-#ifndef NAN
-// This throws a warning with some compilers. If that bugs you, use
-// static double nan_zero = 0.0; and (nan_zero/nan_zero)
-# define NAN (0.0/0.0)
-#endif
-
 using namespace std;
 
 namespace gnash {



From MAILER-DAEMON Mon Apr 02 06:50:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYK7b-0002qi-T8
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 06:50:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYK7a-0002iz-RK
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:50:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYK7Z-0002co-T6
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:50:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYK7Z-0002cM-Oz
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:50:45 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYK4X-0001N1-Lb
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:47:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYK4X-00057G-3x
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:47:37 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYK4W-00057D-Rl
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:47:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYK4W-00057D-Rl@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 10:47:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/samples/Makefile.am t...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 10:50:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 10:47:36

Modified files:
	.              : ChangeLog 
	testsuite/samples: Makefile.am 
Added files:
	testsuite/samples: gotoFrameOnKeyEvent-TestRunner.cpp 

Log message:
	        * testsuite/samples/: Makefile.am, gotoFrameOnKeyEvent-TestRunner.cpp:
	          First stub at an automated test runner for gotoFrameOnKeyEvent.
	          TODO item in comments.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2748&r2=1.2749
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2748
retrieving revision 1.2749
diff -u -b -r1.2748 -r1.2749
--- ChangeLog	2 Apr 2007 10:42:21 -0000	1.2748
+++ ChangeLog	2 Apr 2007 10:47:36 -0000	1.2749
@@ -1,3 +1,9 @@
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/samples/: Makefile.am, gotoFrameOnKeyEvent-TestRunner.cpp:
+	  First stub at an automated test runner for gotoFrameOnKeyEvent.
+	  TODO item in comments.
+
 2007-04-02 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/as_value{.cpp, .h}: Declare NAN in the header

Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/samples/Makefile.am	27 Feb 2007 09:10:21 -0000	1.13
+++ testsuite/samples/Makefile.am	2 Apr 2007 10:47:36 -0000	1.14
@@ -38,6 +38,7 @@
 
 check_PROGRAMS = \
 	clip_as_button2-TestRunner \
+	gotoFrameOnKeyEvent-TestRunner \
 	$(NULL)
 
 check_SCRIPTS = \
@@ -58,6 +59,20 @@
 	$(top_builddir)/testsuite/libtestsuite.la \
 	$(NULL)
 
+gotoFrameOnKeyEvent_TestRunner_SOURCES = \
+	gotoFrameOnKeyEvent-TestRunner.cpp \
+	$(NULL)
+gotoFrameOnKeyEvent_TestRunner_LDADD = \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	$(NULL)
+gotoFrameOnKeyEvent_TestRunner_CXXFLAGS = \
+	-DSRCDIR='"$(srcdir)"' \
+	$(NULL)
+gotoFrameOnKeyEvent_TestRunner_DEPENDENCIES = \
+	gotoFrameOnKeyEvent.swf \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	$(NULL)
+
 GotoAndPlayTestRunner: $(srcdir)/../generic-testrunner.sh $(srcdir)/GotoAndPlayTest.swf
 	sh $< $(top_builddir) $(srcdir)/GotoAndPlayTest.swf > $@
 	chmod 755 $@

Index: testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
===================================================================
RCS file: testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
diff -N testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp	2 Apr 2007 10:47:36 -0000	1.1
@@ -0,0 +1,81 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+#define INPUT_FILENAME "gotoFrameOnKeyEvent.swf"
+
+#include "MovieTester.h"
+#include "GnashException.h"
+#include "sprite_instance.h"
+#include "character.h"
+#include "dlist.h"
+#include "container.h"
+#include "log.h"
+
+#include "check.h"
+#include <string>
+#include <cassert>
+
+using namespace gnash;
+using namespace std;
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+	string filename = string(SRCDIR) + string("/") + string(INPUT_FILENAME);
+	auto_ptr<MovieTester> t;
+
+	gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+	dbglogfile.setVerbosity(1);
+
+	try
+	{
+		t.reset(new MovieTester(filename));
+	}
+	catch (const GnashException& e)
+	{
+		std::cerr << "Error initializing MovieTester: " << e.what() << std::endl;
+		exit(EXIT_FAILURE);
+	}
+	
+	MovieTester& tester = *t;
+
+	// TODO: check why we need this !!
+	//       I wouldn't want the first advance to be needed
+	tester.advance();
+
+	sprite_instance* root = tester.getRootMovie();
+	assert(root);
+
+	check_equals(root->get_frame_count(), 7);
+
+	check_equals(root->get_current_frame(), 0);
+	tester.advance();
+	check_equals(root->get_current_frame(), 0);
+
+	tester.pressKey(key::_1);
+
+	// TODO: check if it is correct to wait for next ::advance before expecting gotoFrame actions
+	//       execution !!
+
+	xcheck_equals(root->get_current_frame(), 1);
+	tester.advance();
+	check_equals(root->get_current_frame(), 1);
+
+}
+



From MAILER-DAEMON Mon Apr 02 07:10:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYKQx-0001qW-TB
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 07:10:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYKQw-0001mt-2L
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 07:10:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYKQu-0001jY-9H
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 07:10:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYKQt-0001j9-Vz
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 07:10:44 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYJvq-0008TM-1q
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 06:38:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYJvm-0004ss-Sy
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:38:34 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYJvm-0004sp-Jy
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:38:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYJvm-0004sp-Jy@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 10:38:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ming_ut...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 11:10:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 10:38:34

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: ming_utils.c ming_utils.h 

Log message:
	* testsuite/misc-ming.all/ming_utils.{c,h}: fix compiler warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2746&r2=1.2747
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2746
retrieving revision 1.2747
diff -u -b -r1.2746 -r1.2747
--- ChangeLog	2 Apr 2007 09:50:43 -0000	1.2746
+++ ChangeLog	2 Apr 2007 10:38:34 -0000	1.2747
@@ -1,5 +1,6 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/ming_utils.{c,h}: fix compiler warnings.
 	* testsuite/samples/: gotoFrameOnKeyEvent.swf, README:
 	  Add new tests used to debug keypress listeners and
 	  goto_frame. Provided by Dongdong <dedodong@163.com>

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/misc-ming.all/ming_utils.c	29 Mar 2007 06:54:09 -0000	1.23
+++ testsuite/misc-ming.all/ming_utils.c	2 Apr 2007 10:38:34 -0000	1.24
@@ -25,6 +25,7 @@
 #include <stdarg.h>
 
 void add_xtrace_function_clip(SWFMovieClip mo, SWFBlock font, int depth, int x, int y, int width, int height);
+static SWFAction get_dejagnu_actions(void);
 
 void
 add_xtrace_function_clip(SWFMovieClip mc, SWFBlock font, int depth, int x, int y, int width, int height)
@@ -157,11 +158,9 @@
 	return sh;
 }
 
-SWFAction
+static SWFAction
 get_dejagnu_actions()
 {
-	SWFAction ac;
-
 	static const size_t BUFLEN = 4096;
 
 	char buf[BUFLEN];
@@ -295,7 +294,7 @@
 {
 	SWFAction ac;
 	ac = compileSWFActionCode(code);
-	SWFMovieClip_addInitAction(mo, (SWFBlock)ac);
+	SWFMovieClip_addInitAction(mo, ac);
 }
 #endif // MING_SUPPORTS_INIT_ACTIONS
 

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/misc-ming.all/ming_utils.h	29 Mar 2007 06:54:09 -0000	1.16
+++ testsuite/misc-ming.all/ming_utils.h	2 Apr 2007 10:38:34 -0000	1.17
@@ -26,6 +26,19 @@
 # define MING_SUPPORTS_INIT_ACTIONS
 #endif
 
+/*
+ * This is to avoid the annoying warnings
+ * coming from Ming when using the deprecated
+ * compileSWFActionCode interface.
+ * A cleaner approach is likely switch to
+ * using newSWFAction always and change the
+ * macro to make it output compileSWFActionCode
+ * when MING_VERSION_CODE < 000040004
+ */
+#if MING_VERSION_CODE >= 00040004
+# define compileSWFActionCode newSWFAction
+#endif
+
 /* Missing define to allow using older Ming releases */
 
 #ifndef SWFACTION_INIT



From MAILER-DAEMON Mon Apr 02 10:46:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYNnN-00056P-Sm
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 10:46:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYNnL-00055B-Tr
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:46:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYNnK-00054G-9b
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:46:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYNnK-00054C-1J
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:46:06 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYNkH-0008Ec-2b
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 10:42:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYNkF-0008JD-Lt
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 14:42:55 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYNkF-0008J9-HG
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 14:42:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYNkF-0008J9-HG@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 14:42:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite misc-ming.all/.cvsignore sample...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 14:46:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 14:42:55

Modified files:
	testsuite/misc-ming.all: .cvsignore 
	testsuite/samples: .cvsignore 

Log message:
	updated

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/.cvsignore?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/.cvsignore?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: misc-ming.all/.cvsignore
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- misc-ming.all/.cvsignore	16 Mar 2007 08:23:19 -0000	1.8
+++ misc-ming.all/.cvsignore	2 Apr 2007 14:42:55 -0000	1.9
@@ -22,3 +22,5 @@
 action_execution_order_test4
 action_execution_order_test5
 eventSoundTest1
+action_execution_order_test6
+reverse_execute_PlaceObject2_test1

Index: samples/.cvsignore
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- samples/.cvsignore	15 Mar 2007 22:39:54 -0000	1.4
+++ samples/.cvsignore	2 Apr 2007 14:42:55 -0000	1.5
@@ -11,3 +11,4 @@
 *.bak
 site.exp
 GotoAndPlayTestRunner
+gotoFrameOnKeyEvent-TestRunner



From MAILER-DAEMON Mon Apr 02 11:48:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYOlq-0002jx-04
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 11:48:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYOlo-0002jo-MB
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:48:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYOlm-0002jb-TB
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:48:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYOlm-0002jY-NZ
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:48:34 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYOij-0008An-3d
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:45:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYOih-0002z1-Mw
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 15:45:23 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYOih-0002yx-8J
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 15:45:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYOih-0002yx-8J@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 15:45:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gui.cpp gui/gui...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 15:48:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 15:45:22

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp gui.cpp gui.h 
	server         : character.cpp character.h gnash.h 
	                 movie_root.cpp movie_root.h sprite_instance.cpp 
	                 sprite_instance.h 
	server/asobj   : Key.cpp 
	server/vm      : ExecutableCode.h 
	testsuite      : MovieTester.cpp 

Log message:
	        * server/vm/ExecutableCode.h: change FunctionCode to take
	          a generic character as target, not necessarely a sprite.
	        * server/movie_root.{cpp,h}: update pushAction() for events
	          to take a generic character, add a notify_key_event method
	          for consistency.
	        * server/asobj/Key.cpp: notify_key_event moved to movie_root.
	        * server/gnash.h: remove notify_key_event prototype, it's now
	          a movie_root method.
	        * gui/gtk.cpp: use gui::notify_key_event for key events.
	        * gui/gui.{cpp,h}: add notify_key_event method.
	        * server/character.{cpp,h}: move queueActionHandler from
	          sprite_instance here.
	        * server/sprite_instance.{cpp,h}: cleanups.
	        * testsuite/MovieTester.cpp: update call to notify_key_event.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2749&r2=1.2750
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.79&r2=1.80
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.216&r2=1.217
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2749
retrieving revision 1.2750
diff -u -b -r1.2749 -r1.2750
--- ChangeLog	2 Apr 2007 10:47:36 -0000	1.2749
+++ ChangeLog	2 Apr 2007 15:45:22 -0000	1.2750
@@ -1,5 +1,22 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ExecutableCode.h: change FunctionCode to take
+	  a generic character as target, not necessarely a sprite.
+	* server/movie_root.{cpp,h}: update pushAction() for events
+	  to take a generic character, add a notify_key_event method
+	  for consistency.
+	* server/asobj/Key.cpp: notify_key_event moved to movie_root.
+	* server/gnash.h: remove notify_key_event prototype, it's now
+	  a movie_root method.
+	* gui/gtk.cpp: use gui::notify_key_event for key events.
+	* gui/gui.{cpp,h}: add notify_key_event method.
+	* server/character.{cpp,h}: move queueActionHandler from
+	  sprite_instance here.
+	* server/sprite_instance.{cpp,h}: cleanups.
+	* testsuite/MovieTester.cpp: update call to notify_key_event.
+
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/samples/: Makefile.am, gotoFrameOnKeyEvent-TestRunner.cpp:
 	  First stub at an automated test runner for gotoFrameOnKeyEvent.
 	  TODO item in comments.

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- gui/gtk.cpp	29 Mar 2007 23:55:49 -0000	1.79
+++ gui/gtk.cpp	2 Apr 2007 15:45:22 -0000	1.80
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.79 2007/03/29 23:55:49 rsavoye Exp $ */
+/* $Id: gtk.cpp,v 1.80 2007/04/02 15:45:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1171,7 +1171,7 @@
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
     
     if (c != gnash::key::INVALID) {
-        gnash::notify_key_event(c, true);
+        gui->notify_key_event(c, true);
     }
 
     /* Handle GUI shortcuts */
@@ -1224,15 +1224,17 @@
 gboolean
 GtkGui::key_release_event(GtkWidget *const /*widget*/,
                 GdkEventKey *const event,
-                const gpointer /*data*/)
+                const gpointer data)
 {
     GNASH_REPORT_FUNCTION;
 
+    Gui* gui = static_cast<Gui*>(data);
+
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
     
     if (c != gnash::key::INVALID) {
-        gnash::notify_key_event(c, false);
+        gui->notify_key_event(c, false);
     }
     
     return true;

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gui/gui.cpp	7 Mar 2007 23:52:13 -0000	1.67
+++ gui/gui.cpp	2 Apr 2007 15:45:22 -0000	1.68
@@ -276,6 +276,20 @@
 	}
 }
 
+void
+Gui::notify_key_event(gnash::key::code k, bool pressed) 
+{
+	movie_root* m = get_current_root();
+
+	//log_msg("mouse @ %d,%d", x, y);
+	if ( m->notify_key_event(k, pressed) )
+	{
+		// any action triggered by the
+		// event required screen refresh
+		display(m);
+	}
+}
+
 bool
 Gui::display(movie_root* m)
 {

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gui/gui.h	7 Mar 2007 23:52:13 -0000	1.46
+++ gui/gui.h	2 Apr 2007 15:45:22 -0000	1.47
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -27,6 +27,7 @@
 #include "tu_config.h"
 #include "rect.h"  // for composition
 #include "snappingrange.h"  // for InvalidatedRanges
+#include "gnash.h" // for gnash::key::code type
 
 #include <string>
 
@@ -167,6 +168,7 @@
     //
     /// @param x The mouse coordinate X component in pixels.
     /// @param y The mouse coordinate Y component in pixels.
+    ///
     void notify_mouse_moved(int x, int y);
 
     /// Mouse notification callback to be called when the mouse is clicked.
@@ -174,8 +176,18 @@
     /// @param mouse_pressed Determines whether the mouse button is being
     ///                      pressed (true) or being released (false)
     /// @param mask A binary representation of the buttons currently pressed.
+    ///
     void notify_mouse_clicked(bool mouse_pressed, int mask);
 
+    /// Key event notification to be called when a key is pressed or depressed
+    //
+    /// @param k The key code.
+    ///
+    /// @param pressed Determines whether the key is being
+    ///           pressed (true) or being released (false)
+    ///
+    void notify_key_event(gnash::key::code k, bool pressed);
+
     /// Resize the client area view and the window accordingly.
     //
     /// @param width  The desired width in pixels.

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/character.cpp	22 Mar 2007 16:56:36 -0000	1.27
+++ server/character.cpp	2 Apr 2007 15:45:22 -0000	1.28
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.27 2007/03/22 16:56:36 bjacques Exp $ */
+/* $Id: character.cpp,v 1.28 2007/04/02 15:45:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,8 @@
 #include "fn_call.h" // for shared ActionScript getter-setters
 #include "GnashException.h" // for shared ActionScript getter-setters (ensure_character)
 
+#include <boost/algorithm/string/case_conv.hpp>
+
 namespace gnash
 {
 
@@ -746,6 +748,66 @@
 	//       mouse or keypress events.
 }
 
+void
+character::unload()
+{
+	_unloaded = true;
+	log_msg("Queuing unload event for character %p", this);
+	queueEventHandler(event_id::UNLOAD);
+	//on_event(event_id::UNLOAD);
+}
+
+void
+character::queueEventHandler(const event_id& id)
+{
+	//testInvariant();
+
+	bool called=false;
+
+	movie_root& root = VM::get().getRoot();
+
+	// First, check for built-in event handler.
+	boost::intrusive_ptr<as_function> method = get_event_handler(id).to_as_function();
+	   
+	if (method)
+	{
+		root.pushAction(method, boost::intrusive_ptr<character>(this));
+		called=true;
+	}
+
+	// This is likely wrong, we use it as a workaround
+	// to the fact that we don't distinguish between
+	// ActionScript and SWF defined events
+	// (for example: onClipLoad vs. onLoad)
+	//
+	if (called) return;
+
+	// Check for member function.
+	// In ActionScript 2.0, event method names are CASE SENSITIVE.
+	// In ActionScript 1.0, event method names are CASE INSENSITIVE.
+	// TODO: move to get_function_name directly ?
+	std::string method_name = id.get_function_name();
+	if ( _vm.getSWFVersion() < 7 )
+	{
+		boost::to_lower(method_name, _vm.getLocale());
+	}
+
+	if (method_name.length() > 0)
+	{
+		as_value method_val;
+		if ( get_member(method_name, &method_val) )
+		{
+			method = method_val.to_as_function();
+			if ( method )
+			{
+				root.pushAction(method, boost::intrusive_ptr<character>(this));
+			}
+		}
+	}
+
+	//testInvariant();
+
+}
 
 } // namespace gnash
 

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/character.h	2 Apr 2007 09:12:48 -0000	1.60
+++ server/character.h	2 Apr 2007 15:45:22 -0000	1.61
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.60 2007/04/02 09:12:48 strk Exp $ */
+/* $Id: character.h,v 1.61 2007/04/02 15:45:22 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -555,6 +555,9 @@
 		return false;
 	}
 
+	/// Queue event handler(s), if any.
+	void queueEventHandler(const event_id& id);
+
 	virtual void on_button_event(const event_id& id)
 	{
 		on_event(id);
@@ -647,14 +650,10 @@
 	/// This function must be called when the character is removed
 	/// from the stage.
 	/// stage for the first time. It will take care of properly
-	/// unloading any child characters and calling the 'UNLOAD'
+	/// unloading any child characters and queuing the 'UNLOAD'
 	/// event handler.
 	///
-	virtual void unload()
-	{
-		_unloaded = true;
-		on_event(event_id::UNLOAD);
-	}
+	virtual void unload();
 
 	bool isUnloaded() { return _unloaded; }
 };

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/gnash.h	1 Mar 2007 11:06:32 -0000	1.88
+++ server/gnash.h	2 Apr 2007 15:45:22 -0000	1.89
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.88 2007/03/01 11:06:32 udog Exp $ */
+/* $Id: gnash.h,v 1.89 2007/04/02 15:45:22 strk Exp $ */
 
 /// \mainpage
 ///
@@ -588,12 +588,6 @@
 };
 }	// end namespace key
 
-/// Key events are global throughout gnash.
-/// @@ Maybe someday make these local to the movie_root ?
-/// See \ref events_handling for more info
-DSOEXPORT void	notify_key_event(key::code k, bool down);
-
-
 /// Some optional helpers.
 namespace tools
 {

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/movie_root.cpp	2 Apr 2007 09:38:16 -0000	1.50
+++ server/movie_root.cpp	2 Apr 2007 15:45:22 -0000	1.51
@@ -33,12 +33,14 @@
 #include "tu_random.h"
 #include "ExecutableCode.h"
 #include "Stage.h"
+#include "Key.h"
 
 #include <iostream>
 #include <string>
 #include <typeinfo>
 #include <cassert>
 #include <boost/ptr_container/ptr_list.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 
 using namespace std;
 
@@ -158,6 +160,70 @@
 
 }
 
+void
+movie_root::notify_global_key(key::code k, bool down)
+{
+	VM& vm = VM::get();
+	if ( vm.getSWFVersion() < 6 )
+	{
+		// _global.Key was added in SWF6
+		return;
+	}
+
+	static boost::intrusive_ptr<key_as_object> keyobject = NULL;
+	if ( ! keyobject )
+	{
+		// This isn't very performant... do we allow user override
+		// of _global.Key, btw ?
+
+		as_value kval;
+		as_object* global = VM::get().getGlobal();
+
+		std::string objName = "Key";
+		if ( vm.getSWFVersion() < 7 )
+		{
+			boost::to_lower(objName, vm.getLocale());
+		}
+		if ( global->get_member(objName, &kval) )
+		{
+			//log_msg("Found member 'Key' in _global: %s", kval.to_string());
+			boost::intrusive_ptr<as_object> obj = kval.to_object();
+			//log_msg("_global.Key to_object() : %s @ %p", typeid(*obj).name(), obj);
+			keyobject = boost::dynamic_pointer_cast<key_as_object>( obj );
+		}
+	}
+
+	if ( keyobject )
+	{
+		if (down) keyobject->set_key_down(k);
+		else keyobject->set_key_up(k);
+	}
+	else
+	{
+		log_error("gnash::notify_key_event(): _global.Key doesn't exist, or isn't the expected built-in\n");
+	}
+}
+
+bool
+movie_root::notify_key_event(key::code k, bool down)
+{
+//	    GNASH_REPORT_FUNCTION;
+	    
+	// Notify keypress listeners.
+	if (down) notify_keypress_listeners(k);
+
+	//
+	// Notify the _global.Key object about key event
+	//
+
+	notify_global_key(k, down);
+
+	processActionQueue();
+
+	return false; // should return true if needs update ...
+}
+
+
 bool
 movie_root::notify_mouse_clicked(bool mouse_pressed, int button_mask)
 {
@@ -583,6 +649,11 @@
 
 void movie_root::cleanup_keypress_listeners()
 {
+#ifdef KEYPRESS_LISTENERS_DEBUG
+	size_t prevsize = m_keypress_listeners.size();
+	log_msg("Cleaning up %u keypress listeners", m_keypress_listeners.size());
+#endif
+
 	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
 			 iter != m_keypress_listeners.end(); )
 	{
@@ -600,6 +671,11 @@
 			++iter;
 		}
 	}
+
+#ifdef KEYPRESS_LISTENERS_DEBUG
+	size_t currsize = m_keypress_listeners.size();
+	log_msg("Cleaned up %u listeners (from %u to %u)", prevsize-currsize, prevsize, currsize);
+#endif
 }
 
 void movie_root::notify_keypress_listeners(key::code k)
@@ -747,7 +823,7 @@
 }
 
 void
-movie_root::pushAction(boost::intrusive_ptr<as_function> func, boost::intrusive_ptr<sprite_instance> target)
+movie_root::pushAction(boost::intrusive_ptr<as_function> func, boost::intrusive_ptr<character> target)
 {
 #ifdef GNASH_DEBUG
 	log_msg("Pushed function (event hanlder?) with target %s", target->getTargetPath().c_str());

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/movie_root.h	2 Apr 2007 09:12:48 -0000	1.43
+++ server/movie_root.h	2 Apr 2007 15:45:22 -0000	1.44
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.43 2007/04/02 09:12:48 strk Exp $ */
+/* $Id: movie_root.h,v 1.44 2007/04/02 15:45:22 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -57,10 +57,8 @@
 ///
 /// - bool movie_root::notify_mouse_moved(int x, int y);
 /// - bool movie_root::notify_mouse_clicked(bool mouse_pressed, int mask);
+/// - bool movie_root::notify_key_event(key::code k, bool down);
 /// 
-/// Note that the notify_key_event() method is a global function, which should
-/// likely be moved somewhere else, and that has not been fixed yet to support
-/// the new interface.
 /// 
 
 
@@ -204,6 +202,16 @@
 	void notify_mouse_state(int x, int y, int buttons);
 
 	/// \brief
+        /// The host app can use this to tell the movie when
+        /// user pressed or released a key.
+	//
+	/// This function should return TRUE iff any action triggered
+	/// by the event requires redraw, see \ref events_handling for
+	/// more info.
+	///
+	bool notify_key_event(key::code k, bool down);
+
+	/// \brief
 	/// Use this to retrieve the last state of the mouse, as set via
 	/// notify_mouse_state(). 
 	//
@@ -409,10 +417,13 @@
 	void pushAction(const action_buffer& buf, boost::intrusive_ptr<sprite_instance> target);
 
 	/// Push a function code to the ActionQueue
-	void pushAction(boost::intrusive_ptr<as_function> func, boost::intrusive_ptr<sprite_instance> target);
+	void pushAction(boost::intrusive_ptr<as_function> func, boost::intrusive_ptr<character> target);
 
 private:
 
+	/// Notify the global Key ActionScript object about a key status change
+	void notify_global_key(key::code k, bool down);
+
 	/// Remove all listeners with a ref-count of 1
 	/// (only referenced as key listeners)
 	void cleanup_keypress_listeners();

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -b -r1.216 -r1.217
--- server/sprite_instance.cpp	2 Apr 2007 09:12:48 -0000	1.216
+++ server/sprite_instance.cpp	2 Apr 2007 15:45:22 -0000	1.217
@@ -69,16 +69,6 @@
 
 namespace gnash {
 
-// Define OLD_GET_MEMBER to thread "default" members within the get_member
-// override rather then by using the new 'init_property' call.
-// This will likely be removed soon, just here to track possible bugs introduced
-// by this change. In particular, the place_and_remove_instane_test is failing 
-// for '_x' property, but attachMovieTest is succeeding with the *new* layout
-// and failign with the previous.
-//
-//#define OLD_GET_MEMBER
-//
-
 //#define GNASH_DEBUG 1
 
 // Forward declarations
@@ -1061,8 +1051,6 @@
 	return as_value(clip.get());
 }
 
-#ifndef OLD_GET_MEMBER
-
 
 static as_value
 sprite_currentframe_get(const fn_call& fn)
@@ -1225,8 +1213,6 @@
 	return as_value();
 }
 
-#endif // ndef OLD_GET_MEMBER
-
 /// Properties (and/or methods) *inherited* by MovieClip instances
 static void
 attachMovieClipInterface(as_object& o)
@@ -1643,240 +1629,6 @@
 		return true;
 	}
 
-#ifdef OLD_GET_MEMBER
-	// FIXME: use addProperty interface for these !!
-	as_standard_member std_member = get_standard_member(name);
-	switch (std_member)
-	{
-	default:
-	case M_INVALID_MEMBER:
-	    break;
-	case M_X:
-	    //if (name == "_x")
-	{
-	    matrix	m = get_matrix();
-	    val->set_double(TWIPS_TO_PIXELS(m.m_[0][2]));
-	    return true;
-	}
-	case M_Y:
-	    //else if (name == "_y")
-	{
-	    matrix	m = get_matrix();
-	    val->set_double(TWIPS_TO_PIXELS(m.m_[1][2]));
-	    return true;
-	}
-	case M_XSCALE:
-	    //else if (name == "_xscale")
-	{
-	    matrix m = get_matrix();	// @@ or get_world_matrix()?  Test this.
-	    float xscale = m.get_x_scale();
-	    val->set_double(xscale * 100);		// result in percent
-	    return true;
-	}
-	case M_YSCALE:
-	    //else if (name == "_yscale")
-	{
-	    matrix m = get_matrix();	// @@ or get_world_matrix()?  Test this.
-	    float yscale = m.get_y_scale();
-	    val->set_double(yscale * 100);		// result in percent
-	    return true;
-	}
-	case M_CURRENTFRAME:
-	    //else if (name == "_currentframe")
-	{
-	    val->set_int(m_current_frame + 1);
-	    return true;
-	}
-	case M_TOTALFRAMES:
-	    //else if (name == "_totalframes")
-	{
-	    // number of frames.  Read only.
-	    val->set_int(m_def->get_frame_count());
-	    return true;
-	}
-	case M_ALPHA:
-	    //else if (name == "_alpha")
-	{
-	    // Alpha units are in percent.
-	    val->set_double(get_cxform().m_[3][0] * 100.f);
-	    return true;
-	}
-	case M_VISIBLE:
-	    //else if (name == "_visible")
-	{
-	    val->set_bool(get_visible());
-	    return true;
-	}
-	case M_WIDTH: // _width
-	{
-	    // Verified using samples/test_rotation.swf
-	    val->set_double(TWIPS_TO_PIXELS(get_width()));
-	    return true;
-	}
-	case M_HEIGHT: // _height
-	{
-	    // Verified using samples/test_rotation.swf
-	    val->set_double(TWIPS_TO_PIXELS(get_height()));
-	    return true;
-	}
-	case M_ROTATION:
-	    //else if (name == "_rotation")
-	{
-	    // Verified against Macromedia player using samples/test_rotation.swf
-	    float	angle = get_matrix().get_rotation();
-
-	    // Result is CLOCKWISE DEGREES, [-180,180]
-	    angle *= 180.0f / float(M_PI);
-
-	    val->set_double(angle);
-	    return true;
-	}
-	case M_PARENT:
-	{
-		if (m_parent==NULL)
-		// _parent is undefined for root movies
-		{
-			return false;
-		}
-		else
-		{
-			assert(dynamic_cast<as_object*>(get_parent()));
-			val->set_as_object(static_cast<as_object*>(get_parent()));
-			return true;
-		}
-	}
-	case M_FRAMESLOADED:
-	    //else if (name == "_framesloaded")
-	{
-	    val->set_int(m_def->get_loading_frame());
-	    return true;
-	}
-
-	case M_XMOUSE:
-	    //else if (name == "_xmouse")
-	{
-	    // Local coord of mouse IN PIXELS.
-	    int	x, y, buttons;
-	    _vm.getRoot().get_mouse_state(x, y, buttons);
-
-	    matrix	m = get_world_matrix();
-
-	    point	a(PIXELS_TO_TWIPS(x), PIXELS_TO_TWIPS(y));
-	    point	b;
-			
-	    m.transform_by_inverse(&b, a);
-
-	    val->set_double(TWIPS_TO_PIXELS(b.m_x));
-	    return true;
-	}
-
-	case M_YMOUSE:
-	    //else if (name == "_ymouse")
-	{
-	    // Local coord of mouse IN PIXELS.
-	    int	x, y, buttons;
-	    _vm.getRoot().get_mouse_state(x, y, buttons);
-
-	    matrix	m = get_world_matrix();
-
-	    point	a(PIXELS_TO_TWIPS(x), PIXELS_TO_TWIPS(y));
-	    point	b;
-			
-	    m.transform_by_inverse(&b, a);
-
-	    val->set_double(TWIPS_TO_PIXELS(b.m_y));
-	    return true;
-	}
-	/// FIXME: use a contextual 'target' member
-	case M_TARGET:
-	    //else if (name == "_target")
-	{
-	    // Full path to this object; e.g. "/_level0/sprite1/sprite2/ourSprite"
-	    val->set_string(getTargetPath().c_str());
-	    return true;
-	}
-	case M_NAME:
-	    //else if (name == "_name")
-	{
-	    if ( _vm.getSWFVersion() < 6 && get_name().empty() )
-		val->set_undefined();
-	    else
-	    	val->set_string(get_name().c_str());
-
-	    return true;
-	}
-
-	case M_DROPTARGET:
-	    //else if (name == "_droptarget")
-	{
-	    // Absolute path in slash syntax where we were last dropped (?)
-	    // @@ TODO
-		static bool warned = false;
-		if ( ! warned ) {
-			log_error("FIXME: MovieClip._droptarget unimplemented");
-			warned=true;
-		}
-
-	    if ( _vm.getSWFVersion() > 5 )
-	    	val->set_string("");
-	    else
-		val->set_undefined();
-	    return true;
-	}
-	case M_URL:
-	    //else if (name == "_url")
-	{
-		// A sprite's url is the url this
-		// sprite has been "downloaded" from.
-		// If this is an ActionScript-created sprite
-		// we might use the actions creating
-		// it as defining where was it "downloaded" from.
-		//
-	    val->set_string(m_def->get_url().c_str()); 
-	    return true;
-	}
-	case M_ONROLLOVER:
-	{
-		return get_event_handler(event_id::ROLL_OVER, val);
-	}
-	case M_ONROLLOUT:
-	{
-		return get_event_handler(event_id::ROLL_OUT, val);
-	}
-	case M_HIGHQUALITY:
-	    //else if (name == "_highquality")
-	{
-	    // Whether we're in high quality mode or not.
-	    val->set_bool(true);
-	    return true;
-	}
-	case M_FOCUSRECT:
-	    //else if (name == "_focusrect")
-	{
-	    // Is a yellow rectangle visible around a focused movie clip (?)
-	    val->set_bool(false);
-	    return true;
-	}
-	case M_SOUNDBUFTIME:
-	    //else if (name == "_soundbuftime")
-	{
-	    // Number of seconds before sound starts to stream.
-	    val->set_double(0.0);
-	    return true;
-	}
-	case M_ONLOAD:
-	{
-	    if (m_as_environment.get_member(std::string(name.c_str()), val))
-		{
-		    return true;
-		}
-	    // Optimization: if no hit, don't bother looking in the display list, etc.
-	    return false;
-	}
-
-	}	// end switch
-#endif // def OLD_GET_MEMBER
-
 	// Try variables.
 	if ( m_as_environment.get_member(name, val) )
 	{
@@ -2140,58 +1892,6 @@
 	}
 }
 
-void
-sprite_instance::queueEventHandler(const event_id& id)
-{
-	testInvariant();
-
-	bool called=false;
-
-	movie_root& root = VM::get().getRoot();
-
-	// First, check for built-in event handler.
-	boost::intrusive_ptr<as_function> method = get_event_handler(id).to_as_function();
-	   
-	if (method)
-	{
-		root.pushAction(method, boost::intrusive_ptr<sprite_instance>(this));
-		called=true;
-	}
-
-	// This is likely wrong, we use it as a workaround
-	// to the fact that we don't distinguish between
-	// ActionScript and SWF defined events
-	// (for example: onClipLoad vs. onLoad)
-	//
-	if (called) return;
-
-	// Check for member function.
-	// In ActionScript 2.0, event method names are CASE SENSITIVE.
-	// In ActionScript 1.0, event method names are CASE INSENSITIVE.
-	// TODO: move to get_function_name directly ?
-	std::string method_name = id.get_function_name();
-	if ( _vm.getSWFVersion() < 7 )
-	{
-		boost::to_lower(method_name, _vm.getLocale());
-	}
-
-	if (method_name.length() > 0)
-	{
-		as_value method_val;
-		if ( get_member(method_name, &method_val) )
-		{
-			method = method_val.to_as_function();
-			if ( method )
-			{
-				root.pushAction(method, boost::intrusive_ptr<sprite_instance>(this));
-			}
-		}
-	}
-
-	testInvariant();
-
-}
-
 /* private */
 void
 sprite_instance::queueActions(ActionList& actions)
@@ -2281,244 +1981,9 @@
 		const as_value& val)
 {
 #ifdef DEBUG_DYNTEXT_VARIABLES
-log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_string());
+	log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_string());
 #endif
 
-#ifdef OLD_GET_MEMBER
-	as_standard_member	std_member = get_standard_member(name);
-	switch (std_member)
-	{
-		default:
-		case M_INVALID_MEMBER:
-		    break;
-		case M_X:
-		    //if (name == "_x")
-		{
-		    matrix	m = get_matrix();
-		    m.m_[0][2] = infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
-		    set_matrix(m);
-
-                    transformedByScript(); // m_accept_anim_moves = false; 
-
-		    return;
-		}
-		case M_Y:
-		    //else if (name == "_y")
-		{
-		    matrix	m = get_matrix();
-		    m.m_[1][2] = infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
-		    set_matrix(m);
-
-                    transformedByScript(); // m_accept_anim_moves = false; 
-
-		    return;
-		}
-		case M_XSCALE:
-		    //else if (name == "_xscale")
-		{
-		    matrix	m = get_matrix();
-
-                    double scale_percent = val.to_number();
-
-                    // Handle bogus values
-                    if (isnan(scale_percent))
-                    {
-			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _xscale to %g, refused",
-                            scale_percent);
-			);
-                        return;
-                    }
-                    else if (scale_percent < 0 )
-                    {
-			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _xscale to %g, use 0",
-                            scale_percent);
-			);
-                        scale_percent = 0;
-                    }
-
-                    // input is in percent
-		    float scale = (float)scale_percent/100.f;
-
-		    // Decompose matrix and insert the desired value.
-		    float	x_scale = scale;
-		    float	y_scale = m.get_y_scale();
-		    float	rotation = m.get_rotation();
-		    m.set_scale_rotation(x_scale, y_scale, rotation);
-
-		    set_matrix(m);
-		    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_YSCALE:
-		    //else if (name == "_yscale")
-		{
-		    matrix	m = get_matrix();
-
-                    double scale_percent = val.to_number();
-
-                    // Handle bogus values
-                    if (isnan(scale_percent))
-                    {
-			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _yscale to %g, refused",
-                            scale_percent);
-			);
-                        return;
-                    }
-                    else if (scale_percent < 0 )
-                    {
-			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _yscale to %g, use 0",
-                            scale_percent);
-			);
-                        scale_percent = 0;
-                    }
-
-                    // input is in percent
-		    float scale = (float)scale_percent/100.f;
-
-		    // Decompose matrix and insert the desired value.
-		    float	x_scale = m.get_x_scale();
-		    float	y_scale = scale;
-		    float	rotation = m.get_rotation();
-		    m.set_scale_rotation(x_scale, y_scale, rotation);
-
-		    set_matrix(m);
-                    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_ALPHA:
-		    //else if (name == "_alpha")
-		{
-		    // Set alpha modulate, in percent.
-		    cxform	cx = get_cxform();
-		    cx.m_[3][0] = infinite_to_fzero(val.to_number()) / 100.f;
-		    set_cxform(cx);
-                    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_VISIBLE:
-		    //else if (name == "_visible")
-		{
-		    set_visible(val.to_bool());
-                    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_WIDTH:
-		    //else if (name == "_width")
-		{
-		    // @@ tulrich: is parameter in world-coords or local-coords?
-		    matrix	m = get_matrix();
-		    m.m_[0][0] = infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
-		    float w = get_width();
-		    if (fabsf(w) > 1e-6f)
-			{
-			    m.m_[0][0] /= w;
-			}
-		    set_matrix(m);
-                    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_HEIGHT:
-		    //else if (name == "_height")
-		{
-		    // @@ tulrich: is parameter in world-coords or local-coords?
-		    matrix	m = get_matrix();
-		    m.m_[1][1] = infinite_to_fzero(PIXELS_TO_TWIPS(val.to_number()));
-		    float h = get_width(); // FIXME: shoudln't this be get_height ??
-		    if (fabsf(h) > 1e-6f)
-			{
-			    m.m_[1][1] /= h;
-			}
-		    set_matrix(m);
-                    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_ROTATION:
-		    //else if (name == "_rotation")
-		{
-		    matrix	m = get_matrix();
-
-		    // Decompose matrix and insert the desired value.
-		    float	x_scale = m.get_x_scale();
-		    float	y_scale = m.get_y_scale();
-		    float	rotation = (float) val.to_number() * float(M_PI) / 180.f;	// input is in degrees
-		    m.set_scale_rotation(x_scale, y_scale, rotation);
-
-		    set_matrix(m);
-                    transformedByScript(); // m_accept_anim_moves = false; 
-		    return;
-		}
-		case M_ONROLLOVER:
-		{
-			set_event_handler(event_id::ROLL_OVER, val);
-			return;
-		}
-		case M_ONROLLOUT:
-		{
-			set_event_handler(event_id::ROLL_OUT, val);
-			return;
-		}
-		case M_HIGHQUALITY:
-		    //else if (name == "_highquality")
-		{
-		    // @@ global { 0, 1, 2 }
-//				// Whether we're in high quality mode or not.
-//				val->set(true);
-		    return;
-		}
-		case M_FOCUSRECT:
-		    //else if (name == "_focusrect")
-		{
-//				// Is a yellow rectangle visible around a focused movie clip (?)
-//				val->set(false);
-		    return;
-		}
-		case M_SOUNDBUFTIME:
-		    //else if (name == "_soundbuftime")
-		{
-		    // @@ global
-//				// Number of seconds before sound starts to stream.
-//				val->set(0.0);
-		    return;
-		}
-	}	// end switch
-#endif // def OLD_GET_MEMBER
-
-#ifdef DEBUG_DYNTEXT_VARIABLES
-log_msg(" not a standard member");
-#endif
-
-
-#if 0 // we'd need a testcase for this, my "short" tests show
-      // that a textfield variable cannot be assigned to like this
-
-	// Not a built-in property.  See if we have a
-	// matching edit_text character in our display
-	// list.
-	bool text_val = val.is_string() || val.is_number();
-	if (text_val)
-	{
-			// CASE INSENSITIVE compare. 
-			// In ActionScript 2.0, this must change
-			// to CASE SENSITIVE!!!
-			character* ch = m_display_list.get_character_by_name_i( name.c_str());
-			if ( ch ) // item found
-			{
-				const char* text = val.to_string();
-				ch->set_text_value(text);
-				return;
-			}
-	}
-
-#ifdef DEBUG_DYNTEXT_VARIABLES
-	log_msg(" not a character");
-#endif
-#endif
-
-
 	// Try textfield variables
 	//
 	// FIXME: Turn textfield variables into Getter/Setters (Properties)
@@ -2532,24 +1997,20 @@
 	if ( etc )
 	{
 #ifdef DEBUG_DYNTEXT_VARIABLES
-log_msg(" it's a Text Variable!");
+		log_msg(" it's a Text Variable!");
 #endif
 		etc->set_text_value(val.to_string());
 	}
 #ifdef DEBUG_DYNTEXT_VARIABLES
 	else
 	{
-log_msg(" it's NOT a Text Variable!");
+		log_msg(" it's NOT a Text Variable!");
 	}
 #endif
 
 	// If that didn't work call the default set_member
 	set_member_default(name, val);
 
-
-	// If that didn't work, set a variable within this environment.
-	// TODO: check if we broke anything with this!
-	//if ( ! t ) m_as_environment.set_member(name.c_str(), val);
 }
 
 const char* sprite_instance::get_variable(const char* path_to_var) const
@@ -2704,7 +2165,8 @@
 
 	// Call UNLOAD event of just removed chars !
 	DisplayList justRemoved = oldDisplayList;
-	justRemoved.clear_except(m_display_list, true);
+	justRemoved.clear_except(m_display_list, false); // true;
+	// No, dont' call UNLOAD event, as it should be called by remove_display_object!
 
 	// Finally, execute actions in newly added childs
 	//
@@ -2721,26 +2183,6 @@
 	//log_msg("Advancing %d newly-added (after clearing) childs of %s", newlyAdded.size(), getTargetPath().c_str());
 	newlyAdded.advance(delta_time);
 
-#if 0 // we push gotoframe actions on the global queue now
-	// goto_frame_action (for now) need be executed
-	// *after* actions in child sprites have
-	// been executed. When action execution order
-	// is fixed, we can move this code inside
-	// do_action, or completely drop m_goto_frame_action_list
-	// or rather push actions in goto_frame target frame
-	// directly in the m_action_list (simplest)
-	if ( ! m_goto_frame_action_list.empty() )
-	{
-		IF_VERBOSE_ACTION(
-		log_action(" Executing %u actions in "
-			"goto_frame_action_list",
-			m_goto_frame_action_list.size());
-		);
-		execute_actions(m_goto_frame_action_list);
-		assert(m_goto_frame_action_list.empty());
-	}
-#endif
-	
 	// Remember current state of the DisplayList for next iteration
 	oldDisplayList = m_display_list;
 }
@@ -2955,7 +2397,9 @@
 void
 sprite_instance::goto_frame(size_t target_frame_number)
 {
-//	IF_VERBOSE_DEBUG(log_msg("sprite::goto_frame(%d)\n", target_frame_number));//xxxxx
+	log_msg("sprite %s ::goto_frame(%d) - current frame is %d",
+			getTargetPath().c_str(), target_frame_number, m_current_frame);
+	assert(! isUnloaded() );
 
 	//	target_frame_number = iclamp(target_frame_number, 0, m_def->get_frame_count() - 1);
 	// Macromedia Flash ignores goto_frame(bad_frame)

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/sprite_instance.h	2 Apr 2007 09:12:48 -0000	1.85
+++ server/sprite_instance.h	2 Apr 2007 15:45:22 -0000	1.86
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.85 2007/04/02 09:12:48 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.86 2007/04/02 15:45:22 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -700,9 +700,6 @@
 
 private:
 
-	/// Queue event handler(s), if any.
-	void queueEventHandler(const event_id& id);
-
 	/// Queue actions in the action list
 	//
 	/// The list of action will be pushed on the current

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/Key.cpp	20 Mar 2007 15:01:20 -0000	1.19
+++ server/asobj/Key.cpp	2 Apr 2007 15:45:22 -0000	1.20
@@ -316,64 +316,6 @@
     return as_value();
 }
 
-void	notify_key_event(key::code k, bool down)
-    // External interface for the host to report key events.
-{
-//	    GNASH_REPORT_FUNCTION;
-	    
-	// Notify keypress listeners.
-	if (down) 
-	{
-		movie_root& mroot = VM::get().getRoot();
-		mroot.notify_keypress_listeners(k);
-	}
-
-	//
-	// Notify the _global.Key object about key event
-	//
-
-
-	VM& vm = VM::get();
-	if ( vm.getSWFVersion() < 6 )
-	{
-		// _global.Key was added in SWF6
-		return;
-	}
-
-	static boost::intrusive_ptr<key_as_object> keyobject = NULL;
-	if ( ! keyobject )
-	{
-		// This isn't very performant... do we allow user override
-		// of _global.Key, btw ?
-
-		as_value kval;
-		as_object* global = VM::get().getGlobal();
-
-		std::string objName = "Key";
-		if ( vm.getSWFVersion() < 7 )
-		{
-			boost::to_lower(objName, vm.getLocale());
-		}
-		if ( global->get_member(objName, &kval) )
-		{
-			//log_msg("Found member 'Key' in _global: %s", kval.to_string());
-			boost::intrusive_ptr<as_object> obj = kval.to_object();
-			//log_msg("_global.Key to_object() : %s @ %p", typeid(*obj).name(), obj);
-			keyobject = boost::dynamic_pointer_cast<key_as_object>( obj );
-		}
-	}
-
-	if ( keyobject )
-	{
-		if (down) keyobject->set_key_down(k);
-		else keyobject->set_key_up(k);
-	}
-	else
-	{
-		log_error("gnash::notify_key_event(): _global.Key doesn't exist, or isn't the expected built-in\n");
-	}
-}
-
 void key_class_init(as_object& global)
 {
 

Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/vm/ExecutableCode.h	27 Mar 2007 14:52:05 -0000	1.1
+++ server/vm/ExecutableCode.h	2 Apr 2007 15:45:22 -0000	1.2
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ExecutableCode.h,v 1.1 2007/03/27 14:52:05 strk Exp $ */
+/* $Id: ExecutableCode.h,v 1.2 2007/04/02 15:45:22 strk Exp $ */
 
 #ifndef GNASH_EXECUTABLECODE_H
 #define GNASH_EXECUTABLECODE_H
@@ -81,7 +81,7 @@
 
 public:
 
-	FunctionCode(boost::intrusive_ptr<as_function> nFunc, boost::intrusive_ptr<sprite_instance> nTarget)
+	FunctionCode(boost::intrusive_ptr<as_function> nFunc, boost::intrusive_ptr<character> nTarget)
 		:
 		func(nFunc),
 		target(nTarget)
@@ -90,14 +90,15 @@
 	virtual void execute()
 	{
 		//log_msg("Execution of FunctionCode unimplemented yet");
-		func->call(fn_call(target.get(), &(target->get_environment()), 0, 0));
+		as_environment env; env.set_target(target.get());
+		func->call(fn_call(target.get(), &env, 0, 0));
 	}
 
 private:
 
 	boost::intrusive_ptr<as_function> func;
 
-	boost::intrusive_ptr<sprite_instance> target;
+	boost::intrusive_ptr<character> target;
 };
 
 

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/MovieTester.cpp	28 Feb 2007 17:25:26 -0000	1.23
+++ testsuite/MovieTester.cpp	2 Apr 2007 15:45:22 -0000	1.24
@@ -157,13 +157,13 @@
 void
 MovieTester::pressKey(key::code code)
 {
-	notify_key_event(code, true);
+	_movie_root->notify_key_event(code, true);
 }
 
 void
 MovieTester::releaseKey(key::code code)
 {
-	notify_key_event(code, false);
+	_movie_root->notify_key_event(code, false);
 }
 
 bool



From MAILER-DAEMON Mon Apr 02 11:57:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYOuG-0004Dy-Sf
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 11:57:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYOuF-0004DL-4Z
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:57:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYOuE-0004D9-NC
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:57:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYOuE-0004D1-Fa
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:57:18 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYOrB-0000n2-5s
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 11:54:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYOrA-0003Ck-Ip
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 15:54:08 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYOrA-0003Ch-9B
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 15:54:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYOrA-0003Ch-9B@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 15:54:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/sdl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 15:57:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 15:54:08

Modified files:
	.              : ChangeLog 
	gui            : sdl.cpp 

Log message:
	* gui/sdl.cpp (key_event): update call to notify_key_event.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2750&r2=1.2751
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2750
retrieving revision 1.2751
diff -u -b -r1.2750 -r1.2751
--- ChangeLog	2 Apr 2007 15:45:22 -0000	1.2750
+++ ChangeLog	2 Apr 2007 15:54:07 -0000	1.2751
@@ -1,5 +1,6 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* gui/sdl.cpp (key_event): update call to notify_key_event.
 	* server/vm/ExecutableCode.h: change FunctionCode to take
 	  a generic character as target, not necessarely a sprite.
 	* server/movie_root.{cpp,h}: update pushAction() for events

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- gui/sdl.cpp	31 Jan 2007 15:24:13 -0000	1.51
+++ gui/sdl.cpp	2 Apr 2007 15:54:08 -0000	1.52
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.51 2007/01/31 15:24:13 bjacques Exp $ */
+/* $Id: sdl.cpp,v 1.52 2007/04/02 15:54:08 strk Exp $ */
 
 // XXXbjacques: Screw up the indentation in this file, and you're dead. And by
 //              screw up, I mean not adhering the indentation used throughout
@@ -311,7 +311,7 @@
     }
     
     if (c != gnash::key::INVALID) {
-        gnash::notify_key_event(c, down);
+        notify_key_event(c, down);
     }
 }
 



From MAILER-DAEMON Mon Apr 02 12:28:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYPOl-0006sX-9H
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 12:28:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYPOj-0006po-Ik
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:28:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYPOf-0006lN-DL
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:28:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYPOe-0006lF-SX
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:28:44 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYPLa-0005l5-1v
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:25:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYPLR-0003oN-Q6
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 16:25:25 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYPLR-0003oK-CG
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 16:25:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYPLR-0003oK-CG@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 16:25:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.cpp server/dlist.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 16:28:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 16:25:25

Modified files:
	.              : ChangeLog 
	server         : dlist.cpp dlist.h 

Log message:
	        * server/dlist.{cpp,h} (place_character): call unload()
	          on characters that are replaced.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2751&r2=1.2752
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2751
retrieving revision 1.2752
diff -u -b -r1.2751 -r1.2752
--- ChangeLog	2 Apr 2007 15:54:07 -0000	1.2751
+++ ChangeLog	2 Apr 2007 16:25:24 -0000	1.2752
@@ -1,5 +1,10 @@
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
+	* server/dlist.{cpp,h} (place_character): call unload()
+	  on characters that are replaced.
+
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
 	* gui/sdl.cpp (key_event): update call to notify_key_event.
 	* server/vm/ExecutableCode.h: change FunctionCode to take
 	  a generic character as target, not necessarely a sprite.

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/dlist.cpp	2 Apr 2007 09:31:52 -0000	1.55
+++ server/dlist.cpp	2 Apr 2007 16:25:25 -0000	1.56
@@ -206,6 +206,7 @@
 	else
 	{
 		//log_msg("place_character: replacing existing character at depth %d", depth);
+		(*it)->unload();
 		// replace existing char
 		*it = DisplayItem(ch);
 	}

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/dlist.h	2 Apr 2007 09:31:52 -0000	1.30
+++ server/dlist.h	2 Apr 2007 16:25:25 -0000	1.31
@@ -55,6 +55,9 @@
 	/// Place a new character in this display list
 	/// replacing any other char at the same depth.
 	//
+	/// If a character is replaced, it's unload() method
+	/// is invoked.
+	///
 	/// If applicable, the event_id::LOAD event
 	/// associated with the given character
 	/// is called as last step of addition. 



From MAILER-DAEMON Mon Apr 02 12:49:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYPiz-0000bX-PT
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 12:49:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYPiy-0000WG-2j
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:49:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYPix-0000Ux-6x
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:49:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYPix-0000Uk-3h
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:49:43 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1HYPft-0000LQ-Cy
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 12:46:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYPfs-0005eY-K8
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 16:46:32 +0000
Received: from tgc by savannah.gnu.org with local (Exim 4.50)
	id 1HYPfs-0005eV-C5
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 16:46:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYPfs-0005eV-C5@savannah.gnu.org>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Mon, 02 Apr 2007 16:46:32 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am configure.ac gui/Ma...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 16:49:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/04/02 16:46:32

Modified files:
	.              : ChangeLog Makefile.am configure.ac 
	gui            : Makefile.am gnash.cpp gtk.cpp 
	server/asobj   : NetStreamFfmpeg.cpp NetStreamGst.cpp 

Log message:
	* Makefile.am, configure.ac, gui/Makefile.am, gui/gnash.cpp, gui/gtk.cpp:
	  Changed the "--enable-sound" option to "--enable-media", and removed
	  the "--with-mp3-decoder" option.
	* server/asobj/NetStreamFfmpeg.cpp: Replaced a few assert(0) with
	  warnings.
	* server/asobj/NetStreamGst.cpp: Only create sound objects if a
	  soundhandler is present.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2752&r2=1.2753
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.283&r2=1.284
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2752
retrieving revision 1.2753
diff -u -b -r1.2752 -r1.2753
--- ChangeLog	2 Apr 2007 16:25:24 -0000	1.2752
+++ ChangeLog	2 Apr 2007 16:46:31 -0000	1.2753
@@ -1,3 +1,13 @@
+2007-04-02 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* Makefile.am, configure.ac, gui/Makefile.am, gui/gnash.cpp, gui/gtk.cpp:
+	  Changed the "--enable-sound" option to "--enable-media", and removed
+	  the "--with-mp3-decoder" option.
+	* server/asobj/NetStreamFfmpeg.cpp: Replaced a few assert(0) with
+	  warnings.
+	* server/asobj/NetStreamGst.cpp: Only create sound objects if a
+	  soundhandler is present.
+
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
 	* server/dlist.{cpp,h} (place_character): call unload()

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- Makefile.am	7 Mar 2007 15:11:24 -0000	1.65
+++ Makefile.am	2 Apr 2007 16:46:31 -0000	1.66
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.65 2007/03/07 15:11:24 strk Exp $
+# $Id: Makefile.am,v 1.66 2007/04/02 16:46:31 tgc Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -108,18 +108,15 @@
 
 # Set a few variables to what features we selected so we can dump it with the
 # test of the config
-if USE_SOUND_SDL
-  SOUND_OPT=sdl
-endif
 if USE_SOUND_GST
-  SOUND_OPT=gst
+  MEDIA_OPT=gst
 endif
 
 if USE_MAD_ENGINE
-  ENGINE_OPT=mad
+  MEDIA_OPT=mad
 endif
 if USE_FFMPEG_ENGINE
-  ENGINE_OPT=ffmpeg
+  MEDIA_OPT=ffmpeg
 endif
 
 if USE_GUI_GTK
@@ -252,7 +249,6 @@
 	@echo "legit value"
 	@echo ""
 	@echo "Configurable options are:"
-	@echo "Sound handler: $(SOUND_OPT)"
-	@echo "MP3 decoder: $(ENGINE_OPT)"
+	@echo "Media handler: $(MEDIA_OPT)"
 	@echo "Renderer engine: $(RENDER_OPT)"
 	@echo "GUI: $(GUI_OPT)"

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -b -r1.283 -r1.284
--- configure.ac	31 Mar 2007 11:02:51 -0000	1.283
+++ configure.ac	2 Apr 2007 16:46:31 -0000	1.284
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.283 2007/03/31 11:02:51 bjacques Exp $
+dnl $Id: configure.ac,v 1.284 2007/04/02 16:46:31 tgc Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -260,41 +260,22 @@
 fi
 
 dnl --------------------------------------------------------
-dnl  Select sound streamer
+dnl  Select media handler
 dnl --------------------------------------------------------
 
 AC_ARG_ENABLE(sound,
- AC_HELP_STRING([--enable-sound=handler], [Enable sound support using the specified handler: SDL, GST (Gstreamer) or none (no sound) [[SDL]] ]),
+ AC_HELP_STRING([--enable-media=handler], [Enable media handling support using the specified handler: ffmpeg, mad, GST (Gstreamer) or none (no sound) [[ffmpeg]] ]),
  [case "${enableval}" in
-   GST|gst) sound_handler=gst ;;
-   sdl|SDL) sound_handler=sdl  ;;
-   no|NO|none) sound_handler=none ;;
-   *) AC_MSG_ERROR([bad value ${enableval} for --enable-sound option]) ;;
+   GST|gst) media_handler=gst ;;
+   ffmpeg|FFMPEG) media_handler=ffmpeg  ;;
+   mad|MAD) media_handler=mad  ;;
+   no|NO|none) media_handler=none ;;
+   *) AC_MSG_ERROR([bad value ${enableval} for --enable-media option]) ;;
   esac],
- [sound_handler=sdl]
+ [media_handler=ffmpeg]
 )
 
 dnl --------------------------------------------------------
-dnl  Select mp3 decoder (only for 'sdl' sound)
-dnl --------------------------------------------------------
-
-AC_ARG_WITH(mp3-decoder,
- AC_HELP_STRING([--with-mp3-decoder=DECODER], [Use the specified mp3 decoder: ffmpeg, mad (libmad) or none [[none]]]),
- [case "${withval}" in
-   ffmpeg|FFMPEG) mp3_decoder=ffmpeg ;;
-   mad|MAD) mp3_decoder=mad  ;;
-   no|none) mp3_decoder=none ;;
-   *) AC_MSG_ERROR([invalid mp3_decoder ${withval} given (accept: ffmpeg|mad)]) ;;
-  esac],
- [mp3_decoder=ffmpeg]
-)
-
-if test x"$sound_handler" != xsdl -a x"$mp3_decoder" != xnone; then
-mp3_decoder=none;
-	dnl AC_MSG_ERROR([--with-mp3-decoder is only valid with --enable-sound=sdl])
-fi
-
-dnl --------------------------------------------------------
 dnl  ...
 dnl --------------------------------------------------------
 
@@ -526,7 +507,7 @@
 dnl currently unused
 dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
 
-if test x$gui = xsdl -o x$sound_handler = xsdl; then
+if test x$gui = xsdl -o x$media_handler = xffmpeg -o x$media_handler = xffmpeg; then
   GNASH_PATH_SDL
 fi
 
@@ -580,7 +561,7 @@
 AM_CONDITIONAL(opengl, [test x$opengl = xyes])
 
 dnl Need GLIB for both GTK and GST
-if test x${gui} = "xgtk" -o x${sound_handler} = "xgst"; then
+if test x${gui} = "xgtk" -o x${media_handler} = "xgst"; then
   GNASH_PATH_GLIB
 fi
 
@@ -664,53 +645,52 @@
   *)
 esac
 
-if test x"$mp3_decoder" = x"ffmpeg"; then
+if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
   if test x"${ac_cv_path_ffmpeg_lib}" = x ; then
-    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present, disabling sound])
-    mp3_decoder=none
-    sound_handler=none
+    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present, disabling media handling])
+    media_handler=none
   fi
 fi
 
-if test x"$mp3_decoder" = x"mad"; then
+if test x"$media_handler" = x"mad"; then
   dnl Will set MAD_LIBS and MAD_CFLAGS.
   dnl Handles --with-mad-incl and --with-mad-lib
   GNASH_PKG_FIND(mad, [mad.h], [mad library], mad_copyright)
   if test x"${ac_cv_path_mad_lib}" = x ; then
-    mp3_decoder=none
-    sound_handler=none
-    AC_MSG_WARN([Libmad specified as decoder, but it's not present, disabling sound])
+    media_handler=none
+    AC_MSG_WARN([Libmad specified as decoder, but it's not present, disabling media handling])
   fi
 fi
 dnl I'm kinda lazy, get rid of this later... //Markus
-AM_CONDITIONAL(HAVE_MAD, test x$mp3_decoder = xmad)
+AM_CONDITIONAL(HAVE_MAD, test x$media_handler = xmad)
 
-AM_CONDITIONAL(USE_SOUND_GST, test x$sound_handler = xgst)
-AM_CONDITIONAL(USE_SOUND_SDL, test x$sound_handler = xsdl)
-AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$mp3_decoder = xffmpeg)
-AM_CONDITIONAL(USE_MAD_ENGINE, test x$mp3_decoder = xmad)
+AM_CONDITIONAL(USE_SOUND_GST, test x$media_handler = xgst)
+AM_CONDITIONAL(USE_SOUND_SDL, test x$media_handler = xmad -o x$media_handler = xffmpeg)
+AM_CONDITIONAL(USE_FFMPEG_ENGINE, test x$media_handler = xffmpeg)
+AM_CONDITIONAL(USE_MAD_ENGINE, test x$media_handler = xmad)
 
 dnl AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
 
-case "${sound_handler}" in
-  gst) AC_DEFINE([SOUND_GST],  [1], [Use GSTREAMER for sound]) ;;
-  sdl) AC_DEFINE([SOUND_SDL],  [1], [Use SDL for sound]) ;;
+case "${media_handler}" in
+  gst) AC_DEFINE([SOUND_GST],  [1], [Use GSTREAMER for media handling]) ;;
+  ffmpeg) AC_DEFINE([SOUND_SDL],  [1], [Use SDL for sound handing]) ;;
+  mad) AC_DEFINE([SOUND_SDL],  [1], [Use SDL for sound handling]) ;;
   *)
 esac
 
-case "${mp3_decoder}" in
-  ffmpeg)  AC_DEFINE([USE_FFMPEG],  [1], [Use FFMPEG for mp3 decoding]) ;;
-  mad)  AC_DEFINE([USE_MAD],  [1], [Use MAD for mp3 decoding]) ;;
+case "${media_handler}" in
+  ffmpeg)  AC_DEFINE([USE_FFMPEG],  [1], [Use FFMPEG for media decoding]) ;;
+  mad)  AC_DEFINE([USE_MAD],  [1], [Use MAD for media decoding]) ;;
   *)
 esac
 
-if test "$sound_handler" = "gst"; then
+if test "$media_handler" = "gst"; then
   GNASH_PKG_FIND(gstreamer, [gst/gst.h], [gstreamer library], gst_init, [0.10])
 fi
 
 dnl I'm kinda lazy, get rid of this later... //Markus
-AM_CONDITIONAL(HAVE_GST, test x$sound_handler = xgst)
+AM_CONDITIONAL(HAVE_GST, test x$media_handler = xgst)
 
 if test x$gui = xfltk; then
   GNASH_PKG_FIND(fltk2, [fltk/FL_API.h], [Fast Light Toolkit], fl_window_flush)
@@ -870,10 +850,8 @@
 AC_SUBST(RENDERER_CONFIG)
 GUI_CONFIG=$gui
 AC_SUBST(GUI_CONFIG)
-SOUND_CONFIG=$sound_handler
-AC_SUBST(SOUND_CONFIG)
-DECODER_CONFIG=$mp3_decoder
-AC_SUBST(DECODER_CONFIG)
+MEDIA_CONFIG=$media_handler
+AC_SUBST(MEDIA_CONFIG)
 
 dnl AC_CONFIG_LINKS(doc/C/images)
 AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
@@ -987,9 +965,9 @@
 
 echo "        Renderer engine: "$renderer
 echo "        GUI: "$gui
-echo "        Sound handler: "$sound_handler
-if test x"$sound_handler" = xsdl; then
-echo "        MP3 decoder: "$mp3_decoder
+echo "        Media handler: "$media_handler
+if test x"$_handler" = xffmpeg -o x"$_handler" = xmad; then
+echo "        Using SDL for sound handling"
 fi
 
 echo ""
@@ -1213,7 +1191,7 @@
 
 fi #}
 
-if test "$sound_handler" = "gst"; then
+if test "$media_handler" = "gst"; then
   if test x"$GSTREAMER_LIBS" != x; then
     if test x"$GSTREAMER_CFLAGS" != x; then
       echo "        Gstreamer flags are: $GSTREAMER_CFLAGS"
@@ -1222,13 +1200,12 @@
     fi
       echo "        Gstreamer libs are: $GSTREAMER_LIBS"
   else
-    echo "        ERROR: gstreamer sound requested, but no gstreamer 0.10+ found"
+    echo "        ERROR: gstreamer media handling requested, but no gstreamer 0.10+ found"
     nogo=true
   fi
 fi
 
-if test "$sound_handler" = "sdl"; then
-  if test x"$mp3_decoder" = x"mad"; then
+  if test x"$media_handler" = x"mad"; then
     echo "        MP3 support enabled through libmad"
     if test x"$MAD_LIBS" != x; then
       if test x"$MAD_CFLAGS" != x; then
@@ -1241,12 +1218,12 @@
       echo "        ERROR: No libmad (mp3) development package installed!"
       echo "               You need to have the libmad development package installed"
       echo "               to enable mp3 decoding. You can either reconfigure using"
-      echo "               --with-mp3-decoder=ffmpeg to use ffmpeg or install libmad0-dev"
+      echo "               --media-handler=ffmpeg to use ffmpeg or install libmad0-dev"
       echo "               (using apt-get) or libmad (using yum)."
       nogo=true
     fi
   else
-    if test x"$mp3_decoder" = x"ffmpeg"; then
+    if test x"$media_handler" = x"ffmpeg"; then
       if test x${ffmpeg_version} != xok; then
          echo "        ERROR: You have version ${ffmpeg_version} of ffmpeg installed."
          echo "               This version of ffmpeg may not work!"
@@ -1254,7 +1231,7 @@
         nogo=true
       fi
       if test x"$FFMPEG_LIBS" != x; then
-        echo "        MP3 support enabled through ffmpeg"
+        echo "        MP3 and video support enabled through ffmpeg"
         if test x"$FFMPEG_CFLAGS" != x; then
           echo "        ffmpeg flags are: $FFMPEG_CFLAGS"
         else
@@ -1265,13 +1242,12 @@
         echo "        ERROR: No ffmpeg development package installed!"
         echo "               You need to have the ffmpeg development package installed"
         echo "               to enable mp3 decoding. You can either reconfigure using"
-        echo "               --with-mp3-decoder=mad to use libmad or install libavcodec-dev"
+        echo "               --media-handler=mad to use libmad or install libavcodec-dev"
         echo "               and libdts-dev (using apt-get) or <package_names_here> (using yum).".
         nogo=true
       fi
     fi
   fi
-fi
 
 if test "$renderer" = "cairo"; then
   if test x"$CAIRO_LIBS" != x; then
@@ -1339,7 +1315,7 @@
   fi
 fi
 
-if test x"$sound_handler" = x"sdl"; then
+if test x"$media_handler" = x"ffmpeg" -o x"$media_handler" = x"mad"; then
   if test x"$SDL_LIBS" != x; then
     echo "        SDL flags are: $SDL_CFLAGS"
     echo "        SDL libs are: $SDL_LIBS"

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- gui/Makefile.am	31 Mar 2007 21:16:49 -0000	1.61
+++ gui/Makefile.am	2 Apr 2007 16:46:32 -0000	1.62
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.61 2007/03/31 21:16:49 strk Exp $
+# $Id: Makefile.am,v 1.62 2007/04/02 16:46:32 tgc Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -178,8 +178,7 @@
 AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
 AM_CPPFLAGS += -DRENDERER_CONFIG=\"$(RENDERER_CONFIG)\"
 AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\"
-AM_CPPFLAGS += -DSOUND_CONFIG=\"$(SOUND_CONFIG)\"
-AM_CPPFLAGS += -DDECODER_CONFIG=\"$(DECODER_CONFIG)\"
+AM_CPPFLAGS += -DMEDIA_CONFIG=\"$(MEDIA_CONFIG)\"
 AM_CPPFLAGS += -DTARGET_CONFIG=\"$(target)\"
 
 dist_images_DATA = images/gnash_128_96.ico images/GnashG.png

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- gui/gnash.cpp	6 Mar 2007 18:06:13 -0000	1.66
+++ gui/gnash.cpp	2 Apr 2007 16:46:32 -0000	1.67
@@ -134,8 +134,7 @@
          << "   Target: " << TARGET_CONFIG << endl
          << "   Renderer: " << RENDERER_CONFIG
          << "   GUI: " << GUI_CONFIG
-         << "   Sound handler: " << SOUND_CONFIG
-         << "   Decoder: " << DECODER_CONFIG
+         << "   Media handler: " << MEDIA_CONFIG
          << endl;
 }
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- gui/gtk.cpp	2 Apr 2007 15:45:22 -0000	1.80
+++ gui/gtk.cpp	2 Apr 2007 16:46:32 -0000	1.81
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.80 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: gtk.cpp,v 1.81 2007/04/02 16:46:32 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -856,12 +856,8 @@
     comments += RENDERER_CONFIG;
     comments += "   GUI: ";
     comments += GUI_CONFIG; // gtk of course!
-    comments += "   Sound: ";
-    comments += SOUND_CONFIG;
-    if (SOUND_CONFIG != "none") {
-	comments += "   MP3 decoder: ";
-	comments += DECODER_CONFIG;
-    }
+    comments += "   Media: ";
+    comments += MEDIA_CONFIG;
     comments += ".";
 
     gtk_about_dialog_set_url_hook(NULL, NULL, NULL);

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/NetStreamFfmpeg.cpp	30 Mar 2007 22:58:11 -0000	1.27
+++ server/asobj/NetStreamFfmpeg.cpp	2 Apr 2007 16:46:32 -0000	1.28
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.27 2007/03/30 22:58:11 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.28 2007/04/02 16:46:32 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -936,7 +936,8 @@
 	as_value status;
 	if (m_statusChanged && get_member(std::string("onStatus"), &status) && status.is_function()) {
 
-		for (int i = m_status_messages.size()-1; i >= 0; --i) {
+		int size = m_status_messages.size();
+		for (int i = 0; i < size; ++i) {
 			boost::intrusive_ptr<as_object> o = new as_object();
 			o->init_member(std::string("code"), as_value(m_status_messages[i]), 1);
 

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/NetStreamGst.cpp	30 Mar 2007 22:58:11 -0000	1.19
+++ server/asobj/NetStreamGst.cpp	2 Apr 2007 16:46:32 -0000	1.20
@@ -483,7 +483,8 @@
 			}
 
 		} else {
-			assert(0);
+			log_error("Unsupported video codec");
+			return;
 		}
 
 		g_object_set (G_OBJECT (ns->videoinputcaps), "caps", videonincaps, NULL);
@@ -514,7 +515,8 @@
 			g_object_set (G_OBJECT (ns->audioinputcaps), "caps", audioincaps, NULL);
 			gst_caps_unref (audioincaps);
 		} else {
-			assert(0);
+			log_error("Unsupported audio codec");
+			return;
 		}
 	}
 
@@ -565,19 +567,19 @@
 
 	// put it all in the pipeline and link the elements
 	if (!ns->m_isFLV) { 
-		gst_bin_add_many (GST_BIN (ns->pipeline),ns->audiosink, ns->audioconv, NULL);
+		if (sound) gst_bin_add_many (GST_BIN (ns->pipeline),ns->audiosink, ns->audioconv, NULL);
 		gst_bin_add_many (GST_BIN (ns->pipeline), ns->source, ns->decoder, ns->colorspace, 
 			ns->videosink, ns->videorate, ns->videocaps, ns->volume, NULL);
 
 		gst_element_link(ns->source, ns->decoder);
 		gst_element_link_many(ns->colorspace, ns->videocaps, ns->videorate, ns->videosink, NULL);
-		gst_element_link_many(ns->audioconv, ns->volume, ns->audiosink, NULL);
+		if (sound) gst_element_link_many(ns->audioconv, ns->volume, ns->audiosink, NULL);
 
 	} else {
 		gst_bin_add_many (GST_BIN (ns->pipeline), ns->videosource, ns->videoinputcaps, ns->videodecoder, ns->colorspace, ns->videocaps, ns->videorate, ns->videosink, NULL);
-		gst_bin_add_many (GST_BIN (ns->pipeline), ns->audiosource, ns->audioinputcaps, ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink, NULL);
+		if (sound) gst_bin_add_many (GST_BIN (ns->pipeline), ns->audiosource, ns->audioinputcaps, ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink, NULL);
 
-		gst_element_link_many(ns->audiosource, ns->audioinputcaps, ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink, NULL);
+		if (sound) gst_element_link_many(ns->audiosource, ns->audioinputcaps, ns->audiodecoder, ns->audioconv, ns->volume, ns->audiosink, NULL);
 		gst_element_link_many(ns->videosource, ns->videoinputcaps, ns->videodecoder, ns->colorspace, ns->videocaps, ns->videorate, ns->videosink, NULL);
 
 	}
@@ -679,7 +681,8 @@
 	as_value status;
 	if (m_statusChanged && get_member(std::string("onStatus"), &status) && status.is_function()) {
 
-		for (int i = m_status_messages.size()-1; i >= 0; --i) {
+		int size = m_status_messages.size();
+		for (int i = 0; i < size; ++i) {
 			boost::intrusive_ptr<as_object> o = new as_object();
 			o->init_member(std::string("code"), as_value(m_status_messages[i]), 1);
 



From MAILER-DAEMON Mon Apr 02 13:25:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYQHr-0006b4-62
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 13:25:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYQHn-0006aV-9E
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 13:25:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYQHl-0006a9-FP
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 13:25:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYQHl-0006a6-9D
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 13:25:41 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYQEh-0005Km-EN
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 13:22:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYQEg-0006I3-BG
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 17:22:30 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYQEg-0006Hz-1T
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 17:22:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYQEg-0006Hz-1T@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 02 Apr 2007 17:22:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog configure.ac server/button_char...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 17:25:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/02 17:22:29

Modified files:
	.              : ChangeLog configure.ac 
	server         : button_character_instance.cpp movie_root.cpp 
	                 movie_root.h 
	server/vm      : ExecutableCode.h 
	testsuite/samples: gotoFrameOnKeyEvent-TestRunner.cpp 

Log message:
	        * configure.ac: fix a couple of typos.
	        * server/button_character_instance.cpp (on_event): queue
	          events, don't execute immediately
	        * server/vm/ExecutableCode.h (GlobalCode): take a character
	          as target.
	        * server/movie_root.{cpp,h} (pushAction): take a character
	          as target.
	        * testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp:
	          unexpected success.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2753&r2=1.2754
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.284&r2=1.285
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2753
retrieving revision 1.2754
diff -u -b -r1.2753 -r1.2754
--- ChangeLog	2 Apr 2007 16:46:31 -0000	1.2753
+++ ChangeLog	2 Apr 2007 17:22:29 -0000	1.2754
@@ -1,3 +1,15 @@
+2007-04-02 Sandro Santilli <strk@keybit.net>
+
+	* configure.ac: fix a couple of typos.
+	* server/button_character_instance.cpp (on_event): queue
+	  events, don't execute immediately
+	* server/vm/ExecutableCode.h (GlobalCode): take a character
+	  as target.
+	* server/movie_root.{cpp,h} (pushAction): take a character
+	  as target.
+	* testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp:
+	  unexpected success.
+
 2007-04-02 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* Makefile.am, configure.ac, gui/Makefile.am, gui/gnash.cpp, gui/gtk.cpp:

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -b -r1.284 -r1.285
--- configure.ac	2 Apr 2007 16:46:31 -0000	1.284
+++ configure.ac	2 Apr 2007 17:22:29 -0000	1.285
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.284 2007/04/02 16:46:31 tgc Exp $
+dnl $Id: configure.ac,v 1.285 2007/04/02 17:22:29 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -263,7 +263,7 @@
 dnl  Select media handler
 dnl --------------------------------------------------------
 
-AC_ARG_ENABLE(sound,
+AC_ARG_ENABLE(media,
  AC_HELP_STRING([--enable-media=handler], [Enable media handling support using the specified handler: ffmpeg, mad, GST (Gstreamer) or none (no sound) [[ffmpeg]] ]),
  [case "${enableval}" in
    GST|gst) media_handler=gst ;;
@@ -507,7 +507,7 @@
 dnl currently unused
 dnl GNASH_PKG_FIND(ogg, [ogg.h], [decode ogg streams], ogg_stream_init)
 
-if test x$gui = xsdl -o x$media_handler = xffmpeg -o x$media_handler = xffmpeg; then
+if test x$gui = xsdl -o x$media_handler = xffmpeg -o x$media_handler = xmad; then
   GNASH_PATH_SDL
 fi
 

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/button_character_instance.cpp	29 Mar 2007 17:35:40 -0000	1.38
+++ server/button_character_instance.cpp	2 Apr 2007 17:22:29 -0000	1.39
@@ -354,7 +354,8 @@
 			// Matching action.
 			for (size_t j=0, je=ba.m_actions.size(); j<je; ++j)
 			{
-				parent->add_action_buffer(ba.m_actions[j]);
+				VM::get().getRoot().pushAction(*(ba.m_actions[j]), boost::intrusive_ptr<character>(this));
+				//parent->add_action_buffer(ba.m_actions[j]);
 			}
 			called = true;
 		}

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/movie_root.cpp	2 Apr 2007 15:45:22 -0000	1.51
+++ server/movie_root.cpp	2 Apr 2007 17:22:29 -0000	1.52
@@ -444,7 +444,13 @@
         _movie->get_topmost_mouse_entity(PIXELS_TO_TWIPS(m_mouse_x), PIXELS_TO_TWIPS(m_mouse_y));
     m_mouse_button_state.m_mouse_button_state_current = (m_mouse_buttons & 1);
 
-    return generate_mouse_button_events(&m_mouse_button_state);
+    bool need_redraw = generate_mouse_button_events(&m_mouse_button_state);
+
+    // FIXME: need_redraw might also depend on actual
+    //        actions execution (consider updateAfterEvent).
+    processActionQueue();
+
+    return need_redraw;
 
 }
 
@@ -814,7 +820,7 @@
 }
 
 void
-movie_root::pushAction(const action_buffer& buf, boost::intrusive_ptr<sprite_instance> target)
+movie_root::pushAction(const action_buffer& buf, boost::intrusive_ptr<character> target)
 {
 #ifdef GNASH_DEBUG
 	log_msg("Pushed action buffer for target %s", target->getTargetPath().c_str());

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/movie_root.h	2 Apr 2007 15:45:22 -0000	1.44
+++ server/movie_root.h	2 Apr 2007 17:22:29 -0000	1.45
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.44 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: movie_root.h,v 1.45 2007/04/02 17:22:29 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -414,7 +414,7 @@
 	}
 
 	/// Push an executable code to the ActionQueue
-	void pushAction(const action_buffer& buf, boost::intrusive_ptr<sprite_instance> target);
+	void pushAction(const action_buffer& buf, boost::intrusive_ptr<character> target);
 
 	/// Push a function code to the ActionQueue
 	void pushAction(boost::intrusive_ptr<as_function> func, boost::intrusive_ptr<character> target);

Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/vm/ExecutableCode.h	2 Apr 2007 15:45:22 -0000	1.2
+++ server/vm/ExecutableCode.h	2 Apr 2007 17:22:29 -0000	1.3
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ExecutableCode.h,v 1.2 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: ExecutableCode.h,v 1.3 2007/04/02 17:22:29 strk Exp $ */
 
 #ifndef GNASH_EXECUTABLECODE_H
 #define GNASH_EXECUTABLECODE_H
@@ -50,7 +50,7 @@
 
 public:
 
-	GlobalCode(const action_buffer& nBuffer, boost::intrusive_ptr<sprite_instance> nTarget)
+	GlobalCode(const action_buffer& nBuffer, boost::intrusive_ptr<character> nTarget)
 		:
 		buffer(nBuffer),
 		target(nTarget)
@@ -65,7 +65,7 @@
 		}
 		else
 		{
-			log_msg("Sprite %s unloaded, won't execute global code in it", target->getTargetPath().c_str());
+			//log_msg("Sprite %s unloaded, won't execute global code in it", target->getTargetPath().c_str());
 		}
 	}
 
@@ -73,7 +73,7 @@
 
 	const action_buffer& buffer;
 
-	boost::intrusive_ptr<sprite_instance> target;
+	boost::intrusive_ptr<character> target;
 };
 
 /// Function code

Index: testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp	2 Apr 2007 10:47:36 -0000	1.1
+++ testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp	2 Apr 2007 17:22:29 -0000	1.2
@@ -73,7 +73,7 @@
 	// TODO: check if it is correct to wait for next ::advance before expecting gotoFrame actions
 	//       execution !!
 
-	xcheck_equals(root->get_current_frame(), 1);
+	check_equals(root->get_current_frame(), 1);
 	tester.advance();
 	check_equals(root->get_current_frame(), 1);
 



From MAILER-DAEMON Mon Apr 02 18:48:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYVK8-00049N-2S
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 18:48:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYVK6-00049F-IR
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 18:48:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYVK4-000493-SK
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 18:48:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYVK4-000490-PO
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 18:48:24 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HYVGz-0002jE-Ed
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 18:45:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYVGw-0004gE-6T
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 22:45:10 +0000
Received: from nihilus by savannah.gnu.org with local (Exim 4.50)
	id 1HYVGv-0004gA-Sx
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 22:45:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYVGv-0004gA-Sx@savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Mon, 02 Apr 2007 22:45:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Apr 2007 22:48:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/02 22:45:09

Modified files:
	.              : ChangeLog 
	server         : as_value.h 

Log message:
	Include <limits> for NAN.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2754&r2=1.2755
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.40&r2=1.41

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2754
retrieving revision 1.2755
diff -u -b -r1.2754 -r1.2755
--- ChangeLog	2 Apr 2007 17:22:29 -0000	1.2754
+++ ChangeLog	2 Apr 2007 22:45:09 -0000	1.2755
@@ -1,3 +1,7 @@
+2007-04-03 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* server/as_value.h: Include <limits> for NAN.
+
 2007-04-02 Sandro Santilli <strk@keybit.net>
 
 	* configure.ac: fix a couple of typos.

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/as_value.h	2 Apr 2007 10:42:21 -0000	1.40
+++ server/as_value.h	2 Apr 2007 22:45:09 -0000	1.41
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.40 2007/04/02 10:42:21 bjacques Exp $ */
+/* $Id: as_value.h,v 1.41 2007/04/02 22:45:09 nihilus Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -28,6 +28,7 @@
 #include "smart_ptr.h"
 
 #include <cmath>
+#include <limits>
 #include <string>
 
 namespace gnash {



From MAILER-DAEMON Mon Apr 02 23:21:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYZaD-00069P-Nv
	for mharc-gnash-commit@gnu.org; Mon, 02 Apr 2007 23:21:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYZaB-00068w-3R
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 23:21:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYZa9-00068W-M4
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 23:21:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYZa9-00068T-CZ
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 23:21:17 -0400
Received: from ug-out-1314.google.com ([66.249.92.169])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HYZX2-0004Cb-IS
	for gnash-commit@gnu.org; Mon, 02 Apr 2007 23:18:04 -0400
Received: by ug-out-1314.google.com with SMTP id j3so182399ugf
	for <gnash-commit@gnu.org>; Mon, 02 Apr 2007 20:18:03 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=j7zvSwIM+tGgP+Ow4IL/s/ER1HIbCNO7va4jqy9cjyrbW3UGI6xJm75sdhtb4hcCa65kQ+W7cdt9oMPnpsA6rOYrFD2C/skPcekW0eFknGG0FgMv9zMfkGrGNwRiq/as0UciZ8wD6BU81sGIhR/zQyoMDQj1oTsHrKcyoH48GT4=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=qZH0gySAZlkz9kkXV7StbhVewILi1Y6niE3vQhM1iykxz9UqZgtE43yz1ew1IFGGpozv1OpaADZoyOaO/RI9GxMEnXDP6j/SuUZm8p+PKrbCp+I1wlOuEQQ1AuCisOf7Hd/Bi13aUtLZ6o1+x6zOQIlYwJ/TnBknOOfRExtHfRw=
Received: by 10.115.78.1 with SMTP id f1mr2094957wal.1175570282746;
	Mon, 02 Apr 2007 20:18:02 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Mon, 2 Apr 2007 20:18:02 -0700 (PDT)
Message-ID: <ca4b43ff0704022018kc32d132ld4de7b0c9aef357f@mail.gmail.com>
Date: Tue, 3 Apr 2007 11:18:02 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
In-Reply-To: <20070402091537.GB24946@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HYFsH-0000Ys-Uu@savannah.gnu.org>
	<20070402075203.GA24946@keybit.net>
	<ca4b43ff0704020144n223cde23q8d0fce46d1c38a16@mail.gmail.com>
	<20070402091537.GB24946@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 03:21:20 -0000

>
> What about adding an execute_state_reversed() to know we're being
> executed in "reverse" mode ?
> It's still dirty, but moves the dirtiness where it's already dirty
> enough :)
>
Currently, execute_tag could not know if it is being executed or
reverse executed. I think tha's the fault  of the reverse execution
concept itself.
eg. reverse execution of a RemoveObject tag is to find previous
PlaceObject tag and *execute* it.
Anyhow, it's not a big deal.  I have spent a week on it, and got the
feeling that we are likely going to get rid of this reverse execution.



From MAILER-DAEMON Tue Apr 03 03:33:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYdWR-0004ho-Lj
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 03:33:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYdWQ-0004hf-Hc
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 03:33:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYdWP-0004hS-Lo
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 03:33:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYdWP-0004hN-JH
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 03:33:41 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYdTG-00010O-6b
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 03:30:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYdT8-0004CN-2L
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 07:30:18 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYdT7-0004CF-MY
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 07:30:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYdT7-0004CF-MY@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 07:30:17 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 07:33:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 07:30:17

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xml.h 

Log message:
	        * server/asobj/xml.{cpp,h}: allow reading XML from
	          a network stream (untested).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2755&r2=1.2756
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2755
retrieving revision 1.2756
diff -u -b -r1.2755 -r1.2756
--- ChangeLog	2 Apr 2007 22:45:09 -0000	1.2755
+++ ChangeLog	3 Apr 2007 07:30:17 -0000	1.2756
@@ -1,3 +1,8 @@
+2007-04-03 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/xml.{cpp,h}: allow reading XML from
+	  a network stream (untested).
+
 2007-04-03 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* server/as_value.h: Include <limits> for NAN.

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/xml.cpp	22 Mar 2007 22:37:46 -0000	1.24
+++ server/asobj/xml.cpp	3 Apr 2007 07:30:17 -0000	1.25
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.24 2007/03/22 22:37:46 bjacques Exp $ */
+/* $Id: xml.cpp,v 1.25 2007/04/03 07:30:17 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,10 @@
 #include "xml.h"
 #include "builtin_function.h"
 #include "debugger.h"
+#include "StreamProvider.h"
+#include "URLAccessManager.h"
+#include "tu_file.h"
+#include "URL.h"
 
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
@@ -43,6 +47,7 @@
 #include <sstream>
 #include <vector>
 #include <boost/lexical_cast.hpp>
+#include <memory>
 
 using namespace std;
 
@@ -52,6 +57,11 @@
 
 static as_object* getXMLInterface();
 
+// Callback function for xmlReadIO
+static int closeTuFile (void * context);
+// Callback function for xmlReadIO
+static int readFromTuFile (void * context, char * buffer, int len);
+
 DSOEXPORT as_value xml_new(const fn_call& fn);
 static as_value xml_load(const fn_call& fn);
 //static as_value xml_set_current(const fn_call& fn); // UNDEFINED
@@ -389,27 +399,33 @@
 // This reads in an XML file from disk and parses into into a memory resident
 // tree which can be walked through later.
 bool
-XML::load(const char *filespec)
+XML::load(const URL& url)
 {
 //    GNASH_REPORT_FUNCTION;
-    struct stat stats;
-    log_msg("Load disk XML file: %s\n", filespec);
   
     //log_msg("%s: mem is %d\n", __FUNCTION__, mem);
 
-    // See if the file exists
-    if (stat(filespec, &stats) == 0) {
-        _bytes_total = stats.st_size;
-        _bytes_loaded = stats.st_size; // FIXME: this should probably
-                                       // be set later on after the
-                                       // file is loaded
+    std::auto_ptr<tu_file> str ( StreamProvider::getDefaultInstance().getStream(url) );
+    if ( ! str.get() ) 
+    {
+        log_error("Can't load XML file: %s (security?)", url.str().c_str());
+        return false;
     }
+
+    log_msg("Load XML file from url: %s", url.str().c_str());
+
     xmlInitParser();
-    _doc = xmlParseFile(filespec);
+
+    _doc = xmlReadIO(readFromTuFile, closeTuFile, str.get(), url.str().c_str(), NULL, 0);
+    _bytes_total = str->get_size();
+
     if (_doc == 0) {
-        log_error("Can't load XML file: %s!\n", filespec);
+        log_error("Can't read XML file (IO): %s!", url.str().c_str());
         return false;
     }
+
+    _bytes_loaded = _bytes_total;
+
     parseDoc(_doc, false);
     xmlCleanupParser();
     xmlFreeDoc(_doc);
@@ -763,7 +779,6 @@
     as_value	val;
     as_value	rv = false;
     bool          ret;
-    struct stat   stats;
 
     //GNASH_REPORT_FUNCTION;
   
@@ -771,16 +786,11 @@
   
     std::string filespec = fn.arg(0).to_string(); 
 
-    // If the file doesn't exist, don't try to do anything.
-    if (stat(filespec.c_str(), &stats) < 0) {
-        fprintf(stderr, "ERROR: doesn't exist.%s\n", filespec.c_str());
-	rv = false;
-        return rv;
-    }
+    URL url(filespec, get_base_url());
   
     // Set the argument to the function event handler based on whether the load
     // was successful or failed.
-    ret = xml_obj->load(filespec.c_str());
+    ret = xml_obj->load(url);
     rv = ret;
 
     if (ret == false) {
@@ -797,35 +807,28 @@
     }  
     xml_obj->setupFrame(xml_obj.get(), xml_obj->firstChild(), false);
   
-#if 1
-    if (fn.this_ptr->get_member("onLoad", &method)) {
+    if (fn.this_ptr->get_member("onLoad", &method))
+    {
         //    log_msg("FIXME: Found onLoad!\n");
         fn.env().set_variable("success", true);
         fn.arg(0) = true;
-#if 0
-        as_c_function_ptr	func = method.to_c_function();
-        if (func) {
-	    // It's a C function.  Call it.
-	    log_msg("Calling C function for onLoad\n");
-	    (*func)(fn_call(&val, xml_obj, fn.env(), fn.nargs, fn.first_arg_bottom_index)); // was this_ptr instead of node
-	} else
-#endif
-	if (as_function* as_func = method.to_as_function()) {
+	    if (as_function* as_func = method.to_as_function())
+        {
 	    // It's an ActionScript function.  Call it.
-	    log_msg("Calling ActionScript function for onLoad\n");
+	        log_msg("Calling ActionScript function for XML.onLoad");
 	    // XXX other than being assigned into, val appears to be unused.
 	    val = (*as_func)(fn_call(xml_obj, &fn.env(), fn.nargs, fn.offset())); // was this_ptr instead of node
-	} else {
+	    }
+        else
+        {
 	    log_error("error in call_method(): method is not a function\n");
 	}
-    } else {
-        log_msg("Couldn't find onLoad event handler, setting up callback\n");
+    }
+    else
+    {
+        //log_msg("Couldn't find onLoad event handler, setting up callback");
         // ptr->set_event_handler(event_id::XML_LOAD, (as_c_function_ptr)&xml_onload);
     }
-#else
-    xml_obj->set_event_handler(event_id::XML_LOAD, &xml_onload);
-
-#endif
 
     rv = true;
     return rv;
@@ -1337,6 +1340,26 @@
 
 }
 
+// Callback function for xmlReadIO
+static int
+readFromTuFile (void * context, char * buffer, int len)
+{
+        tu_file* str = static_cast<tu_file*>(context);
+        size_t read = str->read_bytes(buffer, len);
+        if ( str->get_error() ) return -1;
+        else return read;
+}
+
+// Callback function for xmlReadIO
+static int
+closeTuFile (void * /*context*/)
+{
+        // nothing to do, the tu_file destructor will close
+        //tu_file* str = static_cast<tu_file*>(context);
+        //str->close();
+        return 0; // no error
+}
+
 } // end of gnash namespace
 
 // Local Variables:

Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/xml.h	19 Mar 2007 17:11:14 -0000	1.8
+++ server/asobj/xml.h	3 Apr 2007 07:30:17 -0000	1.9
@@ -47,6 +47,7 @@
 
 // Forward declarations
 class fn_call;
+class URL;
 
 /// XML class and ActionScript object
 class DSOLOCAL XML : public as_object
@@ -63,9 +64,11 @@
     bool parseDoc(xmlDocPtr document, bool mem);
     // Parses an XML document into the specified XML object tree.
     bool parseXML(tu_string xml_in);
+
     // Loads a document (specified by
-    bool load(const char *filespec);
     // the XML object) from a URL.
+    bool load(const URL& url);
+
 
     // An event handler that returns a
     bool onLoad();



From MAILER-DAEMON Tue Apr 03 04:08:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYe3w-0003iq-Fd
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYe3r-0003gf-Ia
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYe3p-0003en-L4
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYe3o-0003do-QV
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:13 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYe0f-0001NY-Nv
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:04:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYe0U-0006Qd-QG
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:04:46 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYe0U-0006Qa-Ir
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:04:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYe0U-0006Qa-Ir@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 08:04:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/asobj/xml.cpp server/asobj/xml.h t...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 08:08:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 08:04:46

Modified files:
	server/asobj   : xml.cpp xml.h 
	testsuite/actionscript.all: XML.as 

Log message:
	Some more cleanups, and a few more tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/xml.cpp	3 Apr 2007 07:30:17 -0000	1.25
+++ server/asobj/xml.cpp	3 Apr 2007 08:04:46 -0000	1.26
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.25 2007/04/03 07:30:17 strk Exp $ */
+/* $Id: xml.cpp,v 1.26 2007/04/03 08:04:46 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,6 +35,7 @@
 #include "URLAccessManager.h"
 #include "tu_file.h"
 #include "URL.h"
+#include "VM.h"
 
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
@@ -47,6 +48,7 @@
 #include <sstream>
 #include <vector>
 #include <boost/lexical_cast.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 #include <memory>
 
 using namespace std;
@@ -209,46 +211,57 @@
     printf("%s: XML _nodes at %p\n", __PRETTY_FUNCTION__, (void*)_nodes);
 }
 
-// Dispatch event handler(s), if any.
-bool
-XML::on_event(const event_id& /* id */)
+void
+XML::onLoadEvent(bool success)
 {
-    GNASH_REPORT_FUNCTION;
-    
-    // Keep m_as_environment alive during any method calls!
-    //  boost::intrusive_ptr<as_object_interface>	this_ptr(this);
-  
-#if 0
-    // First, check for built-in event handler.
-    as_value	method;
-    if (get_event_handler(event_id(id), &method)) {
-        call_method0(method, &m_as_environment, this);
-        return true;
-    }
+    // Do the events that (appear to) happen as the movie
+    // loads.  frame1 tags and actions are executed (even
+    // before advance() is called).  Then the onLoad event
+    // is triggered.
   
-    // Check for member function.
     // In ActionScript 2.0, event method names are CASE SENSITIVE.
     // In ActionScript 1.0, event method names are CASE INSENSITIVE.
-    const tu_string&	method_name = id.get_function_name();
-    if (method_name.length() > 0) {
+    // TODO: move to get_function_name directly ?
+    std::string method_name = "onLoad";
+    if ( _vm.getSWFVersion() < 7 )
+        boost::to_lower(method_name, _vm.getLocale());
+
+    if ( method_name.empty() ) return;
+
         as_value	method;
-        if (get_member(method_name, &method)) {
-            call_method0(method, &m_as_environment, this);
-            return true;
-        }
-    }
-#endif
-    return false;
+    if ( ! get_member(method_name, &method) ) return;
+    if ( method.is_undefined() ) return;
+    if ( ! method.is_function() ) return;
+
+    as_environment env; // how to set target here ??
+    env.push(as_value(success));
+    call_method(method, &env, this, 1, env.stack_size()-1);
 }
 
 void
-XML::on_event_load()
+XML::onCloseEvent()
 {
     // Do the events that (appear to) happen as the movie
     // loads.  frame1 tags and actions are executed (even
     // before advance() is called).  Then the onLoad event
     // is triggered.
-    on_event(event_id::LOAD);
+
+    // In ActionScript 2.0, event method names are CASE SENSITIVE.
+    // In ActionScript 1.0, event method names are CASE INSENSITIVE.
+    // TODO: move to get_function_name directly ?
+    std::string method_name = "onClose";
+    if ( _vm.getSWFVersion() < 7 )
+        boost::to_lower(method_name, _vm.getLocale());
+
+    if ( method_name.empty() ) return;
+
+    as_value	method;
+    if ( ! get_member(method_name, &method) ) return;
+    if ( method.is_undefined() ) return;
+    if ( ! method.is_function() ) return;
+
+    as_environment env; // how to set target here ??
+    call_method(method, &env, this, 0, 0);
 }
 
 XMLNode*
@@ -409,6 +422,7 @@
     if ( ! str.get() ) 
     {
         log_error("Can't load XML file: %s (security?)", url.str().c_str());
+        onLoadEvent(false);
         return false;
     }
 
@@ -421,6 +435,7 @@
 
     if (_doc == 0) {
         log_error("Can't read XML file (IO): %s!", url.str().c_str());
+        onLoadEvent(false);
         return false;
     }
 
@@ -430,6 +445,9 @@
     xmlCleanupParser();
     xmlFreeDoc(_doc);
     xmlMemoryDump();
+
+    onLoadEvent(true);
+
     return true;
 }
 
@@ -797,106 +815,10 @@
         return rv;
     }
     
-    //env->bottom(first_arg) = ret;
-    //  struct node *first_node = ptr->firstChildGet();
-  
-    //const char *name = ptr->nodeNameGet();
-
-    if (xml_obj->hasChildNodes() == false) {
-        log_error("%s: No child nodes!\n", __FUNCTION__);
-    }  
-    xml_obj->setupFrame(xml_obj.get(), xml_obj->firstChild(), false);
-  
-    if (fn.this_ptr->get_member("onLoad", &method))
-    {
-        //    log_msg("FIXME: Found onLoad!\n");
-        fn.env().set_variable("success", true);
-        fn.arg(0) = true;
-	    if (as_function* as_func = method.to_as_function())
-        {
-	        // It's an ActionScript function.  Call it.
-	        log_msg("Calling ActionScript function for XML.onLoad");
-	        // XXX other than being assigned into, val appears to be unused.
-	        val = (*as_func)(fn_call(xml_obj, &fn.env(), fn.nargs, fn.offset())); // was this_ptr instead of node
-	    }
-        else
-        {
-	        log_error("error in call_method(): method is not a function\n");
-	    }
-    }
-    else
-    {
-        //log_msg("Couldn't find onLoad event handler, setting up callback");
-        // ptr->set_event_handler(event_id::XML_LOAD, (as_c_function_ptr)&xml_onload);
-    }
-
     rv = true;
     return rv;
 }
 
-// This executes the event handler for XML::XML_LOAD if it's been defined,
-// and the XML file has loaded sucessfully.
-as_value
-xml_onload(const fn_call& fn)
-{
-    //log_msg("%s:\n", __FUNCTION__);
-    
-    as_value	method;
-    as_value      val;
-    static bool first = true;     // This event handler should only be executed once.
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-  
-    if ((ptr->loaded()) && (first)) {
-        // env->set_variable("success", true, 0);
-        //as_value bo(true);
-        //env->push_val(bo);
-
-        first = false;
-        log_msg("The XML file has been loaded successfully!\n");
-        // ptr->on_event(event_id::XML_LOAD);
-        //env->set_variable("success", true, 0);
-        //env->bottom(0) = true;
-    
-        if (fn.this_ptr->get_member("onLoad", &method)) {
-            // log_msg("FIXME: Found onLoad!\n");
-	    val = call_method(method, &fn.env(), fn.this_ptr.get(), 0, 0);
-        } else {
-            log_msg("FIXME: Couldn't find onLoad!\n");
-        }
-    }
-      
-    return as_value(val.to_bool());
-}
-
-// This is the default event handler, and is usually redefined in the SWF script
-#if 0 // UNUSED, it seems
-as_value
-xml_ondata(const fn_call& fn)
-{
-    log_msg("%s:\n", __FUNCTION__);
-    
-    as_value	method;
-    as_value	val;
-    static bool first = true;     // FIXME: ugly hack!
-  
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-  
-    if ((ptr->loaded()) && (first)) {
-        if (fn.this_ptr->get_member("onData", &method)) {
-            log_msg("FIXME: Found onData!\n");
-	    // TODO: this is suspicious (set_variable for what??)
-            fn.env().set_variable("success", true);
-	    val = call_method(method, fn.env(), fn.this_ptr, 0, 0);
-        } else {
-            log_msg("FIXME: Couldn't find onData!\n");
-        }
-    }
-
-    //fn.result->set(&val);
-    return as_value(val.to_bool());
-}
-#endif // UNUSED
-
 void
 attachXMLInterface(as_object& o)
 {
@@ -1175,21 +1097,7 @@
 	}
     }
     
-#if 1
-    if (fn.this_ptr->get_member("onLoad", &method)) {
-        log_msg("FIXME: Found onLoad!\n");
-        fn.env().set_variable("success", true); // what is this for ?
-	fn.arg(0) = true; // what is this for ?
-	val = call_method(method, &fn.env(), fn.this_ptr.get(), 0, 0);
-    } else {
-        log_msg("Couldn't find onLoad event handler, setting up callback\n");
-        // ptr->set_event_handler(event_id::XML_LOAD, (as_c_function_ptr)&xml_onload);
-    }
-#else
-    
-#endif
     return as_value();
-//    return as_value(ptr->getAllocated());
 }
 
 /// \brief removes the specified XML object from its parent. Also

Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/xml.h	3 Apr 2007 07:30:17 -0000	1.9
+++ server/asobj/xml.h	3 Apr 2007 08:04:46 -0000	1.10
@@ -80,8 +80,6 @@
     // Appends a node to the end of the specified object's child list.
     void appendChild(XMLNode *node);
     
-    virtual bool on_event(const gnash::event_id& id);
-    virtual void	on_event_load();
     bool loaded()    { return _loaded; }
     
     XMLNode *firstChild() {
@@ -138,17 +136,6 @@
     int getBytesLoaded()         { return _bytes_loaded; };
     int getBytesTotal()          { return _bytes_total; };
 
-    virtual void	on_xml_event(const gnash::event_id& id)
-    {
-    	on_event(id);
-    }
-  
-    // Special event handler; 
-    void	on_event_close()
-    {
-    	on_event(gnash::event_id::SOCK_CLOSE);
-    }
-  
     XMLNode *operator [] (int x);
 #if 0
     XMLNode *operator = (XMLNode &node) {
@@ -188,6 +175,12 @@
     bool        _status;	// TODO Should be Number
     bool        _previousSibling;
 
+    /// Trigger the onLoad event, if any
+    void onLoadEvent(bool success);
+
+    /// Trigger the onClose event, if any
+    void onCloseEvent();
+  
 };
 
 

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/XML.as	13 Feb 2007 19:36:34 -0000	1.17
+++ testsuite/actionscript.all/XML.as	3 Apr 2007 08:04:46 -0000	1.18
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.17 2007/02/13 19:36:34 rsavoye Exp $";
+rcsid="$Id: XML.as,v 1.18 2007/04/03 08:04:46 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -257,10 +257,12 @@
 
 // place the new nodes into the XML tree
 element2.appendChild(textNode1);
-check(element2.nodeValue == "textNode1 String value");
+xcheck_equals(element2.nodeValue, null);
+xcheck_equals(element2.lastChild.nodeValue, "textNode1 String value");
 
 element3.appendChild(textNode2);
-check(element3.nodeValue == "textNode2 String value");
+xcheck_equals(element3.nodeValue, null); 
+xcheck_equals(element3.lastChild.nodeValue, "textNode2 String value");
 
 // place the new nodes into the XML tree
 doc.appendChild(element1);
@@ -301,5 +303,28 @@
 // }
 // #endif
 
+
+//--------------------------------------------------------------------
+// Test loading an XML locally
+//--------------------------------------------------------------------
+
+myxml = new XML;
+myxml.onLoad = function(success)
+{
+	note("myxml.onLoad("+success+") called");
+	if ( ! success )
+	{
+		note("No success loading gnash.xml");
+		return;
+	}
+	note("gnash.xml successfully loaded");
+	note("myxml status is "+myxml.status);
+	note("myxml.toString(): "+myxml.toString());
+	xcheck_equals(typeof(myxml.attributes), 'object');
+	check(myxml.hasChildNodes());
+	xcheck_equals(myxml.nodeName, null);
+};
+myxml.load( MEDIA(gnash.xml) );
+
 // We're done
-totals();
+//totals();



From MAILER-DAEMON Tue Apr 03 04:08:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYe4S-0003tD-GS
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYe4P-0003rb-Ib
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYe4O-0003r9-SM
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYe4O-0003r1-Fv
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:08:48 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYe1F-0001T9-Nl
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:05:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYe1B-0006Rv-32
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:05:29 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYe1A-0006Rs-OW
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:05:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYe1A-0006Rs-OW@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 08:05:28 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/media/gnash.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 08:08:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 08:05:28

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/media: gnash.xml 

Log message:
	        * testsuite/actionscript.all/XML.as: a few more tests.
	        * testsuite/media/gnash.xml: new data file for testing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2756&r2=1.2757
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/gnash.xml?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2756
retrieving revision 1.2757
diff -u -b -r1.2756 -r1.2757
--- ChangeLog	3 Apr 2007 07:30:17 -0000	1.2756
+++ ChangeLog	3 Apr 2007 08:05:28 -0000	1.2757
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/XML.as: a few more tests.
+	* testsuite/media/gnash.xml: new data file for testing.
 	* server/asobj/xml.{cpp,h}: allow reading XML from
 	  a network stream (untested).
 

Index: testsuite/media/gnash.xml
===================================================================
RCS file: testsuite/media/gnash.xml
diff -N testsuite/media/gnash.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/media/gnash.xml	3 Apr 2007 08:05:28 -0000	1.1
@@ -0,0 +1,13 @@
+<XML>
+<elem1>
+	<elem1_1>
+	Elem 1.1 content
+	</elem1_1>
+	<elem1_2>
+	Elem 1.2 content
+	</elem1_2>
+</elem1>
+<elem2>
+Elem 2 content
+</elem2>
+</XML>



From MAILER-DAEMON Tue Apr 03 05:01:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYetV-0001QQ-M4
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 05:01:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYetS-0001PI-Qy
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 05:01:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYetQ-0001O7-9G
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 05:01:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYetP-0001Ns-PT
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 05:01:31 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYeqG-0000Vc-Hg
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 04:58:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYeq9-0000fp-O8
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:58:09 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYeq9-0000fm-ER
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:58:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYeq9-0000fm-ER@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 08:58:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/parser/movie_def_impl.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 09:01:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 08:58:09

Modified files:
	.              : ChangeLog 
	server/parser  : movie_def_impl.h 

Log message:
	* server/parser/movie_def_impl.h (add_init_action): fix typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2757&r2=1.2758
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2757
retrieving revision 1.2758
diff -u -b -r1.2757 -r1.2758
--- ChangeLog	3 Apr 2007 08:05:28 -0000	1.2757
+++ ChangeLog	3 Apr 2007 08:58:09 -0000	1.2758
@@ -1,5 +1,6 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/movie_def_impl.h (add_init_action): fix typo.
 	* testsuite/actionscript.all/XML.as: a few more tests.
 	* testsuite/media/gnash.xml: new data file for testing.
 	* server/asobj/xml.{cpp,h}: allow reading XML from

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/parser/movie_def_impl.h	5 Mar 2007 10:36:13 -0000	1.33
+++ server/parser/movie_def_impl.h	3 Apr 2007 08:58:09 -0000	1.34
@@ -459,7 +459,7 @@
 	void	add_init_action(execute_tag* e)
 	{
 	    assert(e);
-	    assert(_frames_loaded < m_playlist.size());
+	    assert(_frames_loaded < m_init_action_list.size());
 	    m_init_action_list[_frames_loaded].push_back(e);
 	}
 



From MAILER-DAEMON Tue Apr 03 06:40:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYgRE-0003Vj-PJ
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 06:40:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYgRD-0003VE-8b
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 06:40:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYgRC-0003V2-OP
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 06:40:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYgRC-0003Uz-Lu
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 06:40:30 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HYgO3-0007ZP-W1
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 06:37:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYgO3-0005Y0-NM
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:37:15 +0000
Received: from martinwguy by savannah.gnu.org with local (Exim 4.50)
	id 1HYgO3-0005Xp-A7
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:37:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYgO3-0005Xp-A7@savannah.gnu.org>
From: Martin Guy <martinwguy@yahoo.it>
Date: Tue, 03 Apr 2007 10:37:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 10:40:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/03 10:37:15

Modified files:
	.              : ChangeLog 

Log message:
	configure.ac: Regularise layout of AC_ARG_*

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2758&r2=1.2759

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2758
retrieving revision 1.2759
diff -u -b -r1.2758 -r1.2759
--- ChangeLog	3 Apr 2007 08:58:09 -0000	1.2758
+++ ChangeLog	3 Apr 2007 10:37:14 -0000	1.2759
@@ -455,6 +455,7 @@
 	  to the same layout
 	* configure.ac: Fail during configure if AGG libraries not detected;
 	  AGG is no longer "experimental"
+	* configure.ac: Regularise layout of AC_ARG_*
 
 2007-03-25 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Tue Apr 03 08:38:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYiH1-0005dW-4N
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 08:38:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYiGz-0005dN-WD
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:38:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYiGw-0005cg-9K
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:38:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYiGw-0005cW-3D
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:38:02 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYiDm-0002Ux-4N
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 08:34:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYiDk-0002o7-F9
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:34:44 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYiDk-0002nz-5H
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:34:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYiDk-0002nz-5H@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 12:34:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 12:38:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 12:34:43

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xml.h xmlnode.cpp xmlnode.h 
	testsuite/actionscript.all: XML.as XMLNode.as 

Log message:
	        * server/asobj/xml.{cpp,h}: have XML be a subclass
	          of XMLNode. Many cleanups.
	        * server/asobj/xmlnode.{cpp,h}: many cleanups.
	        * testsuite/actionscript.all/XML.as: add more tests.
	        * testsuite/actionscript.all/XMLNode.as: fix some bogus
	          existing tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2759&r2=1.2760
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLNode.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2759
retrieving revision 1.2760
diff -u -b -r1.2759 -r1.2760
--- ChangeLog	3 Apr 2007 10:37:14 -0000	1.2759
+++ ChangeLog	3 Apr 2007 12:34:43 -0000	1.2760
@@ -1,5 +1,14 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xml.{cpp,h}: have XML be a subclass
+	  of XMLNode. Many cleanups.
+	* server/asobj/xmlnode.{cpp,h}: many cleanups.
+	* testsuite/actionscript.all/XML.as: add more tests.
+	* testsuite/actionscript.all/XMLNode.as: fix some bogus
+	  existing tests.
+
+2007-04-03 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/movie_def_impl.h (add_init_action): fix typo.
 	* testsuite/actionscript.all/XML.as: a few more tests.
 	* testsuite/media/gnash.xml: new data file for testing.

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/xml.cpp	3 Apr 2007 08:04:46 -0000	1.26
+++ server/asobj/xml.cpp	3 Apr 2007 12:34:43 -0000	1.27
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.26 2007/04/03 08:04:46 strk Exp $ */
+/* $Id: xml.cpp,v 1.27 2007/04/03 12:34:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,40 +59,24 @@
 
 static as_object* getXMLInterface();
 
-// Callback function for xmlReadIO
+// Callback functions for xmlReadIO
 static int closeTuFile (void * context);
-// Callback function for xmlReadIO
 static int readFromTuFile (void * context, char * buffer, int len);
 
 DSOEXPORT as_value xml_new(const fn_call& fn);
 static as_value xml_load(const fn_call& fn);
-//static as_value xml_set_current(const fn_call& fn); // UNDEFINED
-
 static as_value xml_addrequestheader(const fn_call& fn);
-static as_value xml_appendchild(const fn_call& fn);
-static as_value xml_clonenode(const fn_call& fn);
 static as_value xml_createelement(const fn_call& fn);
 static as_value xml_createtextnode(const fn_call& fn);
 static as_value xml_getbytesloaded(const fn_call& fn);
 static as_value xml_getbytestotal(const fn_call& fn);
-static as_value xml_haschildnodes(const fn_call& fn);
-static as_value xml_insertbefore(const fn_call& fn);
 static as_value xml_parsexml(const fn_call& fn);
-static as_value xml_removenode(const fn_call& fn);
 static as_value xml_send(const fn_call& fn);
 static as_value xml_sendandload(const fn_call& fn);
-static as_value xml_tostring(const fn_call& fn);
-static as_value xml_firstchild(const fn_call& fn);
-static as_value xml_childnodes(const fn_call& fn);
 
 // These are the event handlers called for this object
-//static as_value xml_ondata(const fn_call& fn); // UNUSED
 static as_value xml_loaded(const fn_call& fn);
 
-// Properties
-static as_value xml_nodename(const fn_call& fn);
-static as_value xml_nodevalue(const fn_call& fn);
-
 static LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 #ifdef USE_DEBUGGER
 static Debugger& debugger = Debugger::getDefaultInstance();
@@ -100,10 +84,8 @@
 
 XML::XML() 
     :
-    as_object(getXMLInterface()),
+    XMLNode(getXMLInterface()),
     _loaded(false), 
-    _nodename(0),
-    _nodes(0),
     _bytes_loaded(0),
     _bytes_total(0)
 {
@@ -118,10 +100,8 @@
 // Parse the ASCII XML string into memory
 XML::XML(tu_string xml_in)
     :
-    as_object(getXMLInterface()),
+    XMLNode(getXMLInterface()),
     _loaded(false), 
-    _nodename(0),
-    _nodes(0),
     _bytes_loaded(0),
     _bytes_total(0)
 {
@@ -129,17 +109,13 @@
 #ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("Creating XML data at %p \n", this);
 #endif
-    //log_msg("%s: %p \n", __FUNCTION__, this);
-    //memset(&_nodes, 0, sizeof(XMLNode));
     parseXML(xml_in);
 }
 
 XML::XML(struct node * /* childNode */)
     :
-    as_object(getXMLInterface()),
+    XMLNode(getXMLInterface()),
     _loaded(false), 
-    _nodename(0),
-    _nodes(0),
     _bytes_loaded(0),
     _bytes_total(0)
 {
@@ -156,59 +132,9 @@
     GNASH_REPORT_FUNCTION;
     
 #ifdef DEBUG_MEMORY_ALLOCATION
-    if (this->_nodes) {
-        log_msg("\tDeleting XML top level node %s at %p \n", this->_nodes->_name, this);
-    } else {
-        log_msg("\tDeleting XML top level node at %p \n", this);
-    }
+    log_msg("\tDeleting XML top level node at %p", this);
 #endif
   
-    //log_msg("%s: %p \n", __FUNCTION__, this);
-    delete _nodes;
-}
-
-const char *
-XML::nodeName()
-{
-    printf("%s: XML %p _nodes at %p\n", __PRETTY_FUNCTION__, (void*)this, (void*)_nodes);
-    if (_nodes) {
-	return _nodes->nodeName();
-    }
-    return "undefined";
-}
-
-const char *
-XML::nodeValue()
-{
-    printf("%s: XML _nodes at %p\n", __PRETTY_FUNCTION__, (void*)_nodes);
-    if (_nodes) {
-	return _nodes->nodeValue();
-    }
-    return "undefined";
-}
-
-void
-XML::nodeNameSet(const char * /*name */)
-{
-    if (!_nodes) {
-	_nodes = new XMLNode;
-	printf("%s: New XML %p _nodes at %p\n", __PRETTY_FUNCTION__, (void*)this, (void*)_nodes);
-    }
-    //  _nodes->nodeNameSet(name);
-    printf("%s: XML %p _name at %p, %s\n", __PRETTY_FUNCTION__, (void*)this,
-	   _nodes->nodeName(), _nodes->nodeName() );
-}
-
-void
-XML::nodeValueSet(const char * /* value */)
-{
-    if (!_nodes) {
-	_nodes = new XMLNode;
-	printf("%s: New XML _nodes at %p\n", __PRETTY_FUNCTION__, (void*)_nodes);
-    }
-  
-    //  _nodes->nodeValueSet(value);
-    printf("%s: XML _nodes at %p\n", __PRETTY_FUNCTION__, (void*)_nodes);
 }
 
 void
@@ -264,25 +190,23 @@
     call_method(method, &env, this, 0, 0);
 }
 
-XMLNode*
-XML::extractNode(xmlNodePtr node, bool mem)
+void
+XML::extractNode(XMLNode& element, xmlNodePtr node, bool mem)
 {
     xmlAttrPtr attr;
     xmlNodePtr childnode;
     xmlChar *ptr = NULL;
-    XMLNode *element, *child;
+    boost::intrusive_ptr<XMLNode> child;
     int len;
 
-    element = new XMLNode;
-            
 //    log_msg("Created new element for %s at %p\n", node->name, element);
-    memset(element, 0, sizeof (XMLNode));
 
 //    log_msg("%s: extracting node %s\n", __FUNCTION__, node->name);
 
     // See if we have any Attributes (properties)
     attr = node->properties;
-    while (attr != NULL) {
+    while (attr != NULL)
+    {
         //log_msg("extractNode %s has property %s, value is %s\n",
         //          node->name, attr->name, attr->children->content);
         XMLAttr *attrib = new XMLAttr;
@@ -296,15 +220,15 @@
         strcpy(attrib->_value, reinterpret_cast<const char *>(attr->children->content));
         //log_msg("\tPushing attribute %s for element %s has value %s\n",
         //        attr->name, node->name, attr->children->content);
-        element->_attributes.push_back(attrib);
+        element._attributes.push_back(attrib);
         attr = attr->next;
     }
 
     len = memadjust(strlen(reinterpret_cast<const char *>(node->name))+1);
-    element->_name = (char *)new char[len];
-    memset(element->_name, 0, len);
-    strcpy(element->_name, reinterpret_cast<const char *>(node->name));
-    //element->_name = reinterpret_cast<const char *>(node->name);
+    element._name = (char *)new char[len];
+    memset(element._name, 0, len);
+    strcpy(element._name, reinterpret_cast<const char *>(node->name));
+    //element._name = reinterpret_cast<const char *>(node->name);
     if (node->children) {
         //ptr = node->children->content;
         ptr = xmlNodeGetContent(node->children);
@@ -315,9 +239,9 @@
                 } else {
                     //log_msg("extractChildNode from text for %s has contents %s\n", node->name, ptr);
                     len = memadjust(strlen(reinterpret_cast<const char *>(ptr))+1);
-                    element->_value = (char *)new char[len];
-                    memset(element->_value, 0, len);
-                    strcpy(element->_value, reinterpret_cast<const char *>(ptr));
+                    element._value = (char *)new char[len];
+                    memset(element._value, 0, len);
+                    strcpy(element._value, reinterpret_cast<const char *>(ptr));
                     //element->_value = reinterpret_cast<const char *>(ptr);
                 }
             }
@@ -328,22 +252,17 @@
     // See if we have any data (content)
     childnode = node->children;
 
-    while (childnode != NULL) {
-        if (childnode->type == XML_ELEMENT_NODE) {
-//            log_msg("\t\t extracting node %s\n", childnode->name);
-            child = extractNode(childnode, mem);
-            //if (child->_value.get_type() != as_value::UNDEFINED) {
-//             if (child->_value != 0) {
-//                 log_msg("\tPushing childNode %s, value %s on element %s\n", child->_name, child->_value, element->_name);
-//             } else {
-//                 log_msg("\tPushing childNode %s on element %s\n", child->_name, element->_name);
-//             }
-            element->_children.push_back(child);
+    while (childnode != NULL)
+    {
+        if (childnode->type == XML_ELEMENT_NODE)
+        {
+            child = new XMLNode();
+            extractNode(*child, childnode, mem);
+            element._children.push_back(child);
         }
         childnode = childnode->next;
     }
 
-    return element;
 }
 
 // Read in an XML document from the specified source
@@ -360,8 +279,11 @@
 
     cur = xmlDocGetRootElement(document);
   
-    if (cur != NULL) {
-        _nodes = extractNode(cur, mem);
+    if (cur != NULL)
+    {
+        boost::intrusive_ptr<XMLNode> child = new XMLNode();
+        extractNode(*child, cur, mem);
+        _children.push_back(child);
     }  
 
     _loaded = true;
@@ -452,16 +374,6 @@
 }
 
 
-vector<XMLNode *>
-XML::childNodes() 
-{
-    if (_nodes) {
-	return _nodes->_children;
-    } else {
-	return static_cast< vector<XMLNode*> >(0);
-    }
-}
-
 bool
 XML::onLoad()
 {
@@ -470,20 +382,14 @@
     return(_loaded);
 }
 
-XMLNode *
-XML::operator [] (int x) {
-    log_msg("%s:\n", __FUNCTION__);
-
-    return _nodes->_children[x];
-}
-
 void
 XML::cleanupStackFrames(XMLNode * /* xml */)
 {
     GNASH_REPORT_FUNCTION;
 }
 
-as_object *
+#if 0
+void
 XML::setupFrame(as_object *obj, XMLNode *xml, bool mem)
 {
 //    GNASH_REPORT_FUNCTION;
@@ -502,8 +408,6 @@
   
     // Get the data for this node
     nodename   = xml->_name;
-    //nodename   = xml->_name.c_str();
-    //nodevalue  = xml->_value;
     length     = xml->length();
 
     // Set these members in the top level object passed in. This are used
@@ -512,24 +416,17 @@
     // childNodes.
     //obj->set_member("nodeName", nodename); // use the getter/setter !
     obj->set_member("length", length); // FIXME: use a getter/setter !
-    if (xml->_value != 0) {
-        //obj->set_member("nodeValue", xml->_value); // use the getter/setter !
-        //log_msg("\tnodevalue for %s is: %s\n", nodename, xml->_value);
-    } else {
-        // obj->set_member("nodeValue", as_value::UNDEFINED); // use the getter/setter !
-    }
 
     // Process the attributes, if any
-    if (xml->_attributes.size() == 0) {
+    if (xml->_attributes.size() == 0)
+    {
         //log_msg("\t\tNo attributes for node %s, created empty object at %p\n", nodename, attr_obj);
-//     log_msg("\t\tNo attributes for node %s\n", nodename);
-    } else {
+    }
+    else
+    {
         attr_obj = new xmlattr_as_object;
         for (i=0; i<xml->_attributes.size(); i++) {
             attr_obj->set_member(xml->_attributes[i]->_name, xml->_attributes[i]->_value);
-// 	    log_msg("\t\tAdding attribute as member %s, value is %s to node %s (%p)\n",
-// 		    xml->_attributes[i]->_name,
-// 		    xml->_attributes[i]->_value, nodename, static_cast<void*>(obj) );
         }
         obj->set_member("attributes", attr_obj);
     }
@@ -538,7 +435,8 @@
     //obj->set_member("attributes", attr_obj);
 
     // Process the children, if there are any
-    if (length) {
+    if (length)
+    {
         //log_msg("\tProcessing %d children nodes for %s\n", length, nodename);
 	int inum;
         inum = 0;
@@ -557,12 +455,14 @@
             obj->set_member(boost::lexical_cast<std::string>(inum), xmlchildnode_obj);
             ++inum;
         }
-    } else {
+    }
+    else
+    {
         //log_msg("\tNode %s has no children\n", nodename);
     }  
 
-    return obj;
 }
+#endif
 
 
 /// \brief add or change the HTTP Request header
@@ -581,98 +481,6 @@
     log_msg("%s:unimplemented \n", __FUNCTION__);
 }
 
-/// \brief append a node the the XML object
-///
-/// Method; appends the specified node to the XML object's child
-/// list. This method operates directly on the node referenced by the
-/// childNode parameter; it does not append a copy of the node. If the
-/// node to be appended already exists in another tree structure,
-/// appending the node to the new location will remove it from its
-/// current location. If the childNode parameter refers to a node that
-/// already exists in another XML tree structure, the appended child
-/// node is placed in the new tree structure after it is removed from
-/// its existing parent node. 
-void
-XML::appendChild(XMLNode *node)
-{
-    GNASH_REPORT_FUNCTION;
-    
-    if (!_nodes) {
-	_nodes = new XMLNode;
-    }
-    _nodes->_children.push_back(node);
-//    log_msg("%s: %p at _nodes at %p\n", __PRETTY_FUNCTION__, this, _nodes);
-//    dbglogfile << node->_name << endl;
-}
-
-/// \brief copy a node
-///
-/// Method; constructs and returns a new XML node of the same type,
-/// name, value, and attributes as the specified XML object. If deep
-/// is set to true, all child nodes are recursively cloned, resulting
-/// in an exact copy of the original object's document tree. 
-XMLNode &
-XML::cloneNode(XMLNode &newnode, bool deep)
-{
-    GNASH_REPORT_FUNCTION;
-    log_msg("%s: deep is %d\n", __PRETTY_FUNCTION__, deep);
-
-    if (_nodes && deep) {
-	newnode = _nodes;
-//     } else {
-// 	newnode.nodeNameSet((char *)_nodes->nodeName());
-// 	newnode.nodeValueSet((char *)_nodes->nodeValue());    
-    }
-
-    log_msg("%s:partially unimplemented \n", __PRETTY_FUNCTION__);
-
-    return newnode;
-}
-
-# if 0
-/// \brief create a new XML element
-///
-/// Method; creates a new XML element with the name specified in the
-/// parameter. The new element initially has no parent, no children,
-/// and no siblings. The method returns a reference to the newly
-/// created XML object that represents the element. This method and
-/// the XML.createTextNode() method are the constructor methods for
-/// creating nodes for an XML object. 
-XMLNode *
-XML::createElement(const char * /* name */)
-{
-    log_msg("%s:unimplemented \n", __FUNCTION__);
-    return (XMLNode*)0;
-}
-
-/// \brief Create a new XML node
-/// 
-/// Method; creates a new XML text node with the specified text. The
-/// new node initially has no parent, and text nodes cannot have
-/// children or siblings. This method returns a reference to the XML
-/// object that represents the new text node. This method and the
-/// XML.createElement() method are the constructor methods for
-/// creating nodes for an XML object.
-XMLNode *
-XML::createTextNode(const char * /* name */)
-{
-    log_msg("%s:unimplemented \n", __FUNCTION__);
-    return (XMLNode*)0;
-}
-#endif
-
-/// \brief insert a node before a node
-///
-/// Method; inserts a new child node into the XML object's child
-/// list, before the beforeNode node. If the beforeNode parameter is
-/// undefined or null, the node is added using the appendChild()
-/// method. If beforeNode is not a child of my_xml, the insertion
-/// fails.
-void
-XML::insertBefore(XMLNode * /* newnode */, XMLNode * /* node */)
-{
-    log_msg("%s:unimplemented \n", __FUNCTION__);
-}
 
 void
 XML::load()
@@ -686,14 +494,6 @@
     log_msg("%s: unimplemented \n", __FUNCTION__);
 }
 
-/// \brief removes the specified XML object from its parent. Also
-/// deletes all descendants of the node.
-void
-XML::removeNode()
-{
-    log_msg("%s:unimplemented \n", __FUNCTION__);
-}
-
 void
 XML::send()
 {
@@ -706,85 +506,6 @@
     log_msg("%s:unimplemented \n", __FUNCTION__);
 }
 
-const char *
-XML::toString()
-{
-    GNASH_REPORT_FUNCTION;
-    if (_nodes) {
-	stringstream xmlout;
-	return stringify(_nodes, &xmlout);
-    }
-    return NULL;
-}
-
-const char *
-XML::stringify(XMLNode *xml, stringstream *xmlout)
-{
-//    GNASH_REPORT_FUNCTION;
-    const char    *nodename = xml->nodeName();
-    const char    *nodevalue = xml->nodeValue();
-//    stringstream xmlout;
-//     string str;
-
-//    log_msg("%s: processing for object %s <%p>\n", __PRETTY_FUNCTION__, nodename, (void*)xml);
-  
-    if (nodename) {
-	*xmlout << "<" << nodename;
-//       str = "<";
-//       str += nodename;
-     }
-    
-    if (nodevalue) {
-	*xmlout << nodevalue;
-//  	str += nodevalue;
-    }
-
-    // Process the attributes, if any
-    vector<XMLAttr *>::iterator ita;
-    for (ita = xml->_attributes.begin(); ita != xml->_attributes.end(); ita++) {
-//	log_msg("Found One child !!!! %p\n", (void*)*ita);
-//	cerr << "<" << (*it)->nodeName() << ">" << endl;
-	XMLAttr *xa = *ita;
-// 	log_msg("\t\tAdding attribute as member %s, value is %s to node %s",
-// 		nodename, xa->_name, xa->_value);
-	*xmlout << " " << xa->_name << "=\"" << xa->_value << "\"";
-// 	str += " ";
-// 	str += xa->_name;
-// 	str += "=\"";
-// 	str += xa->_value;
-// 	str += "\"";
-    }
-    
-    if (nodename) {
-	*xmlout << ">";		// closing symbol for this tag
-// 	str += ">";
-    }
-
-//    int length = xml->_children.size();
-//    log_msg("\tProcessing %d children nodes for %s", length, nodename);
-    
-    vector<XMLNode *>::iterator itx;
-    for (itx = _nodes->_children.begin(); itx != _nodes->_children.end(); ++itx) {
-//	log_msg("Found One XML child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
-//	cerr << "<" << (*it)->nodeName() << ">" << endl;
-	XMLNode *x = *itx;
-	*xmlout << x->toString();
-//	str +=  x->stringify(x);
-    }
-    
-    if (nodename) {
-	*xmlout << "</" << nodename << ">";
-//      str += "</";
-//      str += nodename;
-
-//      str += ">";
-    }
-
-//    const char *xxx = xmlout->str().c_str();
-//    cerr << "XMLOUT XML= " << xxx << endl;
-    return xmlout->str().c_str();
-//    return str.c_str();
-}
 
 //
 // Callbacks. These are the wrappers for the C++ functions so they'll work as
@@ -826,23 +547,18 @@
     o.init_member("loaded", new builtin_function(xml_loaded));
 	
     o.init_member("addRequestHeader", new builtin_function(xml_addrequestheader));
-    o.init_member("appendChild", new builtin_function(xml_appendchild));
-    o.init_member("cloneNode", new builtin_function(xml_clonenode));
     o.init_member("createElement", new builtin_function(xml_createelement));
     o.init_member("createTextNode", new builtin_function(xml_createtextnode));
     o.init_member("getBytesLoaded", new builtin_function(xml_getbytesloaded));
     o.init_member("getBytesTotal", new builtin_function(xml_getbytestotal));
-    o.init_member("hasChildNodes", new builtin_function(xml_haschildnodes));
-    o.init_member("insertBefore", new builtin_function(xml_insertbefore));
     o.init_member("load", new builtin_function(xml_load));
     o.init_member("parseXML", new builtin_function(xml_parsexml));
-    o.init_member("removeNode", new builtin_function(xml_removenode));
     o.init_member("send", new builtin_function(xml_send));
     o.init_member("sendAndLoad", new builtin_function(xml_sendandload));
-    o.init_member("toString", new builtin_function(xml_tostring));
 
     // Properties
 
+#if 0
     boost::intrusive_ptr<builtin_function> gettersetter;
 
     gettersetter = new builtin_function(&xml_nodename, NULL);
@@ -854,16 +570,22 @@
     gettersetter = new builtin_function(&xml_firstchild, NULL);
     o.init_property("firstChild", *gettersetter, *gettersetter);
 
+    gettersetter = new builtin_function(&xml_lastchild, NULL);
+    o.init_property("lastChild", *gettersetter, *gettersetter);
+
     gettersetter = new builtin_function(&xml_childnodes, NULL);
     o.init_property("childNodes", *gettersetter, *gettersetter);
+#endif
+
 }
 
 static as_object*
 getXMLInterface()
 {
     static boost::intrusive_ptr<as_object> o;
-    if ( o == NULL ) {
-	o = new as_object();
+    if ( o == NULL )
+    {
+        o = new as_object(getXMLNodeInterface());
 	attachXMLInterface(*o);
     }
     return o.get();
@@ -878,28 +600,19 @@
   
     // log_msg("%s: nargs=%d\n", __FUNCTION__, fn.nargs);
   
-    if (fn.nargs > 0) {
+    if (fn.nargs > 0 && fn.arg(0).is_object() )
+    {
 	    boost::intrusive_ptr<as_object> obj = fn.env().top(0).to_object();
-
-        if (! obj ) {
-            xml_obj = new XML;
-            //log_msg("\tCreated New XML object at %p\n", xml_obj);
-            tu_string datain = fn.env().top(0).to_tu_string();
-            xml_obj->parseXML(datain);
-            //log_msg("*** Start setting up the stack frames ***\n");
-            xml_obj->setupFrame(xml_obj.get(), xml_obj->firstChild(), true);
-            //xml_obj->clear();
-            //delete xml_obj->firstChild();
-        } else {
 		xml_obj = boost::dynamic_pointer_cast<XML>(obj);
-            //log_msg("\tCloned the XML object at %p\n", xml_obj);
-            //result->set(xml_obj);
-            return as_value(xml_obj.get());
+        if ( xml_obj )
+        {
+            log_msg("\tCloned the XML object at %p\n", xml_obj.get());
+            return as_value(xml_obj->cloneNode(true).get());
         }
-    } else {
+    }
+
         xml_obj = new XML;
         //log_msg("\tCreated New XML object at %p\n", xml_obj);
-    }
 
     return as_value(xml_obj.get());
 }
@@ -938,52 +651,6 @@
     log_msg("%s:unimplemented \n", __FUNCTION__);
     return as_value();
 }
-as_value xml_appendchild(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    //    log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
-    if (fn.nargs > 0) {
-
-	boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr); 
-	boost::intrusive_ptr<XMLNode> xml_obj = boost::dynamic_pointer_cast<XMLNode>(fn.arg(0).to_object());
-	if ( ! xml_obj )
-	{
-		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("First argument to XML::appendChild() is not an XMLNode");
-		);
-		return as_value();
-	}
-
-	if (xml_obj->nodeType() == XML_ELEMENT_NODE) {
-	    ptr->appendChild(xml_obj.get());
-	} else {
-	    ptr->nodeValueSet(xml_obj->nodeValue());
-	}
-
-    } else {
-        log_msg("ERROR: no child XMLNode paramaters!\\n");
-    }
-    return as_value();
-}
-
-as_value xml_clonenode(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-//    log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-    XMLNode   *xml_obj;
-
-    if (fn.nargs > 0) {
-	bool deep = fn.arg(0).to_bool(); 
-	xml_obj = new XMLNode;
-	ptr->cloneNode(*xml_obj, deep);
-	return as_value(xml_obj);
-    } else {
-        log_msg("ERROR: no Depth paramater!\n");
-    }
-
-    return as_value();
-}
 
 /// \brief create a new XML element
 ///
@@ -1055,33 +722,6 @@
     return as_value(ptr->getBytesTotal());
 }
 
-as_value xml_haschildnodes(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-    return as_value(ptr->hasChildNodes());
-}
-
-/// \brief insert a node before a node
-///
-/// Method; inserts a new child node into the XML object's child
-/// list, before the beforeNode node. If the beforeNode parameter is
-/// undefined or null, the node is added using the appendChild()
-/// method. If beforeNode is not a child of my_xml, the insertion
-/// fails.
-
-as_value xml_insertbefore(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-    UNUSED(ptr);
-    
-//    return as_value(ptr->getAllocated());
-//    ptr->insertBefore();
-    log_msg("%s:unimplemented \n", __FUNCTION__);
-    return as_value();
-}
-
 as_value xml_parsexml(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
@@ -1090,10 +730,12 @@
     as_value	val;    
     boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
 
-    if (fn.nargs > 0) {
+    if (fn.nargs > 0)
+    {
         text = fn.arg(0).to_string(); 
-	if (ptr->parseXML(text)) {
-	    ptr->setupFrame(ptr.get(), ptr->firstChild(), false);  
+	    if (ptr->parseXML(text))
+        {
+	        //ptr->setupFrame(ptr.get(), ptr->firstChild().get(), false);
 	}
     }
     
@@ -1103,15 +745,6 @@
 /// \brief removes the specified XML object from its parent. Also
 /// deletes all descendants of the node.
     
-as_value xml_removenode(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-    
-//    return as_value(ptr->getAllocated());
-    ptr->removeNode();
-    return as_value();
-}
 as_value xml_send(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
@@ -1121,105 +754,15 @@
     ptr->send();
     return as_value();
 }
-as_value xml_sendandload(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
     
-//    return as_value(ptr->getAllocated());
-    ptr->sendAndLoad();
-    return as_value();
-}
-as_value xml_tostring(const fn_call& fn)
-{
-//    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-
-    // TODO: There is also the "stringify" function to be used here.
-    // See above. Wot does FlashPlayer return for this call?
-
-    string str = ptr->toString();
-//     cerr << "AAAAHHHHH: " << str << endl;
-    return as_value(str.c_str());
-}
-
-// Both a getter and a setter for nodeName
 static as_value
-xml_nodename(const fn_call& fn)
-{
-//    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-
-    if ( fn.nargs == 0 ) {
-	const char* val = ptr->nodeName();
-	if ( val ) {
-	    return as_value(val);
-	} else {
-	    return as_value();
-	}
-    } else {
-	ptr->nodeNameSet(fn.arg(0).to_string());
-    }
-    return as_value();
-}
-
-// Both a getter and a setter for nodeValue
-static as_value
-xml_nodevalue(const fn_call& fn)
-{
-//    GNASH_REPORT_FUNCTION;
-
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-    
-    //log_msg("xml_nodevalue called with %d args against 'this' = %p", fn.nargs, ptr);
-    if ( fn.nargs == 0 ) {
-	//log_msg("  nodeValue() returns '%s'", ptr->nodeValue());
-	const char* val = ptr->nodeValue();
-	if ( val ) {
-	    return as_value(val);
-	} else {
-	    return as_value();
-	}
-    } else {
-	//log_msg(" arg(0) == '%s'", fn.arg(0).to_string());
-	ptr->nodeValueSet(fn.arg(0).to_string());
-    }
-    return as_value();
-}
-
-// Both a getter and a (do-nothing) setter for firstChild
-static as_value
-xml_firstchild(const fn_call& fn)
+xml_sendandload(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
 
-    if ( fn.nargs == 0 ) {
-	//return as_value(ptr->firstChild());
-	return as_value(ptr.get());
-    } else {
-	IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XML.firstChild");
-	    );
-    }
-    return as_value();
-}
-
-// Both a getter and a (do-nothing) setter for childNodes
-static as_value
-xml_childnodes(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-
-    if ( fn.nargs == 0 ) {
-	//return as_value(ptr->childNodes());
-	return as_value(ptr.get());
-    } else {
-	IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XML.childNodes");
-	    );
-    }
+//    return as_value(ptr->getAllocated());
+    ptr->sendAndLoad();
     return as_value();
 }
 

Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/xml.h	3 Apr 2007 08:04:46 -0000	1.10
+++ server/asobj/xml.h	3 Apr 2007 12:34:43 -0000	1.11
@@ -50,7 +50,7 @@
 class URL;
 
 /// XML class and ActionScript object
-class DSOLOCAL XML : public as_object
+class DSOLOCAL XML : public XMLNode
 {
 public:
 
@@ -62,6 +62,7 @@
     // Methods
     // This is the base method used by both parseXML() and load().
     bool parseDoc(xmlDocPtr document, bool mem);
+
     // Parses an XML document into the specified XML object tree.
     bool parseXML(tu_string xml_in);
 
@@ -69,111 +70,55 @@
     // the XML object) from a URL.
     bool load(const URL& url);
 
-
     // An event handler that returns a
     bool onLoad();
+
     // Boolean value indicating whether
     // the XML object was successfully
     // loaded with XML.load() or
     // XML.sendAndLoad().
 
-    // Appends a node to the end of the specified object's child list.
-    void appendChild(XMLNode *node);
-    
     bool loaded()    { return _loaded; }
     
-    XMLNode *firstChild() {
-        return _nodes;
-        //return _node_data[0];
-    }
-    
-    void clear() {
-        delete _nodes;
-    }
-  
-    std::vector<XMLNode *> childNodes();
-  
-    const char *stringify(XMLNode *xml, std::stringstream *str);
-    //  Returns true if the specified node has child nodes; otherwise, returns false.
-    bool hasChildNodes() {
-	if (_nodes) {
-	    if (_nodes->_children.size()) {
-		return true;
-	    } 
-	}
-	return false;
-    }
+    void clear() {}
     
-    XMLNode *extractNode(xmlNodePtr node, bool mem);
     XMLNode *processNode(xmlTextReaderPtr reader, XMLNode *node);
 
     void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
 //    void  setupStackFrames(gnash::as_object *xml, gnash::as_environment *env);
-    void  cleanupStackFrames( XMLNode *data);
-    as_object *setupFrame(gnash::as_object *xml, XMLNode *data, bool src);
   
-    const char *nodeNameGet()    { return _nodename; }
-    const char *nodeName();
-    const char *nodeValue();
-    void nodeNameSet(const char *name);
-    void nodeValueSet(const char *value);
-    int length()                 { return _nodes->length(); }
+    void  cleanupStackFrames( XMLNode *data);
   
     // These 6 have to 
     void addRequestHeader(const char *name, const char *value);
-    XMLNode &cloneNode(XMLNode &newnode, bool deep);
+
     XMLNode *createElement(const char *name);
+
     XMLNode *createTextNode(const char *name);
-    void insertBefore(XMLNode *newnode, XMLNode *node);
 
     void load();
+
     void parseXML();
-    void removeNode();
+
     void send();
+
     void sendAndLoad();
-    const char *toString();
 
     int getBytesLoaded()         { return _bytes_loaded; };
     int getBytesTotal()          { return _bytes_total; };
 
-    XMLNode *operator [] (int x);
-#if 0
-    XMLNode *operator = (XMLNode &node) {
-        gnash::log_msg("%s: copy element %s\n", __PRETTY_FUNCTION__, node._name);
-	//        _nodes = node.;
-    }
-
-#endif
-    XML *operator = (XMLNode *node) {
-        _nodes = node;    
-        return this;
-    }
-
 private:
     xmlDocPtr _doc;
     xmlNodePtr _firstChild;
     
     // Properties
     bool _loaded;
-    const char  *_nodename;
-    XMLNode     *_nodes;
 
-    int         _bytes_loaded;
-    int         _bytes_total;
+    size_t      _bytes_loaded;
+ 
+    size_t      _bytes_total;
     
-    bool        _contentType;	// TODO Should be String
-    bool        _attributes;
-    bool        _childNodes;
-    bool        _xmlDecl;	// TODO Should be String
-    bool        _docTypeDecl;	// TODO Should be String
-    bool        _ignoreWhite;
-    bool        _lastChild;
-    bool        _nextSibling;
-    bool        _nodeType;
-    bool        _nodeValue;
-    bool        _parentNode;
     bool        _status;	// TODO Should be Number
-    bool        _previousSibling;
 
     /// Trigger the onLoad event, if any
     void onLoadEvent(bool success);
@@ -181,6 +126,16 @@
     /// Trigger the onClose event, if any
     void onCloseEvent();
   
+    /// Initialize an XMLNode from an xmlNodePtr
+    //
+    /// @param element
+    ///     The XMLNode to initialize.
+    ///
+    void extractNode(XMLNode& element, xmlNodePtr node, bool mem);
+
+    void setupFrame(gnash::as_object *xml, XMLNode *data, bool src);
+  
+
 };
 
 

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/xmlnode.cpp	20 Mar 2007 15:01:20 -0000	1.19
+++ server/asobj/xmlnode.cpp	3 Apr 2007 12:34:43 -0000	1.20
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.19 2007/03/20 15:01:20 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.20 2007/04/03 12:34:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -52,18 +52,18 @@
 static as_value xmlnode_nodename(const fn_call& fn);
 static as_value xmlnode_nodevalue(const fn_call& fn);
 static as_value xmlnode_nodetype(const fn_call& fn);
+static as_value xmlnode_attributes(const fn_call& fn);
 static as_value xmlnode_appendchild(const fn_call& fn);
 static as_value xmlnode_clonenode(const fn_call& fn);
 static as_value xmlnode_haschildnodes(const fn_call& fn);
 static as_value xmlnode_insertbefore(const fn_call& fn);
 static as_value xmlnode_removenode(const fn_call& fn);
 static as_value xmlnode_tostring(const fn_call& fn);
-static as_value xmlnode_nodename(const fn_call& fn);
 static as_value xmlnode_firstchild(const fn_call& fn);
 static as_value xmlnode_lastchild(const fn_call& fn);
 static as_value xmlnode_nextsibling(const fn_call& fn);
 static as_value xmlnode_previoussibling(const fn_call& fn);
-static as_object* getXMLNodeInterface();
+as_object* getXMLNodeInterface();
 
 static LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 
@@ -82,8 +82,43 @@
 #ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("\tCreating XMLNode data at %p \n", this);
 #endif
-    _name = 0;
-    _value = 0;
+}
+
+XMLNode::XMLNode(as_object* overridden_interface)
+    :
+    as_object(overridden_interface),
+    _name(0),
+    _value(0),
+    _type(XML_ELEMENT_NODE),
+    _parent(0)
+{
+    //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
+#ifdef DEBUG_MEMORY_ALLOCATION
+    log_msg("\tCreating XMLNode data at %p \n", this);
+#endif
+}
+
+XMLNode::XMLNode(const XMLNode& tpl, bool deep)
+    :
+    as_object(getXMLNodeInterface()),
+    _name(tpl._name),
+    _value(tpl._value),
+    _type(tpl._type),
+    _parent(tpl._parent)
+{
+    if ( ! deep )
+    {
+            _children = tpl._children;
+    }
+    else // deep copy
+    {
+        const ChildList& from=tpl._children;
+        for (ChildList::const_iterator it=from.begin(), itEnd=from.end();
+                        it != itEnd; ++it)
+        {
+                _children.push_back(new XMLNode(*(*it), deep));
+        }
+    }
 }
 
 XMLNode::~XMLNode()
@@ -134,25 +169,24 @@
     return false;
 }
 
-XMLNode *
+boost::intrusive_ptr<XMLNode>
 XMLNode::firstChild()
 {
     GNASH_REPORT_FUNCTION;
-    if (_children.size() > 0) {
+	if ( _children.empty() ) return NULL;
 	return _children.front();
-    }
-    return NULL;
 }
 
-XMLNode *
+boost::intrusive_ptr<XMLNode>
 XMLNode::lastChild()
 {
     GNASH_REPORT_FUNCTION;
-    
-    if (_children.size() > 0) {
-	return _children.back();
-    }
+	if ( _children.empty() )
+	{
+			log_msg("XMLNode %p has no childrens", (void*)this);
     return NULL;
+	}
+	return _children.back();
 }
 
 void
@@ -204,51 +238,11 @@
     return -1;
 }
 
-const char *
-XMLNode::nodeName() 
-{
-    if (_name) {
-	return _name;
-    }
-    return NULL;
-}
-
-const char *
-XMLNode::nodeValue() 
-{  
-    if (_value) {
-	return _value;
-    }
-    return NULL;
-}
-
-/// \brief append a node the the XMLNode object
-///
-/// Method; appends the specified node to the XMLNode object's child
-/// list. This method operates directly on the node referenced by the
-/// childNode parameter; it does not append a copy of the node. If the
-/// node to be appended already exists in another tree structure,
-/// appending the node to the new location will remove it from its
-/// current location. If the childNode parameter refers to a node that
-/// already exists in another XMLNode tree structure, the appended child
-/// node is placed in the new tree structure after it is removed from
-/// its existing parent node.
-///
-/// @param as
-///	The XMLNode ?
-///
-/// @param node
-///	same as XMLNode::obj ?
-///
 void
-XMLNode::appendChild(XMLNode *node)
+XMLNode::appendChild(boost::intrusive_ptr<XMLNode> node)
 {
-//    GNASH_REPORT_FUNCTION;
-//     log_msg("%s: %p, as is %d, node is %d\n",
-// 	    __PRETTY_FUNCTION__, this, _children.size(), _children.size());
-//
-
-    if (node) {
+    if (node)
+	{
 	node->setParent(this);
 	_children.push_back(node);
     }
@@ -256,26 +250,14 @@
 //    log_msg("%s: partially unimplemented\n", __PRETTY_FUNCTION__);
 }
 
-/// \brief copy a node
-///
-/// Method; constructs and returns a new XML node of the same type,
-/// name, value, and attributes as the specified XML object. If deep
-/// is set to true, all child nodes are recursively cloned, resulting
-/// in an exact copy of the original object's document tree. 
-XMLNode &
-XMLNode::cloneNode(XMLNode &newnode, bool deep)
+boost::intrusive_ptr<XMLNode> 
+XMLNode::cloneNode(bool deep)
 {
     GNASH_REPORT_FUNCTION;
     log_msg("%s: deep is %d\n", __PRETTY_FUNCTION__, deep);
 
-    if (deep) {
-//	newnode = _nodes;
-    } else {
-	newnode.nodeNameSet(_name);
-	newnode.nodeValueSet(_value);
-    }
+    boost::intrusive_ptr<XMLNode> newnode = new XMLNode(*this, deep);
 
-    log_msg("%s: partially unimplemented \n", __PRETTY_FUNCTION__);
     return newnode;
 }
 
@@ -304,18 +286,19 @@
 {
     GNASH_REPORT_FUNCTION;
 
-    vector<XMLNode *>::iterator itx;
+    if ( ! _parent) return NULL;
+ 	if (_parent->_children.size() <= 1) return NULL;
+
     XMLNode *previous_node = NULL;
-    if (_parent) {
- 	if (_parent->_children.size() > 1) {
-	    for (itx = _parent->_children.begin(); itx != _parent->_children.end(); itx++) {
-		if ((*itx) == this) {
+    ChildList::iterator itx;
+    for (itx = _parent->_children.begin(); itx != _parent->_children.end(); itx++)
+    {
+        if (itx->get() == this)
+        {
 		    // log_msg("Found the previous XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
 		    return previous_node;
 		}
-		previous_node = *itx;
-	    }
- 	}
+		previous_node = itx->get();
     }
 
     return NULL;
@@ -325,77 +308,79 @@
 XMLNode::nextSibling()
 {
     GNASH_REPORT_FUNCTION;
-    vector<XMLNode *>::iterator itx;
-    if (_parent) {
- 	if (_parent->_children.size() > 1) {
-	    for (itx = _parent->_children.begin(); itx != _parent->_children.end(); itx++) {
-		if ((*itx) == this) {
-		    // We've found ourselves; now find next sibling if any
-		    XMLNode *sibling = *++itx;
-		    if (itx == _parent->_children.end()) return NULL;
-		    else {
+
+    if ( ! _parent) return NULL;
+ 	if (_parent->_children.size() <= 1) return NULL;
+
+    XMLNode *previous_node = NULL;
+    ChildList::reverse_iterator itx;
+    for (itx = _parent->_children.rbegin(); itx != _parent->_children.rend(); itx++)
+    {
+        if (itx->get() == this)
+        {
 		        // log_msg("Found the next XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
-		        return sibling;
-		    }
-		}
-	    }
+		    return previous_node;
  	}
+		previous_node = itx->get();
     }
+
     return NULL;
 }
 
-const char *
-XMLNode::toString()
+void
+XMLNode::toString(std::ostream& xmlout) const
 {
 //    GNASH_REPORT_FUNCTION;
-    stringstream xmlout;
-    return stringify(this, &xmlout);
+    stringify(*this, xmlout);
 }
 
-const char *
-XMLNode::stringify(XMLNode *xml, stringstream *xmlout)
+/* static private */
+void
+XMLNode::stringify(const XMLNode& xml, std::ostream& xmlout) 
 {
 //    GNASH_REPORT_FUNCTION;
-    const char    *nodevalue = xml->nodeValue();
-    const char    *nodename = xml->nodeName();
+    const char    *nodevalue = xml.nodeValue();
+    const char    *nodename = xml.nodeName();
     
 //    log_msg("%s: processing for object %s <%p>\n", __PRETTY_FUNCTION__, nodename, xml);
 
     // Create the beginning of the tag
-    *xmlout << "<" << nodename;
+    xmlout << "<" << nodename;
     
     // Process the attributes, if any
-    vector<XMLAttr *>::iterator ita;
-    for (ita = xml->_attributes.begin(); ita != xml->_attributes.end(); ita++) {
-	XMLAttr *xa = *ita;
+    vector<XMLAttr *>::const_iterator ita;
+    for (ita = xml._attributes.begin(); ita != xml._attributes.end(); ita++)
+    {
+	    const XMLAttr *xa = *ita;
 // 	log_msg("\t\tAdding attribute as member %s, value is %s to node %s",
 // 		nodename, xa->_name, xa->_value);
-	*xmlout << " " << xa->_name << "=\"" << xa->_value << "\"";
+        xmlout << " " << xa->_name << "=\"" << xa->_value << "\"";
     }
 
-    *xmlout << ">";		// closing symbol for this tag
+    xmlout << ">";		// closing symbol for this tag
     
     if (nodevalue) {
-	*xmlout << nodevalue;
-	*xmlout << "</" << nodename << ">";
+	xmlout << nodevalue;
+	xmlout << "</" << nodename << ">";
     }
 
 //    int length = xml->_children.size();
 //    log_msg("\tProcessing %d children nodes for %s", length, nodename);
     
-    vector<XMLNode *>::iterator itx;
-    for (itx = xml->_children.begin(); itx != xml->_children.end(); itx++) {
+    ChildList::const_iterator itx;
+    for (itx = xml._children.begin(); itx != xml._children.end(); itx++)
+    {
 //	log_msg("Found One XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
 //	cerr << "<" << (*it)->nodeName() << ">" << endl;
-	XMLNode *x = *itx;
-	*xmlout << x->toString();
+        (*itx)->toString(xmlout);
+        //x->toString(xmlout);
     }
 
-    if (!nodevalue) {
-	*xmlout << "</" << nodename << ">";
+    if (!nodevalue)
+    {
+	    xmlout << "</" << nodename << ">";
     }
 
-    return xmlout->str().c_str();;
 }
 
 void
@@ -421,8 +406,10 @@
     gettersetter = new builtin_function(&xmlnode_nodetype, NULL);
     o.init_property("nodeType", *gettersetter, *gettersetter);
 
+    gettersetter = new builtin_function(&xmlnode_attributes, NULL);
+    o.init_property("attributes", *gettersetter, *gettersetter);
+
     // These two return an array of objects
-    o.init_member("attributes", as_value(""));
     o.init_member("childNodes", as_value(""));
 
     /// \fn MLNode::firstChild
@@ -460,7 +447,8 @@
 
 }
 
-static as_object*
+// External, used by getXMLInterface() !
+as_object*
 getXMLNodeInterface()
 {
     static boost::intrusive_ptr<as_object> o;
@@ -492,9 +480,16 @@
 xmlnode_appendchild(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    if (fn.nargs > 0) {
+
       boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
-//    log_msg("%s: %p, %d args\n", __PRETTY_FUNCTION__, ptr, fn.nargs);
+
+	if ( ! fn.nargs )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("XMLNode::appendChild() needs at least one argument");
+		);
+		return as_value();
+	}
 	
 	boost::intrusive_ptr<XMLNode> xml_obj = boost::dynamic_pointer_cast<XMLNode>(fn.arg(0).to_object());	
 	if ( ! xml_obj )
@@ -505,6 +500,10 @@
 		return as_value();
 	}
 
+	ptr->appendChild(xml_obj);
+	return as_value(); // undefined
+
+#if 0
 	if (xml_obj->nodeType() == XML_ELEMENT_NODE) {
 	    ptr->appendChild(xml_obj.get());
 	} else {
@@ -527,6 +526,7 @@
         log_msg("ERROR: no child XMLNode paramaters!\\n");
     }
     return as_value();
+#endif
 }
 
 static as_value
@@ -535,18 +535,12 @@
     GNASH_REPORT_FUNCTION;
 //    log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
-    XMLNode   *xmlnode_obj;
 
-    if (fn.nargs > 0) {
-	bool deep = fn.arg(0).to_bool();
-	xmlnode_obj = new XMLNode;
-	ptr->cloneNode(*xmlnode_obj, deep);
-	return as_value(xmlnode_obj);
-    } else {
-        log_msg("ERROR: no Depth paramater!\n");
-    }
-    return as_value();
+    bool deep = false;
+    if (fn.nargs > 0) deep = fn.arg(0).to_bool();
 
+    boost::intrusive_ptr<XMLNode> newnode = ptr->cloneNode(deep);
+    return as_value(newnode.get());
 }
 
 static as_value
@@ -580,7 +574,10 @@
     
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     
-    return as_value(ptr->toString());
+    std::stringstream ss;
+    ptr->toString(ss);
+
+    return as_value(ss.str());
 }
 
 static as_value
@@ -602,13 +599,14 @@
     rv.set_null();
     
     //log_msg("xmlnode_nodevalue called with %d args against 'this' = %p", fn.nargs, ptr);
-    if ( fn.nargs == 0 ) {
+    if ( fn.nargs == 0 )
+    {
 	//log_msg("  nodeValue() returns '%s'", ptr->nodeValue());
 	const char* val = ptr->nodeValue();
-	if ( val ) {
-	    rv = val;
+        if ( val ) rv = val;
 	}
-    } else {
+    else
+    {
 	//log_msg(" arg(0) == '%s'", fn.arg(0).to_string());
 	ptr->nodeValueSet(fn.arg(0).to_string());
     }
@@ -626,10 +624,10 @@
 
     if ( fn.nargs == 0 ) {
 	const char* val = ptr->nodeName();
-	if ( val ) {
-	    rv = val;
+        if ( val ) rv = val;
 	}
-    } else {
+    else
+    {
 	ptr->nodeNameSet(fn.arg(0).to_string());
     }
     return rv;
@@ -653,6 +651,28 @@
     return as_value();
 }
 
+// Both a getter and a (do-nothing) setter for attributes
+static as_value
+xmlnode_attributes(const fn_call& fn)
+{
+//    GNASH_REPORT_FUNCTION;
+    
+    boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
+
+    if ( fn.nargs == 0 )
+	{
+		log_error("FIXME: XMLNode.attributes not implemented yet");
+		return as_value(); 
+    }
+	else
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+	    log_aserror("Tried to set read-only property XMLNode.attributes");
+	    );
+    }
+    return as_value();
+}
+
 // Both a getter and a (do-nothing) setter for firstChild
 static as_value
 xmlnode_firstchild(const fn_call& fn)
@@ -664,9 +684,9 @@
 
     if ( fn.nargs == 0 )
     {
-	    XMLNode *node = ptr->firstChild();
+        boost::intrusive_ptr<XMLNode> node = ptr->firstChild();
 	    if (node) {
-		rv = node;
+		    rv = node.get();
 	    }
     }
     else
@@ -683,7 +703,7 @@
 static as_value
 xmlnode_lastchild(const fn_call& fn)
 {
-//    GNASH_REPORT_FUNCTION;
+    GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     as_value rv;
     rv.set_null();
@@ -696,10 +716,9 @@
 	return rv;
     } 
 
-    XMLNode *node = ptr->lastChild();
-    if (node) {
-	rv = node;
-    }
+    boost::intrusive_ptr<XMLNode> node = ptr->lastChild();
+    if (node) rv = node.get();
+
     return rv;
 }
 

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/xmlnode.h	15 Feb 2007 04:05:41 -0000	1.7
+++ server/asobj/xmlnode.h	3 Apr 2007 12:34:43 -0000	1.8
@@ -52,10 +52,19 @@
 {
 public:
     XMLNode();
+
+    // This constructor is used by the XML class
+    XMLNode(as_object* overridden_interface);
+
+    XMLNode(const XMLNode &node, bool deep);
     ~XMLNode();
-    int length()                 { return _children.size(); }
-    const char *nodeName();
-    const char *nodeValue();
+
+    size_t length() const { return _children.size(); }
+
+    const char* nodeName() const { return _name; }
+
+    const char* nodeValue() const { return _value; }
+
     int nodeType();
     void nodeTypeSet(xmlElementType type) {
 	    _type = type;
@@ -73,47 +82,94 @@
     void nodeValueSet(const char *value);
     //  nodeType 	XML.nodeType
 
-    const char *stringify(XMLNode *xml, std::stringstream *xmlout);
+    ///  Returns true if the specified node has child nodes; otherwise, returns false.
     bool hasChildNodes();
-    XMLNode *firstChild();
-    XMLNode *lastChild();
     
-    std::vector<XMLNode *>& childNodes() { return _children; }
+    boost::intrusive_ptr<XMLNode> firstChild();
+    boost::intrusive_ptr<XMLNode> lastChild();
+    
+    typedef std::vector< boost::intrusive_ptr<XMLNode> > ChildList;
     
-    XMLNode *operator [] (int x) {
-        gnash::log_msg("%s: get element %d\n", __PRETTY_FUNCTION__, x);
+    // Change this !! We want a managed thing, maybe also shared ?
+    typedef std::vector< XMLAttr* > AttribList;
+
+    ChildList& childNodes() { return _children; }
+
+    AttribList& attributes() { return _attributes; }
+    
+    boost::intrusive_ptr<XMLNode> operator [] (int x)
+    {
+        log_msg("%s: get element %d", __PRETTY_FUNCTION__, x);
         
         return _children[x];
     }
     
-    XMLNode *operator = (XMLNode &node) {
+    XMLNode& operator = (XMLNode &node) {
         gnash::log_msg("%s: \n", __PRETTY_FUNCTION__);
+        if (this == &node) return *this;
         _name = node._name;
         _value = node._value;
 	_children = node._children;
         _attributes = node._attributes;
-        return this;
+        return *this;
     }
     
-    XMLNode *operator = (XMLNode *node) {
-        gnash::log_msg("%s: \n", __PRETTY_FUNCTION__);
-        _name = node->_name;
-        _value = node->_value;
-	_children = node->_children;
-        _attributes = node->_attributes;
-        return this;
+    XMLNode& operator = (XMLNode *node)
+    {
+	    assert(node);
+	    return (*this = *node);
     }
 
     XMLNode* previousSibling();
     XMLNode* nextSibling();
-    XMLNode &cloneNode(XMLNode &newnode, bool deep);
-    void appendChild(XMLNode *node);
+
+    /// Copy a node
+    //
+    /// Method; constructs and returns a new XML node of the same type,
+    /// name, value, and attributes as the specified XML object. If deep
+    /// is set to true, all child nodes are recursively cloned, resulting
+    /// in an exact copy of the original object's document tree. 
+    ///
+    boost::intrusive_ptr<XMLNode> cloneNode(bool deep);
+
+    /// Append a child node the the XML object
+    //
+    /// Appends the specified node to the XML object's child
+    /// list. This method operates directly on the node referenced by the
+    /// childNode parameter; it does not append a copy of the node. If the
+    /// node to be appended already exists in another tree structure,
+    /// appending the node to the new location will remove it from its
+    /// current location. If the childNode parameter refers to a node that
+    /// already exists in another XML tree structure, the appended child
+    /// node is placed in the new tree structure after it is removed from
+    /// its existing parent node. 
+    ///
+    /// @param as
+    ///	   The XMLNode ?
+    ///
+    /// @param node
+    ///	   same as XMLNode::obj ?
+    ///
+    void appendChild(boost::intrusive_ptr<XMLNode> childNode);
+
     void setParent(XMLNode *node) { _parent = node; };
     XMLNode *getParent() { return _parent; };
 
+    /// Insert a node before a node
+    //
+    /// Method; inserts a new child node into the XML object's child
+    /// list, before the beforeNode node. If the beforeNode parameter is
+    /// undefined or null, the node is added using the appendChild()
+    /// method. If beforeNode is not a child of my_xml, the insertion
+    /// fails.
     void insertBefore(XMLNode *newnode, XMLNode *node);
+
+    /// Removes the specified XML object from its parent.
+    //
+    /// Also deletes all descendants of the node.
     void removeNode();
-    const char *toString();
+
+    void toString(std::ostream& str) const;
 
     void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
 
@@ -125,14 +181,23 @@
 
     xmlElementType      _type;
     XMLNode		*_parent;
-    std::vector<XMLNode *>    _children;
-    std::vector<XMLAttr *>    _attributes;
+    ChildList		_children;
+    AttribList      _attributes;
+
+private:
+
+    // TODO: make a lot more things private !
+
+    static void stringify(const XMLNode& xml, std::ostream& xmlout);
 
 };
 
 // Initialize the global XMLNode class
 void xmlnode_class_init(as_object& global);
 
+// External, used by getXMLInterface() !
+as_object* getXMLNodeInterface();
+
 } // end of gnash namespace
 
 

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/actionscript.all/XML.as	3 Apr 2007 08:04:46 -0000	1.18
+++ testsuite/actionscript.all/XML.as	3 Apr 2007 12:34:43 -0000	1.19
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.18 2007/04/03 08:04:46 strk Exp $";
+rcsid="$Id: XML.as,v 1.19 2007/04/03 12:34:43 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -28,7 +28,47 @@
 var existtests = true;
 
 check(XML);
+
+#if OUTPUT_VERSION >= 6
+check(! XML.prototype.hasOwnProperty("appendChild") );
+check(! XML.prototype.hasOwnProperty("cloneNode") );
+check(! XML.prototype.hasOwnProperty("hasChildNodes") );
+check(! XML.prototype.hasOwnProperty("insertBefore") );
+check(! XML.prototype.hasOwnProperty("removeNode") );
+check(! XML.prototype.hasOwnProperty("cloneNode") );
+check(! XML.prototype.hasOwnProperty("toString") );
+check(! XML.prototype.hasOwnProperty("length") );
+check(XML.prototype.hasOwnProperty("createElement") );
+check(XML.prototype.hasOwnProperty("addRequestHeader") );
+check(XML.prototype.hasOwnProperty("createTextNode") );
+check(XML.prototype.hasOwnProperty("getBytesLoaded") );
+check(XML.prototype.hasOwnProperty("getBytesTotal") );
+check(XML.prototype.hasOwnProperty("load") );
+check(XML.prototype.hasOwnProperty("parseXML") );
+check(XML.prototype.hasOwnProperty("send") );
+check(XML.prototype.hasOwnProperty("sendAndLoad") );
+
+check(XMLNode.prototype.hasOwnProperty("appendChild") );
+check(XMLNode.prototype.hasOwnProperty("cloneNode") );
+check(XMLNode.prototype.hasOwnProperty("hasChildNodes") );
+check(XMLNode.prototype.hasOwnProperty("insertBefore") );
+check(XMLNode.prototype.hasOwnProperty("removeNode") );
+check(XMLNode.prototype.hasOwnProperty("toString") );
+check(XMLNode.prototype.hasOwnProperty("cloneNode") );
+check(! XMLNode.prototype.hasOwnProperty("length") );
+check(! XMLNode.prototype.hasOwnProperty("createElement") );
+check(! XMLNode.prototype.hasOwnProperty("addRequestHeader") );
+check(! XMLNode.prototype.hasOwnProperty("createTextNode") );
+check(! XMLNode.prototype.hasOwnProperty("getBytesLoaded") );
+check(! XMLNode.prototype.hasOwnProperty("getBytesTotal") );
+check(! XMLNode.prototype.hasOwnProperty("load") );
+check(! XMLNode.prototype.hasOwnProperty("parseXML") );
+check(! XMLNode.prototype.hasOwnProperty("send") );
+check(! XMLNode.prototype.hasOwnProperty("sendAndLoad") );
+#endif
+
 var tmp = new XML();
+check(! tmp.hasOwnProperty("length"));
 
 // test the XML constuctor
 if (tmp) {
@@ -202,12 +242,17 @@
 check_equals( typeof(tmp.parseXML), 'function');
 // parseXML doesn't return anything
 tmp.parseXML(xml_in);
-
-if (tmp.firstChild.nodeName == "TOPNODE") {
-    pass("XML::parseXML() works");
-} else {
-    fail("XML::parseXML() doesn't work");
-}
+check_equals(typeof(tmp.firstChild), 'object');
+note("Parsed XML: "+tmp.toString());
+check(XML.prototype instanceof XMLNode);
+check(tmp instanceof XML);
+check(tmp instanceof XMLNode);
+check(tmp.firstChild instanceof XMLNode);
+check_equals(typeof(tmp.nodeName), 'null');
+check_equals(typeof(tmp.nodeValue), 'null');
+check_equals(typeof(tmp.length), 'undefined');
+check_equals(tmp.firstChild.nodeName, "TOPNODE");
+check_equals(typeof(tmp.firstChild.length), 'undefined');
 
 if (tmp.hasChildNodes() == true) {
     pass("XML::hasChildNodes() works");
@@ -241,10 +286,10 @@
 check(element1.nodeName == "element1");
 
 var element2 = myXML.createElement("element2");
-check(element2.nodeName == "element2");
+check_equals(element2.nodeName, "element2");
 
 var element3 = myXML.createElement("element3");
-check(element3.nodeName == "element3");
+check_equals(element3.nodeName, "element3");
 
 check(myXML.createTextNode);
 
@@ -256,13 +301,21 @@
 check(textNode2.nodeValue == "textNode2 String value");
 
 // place the new nodes into the XML tree
-element2.appendChild(textNode1);
-xcheck_equals(element2.nodeValue, null);
-xcheck_equals(element2.lastChild.nodeValue, "textNode1 String value");
+check(!element2.hasChildNodes());
+ret = element2.appendChild(textNode1);
+check_equals(typeof(ret), 'undefined');
+check(element2.hasChildNodes());
+
+check_equals(element2.nodeValue, null);
+check_equals(typeof(element2.lastChild), 'object');
+check_equals(element2.lastChild.nodeValue, "textNode1 String value");
+element2.lastChild = 4;
+check_equals(typeof(element2.lastChild), 'object');
 
 element3.appendChild(textNode2);
-xcheck_equals(element3.nodeValue, null); 
-xcheck_equals(element3.lastChild.nodeValue, "textNode2 String value");
+check_equals(element3.nodeValue, null); 
+check_equals(typeof(element3.lastChild), 'object');
+check_equals(element3.lastChild.nodeValue, "textNode2 String value");
 
 // place the new nodes into the XML tree
 doc.appendChild(element1);
@@ -322,7 +375,7 @@
 	note("myxml.toString(): "+myxml.toString());
 	xcheck_equals(typeof(myxml.attributes), 'object');
 	check(myxml.hasChildNodes());
-	xcheck_equals(myxml.nodeName, null);
+	check_equals(myxml.nodeName, null);
 };
 myxml.load( MEDIA(gnash.xml) );
 

Index: testsuite/actionscript.all/XMLNode.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLNode.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/XMLNode.as	15 Feb 2007 04:05:41 -0000	1.9
+++ testsuite/actionscript.all/XMLNode.as	3 Apr 2007 12:34:43 -0000	1.10
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XMLNode.as,v 1.9 2007/02/15 04:05:41 rsavoye Exp $";
+rcsid="$Id: XMLNode.as,v 1.10 2007/04/03 12:34:43 strk Exp $";
 
 #include "dejagnu.as"
 
@@ -77,9 +77,9 @@
 node1.appendChild(node2);
 check_equals(node1.hasChildNodes(), true);
 
-check_equals(node1.firstChild.nodeValue, "second text node");
-check_equals(node1.lastChild.nodeValue, "second text node");
-xcheck_equals(node2.lastChild, "null"); // FIXME
+check_equals(node1.firstChild.nodeValue, "first text node");
+check_equals(typeof(node1.lastChild.nodeValue), 'null');
+xcheck_equals(node2.lastChild.toString(), "second text node"); 
 
 var node3 = doc.createElement("node3");
 var textnode3 = doc.createTextNode("third text node");
@@ -91,16 +91,16 @@
 
 // trace(node1.firstChild.nodeValue);
 // trace(node1.lastChild.nodeValue);
-check_equals(node1.firstChild.nodeValue, "second text node");
-check_equals(node1.lastChild.nodeValue, "third text node");
+check_equals(node1.firstChild.nodeValue, "first text node");
+check_equals(typeof(node1.lastChild.nodeValue), 'null');
 
 trace(node1.lastChild.previousSibling);
 trace(node1.firstChild.nextSibling);
 
-check_equals(node1.firstChild.nodeName, "node2");
+check_equals(typeof(node1.firstChild.nodeName), "null");
 check_equals(node1.lastChild.nodeName, "node3");
 
-xcheck_equals(node2.previousSibling.nodeValue, "second text node");
+check_equals(node2.previousSibling.nodeValue, "first text node");
 
 // TODO: test removeNode, insertNode
 



From MAILER-DAEMON Tue Apr 03 09:25:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYj17-0002AQ-B9
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 09:25:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYj14-0002A7-VG
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:25:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYj13-00029q-CN
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:25:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYj13-00029m-3a
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:25:41 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYixt-0002SG-De
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:22:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYixs-0004Mv-LQ
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:22:24 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYixs-0004Mr-C1
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:22:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYixs-0004Mr-C1@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 13:22:24 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 13:25:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 13:22:24

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xmlattrs.cpp xmlattrs.h xmlnode.cpp 
	                 xmlnode.h 
	testsuite/actionscript.all: XML.as 
	testsuite/media: gnash.xml 

Log message:
	        * server/asobj/xmlattrs.{cpp,h}: use std::string
	          for name and value, access trough members, initialize
	          trought contructor.
	        * server/asobj/xmlnode.{cpp,h}: keep XMLAttr by value,
	          not by pointer; implement the 'attributes' getter.
	        * server/asobj/xml.cpp: update XMLAttr uses.
	        * testsuite/actionscript.all/XML.as: more tests, less failures.
	        * testsuite/media/gnash.xml: add a tag attribute.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2760&r2=1.2761
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlattrs.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlattrs.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/gnash.xml?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2760
retrieving revision 1.2761
diff -u -b -r1.2760 -r1.2761
--- ChangeLog	3 Apr 2007 12:34:43 -0000	1.2760
+++ ChangeLog	3 Apr 2007 13:22:23 -0000	1.2761
@@ -1,5 +1,16 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xmlattrs.{cpp,h}: use std::string
+	  for name and value, access trough members, initialize
+	  trought contructor.
+	* server/asobj/xmlnode.{cpp,h}: keep XMLAttr by value,
+	  not by pointer; implement the 'attributes' getter.
+	* server/asobj/xml.cpp: update XMLAttr uses.
+	* testsuite/actionscript.all/XML.as: more tests, less failures.
+	* testsuite/media/gnash.xml: add a tag attribute.
+
+2007-04-03 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/xml.{cpp,h}: have XML be a subclass
 	  of XMLNode. Many cleanups.
 	* server/asobj/xmlnode.{cpp,h}: many cleanups.

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/xml.cpp	3 Apr 2007 12:34:43 -0000	1.27
+++ server/asobj/xml.cpp	3 Apr 2007 13:22:23 -0000	1.28
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.27 2007/04/03 12:34:43 strk Exp $ */
+/* $Id: xml.cpp,v 1.28 2007/04/03 13:22:23 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -209,15 +209,21 @@
     {
         //log_msg("extractNode %s has property %s, value is %s\n",
         //          node->name, attr->name, attr->children->content);
-        XMLAttr *attrib = new XMLAttr;
+        XMLAttr attrib(reinterpret_cast<const char*>(attr->name),
+			reinterpret_cast<const char*>(attr->children->content));
+
+#if 0
         len = memadjust(strlen(reinterpret_cast<const char *>(attr->name))+1);
         attrib->_name = (char *)new char[len];
         memset(attrib->_name, 0, len);
         strcpy(attrib->_name, reinterpret_cast<const char *>(attr->name));
+
         len = memadjust(strlen(reinterpret_cast<const char *>(attr->children->content))+1);
         attrib->_value = (char *)new char[len];
         memset(attrib->_value, 0, len);
         strcpy(attrib->_value, reinterpret_cast<const char *>(attr->children->content));
+#endif
+
         //log_msg("\tPushing attribute %s for element %s has value %s\n",
         //        attr->name, node->name, attr->children->content);
         element._attributes.push_back(attrib);

Index: server/asobj/xmlattrs.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlattrs.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/xmlattrs.cpp	9 Jan 2007 15:14:20 -0000	1.2
+++ server/asobj/xmlattrs.cpp	3 Apr 2007 13:22:23 -0000	1.3
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlattrs.cpp,v 1.2 2007/01/09 15:14:20 rsavoye Exp $ */
+/* $Id: xmlattrs.cpp,v 1.3 2007/04/03 13:22:23 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -49,28 +49,6 @@
   
 //std::vector<as_object *> _xmlobjs;    // FIXME: hack alert
 
-XMLAttr::XMLAttr()
-{
-#ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\t\tCreating XMLAttr data at %p \n", this);
-#endif
-    _name = 0;
-    _value = 0;
-}
-
-XMLAttr::~XMLAttr()
-{
-#ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\t\tDeleting XMLAttr data %s at %p \n", this->_name, this);
-#endif
-    //log_msg("%s: %p \n", __FUNCTION__, this);
-    if (_name) {
-        delete _name;
-    }
-    if (_value) {
-        delete _value;
-    }  
-}  
 
 } // end of gnash namespace
 

Index: server/asobj/xmlattrs.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlattrs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/xmlattrs.h	9 Jan 2007 15:14:20 -0000	1.2
+++ server/asobj/xmlattrs.h	3 Apr 2007 13:22:24 -0000	1.3
@@ -47,28 +47,39 @@
 /// XML Attribute class
 class DSOLOCAL XMLAttr {
 public:
-    XMLAttr();
-    ~XMLAttr();
   
-    // why don't we use std::strings here ?
-    // code would be much simpler and safer!
-    char                *_name;
-    char                *_value;
-    xmlAttributeType    _type;
-    
-    XMLAttr *operator = (XMLAttr node) {
-        log_msg("\t\tCopying XMLAttr object at %p\n", (void*)this);
+    XMLAttr()
+    {}
     
-        _name = new char[strlen(node._name)+2];
-        memset(_name, 0, strlen(node._name)+2);
-        strcpy(_name, node._name);
-
-        _value = new char[strlen(node._value)+2];
-        memset(_value, 0, strlen(node._value)+2);
-        strcpy(_value, node._value);
+    XMLAttr(const std::string& name, const std::string& value)
+            :
+            _name(name),
+            _value(value)
+    {}
+
+    ~XMLAttr()
+    {}
+  
+#if 0
+    XMLAttr& operator = (const XMLAttr& node)
+    {
+        _name = node._name;
+        _value = node._value;
 
-        return this;
+        return *this;
     }
+#endif
+
+    const std::string& name() const { return _name; }
+
+    const std::string& value() const { return _value; }
+
+private:
+
+    std::string _name;
+    std::string _value;
+    xmlAttributeType _type;
+    
 };
 
 /// XML Attribute ActionScript Object

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/xmlnode.cpp	3 Apr 2007 12:34:43 -0000	1.20
+++ server/asobj/xmlnode.cpp	3 Apr 2007 13:22:24 -0000	1.21
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.20 2007/04/03 12:34:43 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.21 2007/04/03 13:22:24 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -138,13 +138,10 @@
 	}
     }
 
-    for (i=0; i<_attributes.size(); i++) {
-	if (_attributes[i]->_name) {
-	    delete [] _attributes[i]->_name;
-	}
-	if (_attributes[i]->_value) {
-	    delete [] _attributes[i]->_value;
-	}
+    for (i=0; i<_attributes.size(); i++)
+    {
+            // shouldn't we delete attributes here ??
+            // TODO: plug this leak somehow !!
     }
 
     _children.clear();
@@ -348,13 +345,12 @@
     xmlout << "<" << nodename;
     
     // Process the attributes, if any
-    vector<XMLAttr *>::const_iterator ita;
+    AttribList::const_iterator ita;
     for (ita = xml._attributes.begin(); ita != xml._attributes.end(); ita++)
     {
-	    const XMLAttr *xa = *ita;
-// 	    log_msg("\t\tAdding attribute as member %s, value is %s to node %s",
-// 		    nodename, xa->_name, xa->_value);
-        xmlout << " " << xa->_name << "=\"" << xa->_value << "\"";
+	    const XMLAttr& xa = *ita;
+        // TODO: replace with XMLAttr::operator<<
+        xmlout << " " << xa.name() << "=\"" << xa.value() << "\"";
     }
 
     xmlout << ">";		// closing symbol for this tag
@@ -661,8 +657,19 @@
 
     if ( fn.nargs == 0 )
 	{
-		log_error("FIXME: XMLNode.attributes not implemented yet");
-		return as_value(); 
+        XMLNode::AttribList& attrs = ptr->attributes();
+		boost::intrusive_ptr<as_object> ret = new as_object();
+		for (XMLNode::AttribList::const_iterator it=attrs.begin(),
+                        itEnd=attrs.end();
+                it != itEnd; ++it)
+		{
+                const XMLAttr& at = *it;
+                const std::string& name = at.name();
+                const std::string& val = at.value();
+                ret->init_member(name, val);
+		}
+		//log_error("FIXME: XMLNode.attributes not implemented yet");
+		return as_value(ret); 
     }
 	else
 	{

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/xmlnode.h	3 Apr 2007 12:34:43 -0000	1.8
+++ server/asobj/xmlnode.h	3 Apr 2007 13:22:24 -0000	1.9
@@ -90,8 +90,7 @@
     
     typedef std::vector< boost::intrusive_ptr<XMLNode> > ChildList;
 
-    // Change this !! We want a managed thing, maybe also shared ?
-    typedef std::vector< XMLAttr* > AttribList;
+    typedef std::vector< XMLAttr > AttribList;
 
     ChildList& childNodes() { return _children; }
 

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/actionscript.all/XML.as	3 Apr 2007 12:34:43 -0000	1.19
+++ testsuite/actionscript.all/XML.as	3 Apr 2007 13:22:24 -0000	1.20
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.19 2007/04/03 12:34:43 strk Exp $";
+rcsid="$Id: XML.as,v 1.20 2007/04/03 13:22:24 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -373,9 +373,16 @@
 	note("gnash.xml successfully loaded");
 	note("myxml status is "+myxml.status);
 	note("myxml.toString(): "+myxml.toString());
-	xcheck_equals(typeof(myxml.attributes), 'object');
+	check_equals(typeof(myxml.attributes), 'object');
+	xcheck(! myxml.attributes instanceof Object);
+	xcheck_equals(typeof(myxml.attributes.__proto__), 'undefined');
+
 	check(myxml.hasChildNodes());
 	check_equals(myxml.nodeName, null);
+
+    topnode = myxml.firstChild;
+	check_equals(topnode.nodeName, 'XML');
+	check_equals(topnode.attributes.attr1, 'attr1 value');
 };
 myxml.load( MEDIA(gnash.xml) );
 

Index: testsuite/media/gnash.xml
===================================================================
RCS file: /sources/gnash/gnash/testsuite/media/gnash.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/media/gnash.xml	3 Apr 2007 08:05:28 -0000	1.1
+++ testsuite/media/gnash.xml	3 Apr 2007 13:22:24 -0000	1.2
@@ -1,4 +1,4 @@
-<XML>
+<XML attr1="attr1 value">
 <elem1>
 	<elem1_1>
 	Elem 1.1 content



From MAILER-DAEMON Tue Apr 03 09:46:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYjLY-0001xc-7N
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 09:46:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYjLX-0001x9-4F
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:46:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYjLW-0001wi-3K
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:46:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYjLV-0001wZ-Qx
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:46:49 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYjIM-0005QO-42
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 09:43:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYjIK-0006Jv-UZ
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:43:33 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYjIK-0006Js-G1
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:43:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYjIK-0006Js-G1@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 13:43:32 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 13:46:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 13:43:32

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 

Log message:
	        * server/sprite_instance.{cpp,h}: split the
	          DisplayList reset code from execute_frame_tags()
	          to a resetDisplayList() method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2761&r2=1.2762
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.217&r2=1.218
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2761
retrieving revision 1.2762
diff -u -b -r1.2761 -r1.2762
--- ChangeLog	3 Apr 2007 13:22:23 -0000	1.2761
+++ ChangeLog	3 Apr 2007 13:43:32 -0000	1.2762
@@ -1,5 +1,11 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.{cpp,h}: split the
+	  DisplayList reset code from execute_frame_tags()
+	  to a resetDisplayList() method.
+
+2007-04-03 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/xmlattrs.{cpp,h}: use std::string
 	  for name and value, access trough members, initialize
 	  trought contructor.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -b -r1.217 -r1.218
--- server/sprite_instance.cpp	2 Apr 2007 15:45:22 -0000	1.217
+++ server/sprite_instance.cpp	3 Apr 2007 13:43:32 -0000	1.218
@@ -2238,18 +2238,9 @@
 	//env.set_local_frame_top(local_stack_top);
 }
 
-// 0-based frame number !
 void
-sprite_instance::execute_frame_tags(size_t frame, int typeflags)
+sprite_instance::resetDisplayList()
 {
-	testInvariant();
-
-	assert(frame < m_def->get_frame_count());
-
-	m_is_reverse_execution = false;
-
-	if ( frame == 0 && has_looped() )
-	{
 		// Resort frame0 DisplayList as depth of
 		// characters in it might have been
 		// externally changed.
@@ -2268,7 +2259,8 @@
 		//       of static objects (change second argument to switch)
 		_frame0_chars.addAll(charsToAdd, false);
 		
-		if ( ! (m_display_list == _frame0_chars) ) {
+	if ( ! (m_display_list == _frame0_chars) )
+	{
 	
 			// Set this character as invalidated *before*
 			// actually updating the displaylist !
@@ -2276,6 +2268,22 @@
 	
 			m_display_list = _frame0_chars;			
 		};
+}
+
+// 0-based frame number !
+void
+sprite_instance::execute_frame_tags(size_t frame, int typeflags)
+{
+	testInvariant();
+
+	assert(frame < m_def->get_frame_count());
+
+	m_is_reverse_execution = false;
+
+	if ( frame == 0 && has_looped() )
+	{
+		resetDisplayList();
+
 	}
 
 	// Execute this frame's init actions, if necessary.

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/sprite_instance.h	2 Apr 2007 15:45:22 -0000	1.86
+++ server/sprite_instance.h	3 Apr 2007 13:43:32 -0000	1.87
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.86 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.87 2007/04/03 13:43:32 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -700,6 +700,12 @@
 
 private:
 
+	/// Reset the DisplayList for proper loop-back or goto_frame
+	//
+	/// The DisplayList is cleared by all but dynamic characters
+	///
+	void resetDisplayList();
+
 	/// Queue actions in the action list
 	//
 	/// The list of action will be pushed on the current



From MAILER-DAEMON Tue Apr 03 10:10:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYjid-0007hj-Hm
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 10:10:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYjic-0007hI-0y
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:10:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYjia-0007gh-Uv
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:10:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYjia-0007gc-NP
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:10:40 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYjfQ-0001HY-Ob
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:07:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYjfO-000762-IR
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 14:07:22 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYjfO-00075w-9T
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 14:07:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYjfO-00075w-9T@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 14:07:22 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/XMLS...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 14:10:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 14:07:22

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: XMLSocket.as 

Log message:
	        * testsuite/actionscript.all/XMLSocket.as: some more
	          testing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2762&r2=1.2763
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLSocket.as?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2762
retrieving revision 1.2763
diff -u -b -r1.2762 -r1.2763
--- ChangeLog	3 Apr 2007 13:43:32 -0000	1.2762
+++ ChangeLog	3 Apr 2007 14:07:21 -0000	1.2763
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/XMLSocket.as: some more
+	  testing.
 	* server/sprite_instance.{cpp,h}: split the
 	  DisplayList reset code from execute_frame_tags()
 	  to a resetDisplayList() method.

Index: testsuite/actionscript.all/XMLSocket.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLSocket.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/actionscript.all/XMLSocket.as	30 Mar 2007 14:51:38 -0000	1.1
+++ testsuite/actionscript.all/XMLSocket.as	3 Apr 2007 14:07:22 -0000	1.2
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XMLSocket.as,v 1.1 2007/03/30 14:51:38 strk Exp $";
+rcsid="$Id: XMLSocket.as,v 1.2 2007/04/03 14:07:22 strk Exp $";
 
 #include "check.as"
 
@@ -49,3 +49,56 @@
 check( ! socketObj.hasOwnProperty('connect') );
 check( ! socketObj.hasOwnProperty('close') );
 check( ! socketObj.hasOwnProperty('send') );
+
+socketObj.secret = 4;
+
+socketObj.onConnect = function(success) {
+	check_equals(this.secret, 4);
+	if ( success )
+	{
+		note("XMLSocket.onConnect(success) called");
+	}
+	else
+	{
+		note("XMLSocket.onConnect(failure) called");
+	}
+};
+
+socketObj.onData = function(src) {
+	check_equals(this.secret, 4);
+	note("XMLSocket.onData("+src+") called with "+arguments.length);
+};
+
+socketObj.onClose = function() {
+	check_equals(this.secret, 4);
+	note("XMLSocket.onClose() called with "+arguments.length);
+};
+
+host = 'localhost';
+port = 3660;
+ret = socketObj.connect(host, port);
+if (ret) {
+	note("XMLSocket.connect("+host+", "+port+") returned true");
+} else {
+	note("XMLSocket.connect("+host+", "+port+") returned false");
+}
+
+#if 0 // disabled reconnect to avoid closing the socket prematurely
+host = null;
+port = 3660;
+ret = socketObj.connect(host, port);
+if (ret) {
+	note("XMLSocket.connect("+host+", "+port+") returned true");
+} else {
+	note("XMLSocket.connect("+host+", "+port+") returned false");
+}
+
+host = 'localhost';
+port = 3661;
+ret = socketObj.connect(host, port);
+if (ret) {
+	note("XMLSocket.connect("+host+", "+port+") returned true");
+} else {
+	note("XMLSocket.connect("+host+", "+port+") returned false");
+}
+#endif



From MAILER-DAEMON Tue Apr 03 10:23:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYjvC-0005zj-Nd
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 10:23:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYjvB-0005zc-8L
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:23:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYjv9-0005zN-Se
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:23:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYjv9-0005zK-NL
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:23:39 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYjrz-0003N3-QT
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 10:20:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYjry-0007ZR-Jb
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 14:20:22 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYjry-0007ZN-BK
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 14:20:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYjry-0007ZN-BK@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 14:20:22 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/media gnash.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 14:23:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 14:20:22

Modified files:
	testsuite/media: gnash.xml 

Log message:
	Add null-termination

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/media/gnash.xml?cvsroot=gnash&rev=1.3

Patches:
Index: gnash.xml
===================================================================
RCS file: /sources/gnash/gnash/testsuite/media/gnash.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
Binary files /tmp/cvsAbcI2U and /tmp/cvsaXeKOg differ



From MAILER-DAEMON Tue Apr 03 11:27:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYkuy-0002uc-Rw
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 11:27:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYkux-0002sP-9H
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 11:27:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYkuw-0002qn-Br
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 11:27:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYkuw-0002qY-89
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 11:27:30 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYkrl-00046H-QP
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 11:24:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYkrk-0002Sq-Iv
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 15:24:12 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYkrk-0002Sk-1G
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 15:24:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYkrk-0002Sk-1G@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 15:24:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/network.cpp libbase/net...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 15:27:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 15:24:11

Modified files:
	.              : ChangeLog 
	libbase        : network.cpp network.h 
	server/asobj   : xmlsocket.cpp xmlsocket.h 

Log message:
	        * libbase/network.{cpp,h}: do not allow assignment, cleanup
	          accessor functions to return by const refs.
	        * server/asobj/xmlsocket.{cpp,h}: do not override inherited
	          members and methods. Enable some more debugging and added
	          more assertions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2763&r2=1.2764
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2763
retrieving revision 1.2764
diff -u -b -r1.2763 -r1.2764
--- ChangeLog	3 Apr 2007 14:07:21 -0000	1.2763
+++ ChangeLog	3 Apr 2007 15:24:11 -0000	1.2764
@@ -1,5 +1,13 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* libbase/network.{cpp,h}: do not allow assignment, cleanup
+	  accessor functions to return by const refs.
+	* server/asobj/xmlsocket.{cpp,h}: do not override inherited
+	  members and methods. Enable some more debugging and added
+	  more assertions.
+
+2007-04-03 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/XMLSocket.as: some more
 	  testing.
 	* server/sprite_instance.{cpp,h}: split the

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libbase/network.cpp	30 Mar 2007 14:55:11 -0000	1.22
+++ libbase/network.cpp	3 Apr 2007 15:24:11 -0000	1.23
@@ -63,7 +63,15 @@
 #define INADDR_NONE  0xffffffff
 #endif
 
-Network::Network() : _ipaddr(INADDR_ANY), _sockfd(0), _listenfd(0), _port(0), _connected(false), _debug(false), _timeout(5)
+Network::Network()
+	:
+	_ipaddr(INADDR_ANY),
+	_sockfd(0),
+	_listenfd(0),
+	_port(0),
+	_connected(false),
+	_debug(false),
+	_timeout(5)
 {
     //log_msg("%s", __PRETTY_FUNCTION__);
 #ifdef HAVE_WINSOCK_H
@@ -88,17 +96,6 @@
 #endif
 }
 
-Network &
-Network::operator = (Network &net)
-{
-    _sockfd = net.getFileFd();
-    _port = net.getPort();
-    _host = net.getHost();
-    _connected = net.connected();
-    _timeout = net.getTimeout();
-    return *this;
-}
-
 // Description: Create a tcp/ip network server. This creates a server
 //              that listens for incoming socket connections. This
 //              support IP aliasing on the host, and will sequntially
@@ -347,6 +344,8 @@
     char                thishostname[MAXHOSTNAMELEN];
     struct protoent     *proto;
 
+    assert( ! connected() );
+
     if (port < 1024) {
         log_error("Can't connect to priviledged port #%hd!", port);
         _connected = false;
@@ -434,12 +433,14 @@
                 log_msg("\tport %d at IP %s for fd #%d", port,
                         ::inet_ntoa(sock_in.sin_addr), _sockfd);
                 _connected = true;
+                assert(_sockfd > 0);
                 return true;
             }
             if (ret == -1) {
                 log_msg("The connect() socket for fd #%d never was available for writing!",
                         _sockfd);
                 _sockfd = -1;      
+                assert(!_connected);
                 return false;
             }
         }
@@ -455,6 +456,7 @@
 #endif
 
     _connected = true;
+    assert(_sockfd > 0);
     return true;
 }
 

Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/network.h	17 Dec 2006 20:24:57 -0000	1.12
+++ libbase/network.h	3 Apr 2007 15:24:11 -0000	1.13
@@ -101,20 +101,27 @@
     void toggleDebug(bool val);
     
     bool send(const char *str);
-    //#ifdef ENABLE_TESTING 
+
     // Accessors for testing
-    bool connected()            { return _connected; };
-    int getFileFd()             { return _sockfd; };
-    int getListenFd()           { return _listenfd; };
-    short getPort()             { return _port; };
-    std::string getURL()        { return _url; }
-    std::string getProtocol()   { return _protocol; }
-    std::string getHost()       { return _host; }
-    std::string getPortStr()    { return _portstr; }
-    std::string getPath()       { return _path; }
-    int getTimeout()            { return _timeout; }
-    //#endif
-    Network &operator = (Network &net);
+    bool connected()           
+    {
+        assert ( ( _connected && _sockfd > 0 ) || ( ! _connected && _sockfd <= 0 ) );
+        return _connected;
+    };
+
+    int getFileFd() const { return _sockfd; };
+    int getListenFd() const { return _listenfd; };
+    short getPort() const { return _port; };
+    const std::string& getURL() const { return _url; }
+    const std::string& getProtocol() const  { return _protocol; }
+    const std::string& getHost() const { return _host; }
+    const std::string& getPortStr() const { return _portstr; }
+    const std::string& getPath() const { return _path; }
+    int getTimeout() const { return _timeout; }
+
+    // Network is not copiable !
+    //Network &operator = (Network &net) {}
+
  protected:
     in_addr_t   _ipaddr;
     int         _sockfd;

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/xmlsocket.cpp	30 Mar 2007 14:51:38 -0000	1.15
+++ server/asobj/xmlsocket.cpp	3 Apr 2007 15:24:11 -0000	1.16
@@ -97,7 +97,6 @@
     _data = false;
     _xmldata = false;
     _closed = false;
-    _connect = false;
     _processing = false;
     _port = 0;
     _sockfd = 0;
@@ -114,9 +113,8 @@
 {
     GNASH_REPORT_FUNCTION;
     bool success = createClient(host, port);
-    _connect = success;
 
-    assert(!_sockfd || _connected);
+    assert( success || ! connected() );
 
     return success;
 }
@@ -132,19 +130,22 @@
     // Anyway, let's make sure we're clean
     assert(!_sockfd);
     assert(!_connected);
+    assert(!connected());
 }
 
 // Return true if there is data in the socket, otherwise return false.
 bool
 XMLSocket::anydata(char **msgs)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
+    assert(connected());
+    assert(_sockfd > 0);
     return anydata(_sockfd, msgs);
 }
 
 bool XMLSocket::processingData()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     //printf("%s: processing flags is is %d\n", __FUNCTION__, _processing);
     return _processing;
 }
@@ -159,6 +160,8 @@
 bool
 XMLSocket::anydata(int fd, char **msgs)
 {
+    GNASH_REPORT_FUNCTION;
+
     fd_set                fdset;
     struct timeval        tval;
     int                   ret = 0;
@@ -170,9 +173,10 @@
     static char           *leftover = 0;
     int                   adjusted_size;
     
-    //log_msg("%s: \n", __FUNCTION__);
     
     if (fd <= 0) {
+	    log_msg("fd <= 0, returning false");
+	    assert(!connected());
         return false;
     }
     
@@ -189,33 +193,36 @@
         
         // If interupted by a system call, try again
         if (ret == -1 && errno == EINTR) {
-            log_msg("The socket for fd #%d was interupted by a system call!\n",
+            log_msg("The socket for fd #%d was interupted by a system call!",
                     fd);
             continue;
         }
         if (ret == -1) {
-            log_error("The socket for fd #%d never was available!\n", fd);
+            log_error("%s: The socket for fd #%d never was available!",
+                __FUNCTION__, fd);
             return false;
         }
         if (ret == 0) {
-            //log_msg("There is no data in the socket for fd #%d!\n", fd);
+            log_msg("%s: There is no data in the socket for fd #%d!",
+                __FUNCTION__, fd);
             return false;
         }
         if (ret > 0) {
-            //log_msg("There is data in the socket for fd #%d!\n", fd);        
-            //break;
+            log_msg("%s: There is data in the socket for fd #%d!",
+                __FUNCTION__, fd);
+            break;
         }
         memset(buf, 0, INBUF);
         ret = ::read(_sockfd, buf, INBUF-2);
         cr = strlen(buf);
-        //log_msg("%s: read %d bytes, first msg terminates at %d\n", __FUNCTION__, ret, cr);
+        log_msg("%s: read %d bytes, first msg terminates at %d\n", __FUNCTION__, ret, cr);
         //log_msg("%s: read (%d,%d) %s\n", __FUNCTION__, buf[0], buf[1], buf);
         ptr = buf;
         // If we get a single XML message, do less work
         if (ret == cr + 1) {
             adjusted_size = memadjust(ret + 1);
             packet = new char[adjusted_size];
-            //printf("Packet size is %d at %p\n", ret + 1, packet);
+            printf("Packet size is %d at %p\n", ret + 1, packet);
             memset(packet, 0, adjusted_size);
             strcpy(packet, ptr);
             eom = strrchr(packet, '\n'); // drop the CR off the end if there is one
@@ -225,7 +232,7 @@
             //data.push_back(packet);
             msgs[index] = packet;
             msgs[index+1] = 0;
-            //printf("%d: Pushing Packet of size %d at %p\n", __LINE__, strlen(packet), packet);
+            printf("%d: Pushing Packet of size %d at %p\n", __LINE__, strlen(packet), packet);
             processing(false);
             return true;
         }
@@ -296,14 +303,13 @@
 {
     //GNASH_REPORT_FUNCTION;
     
-    if ( ! _connect )
+    if ( ! connected() )
     {
 	assert(!_sockfd);
         log_warning("socket not initialized at XMLSocket.send() call time");
 	return false;
     }
     
-    str += '\0';
     int ret = write(_sockfd, str.c_str(), str.size());
     
     log_msg("%s: sent %d bytes, data was %s\n", __FUNCTION__, ret, str.c_str());
@@ -340,29 +346,6 @@
     GNASH_REPORT_FUNCTION;
 }
 
-void
-XMLSocket::push(as_object *obj)
-{
-    GNASH_REPORT_FUNCTION;
-    _nodes.push_back(obj);
-}
-
-void
-XMLSocket::clear()
-{
-    GNASH_REPORT_FUNCTION;
-    for (unsigned int i=0; i< _nodes.size(); i++) {
-        delete _nodes[i];
-    }
-}
-
-int
-XMLSocket::count()
-{
-    GNASH_REPORT_FUNCTION;
-    return _nodes.size();
-}
-
 int
 XMLSocket::checkSockets(void)
 {
@@ -389,17 +372,20 @@
     
     // If interupted by a system call, try again
     if (ret == -1 && errno == EINTR) {
-        log_msg("The socket for fd #%d was interupted by a system call in this thread!\n",
-                fd);
+        log_msg("%s: The socket for fd #%d was interupted by a system call in this thread!",
+                __FUNCTION__, fd);
     }
     if (ret == -1) {
-        log_error("The socket for fd #%d never was available!\n", fd);
+        log_error("%s: The socket for fd #%d never was available!",
+            __FUNCTION__, fd);
     }
     if (ret == 0) {
-        printf("There is no data in the socket for fd #%d!\n", fd);
+        log_msg("%s: There is no data in the socket for fd #%d!",
+            __FUNCTION__, fd);
     }
     if (ret > 0) {
-        //printf("There is data in the socket for fd #%d!\n", fd);        
+        log_msg("%s: There is data in the socket for fd #%d!",
+            __FUNCTION__, fd);
     }
     
     return ret;
@@ -420,35 +406,44 @@
 #endif
 
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
-    std::string host = fn.arg(0).to_std_string(&fn.env());
-    std::string port_str = fn.arg(1).to_std_string(&fn.env());
-    int port = atoi(port_str.c_str());
     
-    bool success = ptr->obj.connect(host.c_str(), port);
-    
-    if ( success )
+    if (ptr->obj.connected())
     {
-        static bool first = true;     // This event handler should only be executed once.
-        if (!first)
-        {
-            log_warning("XMLSocket.onConnect() not being called the second time (dunno why: check %s:%d)", __FILE__, __LINE__);
+        log_warning("XMLSocket.connect() called while already connected, ignored");
         }
-        else
-        {
-            first = false;  // dont call onConnect twice (is this correct??)
 
+    as_value hostval = fn.arg(0);
+    std::string host = hostval.to_std_string(&fn.env());
+    int port = int(fn.arg(1).to_number(&fn.env()));
+    
+    bool success = ptr->obj.connect(host.c_str(), port);
+    
+    // Actually, if first-stage connection was successful, we
+    // should NOT invoke onConnect(true) here, but postpone
+    // that event call to a second-stage connection checking,
+    // to be done in a separate thread. The visible effect to
+    // confirm this is that onConnect is invoked *after* 
+    // XMLSocket.connect() returned in these cases.
+    //
             if (fn.this_ptr->get_member("onConnect", &method))
             {
-                //    log_msg("FIXME: Found onConnect!\n");
-                val = call_method0(method, &fn.env(), fn.this_ptr.get());
+        log_msg("XMLSocket.connect(): calling onConnect");
+        as_environment env;
+        env.push(success);
+        val = call_method(method, &env, ptr.get(), 1, env.stack_size()-1); 
             } 
 	    
-            // TODO: don't allocate on heap!
+    if ( success )
+    {
+        log_warning("Setting up timer for calling XMLSocket.onData()");
+
             Timer timer;
             boost::intrusive_ptr<builtin_function> ondata_handler = new builtin_function(&xmlsocket_event_ondata, NULL);
-            timer.setInterval(*ondata_handler, 50, boost::dynamic_pointer_cast<as_object>(ptr), &fn.env());
+        unsigned interval = 50; // just make sure it's expired at every frame iteration (20 FPS used here)
+        timer.setInterval(*ondata_handler, interval, boost::dynamic_pointer_cast<as_object>(ptr), &fn.env());
             VM::get().getRoot().add_interval_timer(timer);
-        }
+
+        log_warning("Timer set");
     }
 
     return as_value(success);
@@ -459,11 +454,9 @@
 xmlsocket_send(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
-    as_value	method;
-    as_value	val;
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
-    const std::string object = fn.arg(0).to_string();
+    std::string object = fn.arg(0).to_std_string(&fn.env());
     //  log_msg("%s: host=%s, port=%g\n", __FUNCTION__, host, port);
     return as_value(ptr->obj.send(object));
 }
@@ -472,8 +465,6 @@
 xmlsocket_close(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
-    as_value	method;
-    as_value	val;
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
     // Since the return code from close() doesn't get used by Shockwave,
@@ -488,23 +479,17 @@
     //GNASH_REPORT_FUNCTION;
     //log_msg("%s: nargs=%d\n", __FUNCTION__, nargs);
     
-    as_object*	xmlsock_obj = new xmlsocket_as_object;
+    boost::intrusive_ptr<as_object> xmlsock_obj = new xmlsocket_as_object;
 
 #ifdef GNASH_XMLSOCKET_DEBUG
     std::stringstream ss;
     fn.dump_args(ss);
-    log_msg("new XMLSocket(%s) called - created object at %p", ss.str().c_str(), (void*)xmlsock_obj);
+    log_msg("new XMLSocket(%s) called - created object at %p", ss.str().c_str(), (void*)xmlsock_obj.get());
 #else
     UNUSED(fn);
 #endif
 
     return as_value(xmlsock_obj);
-    
-    // Tune malloc for the best performance
-    //mallopt(M_MMAP_MAX,0);
-    //mallopt(M_TRIM_THRESHOLD,-1);
-    //mallopt(M_MMAP_THRESHOLD,16);
-    
 }
 
 
@@ -513,6 +498,9 @@
 {
     GNASH_REPORT_FUNCTION;
     
+    //log_msg("doing nothing as this function is completely broken");
+    //return as_value();
+    
     as_value	method;
     as_value	val;
     as_value      datain;
@@ -521,6 +509,12 @@
     int           i;
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
+    if ( ! ptr->obj.connected() )
+    {
+	    log_warning("XMLSocket not connected at xmlsocket_event_ondata call");
+	    return as_value();
+    }
+
     if (ptr->obj.processingData()) {
         log_msg("Still processing data!\n");
         return as_value(false);
@@ -532,23 +526,30 @@
     //dump_memory_stats(__FUNCTION__, __LINE__, "memory checkpoint");
 #endif
     
-    if (ptr->obj.anydata(messages)) {
-        if (fn.this_ptr->get_member("onData", &method)) {
-            //log_msg("Got %d messages from XMLsocket\n", msgs.size());
-            //      for (i=0; i<msgs.size(); i++) {
-            for (i=0; messages[i] != 0; i++) {
+    assert(ptr->obj.connected());
+
+    if (ptr->obj.anydata(messages))
+    {
+        //log_msg("Got message #%d, %d bytes long at %p: %s", i,
+         //   strlen(messages[i]), messages[i], messages[i]);
+
+        if (fn.this_ptr->get_member("onData", &method))
+        {
+            //log_msg("Got %d messages from XMLsocket", msgs.size());
+            for (i=0; messages[i] != 0; i++)
+            {
 //          log_msg("Got message #%d, %d bytes long at %p: %s: \n", i,
 //                  strlen(messages[i]), messages[i], messages[i]);
                 datain = messages[i];
                 //fn.env().push(datain);
+
 #ifndef USE_DMALLOC
                 //dump_memory_stats(__FUNCTION__, __LINE__, "start");
 #endif
-                as_environment *env = new as_environment;
-                env->push(datain);
-        	val = call_method(method, env, fn.this_ptr.get(), 1, 0);
-        env->pop();
-        delete env;
+                as_environment& env = fn.env();
+                env.push(datain);
+                val = call_method(method, &env, fn.this_ptr.get(), 1, 0);
+
 #ifndef USE_DMALLOC
         //dump_memory_stats(__FUNCTION__, __LINE__, "end");
 #endif  
@@ -558,11 +559,15 @@
         datain.set_undefined();
       }
       ptr->obj.processing(false);
-    } else {
-      log_error("Couldn't find onData!\n");
     }
+        else
+        {
+            log_error("Couldn't find onData!");
+        }
+
     // Delete this in a batch for now so we can track memory allocation
-    for (i=0; messages[i] != 0; i++) {
+        for (i=0; messages[i] != 0; i++)
+        {
       //log_msg("Deleting message #%d at %p\n", i, messages[i]);
       delete messages[i];
     }
@@ -570,8 +575,7 @@
 
   //malloc_trim(0);
   
-  //result->set(&data);
-  return as_value(true);
+    return as_value();
 }
 
 static as_object*

Index: server/asobj/xmlsocket.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/xmlsocket.h	30 Mar 2007 14:51:38 -0000	1.6
+++ server/asobj/xmlsocket.h	3 Apr 2007 15:24:11 -0000	1.7
@@ -43,7 +43,7 @@
     
     bool anydata(char **msgs);
     bool anydata(int sockfd, char **msgs);
-    bool connected() { return _connect; };
+
     bool fdclosed() { return _closed; }
     bool xmlmsg() { return _xmldata; }
     
@@ -62,24 +62,20 @@
     void onXML(std::string);
     
     // These handle the array of XML nodes
-    void push(as_object *obj);
-    void clear();
-    int  count();
+    //void push(as_object *obj) { _nodes.push_back(obj); }
+    //void clear() { _nodes.clear(); }
+    //int  count() { return _nodes.size(); }
     
     int checkSockets(void);
     int checkSockets(int x);
     
 private:
-    std::string	_host;
-    short         _port;
-    int           _sockfd;
     bool          _data;
     bool          _xmldata;
     bool          _closed;
-    bool          _connect;
     bool          _processing;
     std::vector<std::string> _messages;
-    std::vector<as_object *>  _nodes;
+    //std::vector< boost::intrusive_ptr<as_object> >  _nodes;
 };
 
 void xmlsocket_class_init(as_object& global);



From MAILER-DAEMON Tue Apr 03 12:16:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYlgU-0005Ct-15
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:16:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYlgR-0005Cn-L2
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:16:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYlgN-0005CL-VC
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:16:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYlgN-0005CI-S1
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:16:31 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HYldD-0002il-7W
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:13:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYld6-00055P-Ef
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:13:08 +0000
Received: from bjacques by savannah.gnu.org with local (Exim 4.50)
	id 1HYld6-00055J-5c
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:13:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYld6-00055J-5c@savannah.gnu.org>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Tue, 03 Apr 2007 16:13:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash configure.ac libamf/amf.cpp libamf/amf.h ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:16:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/03 16:13:08

Modified files:
	.              : configure.ac 
	libamf         : amf.cpp amf.h 
	libbase        : log.h 
	server         : as_object.cpp edit_text_character.cpp 
	                 movie_root.cpp sprite_instance.cpp 
	server/parser  : morph2_character_def.cpp movie_def_impl.cpp 
	server/vm      : ASHandlers.cpp 
	utilities      : processor.cpp 

Log message:
	        * configure.ac: Check for the correct SIZET_FMT trial-by-
	        error style. 
	        * libamf/amf{.h, .cpp}: Make the void* argument which is 
	        exclusively read a const pointer. Fix warnings.
	        * libbase/log.h: Remove definition of SIZET_FMT.
	        * server: More use of SIZET_FMT

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.285&r2=1.286
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.218&r2=1.219
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.78&r2=1.79
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.53&r2=1.54

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.285
retrieving revision 1.286
diff -u -b -r1.285 -r1.286
--- configure.ac	2 Apr 2007 17:22:29 -0000	1.285
+++ configure.ac	3 Apr 2007 16:13:07 -0000	1.286
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.285 2007/04/02 17:22:29 strk Exp $
+dnl $Id: configure.ac,v 1.286 2007/04/03 16:13:07 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -54,6 +54,28 @@
 
 AC_DISABLE_STATIC dnl Disable building static libs.
 
+
+save_CFLAGS="$CFLAGS";
+CFLAGS="$CFLAGS -Werror -Wformat";
+
+AC_TRY_COMPILE([#include <stdio.h>], [
+  size_t num = 0;
+  printf("%d", num); ],
+  AC_DEFINE(SIZET_FMT, ["%d"], [size_t printf modifier is d])
+)
+AC_TRY_COMPILE([#include <stdio.h>], [
+  size_t num = 0;
+  printf("%u", num); ],
+  AC_DEFINE(SIZET_FMT, ["%u"], [size_t printf modifier is u])
+)
+AC_TRY_COMPILE([#include <stdio.h>], [
+  size_t num = 0;
+  printf("%lu", num); ],
+  AC_DEFINE(SIZET_FMT, ["%lu"], [size_t printf modifier is lu])
+)
+
+CFLAGS="$save_CFLAGS";
+
 AC_ARG_ENABLE(debugger,
   AC_HELP_STRING([--disable-debugger],[Disable the Flash debugger]),
 [case "${enableval}" in

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- libamf/amf.cpp	19 Mar 2007 17:11:14 -0000	1.28
+++ libamf/amf.cpp	3 Apr 2007 16:13:07 -0000	1.29
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.28 2007/03/19 17:11:14 bjacques Exp $ */
+/* $Id: amf.cpp,v 1.29 2007/04/03 16:13:07 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -279,7 +279,7 @@
 /// characters, but for now we just leave them as standard multibyte
 /// characters.
 void *
-AMF::encodeElement(astype_e type, void *in, int nbytes)
+AMF::encodeElement(astype_e type, const void *in, int nbytes)
 {
     GNASH_REPORT_FUNCTION;
 

Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libamf/amf.h	17 Mar 2007 14:14:36 -0000	1.16
+++ libamf/amf.h	3 Apr 2007 16:13:07 -0000	1.17
@@ -179,13 +179,13 @@
     void *swapBytes(void *word, int size);
 
     // encode an element
-    void *encodeElement(astype_e type, void *in, int nbytes);
+    void *encodeElement(astype_e type, const void *in, int nbytes);
     // encode a string
     void *encodeString(char *str)  {
         return encodeElement (STRING, str, strlen(str));
     };
     void *encodeString(std::string &str) {
-        return encodeElement (STRING, (void *)str.c_str(), str.size());
+        return encodeElement (STRING, static_cast<const void *>(str.c_str()), str.size());
     };
     // encode a 64 bit number
     void *encodeNumber(amfnum_t num)  {

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- libbase/log.h	21 Feb 2007 20:22:59 -0000	1.42
+++ libbase/log.h	3 Apr 2007 16:13:07 -0000	1.43
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.42 2007/02/21 20:22:59 strk Exp $ */
+/* $Id: log.h,v 1.43 2007/04/03 16:13:07 bjacques Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -34,14 +34,6 @@
 #define TIMESTAMP_LENGTH 24             // timestamp length
 #define TIMESTAMP_FORMAT "%Y-%m-%d %H:%M:%S     " // timestamp format
 
-#if SIZEOF_SIZE_T == SIZEOF_INT // try "int" first
-  #define SIZET_FMT "%d"
-#elif SIZEOF_SIZE_T == SIZEOF_LONG
-  #define SIZET_FMT "%ld"
-#elif SIZEOF_SIZE_T == SIZEOF_SHORT
-  #define SIZET_FMT "%hd"
-#endif
-
 namespace gnash {
 
 extern std::ostream& stampon(std::ostream& x);

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/as_object.cpp	29 Mar 2007 14:29:15 -0000	1.46
+++ server/as_object.cpp	3 Apr 2007 16:13:07 -0000	1.47
@@ -389,7 +389,7 @@
 void
 as_object::dump_members() 
 {
-	log_msg("%d Members of object %p follow",
+	log_msg(SIZET_FMT " members of object %p follow",
 		_members.size(), (const void*)this);
 	_members.dump(*this);
 }

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/edit_text_character.cpp	28 Mar 2007 20:38:35 -0000	1.49
+++ server/edit_text_character.cpp	3 Apr 2007 16:13:07 -0000	1.50
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.49 2007/03/28 20:38:35 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.50 2007/04/03 16:13:07 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -926,6 +926,12 @@
 
 			_font = newfont;
 		}
+		else
+		{
+			log_error("Current font has no glyphs and I couldn't"
+				  " find another font with glyphs... :(");
+		}
+
 	}
 
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/movie_root.cpp	2 Apr 2007 17:22:29 -0000	1.52
+++ server/movie_root.cpp	3 Apr 2007 16:13:07 -0000	1.53
@@ -686,7 +686,8 @@
 
 void movie_root::notify_keypress_listeners(key::code k)
 {
-	log_msg("Notifying %u keypress listeners", m_keypress_listeners.size());
+	log_msg("Notifying " SIZET_FMT " keypress listeners", 
+		m_keypress_listeners.size());
 	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
 			 iter != m_keypress_listeners.end(); ++iter)
 	{

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -b -r1.218 -r1.219
--- server/sprite_instance.cpp	3 Apr 2007 13:43:32 -0000	1.218
+++ server/sprite_instance.cpp	3 Apr 2007 16:13:07 -0000	1.219
@@ -1693,8 +1693,8 @@
 	testInvariant();
 
 	IF_VERBOSE_ACTION(
-		log_action("Executing %u actions in frame %u/%u"
-			" of sprite %s",
+		log_action("Executing " SIZET_FMT " actions in frame %u/"
+			SIZET_FMT " of sprite %s",
 			m_action_list.size(),
 			m_current_frame+1,
 			m_def->get_frame_count(), getTargetPath().c_str());
@@ -2405,7 +2405,8 @@
 void
 sprite_instance::goto_frame(size_t target_frame_number)
 {
-	log_msg("sprite %s ::goto_frame(%d) - current frame is %d",
+	log_msg("sprite %s ::goto_frame(" SIZET_FMT ") - current frame is "
+		SIZET_FMT,
 			getTargetPath().c_str(), target_frame_number, m_current_frame);
 	assert(! isUnloaded() );
 

Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/morph2_character_def.cpp	26 Feb 2007 10:42:24 -0000	1.5
+++ server/parser/morph2_character_def.cpp	3 Apr 2007 16:13:07 -0000	1.6
@@ -355,8 +355,8 @@
 
 		IF_VERBOSE_PARSE(
 		  log_parse("morph: "
-			  "startShape(paths:%u, edges:%u), "
-			  "endShape(paths:%u, edges:%u)",
+			  "startShape(paths:" SIZET_FMT ", edges:%u), "
+			  "endShape(paths:" SIZET_FMT ", edges:%u)",
 			  m_shape1->m_paths.size(), edges_count1,
 			  m_shape2->m_paths.size(), edges_count2);
 		);
@@ -368,8 +368,8 @@
 		if ( m_shape1->m_paths.size() != m_shape2->m_paths.size() )
 		{
 			log_swferror("Different number of paths "
-				"in start (%u) and end (%u) shapes "
-				"of a morph",
+				"in start (" SIZET_FMT ") and end (" SIZET_FMT
+				") shapes of a morph",
 				m_shape1->m_paths.size(),
 				m_shape2->m_paths.size());
 		}

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/parser/movie_def_impl.cpp	27 Feb 2007 09:10:20 -0000	1.61
+++ server/parser/movie_def_impl.cpp	3 Apr 2007 16:13:07 -0000	1.62
@@ -923,7 +923,7 @@
 	if ( ! m_playlist[_frames_loaded].empty() || ! m_init_action_list[_frames_loaded].empty() )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("%d action blocks and %d init action blocks are NOT followed by"
+		log_swferror(SIZET_FMT " action blocks and " SIZET_FMT " init action blocks are NOT followed by"
 			" a SHOWFRAME tag",
 			m_playlist[_frames_loaded].size(),
 			m_init_action_list[_frames_loaded].size());
@@ -1062,8 +1062,8 @@
 		if ( loading_frame >= m_frame_count )
 		{
 			log_msg("At end of stream, still no '%s' symbol found "
-				"in m_exports (%u entries in it, follow)",
-				symbol.c_str(), m_exports.size());
+				"in m_exports (" SIZET_FMT " entries in it, "
+				"follow)", symbol.c_str(), m_exports.size());
 			return res;
 		}
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -b -r1.78 -r1.79
--- server/vm/ASHandlers.cpp	30 Mar 2007 07:23:19 -0000	1.78
+++ server/vm/ASHandlers.cpp	3 Apr 2007 16:13:07 -0000	1.79
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.78 2007/03/30 07:23:19 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.79 2007/04/03 16:13:07 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1657,11 +1657,11 @@
 		IF_VERBOSE_ACTION (
 		if ( type == pushDict8 || type == pushDict16 )
 		{
-			log_action("\t%d) type=%s (%d), value=%s", count, pushType[type], id, env.top(0).to_debug_string().c_str());
+			log_action("\t" SIZET_FMT ") type=%s (%d), value=%s", count, pushType[type], id, env.top(0).to_debug_string().c_str());
 		}
 		else
 		{
-			log_action("\t%d) type=%s, value=%s", count, pushType[type], env.top(0).to_debug_string().c_str());
+			log_action("\t" SIZET_FMT ") type=%s, value=%s", count, pushType[type], env.top(0).to_debug_string().c_str());
 		}
 		++count;
 		);
@@ -3191,8 +3191,8 @@
 		IF_VERBOSE_MALFORMED_SWF(
 			log_swferror("function2 code len (%u) "
 				"overflows DOACTION tag boundaries "
-				"(DOACTION tag len=%u, "
-				"function2 code offset=%u). "
+				"(DOACTION tag len=" SIZET_FMT
+				", function2 code offset=" SIZET_FMT "). "
 				"Forcing code len to eat the whole buffer "
 				"(would this work?).",
 				code_size, actionbuf_size, thread.next_pc);

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- utilities/processor.cpp	15 Mar 2007 22:39:54 -0000	1.53
+++ utilities/processor.cpp	3 Apr 2007 16:13:07 -0000	1.54
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: processor.cpp,v 1.53 2007/03/15 22:39:54 strk Exp $ */
+/* $Id: processor.cpp,v 1.54 2007/04/03 16:13:07 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -344,7 +344,7 @@
 	++nadvances;
 	if ( limit_advances && nadvances >= limit_advances)
 	{
-		printf("exiting after %d advances\n", nadvances);
+		printf("exiting after " SIZET_FMT " advances\n", nadvances);
 		break;
 	}
 
@@ -355,7 +355,8 @@
 	{
 		if ( allowed_end_hits && ++end_hitcount >= allowed_end_hits )
 		{
-			printf("exiting after %d times last frame was reached\n", end_hitcount);
+			printf("exiting after " SIZET_FMT 
+			       " times last frame was reached\n", end_hitcount);
 	    		break;
 		}
 	}



From MAILER-DAEMON Tue Apr 03 12:21:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYlko-0005wg-4C
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:21:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYlkm-0005rh-Ut
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:21:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYlkm-0005oW-3Q
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:21:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYlkl-0005o2-UK
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:21:03 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYlhb-0003ZI-C2
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:17:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYlha-0005CS-3W
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:17:46 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYlhZ-0005CN-Os
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:17:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYlhZ-0005CN-Os@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 16:17:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xmlsocket.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:21:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 16:17:45

Modified files:
	.              : ChangeLog 
	server/asobj   : xmlsocket.cpp xmlsocket.h 

Log message:
	        * server/asobj/xmlsocket.{cpp,h}: more cleanups and fix for
	          polling from the socket.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2764&r2=1.2765
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2764
retrieving revision 1.2765
diff -u -b -r1.2764 -r1.2765
--- ChangeLog	3 Apr 2007 15:24:11 -0000	1.2764
+++ ChangeLog	3 Apr 2007 16:17:44 -0000	1.2765
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xmlsocket.{cpp,h}: more cleanups and fix for
+	  polling from the socket.
 	* libbase/network.{cpp,h}: do not allow assignment, cleanup
 	  accessor functions to return by const refs.
 	* server/asobj/xmlsocket.{cpp,h}: do not override inherited

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/xmlsocket.cpp	3 Apr 2007 15:24:11 -0000	1.16
+++ server/asobj/xmlsocket.cpp	3 Apr 2007 16:17:45 -0000	1.17
@@ -50,6 +50,8 @@
 # include <sys/select.h>
 #endif
 
+#include <boost/algorithm/string/case_conv.hpp>
+
 #ifndef MAXHOSTNAMELEN
 #define MAXHOSTNAMELEN 256
 #endif
@@ -87,7 +89,19 @@
                 as_object(getXMLSocketInterface())
         {}
 
+		/// This function should be called everytime we're willing
+		/// to check if any data is available on the socket.
+		//
+		/// The method will take care of polling from the
+		/// socket and invoking any onData handler.
+		///
+		void checkForIncomingData(as_environment& env);
+
         XMLSocket obj;
+
+		/// Return the as_function with given name, converting case if needed
+		boost::intrusive_ptr<as_function> getEventHandler(const std::string& name);
+
 };
 
   
@@ -135,7 +149,7 @@
 
 // Return true if there is data in the socket, otherwise return false.
 bool
-XMLSocket::anydata(char **msgs)
+XMLSocket::anydata(MessageList& msgs)
 {
     //GNASH_REPORT_FUNCTION;
     assert(connected());
@@ -158,7 +172,7 @@
 }
 
 bool
-XMLSocket::anydata(int fd, char **msgs)
+XMLSocket::anydata(int fd, MessageList& msgs)
 {
     GNASH_REPORT_FUNCTION;
 
@@ -175,13 +189,10 @@
     
     
     if (fd <= 0) {
-	    log_msg("fd <= 0, returning false");
-	    assert(!connected());
+	log_msg("fd <= 0, returning false (timer not unregistered while socket disconnected?");
         return false;
     }
     
-    //msgs = (char **)realloc(msgs, sizeof(char *));
-    
     while (retries-- > 0) {
         FD_ZERO(&fdset);
         FD_SET(fd, &fdset);
@@ -210,7 +221,7 @@
         if (ret > 0) {
             log_msg("%s: There is data in the socket for fd #%d!",
                 __FUNCTION__, fd);
-            break;
+            //break;
         }
         memset(buf, 0, INBUF);
         ret = ::read(_sockfd, buf, INBUF-2);
@@ -219,7 +230,8 @@
         //log_msg("%s: read (%d,%d) %s\n", __FUNCTION__, buf[0], buf[1], buf);
         ptr = buf;
         // If we get a single XML message, do less work
-        if (ret == cr + 1) {
+        if (ret == cr + 1)
+		{
             adjusted_size = memadjust(ret + 1);
             packet = new char[adjusted_size];
             printf("Packet size is %d at %p\n", ret + 1, packet);
@@ -229,9 +241,7 @@
             if (eom) {
                 *eom = 0;
             }
-            //data.push_back(packet);
-            msgs[index] = packet;
-            msgs[index+1] = 0;
+            msgs.push_back( packet );
             printf("%d: Pushing Packet of size %d at %p\n", __LINE__, strlen(packet), packet);
             processing(false);
             return true;
@@ -273,7 +283,7 @@
                 }
                 //printf("Allocating new packet at %p\n", packet);
                 //data.push_back(packet);
-                msgs[index++] = packet;
+                msgs.push_back( std::string(packet) );
             } else {
                 log_error("Throwing out partial packet %s\n", packet);
             }
@@ -425,12 +435,13 @@
     // confirm this is that onConnect is invoked *after* 
     // XMLSocket.connect() returned in these cases.
     //
-    if (fn.this_ptr->get_member("onConnect", &method))
+	boost::intrusive_ptr<as_function> handler = ptr->getEventHandler("onConnect");
+    if ( handler )
     {
         log_msg("XMLSocket.connect(): calling onConnect");
         as_environment env;
         env.push(success);
-        val = call_method(method, &env, ptr.get(), 1, env.stack_size()-1); 
+        val = call_method(handler.get(), &env, ptr.get(), 1, env.stack_size()-1); 
     }
 	    
     if ( success )
@@ -503,10 +514,6 @@
     
     as_value	method;
     as_value	val;
-    as_value      datain;
-    std::vector<const char *> msgs;
-    char          *messages[200];
-    int           i;
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
     if ( ! ptr->obj.connected() )
@@ -515,65 +522,7 @@
 	    return as_value();
     }
 
-    if (ptr->obj.processingData()) {
-        log_msg("Still processing data!\n");
-        return as_value(false);
-    }
-    
-    memset(messages, 0, sizeof(char *)*200);
-    
-#ifndef USE_DMALLOC
-    //dump_memory_stats(__FUNCTION__, __LINE__, "memory checkpoint");
-#endif
-    
-    assert(ptr->obj.connected());
-
-    if (ptr->obj.anydata(messages))
-    {
-        //log_msg("Got message #%d, %d bytes long at %p: %s", i,
-         //   strlen(messages[i]), messages[i], messages[i]);
-
-        if (fn.this_ptr->get_member("onData", &method))
-        {
-            //log_msg("Got %d messages from XMLsocket", msgs.size());
-            for (i=0; messages[i] != 0; i++)
-            {
-//              log_msg("Got message #%d, %d bytes long at %p: %s: \n", i,
-//                  strlen(messages[i]), messages[i], messages[i]);
-                datain = messages[i];
-                //fn.env().push(datain);
-
-#ifndef USE_DMALLOC
-                //dump_memory_stats(__FUNCTION__, __LINE__, "start");
-#endif
-                as_environment& env = fn.env();
-                env.push(datain);
-                val = call_method(method, &env, fn.this_ptr.get(), 1, 0);
-
-#ifndef USE_DMALLOC
-                //dump_memory_stats(__FUNCTION__, __LINE__, "end");
-#endif  
-                //log_msg("Deleting message #%d at %p\n", i, messages[i]);
-                //delete messages[i];
-                //fn.env().pop();
-                datain.set_undefined();
-            }
-            ptr->obj.processing(false);
-        }
-        else
-        {
-            log_error("Couldn't find onData!");
-        }
-
-        // Delete this in a batch for now so we can track memory allocation
-        for (i=0; messages[i] != 0; i++)
-        {
-            //log_msg("Deleting message #%d at %p\n", i, messages[i]);
-            delete messages[i];
-        }
-    }
-
-    //malloc_trim(0);
+	ptr->checkForIncomingData(fn.env());
   
     return as_value();
 }
@@ -617,6 +566,74 @@
 
 }
 
+boost::intrusive_ptr<as_function>
+xmlsocket_as_object::getEventHandler(const std::string& name)
+{
+		boost::intrusive_ptr<as_function> ret;
+
+		std::string key=name;
+		VM& vm = VM::get();
+		if ( vm.getSWFVersion() < 7 ) boost::to_lower(key, vm.getLocale());
+
+		as_value tmp;
+		if ( ! get_member(key, &tmp) ) return ret;
+		ret = tmp.to_as_function();
+		return ret;
+}
+
+void
+xmlsocket_as_object::checkForIncomingData(as_environment& env)
+{
+    assert(obj.connected());
+
+    if (obj.processingData()) {
+        log_msg("Still processing data!");
+    }
+    
+#ifndef USE_DMALLOC
+    //dump_memory_stats(__FUNCTION__, __LINE__, "memory checkpoint");
+#endif
+
+    std::vector<std::string > msgs;
+    if (obj.anydata(msgs))
+    {
+        log_msg("Got %u messages: ", msgs.size());
+		for (size_t i=0; i<msgs.size(); ++i)
+		{
+        	log_msg(" Message %u: %s ", i, msgs[i].c_str());
+		}
+
+		boost::intrusive_ptr<as_function> onDataHandler = getEventHandler("onData");
+        if ( onDataHandler )
+        {
+            //log_msg("Got %d messages from XMLsocket", msgs.size());
+            for (XMLSocket::MessageList::iterator it=msgs.begin(),
+							itEnd=msgs.end();
+			    it != itEnd; ++it)
+            {
+				std::string& s = *it;
+				as_value datain( s );
+
+#ifndef USE_DMALLOC
+                //dump_memory_stats(__FUNCTION__, __LINE__, "start");
+#endif
+                env.push(datain);
+                call_method(as_value(onDataHandler.get()), &env, this, 1, env.stack_size()-1);
+
+#ifndef USE_DMALLOC
+                //dump_memory_stats(__FUNCTION__, __LINE__, "end");
+#endif  
+            }
+            obj.processing(false);
+        }
+        else
+        {
+            log_error("Couldn't find onData!");
+        }
+
+    }
+}
+
 } // end of gnash namespace
 
 // Local Variables:

Index: server/asobj/xmlsocket.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/xmlsocket.h	3 Apr 2007 15:24:11 -0000	1.7
+++ server/asobj/xmlsocket.h	3 Apr 2007 16:17:45 -0000	1.8
@@ -41,8 +41,10 @@
     bool send(std::string str);
     void close();
     
-    bool anydata(char **msgs);
-    bool anydata(int sockfd, char **msgs);
+    typedef std::vector<std::string> MessageList;
+
+    bool anydata(MessageList& msgs);
+    bool anydata(int sockfd, MessageList& msgs);
 
     bool fdclosed() { return _closed; }
     bool xmlmsg() { return _xmldata; }
@@ -76,6 +78,7 @@
     bool          _processing;
     std::vector<std::string> _messages;
     //std::vector< boost::intrusive_ptr<as_object> >  _nodes;
+
 };
 
 void xmlsocket_class_init(as_object& global);



From MAILER-DAEMON Tue Apr 03 12:35:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYlyh-0006wO-2h
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:35:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYlyf-0006w6-Hx
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:35:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYlyd-0006vt-K3
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:35:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYlyd-0006vq-FM
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:35:23 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYlvS-0005af-Ue
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:32:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYlvR-0005rb-J8
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:32:05 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYlvR-0005rS-Al
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:32:05 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYlvR-0005rS-Al@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 16:32:05 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp server/mo...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:35:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 16:32:05

Modified files:
	.              : ChangeLog 
	server         : movie_root.cpp movie_root.h 

Log message:
	        * server/movie_root.{cpp,h}: limit the number of interval
	          timers to 255.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2765&r2=1.2766
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2765
retrieving revision 1.2766
diff -u -b -r1.2765 -r1.2766
--- ChangeLog	3 Apr 2007 16:17:44 -0000	1.2765
+++ ChangeLog	3 Apr 2007 16:32:04 -0000	1.2766
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/movie_root.{cpp,h}: limit the number of interval
+	  timers to 255.
 	* server/asobj/xmlsocket.{cpp,h}: more cleanups and fix for
 	  polling from the socket.
 	* libbase/network.{cpp,h}: do not allow assignment, cleanup

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/movie_root.cpp	3 Apr 2007 16:13:07 -0000	1.53
+++ server/movie_root.cpp	3 Apr 2007 16:32:05 -0000	1.54
@@ -512,6 +512,10 @@
 	assert(testInvariant());
 			
 	int id = _intervalTimers.size()+1;
+	if ( _intervalTimers.size() >= 255 )
+	{
+		log_error("FIXME: %u timers currently active, won't add another one", _intervalTimers.size());
+	}
 
 	// TODO: find first NULL element in vector for reuse ?
 	_intervalTimers.push_back(timer);

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/movie_root.h	2 Apr 2007 17:22:29 -0000	1.45
+++ server/movie_root.h	3 Apr 2007 16:32:05 -0000	1.46
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.45 2007/04/02 17:22:29 strk Exp $ */
+/* $Id: movie_root.h,v 1.46 2007/04/03 16:32:05 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -297,9 +297,10 @@
 	float	get_timer() const { return m_timer; }
 	
 	/// Sets the current movie timer in seconds.
-	///
+	//
 	/// (Udo): I think getTimer() should be handled *completely* 
   /// in the AS VM... 
+	///
 	void set_timer(float value) { m_timer = value; }
 
 	/// Delegate to current top-level root sprite



From MAILER-DAEMON Tue Apr 03 12:36:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYlzn-0007qR-Aj
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:36:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYlzl-0007pz-KX
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:36:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYlzk-0007pY-HG
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:36:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYlzk-0007pU-5e
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:36:32 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYlwZ-0005pF-KV
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:33:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYlwY-0006CN-QN
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:33:14 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYlwY-0006CE-Ax
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:33:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYlwY-0006CE-Ax@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 16:33:14 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:36:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 16:33:14

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

Log message:
	        * server/vm/ASHandlers.cpp: extend tag is not in testing
	          stage anymore, be more explicit about targetPath() arg
	          not casting to an object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2766&r2=1.2767
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.79&r2=1.80

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2766
retrieving revision 1.2767
diff -u -b -r1.2766 -r1.2767
--- ChangeLog	3 Apr 2007 16:32:04 -0000	1.2766
+++ ChangeLog	3 Apr 2007 16:33:13 -0000	1.2767
@@ -1,5 +1,8 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp: extend tag is not in testing
+	  stage anymore, be more explicit about targetPath() arg
+	  not casting to an object.
 	* server/movie_root.{cpp,h}: limit the number of interval
 	  timers to 255.
 	* server/asobj/xmlsocket.{cpp,h}: more cleanups and fix for

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -b -r1.79 -r1.80
--- server/vm/ASHandlers.cpp	3 Apr 2007 16:13:07 -0000	1.79
+++ server/vm/ASHandlers.cpp	3 Apr 2007 16:33:14 -0000	1.80
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.79 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: ASHandlers.cpp,v 1.80 2007/04/03 16:33:14 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2357,7 +2357,8 @@
 	else
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Argument to TargetPath() doesn't cast to a movieclip");
+		log_aserror("Argument to TargetPath(%s) doesn't cast to a movieclip",
+			env.top(0).to_debug_string().c_str());
 		);
 		env.top(0).set_undefined();
 	}
@@ -3111,7 +3112,7 @@
 
 	sub->extends(*super);
 
-	dbglogfile << __PRETTY_FUNCTION__ << ": testing!" << endl;
+	//dbglogfile << __PRETTY_FUNCTION__ << ": testing!" << endl;
 }
 
 void



From MAILER-DAEMON Tue Apr 03 12:37:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYm12-0000vo-MR
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:37:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYm10-0000sQ-Ml
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:37:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYm0z-0000rN-O5
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:37:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYm0z-0000rF-IE
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:37:49 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYlxp-0005z9-29
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:34:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYlxo-0006YD-7L
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:34:32 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYlxn-0006Y5-Su
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:34:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYlxn-0006Y5-Su@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 16:34:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:37:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 16:34:31

Modified files:
	server         : sprite_instance.cpp 

Log message:
	removed debugging print from goto_frame

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.219&r2=1.220

Patches:
Index: sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -b -r1.219 -r1.220
--- sprite_instance.cpp	3 Apr 2007 16:13:07 -0000	1.219
+++ sprite_instance.cpp	3 Apr 2007 16:34:31 -0000	1.220
@@ -2405,9 +2405,12 @@
 void
 sprite_instance::goto_frame(size_t target_frame_number)
 {
+#ifdef DEBUG_GOTOFRAME
 	log_msg("sprite %s ::goto_frame(" SIZET_FMT ") - current frame is "
 		SIZET_FMT,
 		getTargetPath().c_str(), target_frame_number, m_current_frame);
+#endif
+
 	assert(! isUnloaded() );
 
 	//	target_frame_number = iclamp(target_frame_number, 0, m_def->get_frame_count() - 1);



From MAILER-DAEMON Tue Apr 03 12:48:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYmBE-0007ZN-Mb
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:48:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYmBC-0007Xy-FO
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:48:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYmBB-0007Xm-JL
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:48:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYmBB-0007Xj-FM
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:48:21 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYm80-0007Kf-VD
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:45:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYm7z-00078D-A7
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:45:03 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYm7z-000785-3p
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:45:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYm7z-000785-3p@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 16:45:03 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libbase LoadThread.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:48:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 16:45:03

Modified files:
	libbase        : LoadThread.cpp 

Log message:
	fix signedness warning

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- LoadThread.cpp	30 Mar 2007 13:57:26 -0000	1.4
+++ LoadThread.cpp	3 Apr 2007 16:45:02 -0000	1.5
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: LoadThread.cpp,v 1.4 2007/03/30 13:57:26 tgc Exp $
+// $Id: LoadThread.cpp,v 1.5 2007/04/03 16:45:02 strk Exp $
 
 #include "LoadThread.h"
 
@@ -266,7 +266,7 @@
 
 	_stream->set_position(_loadPosition + _chunkSize);
 
-	unsigned int pos = _stream->get_position();
+	long pos = _stream->get_position();
 	if (pos != _loadPosition + _chunkSize) {
 		_completed = true;
 	}



From MAILER-DAEMON Tue Apr 03 12:57:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYmKS-0004k3-JJ
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 12:57:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYmKR-0004jw-0x
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:57:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYmKP-0004jj-1U
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:57:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYmKO-0004jf-Ua
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:57:52 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYmHE-00005m-9W
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 12:54:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYmHD-0007JF-QS
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:54:35 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYmHD-0007JC-KV
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 16:54:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYmHD-0007JC-KV@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 16:54:35 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libbase network.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 16:57:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 16:54:35

Modified files:
	libbase        : network.h 

Log message:
	include cassert

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- network.h	3 Apr 2007 15:24:11 -0000	1.13
+++ network.h	3 Apr 2007 16:54:35 -0000	1.14
@@ -43,6 +43,8 @@
 #include "impl.h"
 #endif
 
+#include <cassert>
+
 namespace gnash {
 
 // Define the ports for the RTMP protocols



From MAILER-DAEMON Tue Apr 03 13:04:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYmQe-00014F-3h
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 13:04:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYmQc-00010K-PO
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:04:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYmQb-0000yA-V8
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:04:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYmQb-0000xl-Rj
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:04:17 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYmNR-0000tX-6D
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:01:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYmNQ-0007OU-9C
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:01:00 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYmNP-0007OR-QW
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:01:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYmNP-0007OR-QW@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 17:00:59 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ming_ut...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 17:04:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 17:00:59

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: ming_utils.c 

Log message:
	        * testsuite/misc-ming.all/ming_utils.c: embed a glyph for
	          the TAB character in our font.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2767&r2=1.2768
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2767
retrieving revision 1.2768
diff -u -b -r1.2767 -r1.2768
--- ChangeLog	3 Apr 2007 16:33:13 -0000	1.2767
+++ ChangeLog	3 Apr 2007 17:00:59 -0000	1.2768
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/ming_utils.c: embed a glyph for 
+	  the TAB character in our font.
 	* server/vm/ASHandlers.cpp: extend tag is not in testing
 	  stage anymore, be more explicit about targetPath() arg
 	  not casting to an object.

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- testsuite/misc-ming.all/ming_utils.c	2 Apr 2007 10:38:34 -0000	1.24
+++ testsuite/misc-ming.all/ming_utils.c	3 Apr 2007 17:00:59 -0000	1.25
@@ -27,12 +27,13 @@
 void add_xtrace_function_clip(SWFMovieClip mo, SWFBlock font, int depth, int x, int y, int width, int height);
 static SWFAction get_dejagnu_actions(void);
 
+static const char* asciichars = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_=+[]{};:.>,</?'\"\\|`~\t";
+
 void
 add_xtrace_function_clip(SWFMovieClip mc, SWFBlock font, int depth, int x, int y, int width, int height)
 {
 	SWFTextField tf;
 	SWFDisplayItem it;
-	const char* asciichars = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_=+[]{};:.>,</?'\"\\|`~";
 
 	tf = newSWFTextField();
 
@@ -87,7 +88,6 @@
 {
 	SWFTextField tf;
 	SWFDisplayItem it;
-	const char* asciichars = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()-_=+[]{};:.>,</?'\"\\|`~";
 
 	tf = newSWFTextField();
 



From MAILER-DAEMON Tue Apr 03 13:24:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYmkd-0002Ua-GC
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 13:24:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYmkc-0002RR-1G
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:24:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYmkb-0002Qn-Ar
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:24:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYmkb-0002Qk-5D
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:24:57 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYmhQ-0003gc-Cm
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:21:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYmhP-00081b-Dq
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:21:39 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYmhP-00081Y-4m
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:21:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYmhP-00081Y-4m@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 17:21:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 17:24:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 17:21:39

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp 

Log message:
	        * server/edit_text_character.cpp (format_text): handle
	          TAB characters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2768&r2=1.2769
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.50&r2=1.51

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2768
retrieving revision 1.2769
diff -u -b -r1.2768 -r1.2769
--- ChangeLog	3 Apr 2007 17:00:59 -0000	1.2768
+++ ChangeLog	3 Apr 2007 17:21:38 -0000	1.2769
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
+	* server/edit_text_character.cpp (format_text): handle
+	  TAB characters.
 	* testsuite/misc-ming.all/ming_utils.c: embed a glyph for 
 	  the TAB character in our font.
 	* server/vm/ASHandlers.cpp: extend tag is not in testing

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/edit_text_character.cpp	3 Apr 2007 16:13:07 -0000	1.50
+++ server/edit_text_character.cpp	3 Apr 2007 17:21:38 -0000	1.51
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.50 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: edit_text_character.cpp,v 1.51 2007/04/03 17:21:38 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1047,12 +1047,38 @@
 			continue;
 		}
 
+		if (code == 9) // tab (ASCII HT)
+		{
+			int index = _font->get_glyph_index(32); // ascii SPACE
+			if ( index == -1 )
+			{
+				log_warning("%s -- missing glyph for space char (needed for TAB)."
+					    " Make sure character shapes for font %s are being exported "
+					    "into your SWF file!",
+					    __PRETTY_FUNCTION__,
+					    _font->get_name());
+			}
+			else
+			{
+				text_glyph_record::glyph_entry	ge;
+				ge.m_glyph_index = index;
+				ge.m_glyph_advance = scale * _font->get_advance(index);
+
+				const int tabstop=8;
+				rec.m_glyphs.insert(rec.m_glyphs.end(), tabstop, ge);
+				x += ge.m_glyph_advance*tabstop;
+			}
+			goto after_x_advance;
+		}
+
 		// Remember where word breaks occur.
 		if (code == 32)
 		{
 			last_space_glyph = rec.m_glyphs.size();
 		}
 
+		{ // need a sub-scope to avoid the 'goto' in TAB handling to cross
+		  // initialization of the 'index' variable
 		int index = _font->get_glyph_index((uint16_t) code);
 		if (index == -1)
 		{
@@ -1082,7 +1108,9 @@
 		rec.m_glyphs.push_back(ge);
 
 		x += ge.m_glyph_advance;
+		}
 
+after_x_advance:
 		
 		if (x >= m_def->width() - m_def->get_right_margin() - WIDTH_FUDGE)
 		{



From MAILER-DAEMON Tue Apr 03 13:43:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYn26-0001Qq-Tw
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 13:43:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYn25-0001P9-UY
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:43:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYn24-0001M4-H6
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:43:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYn24-0001Lk-Cw
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:43:00 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYmyt-0006DR-IG
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 13:39:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYmys-0001MI-Jo
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:39:42 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYmys-0001MF-Au
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:39:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYmys-0001MF-Au@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 03 Apr 2007 17:39:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all XMLSocket.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 17:43:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/03 17:39:42

Modified files:
	testsuite/actionscript.all: XMLSocket.as 

Log message:
	More tests for event handlers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLSocket.as?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: XMLSocket.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLSocket.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- XMLSocket.as	3 Apr 2007 14:07:22 -0000	1.2
+++ XMLSocket.as	3 Apr 2007 17:39:42 -0000	1.3
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XMLSocket.as,v 1.2 2007/04/03 14:07:22 strk Exp $";
+rcsid="$Id: XMLSocket.as,v 1.3 2007/04/03 17:39:42 strk Exp $";
 
 #include "check.as"
 
@@ -44,6 +44,12 @@
 
 socketObj = new XMLSocket;
 
+// The default onData handler calls onXML after parsing the code
+xcheck_equals(typeof(socketObj.onData), 'function');
+#if OUTPUT_VERSION >= 6
+xcheck(socketObj.hasOwnProperty('onData'));
+#endif
+
 check_equals(typeof(socketObj), 'object');
 check_equals(socketObj.__proto__, XMLSocket.prototype);
 check( ! socketObj.hasOwnProperty('connect') );
@@ -64,9 +70,19 @@
 	}
 };
 
+#if 1 // the default onData calls onXML
 socketObj.onData = function(src) {
 	check_equals(this.secret, 4);
-	note("XMLSocket.onData("+src+") called with "+arguments.length);
+	check_equals(typeof(src), 'string');
+	note("XMLSocket.onData("+src+") called with "+arguments.length+" args");
+};
+#endif
+
+socketObj.onXML = function(x) {
+	check_equals(this.secret, 4);
+	check_equals(arguments.length, 1);
+	check(x instanceof XML);
+	note("XMLSocket.onXML() called with a "+typeof(arguments[0])+" as arg");
 };
 
 socketObj.onClose = function() {



From MAILER-DAEMON Tue Apr 03 17:50:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYqt6-0003UN-Ce
	for mharc-gnash-commit@gnu.org; Tue, 03 Apr 2007 17:50:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYqt4-0003UG-DM
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:49:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYqt3-0003U2-8C
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:49:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYqt3-0003Tz-2J
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:49:57 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HYqpr-0003pe-1f
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 17:46:39 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYqpp-0004XG-VF
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 21:46:38 +0000
Received: from nihilus by savannah.gnu.org with local (Exim 4.50)
	id 1HYqpp-0004XB-I0
	for gnash-commit@gnu.org; Tue, 03 Apr 2007 21:46:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYqpp-0004XB-I0@savannah.gnu.org>
From: Markus Gothe <markus@unixrus.se>
Date: Tue, 03 Apr 2007 21:46:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Apr 2007 21:49:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/03 21:46:37

Modified files:
	.              : ChangeLog 
	backend        : render_handler_ogl.cpp 

Log message:
	Fixed posible memory leak.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2769&r2=1.2770
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2769
retrieving revision 1.2770
diff -u -b -r1.2769 -r1.2770
--- ChangeLog	3 Apr 2007 17:21:38 -0000	1.2769
+++ ChangeLog	3 Apr 2007 21:46:37 -0000	1.2770
@@ -56,6 +56,7 @@
 2007-04-03 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* server/as_value.h: Include <limits> for NAN.
+	* backend/render_ogl.cpp: Fixed memory leak.
 
 2007-04-02 Sandro Santilli <strk@keybit.net>
 

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- backend/render_handler_ogl.cpp	27 Mar 2007 22:06:08 -0000	1.66
+++ backend/render_handler_ogl.cpp	3 Apr 2007 21:46:37 -0000	1.67
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.66 2007/03/27 22:06:08 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.67 2007/04/03 21:46:37 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -931,7 +931,7 @@
 	}
 	glEnd();
 	glCopyTexImage2D(GL_TEXTURE_2D, 0, out_format, 0,0, dst_width, dst_height, 0);
-	delete temp;
+	delete[] temp;
     }
     glPopAttrib();
     glPopMatrix();



From MAILER-DAEMON Wed Apr 04 03:03:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYzWn-0005zO-70
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 03:03:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYzWl-0005y4-KL
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:03:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYzWj-0005x3-Nx
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:03:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYzWj-0005x0-K1
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:03:29 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HYzTU-0004wl-7B
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:00:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYzTO-0006rv-Ob
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 07:00:02 +0000
Received: from zoulunkai by savannah.gnu.org with local (Exim 4.50)
	id 1HYzTO-0006rr-LB
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 07:00:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYzTO-0006rr-LB@savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 04 Apr 2007 07:00:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 07:03:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/04 07:00:02

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	first attempt to deprecate reverse execution of frame tags

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2770&r2=1.2771
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.220&r2=1.221

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2770
retrieving revision 1.2771
diff -u -b -r1.2770 -r1.2771
--- ChangeLog	3 Apr 2007 21:46:37 -0000	1.2770
+++ ChangeLog	4 Apr 2007 07:00:02 -0000	1.2771
@@ -1,3 +1,8 @@
+2007-04-02 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/sprite_instance.cpp
+	first attempt to deprecate reverse execution of frame tags
+	
 2007-04-03 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.cpp (format_text): handle

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -b -r1.220 -r1.221
--- server/sprite_instance.cpp	3 Apr 2007 16:34:31 -0000	1.220
+++ server/sprite_instance.cpp	4 Apr 2007 07:00:02 -0000	1.221
@@ -2462,10 +2462,10 @@
 	if (target_frame_number < m_current_frame)
 	// Go backward to a previous frame
 	{
-		for (size_t f = m_current_frame; f>target_frame_number; --f)
+		resetDisplayList();
+		for (size_t f = 0; f<target_frame_number; f++)
 		{
-			// CHECK: will this execute "state" tags only ?
-			execute_frame_tags_reverse(f);
+			execute_frame_tags(f, TAG_DLIST);
 		}
 	}
 	else



From MAILER-DAEMON Wed Apr 04 03:13:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HYzgl-0006MX-Hj
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 03:13:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HYzgj-0006IH-5A
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:13:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HYzgh-0006Em-GA
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:13:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HYzgh-0006EY-6S
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:13:47 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HYzdR-0007Lh-6c
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:10:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HYzdL-00074M-UU
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 07:10:20 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HYzdL-00074J-HM
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 07:10:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HYzdL-00074J-HM@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 07:10:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/URLAccessManager.cpp ser...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 07:13:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 07:10:19

Modified files:
	.              : ChangeLog 
	server         : URLAccessManager.cpp URLAccessManager.h 
	server/asobj   : xmlsocket.cpp 

Log message:
	        * server/URLAccessManager.{cpp,h}: add allowHost interface.
	        * server/asobj/xmlsocket.cpp (connect): check host security.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2771&r2=1.2772
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2771
retrieving revision 1.2772
diff -u -b -r1.2771 -r1.2772
--- ChangeLog	4 Apr 2007 07:00:02 -0000	1.2771
+++ ChangeLog	4 Apr 2007 07:10:19 -0000	1.2772
@@ -1,4 +1,9 @@
-2007-04-02 Zou Lunkai <zoulunkai@gmail.com>
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
+	* server/URLAccessManager.{cpp,h}: add allowHost interface.
+	* server/asobj/xmlsocket.cpp (connect): check host security.
+
+2007-04-03 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/sprite_instance.cpp
 	first attempt to deprecate reverse execution of frame tags

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/URLAccessManager.cpp	20 Nov 2006 13:18:58 -0000	1.12
+++ server/URLAccessManager.cpp	4 Apr 2007 07:10:19 -0000	1.13
@@ -268,6 +268,21 @@
 }
 
 bool
+allowHost(const std::string& host, short port)
+{
+	return allowHost(host);
+}
+
+bool
+allowHost(const std::string& host)
+{
+	if (host.size() == 0) {
+		return true;
+	}
+	return host_check(host);
+}
+
+bool
 allow(const URL& url)
 {
 	// We might reintroduce use of an AccessPolicy cache

Index: server/URLAccessManager.h
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/URLAccessManager.h	29 Oct 2006 18:34:11 -0000	1.2
+++ server/URLAccessManager.h	4 Apr 2007 07:10:19 -0000	1.3
@@ -20,6 +20,8 @@
 #ifndef _GNASH_URLACCESSMANAGER_H
 #define _GNASH_URLACCESSMANAGER_H
 
+#include <string>
+
 // Forward declarations
 namespace gnash {
 	class URL;
@@ -37,6 +39,10 @@
 ///
 bool allow(const URL& url);
 
+bool allowHost(const std::string& str);
+
+bool allowHost(const std::string& str, short port);
+
 } // AccessManager
 
 } // namespace gnash

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/xmlsocket.cpp	3 Apr 2007 16:17:45 -0000	1.17
+++ server/asobj/xmlsocket.cpp	4 Apr 2007 07:10:19 -0000	1.18
@@ -27,6 +27,7 @@
 #include "sprite_instance.h"
 #include "VM.h"
 #include "builtin_function.h" // for setting timer, should likely avoid that..
+#include "URLAccessManager.h"
 
 #include "log.h"
 
@@ -126,6 +127,13 @@
 XMLSocket::connect(const char *host, short port)
 {
     GNASH_REPORT_FUNCTION;
+
+    if ( ! URLAccessManager::allowHost(host, port) )
+    {
+	    return false;
+    }
+	    
+
     bool success = createClient(host, port);
 
     assert( success || ! connected() );



From MAILER-DAEMON Wed Apr 04 03:57:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ0MX-0003mQ-F9
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 03:57:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ0MV-0003mF-BL
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:56:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ0MT-0003m3-Pw
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:56:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ0MT-0003m0-M7
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:56:57 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ0JD-0003Oc-9c
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 03:53:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ0J7-0000zz-0T
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 07:53:29 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ0J6-0000zv-NW
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 07:53:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ0J6-0000zv-NW@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 07:53:28 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 07:56:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 07:53:28

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xml.h xmlsocket.cpp 
	testsuite/actionscript.all: XMLSocket.as 

Log message:
	        * server/asobj/xml.{cpp,h}: tu_string => std::string
	        * server/asobj/xmlsocket.cpp: provide a builtin onData
	          event handler to XMLSocket instances.
	        * testsuite/actionscript.all/XMLSocket.as: more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2772&r2=1.2773
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLSocket.as?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2772
retrieving revision 1.2773
diff -u -b -r1.2772 -r1.2773
--- ChangeLog	4 Apr 2007 07:10:19 -0000	1.2772
+++ ChangeLog	4 Apr 2007 07:53:28 -0000	1.2773
@@ -1,5 +1,9 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xml.{cpp,h}: tu_string => std::string
+	* server/asobj/xmlsocket.cpp: provide a builtin onData
+	  event handler to XMLSocket instances.
+	* testsuite/actionscript.all/XMLSocket.as: more successes.
 	* server/URLAccessManager.{cpp,h}: add allowHost interface.
 	* server/asobj/xmlsocket.cpp (connect): check host security.
 

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/xml.cpp	3 Apr 2007 13:22:23 -0000	1.28
+++ server/asobj/xml.cpp	4 Apr 2007 07:53:28 -0000	1.29
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.28 2007/04/03 13:22:23 strk Exp $ */
+/* $Id: xml.cpp,v 1.29 2007/04/04 07:53:28 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -98,7 +98,7 @@
 
 
 // Parse the ASCII XML string into memory
-XML::XML(tu_string xml_in)
+XML::XML(const std::string& xml_in)
     :
     XMLNode(getXMLInterface()),
     _loaded(false), 
@@ -299,14 +299,14 @@
 // This reads in an XML file from disk and parses into into a memory resident
 // tree which can be walked through later.
 bool
-XML::parseXML(tu_string xml_in)
+XML::parseXML(const std::string& xml_in)
 {
     GNASH_REPORT_FUNCTION;
 
-    log_msg("Parse XML from memory: %s\n", xml_in.c_str());
+    log_msg("Parse XML from memory: %s", xml_in.c_str());
 
-    if (xml_in.size() == 0) {
-        log_error("XML data is empty!\n");
+    if (xml_in.empty()) {
+        log_error("XML data is empty!");
         return false;
     }
 

Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/xml.h	3 Apr 2007 12:34:43 -0000	1.11
+++ server/asobj/xml.h	4 Apr 2007 07:53:28 -0000	1.12
@@ -55,7 +55,7 @@
 public:
 
     XML();
-    XML(tu_string xml_in);
+    XML(const std::string& xml_in);
     XML(struct node * childNode);
     virtual ~XML();
   
@@ -64,7 +64,7 @@
     bool parseDoc(xmlDocPtr document, bool mem);
 
     // Parses an XML document into the specified XML object tree.
-    bool parseXML(tu_string xml_in);
+    bool parseXML(const std::string& xml_in);
 
     // Loads a document (specified by
     // the XML object) from a URL.

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/xmlsocket.cpp	4 Apr 2007 07:10:19 -0000	1.18
+++ server/asobj/xmlsocket.cpp	4 Apr 2007 07:53:28 -0000	1.19
@@ -71,10 +71,13 @@
 static as_value xmlsocket_close(const fn_call& fn);
 
 // These are the event handlers called for this object
-static as_value xmlsocket_event_ondata(const fn_call& fn);
+static as_value xmlsocket_inputChecker(const fn_call& fn);
+
+static as_value xmlsocket_onData(const fn_call& fn);
 
 static as_object* getXMLSocketInterface();
 static void attachXMLSocketInterface(as_object& o);
+static void attachXMLSocketProperties(as_object& o);
 
 const int SOCKET_DATA = 1;
   
@@ -88,7 +91,9 @@
         xmlsocket_as_object()
                 :
                 as_object(getXMLSocketInterface())
-        {}
+        {
+            attachXMLSocketProperties(*this);
+        }
 
 		/// This function should be called everytime we're willing
 		/// to check if any data is available on the socket.
@@ -457,7 +462,7 @@
         log_warning("Setting up timer for calling XMLSocket.onData()");
 
         Timer timer;
-        boost::intrusive_ptr<builtin_function> ondata_handler = new builtin_function(&xmlsocket_event_ondata, NULL);
+        boost::intrusive_ptr<builtin_function> ondata_handler = new builtin_function(&xmlsocket_inputChecker, NULL);
         unsigned interval = 50; // just make sure it's expired at every frame iteration (20 FPS used here)
         timer.setInterval(*ondata_handler, interval, boost::dynamic_pointer_cast<as_object>(ptr), &fn.env());
         VM::get().getRoot().add_interval_timer(timer);
@@ -513,20 +518,17 @@
 
 
 as_value
-xmlsocket_event_ondata(const fn_call& fn)
+xmlsocket_inputChecker(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
 
-    //log_msg("doing nothing as this function is completely broken");
-    //return as_value();
-    
     as_value	method;
     as_value	val;
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
     if ( ! ptr->obj.connected() )
     {
-	    log_warning("XMLSocket not connected at xmlsocket_event_ondata call");
+        log_warning("XMLSocket not connected at xmlsocket_inputChecker call");
 	    return as_value();
     }
 
@@ -535,6 +537,53 @@
     return as_value();
 }
 
+as_value
+xmlsocket_onData(const fn_call& fn)
+{
+    GNASH_REPORT_FUNCTION;
+
+    as_value	method;
+    as_value	val;
+    
+    boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
+
+    boost::intrusive_ptr<as_function> onXMLEvent = ptr->getEventHandler("onXML");
+    if ( ! onXMLEvent )
+    {
+            log_msg("Builtin XMLSocket.onData doing nothing as no "
+                            "onXML event is defined on XMLSocket %p",
+                            (void*)ptr.get());
+            return as_value();
+    }
+
+    if ( fn.nargs < 1 )
+    {
+        IF_VERBOSE_ASCODING_ERRORS(
+        log_aserror("Builtin XMLSocket.onData() needs an argument");
+        );
+        return as_value();
+    }
+
+    as_environment& env = fn.env();
+    std::string xmlin = fn.arg(0).to_std_string(&env);
+
+    if ( xmlin.empty() )
+    {
+            log_error("Builtin XMLSocket.onData() called with an argument "
+                            "that resolves to the empty string: %s",
+                            fn.arg(0).to_debug_string().c_str());
+            return as_value();
+    }
+
+    boost::intrusive_ptr<as_object> xml = new XML(xmlin);
+
+    env.push(xml);
+    call_method(as_value(onXMLEvent.get()), &env, ptr.get(), 1, env.stack_size()-1);
+    return as_value();
+
+
+}
+
 static as_object*
 getXMLSocketInterface()
 {
@@ -555,6 +604,12 @@
     o.init_member("close", new builtin_function(xmlsocket_close));
 }
 
+static void
+attachXMLSocketProperties(as_object& o)
+{
+    o.init_member("onData", new builtin_function(xmlsocket_onData));
+}
+
 // extern (used by Global.cpp)
 void xmlsocket_class_init(as_object& global)
 {

Index: testsuite/actionscript.all/XMLSocket.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLSocket.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/actionscript.all/XMLSocket.as	3 Apr 2007 17:39:42 -0000	1.3
+++ testsuite/actionscript.all/XMLSocket.as	4 Apr 2007 07:53:28 -0000	1.4
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XMLSocket.as,v 1.3 2007/04/03 17:39:42 strk Exp $";
+rcsid="$Id: XMLSocket.as,v 1.4 2007/04/04 07:53:28 strk Exp $";
 
 #include "check.as"
 
@@ -45,9 +45,9 @@
 socketObj = new XMLSocket;
 
 // The default onData handler calls onXML after parsing the code
-xcheck_equals(typeof(socketObj.onData), 'function');
+check_equals(typeof(socketObj.onData), 'function');
 #if OUTPUT_VERSION >= 6
-xcheck(socketObj.hasOwnProperty('onData'));
+check(socketObj.hasOwnProperty('onData'));
 #endif
 
 check_equals(typeof(socketObj), 'object');
@@ -70,11 +70,12 @@
 	}
 };
 
-#if 1 // the default onData calls onXML
+#if 0 // the default onData calls onXML
 socketObj.onData = function(src) {
 	check_equals(this.secret, 4);
 	check_equals(typeof(src), 'string');
 	note("XMLSocket.onData("+src+") called with "+arguments.length+" args");
+    this.onXML(new XML(src));
 };
 #endif
 
@@ -83,6 +84,7 @@
 	check_equals(arguments.length, 1);
 	check(x instanceof XML);
 	note("XMLSocket.onXML() called with a "+typeof(arguments[0])+" as arg");
+    note("Parsed XML: "+x.toString());
 };
 
 socketObj.onClose = function() {



From MAILER-DAEMON Wed Apr 04 04:50:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ1CD-0005po-3c
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 04:50:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ1C8-0005oE-LS
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 04:50:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ1C5-0005mr-BX
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 04:50:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ1C4-0005mc-RA
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 04:50:17 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ18o-0001LD-Bl
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 04:46:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ18c-0003mD-K6
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 08:46:42 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ18c-0003mA-AB
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 08:46:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ18c-0003mA-AB@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 08:46:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 08:50:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 08:46:42

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xmlnode.cpp 

Log message:
	        * server/asobj/xmlnode.cpp (stringify): stop feeding NULL
	          pointers to output operators !
	        * server/asobj/xml.cpp (xml_new): support a string as first
	          argument to constructor.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2773&r2=1.2774
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2773
retrieving revision 1.2774
diff -u -b -r1.2773 -r1.2774
--- ChangeLog	4 Apr 2007 07:53:28 -0000	1.2773
+++ ChangeLog	4 Apr 2007 08:46:41 -0000	1.2774
@@ -1,5 +1,12 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xmlnode.cpp (stringify): stop feeding NULL 
+	  pointers to output operators !
+	* server/asobj/xml.cpp (xml_new): support a string as first
+	  argument to constructor.
+
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/xml.{cpp,h}: tu_string => std::string
 	* server/asobj/xmlsocket.cpp: provide a builtin onData
 	  event handler to XMLSocket instances.

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/xml.cpp	4 Apr 2007 07:53:28 -0000	1.29
+++ server/asobj/xml.cpp	4 Apr 2007 08:46:42 -0000	1.30
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.29 2007/04/04 07:53:28 strk Exp $ */
+/* $Id: xml.cpp,v 1.30 2007/04/04 08:46:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -106,9 +106,9 @@
     _bytes_total(0)
 {
     GNASH_REPORT_FUNCTION;
-#ifdef DEBUG_MEMORY_ALLOCATION
+//#ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("Creating XML data at %p \n", this);
-#endif
+//#endif
     parseXML(xml_in);
 }
 
@@ -279,7 +279,7 @@
     xmlNodePtr cur;
 
     if (document == 0) {
-        log_error("Can't load XML file!\n");
+        log_error("Can't load XML file!");
         return false;
     }
 
@@ -292,6 +292,8 @@
         _children.push_back(child);
     }  
 
+    log_msg("parseDoc: %u childrens for XML %p after parsing", _children.size(), (void*)this);
+
     _loaded = true;
     return true;
 }
@@ -606,7 +608,9 @@
   
     // log_msg("%s: nargs=%d\n", __FUNCTION__, fn.nargs);
   
-    if (fn.nargs > 0 && fn.arg(0).is_object() )
+    if ( fn.nargs > 0 )
+    {
+        if ( fn.arg(0).is_object() )
     {
 	    boost::intrusive_ptr<as_object> obj = fn.env().top(0).to_object();
         xml_obj = boost::dynamic_pointer_cast<XML>(obj);
@@ -617,6 +621,21 @@
         }
     }
 
+        std::string xml_in = fn.arg(0).to_std_string();
+        if ( xml_in.empty() )
+        {
+            IF_VERBOSE_ASCODING_ERRORS(
+            log_aserror("First arg given to XML constructor (%s) evaluates to the empty string",
+                    fn.arg(0).to_debug_string().c_str());
+            );
+        }
+        else
+        {
+            xml_obj = new XML(xml_in);
+            return as_value(xml_obj.get());
+        }
+    }
+
     xml_obj = new XML;
     //log_msg("\tCreated New XML object at %p\n", xml_obj);
 

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/xmlnode.cpp	3 Apr 2007 13:22:24 -0000	1.21
+++ server/asobj/xmlnode.cpp	4 Apr 2007 08:46:42 -0000	1.22
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.21 2007/04/03 13:22:24 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.22 2007/04/04 08:46:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -336,12 +336,18 @@
 XMLNode::stringify(const XMLNode& xml, std::ostream& xmlout) 
 {
 //    GNASH_REPORT_FUNCTION;
-    const char    *nodevalue = xml.nodeValue();
-    const char    *nodename = xml.nodeName();
+    const char* nodevalue = xml.nodeValue();
+    const char* nodename = xml.nodeName();
+
     
 //    log_msg("%s: processing for object %s <%p>\n", __PRETTY_FUNCTION__, nodename, xml);
 
+    log_msg("Stringifying node %p with name %s, value %s, %u attributes and %u childs",
+                    (void*)&xml, nodename, nodevalue, xml._attributes.size(), xml._children.size());
+
     // Create the beginning of the tag
+    if (nodename)
+    {
     xmlout << "<" << nodename;
     
     // Process the attributes, if any
@@ -353,27 +359,27 @@
         xmlout << " " << xa.name() << "=\"" << xa.value() << "\"";
     }
 
-    xmlout << ">";		// closing symbol for this tag
+        xmlout << ">";
+    }
     
-    if (nodevalue) {
+    // Node value first, then childs
+    if ( nodevalue )
+    {
 	xmlout << nodevalue;
-	xmlout << "</" << nodename << ">";
     }
 
-//    int length = xml->_children.size();
-//    log_msg("\tProcessing %d children nodes for %s", length, nodename);
-    
+    // Childs, after node value.
     ChildList::const_iterator itx;
     for (itx = xml._children.begin(); itx != xml._children.end(); itx++)
     {
 //	    log_msg("Found One XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
 //	    cerr << "<" << (*it)->nodeName() << ">" << endl;
         (*itx)->toString(xmlout);
-        //x->toString(xmlout);
     }
 
-    if (!nodevalue)
+    if (nodename)
     {
+	    assert(nodename);
 	    xmlout << "</" << nodename << ">";
     }
 
@@ -566,12 +572,13 @@
 static as_value
 xmlnode_tostring(const fn_call& fn)
 {
-//    GNASH_REPORT_FUNCTION;
+    GNASH_REPORT_FUNCTION;
     
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     
     std::stringstream ss;
     ptr->toString(ss);
+    log_msg("Stringstream: %s", ss.str().c_str());
 
     return as_value(ss.str());
 }



From MAILER-DAEMON Wed Apr 04 05:05:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ1Qv-000514-Kv
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 05:05:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ1Qu-00050y-0b
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:05:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ1Qs-00050S-B5
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:05:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ1Qs-00050P-2I
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:05:34 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ1Nc-0004AN-Ga
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:02:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ1Nb-00048v-38
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:02:11 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ1Na-00048s-Kn
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:02:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ1Na-00048s-Kn@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 09:02:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 09:05:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 09:02:10

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xmlnode.cpp 
	testsuite/actionscript.all: XML.as 

Log message:
	        * server/asobj/xml.cpp: remove debugging lines, return undefined
	          from getBytesLoaded,getBytesTotal if the XML was not loaded.
	        * server/asobj/xmlnode.cpp: remove debugging lines.
	        * testsuite/actionscript.all/XML.as: all current tests pass now
	          (but we need more tests);

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2774&r2=1.2775
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2774
retrieving revision 1.2775
diff -u -b -r1.2774 -r1.2775
--- ChangeLog	4 Apr 2007 08:46:41 -0000	1.2774
+++ ChangeLog	4 Apr 2007 09:02:10 -0000	1.2775
@@ -1,5 +1,13 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xml.cpp: remove debugging lines, return undefined
+	  from getBytesLoaded,getBytesTotal if the XML was not loaded.
+	* server/asobj/xmlnode.cpp: remove debugging lines.
+	* testsuite/actionscript.all/XML.as: all current tests pass now
+	  (but we need more tests);
+
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/xmlnode.cpp (stringify): stop feeding NULL 
 	  pointers to output operators !
 	* server/asobj/xml.cpp (xml_new): support a string as first

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/xml.cpp	4 Apr 2007 08:46:42 -0000	1.30
+++ server/asobj/xml.cpp	4 Apr 2007 09:02:10 -0000	1.31
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.30 2007/04/04 08:46:42 strk Exp $ */
+/* $Id: xml.cpp,v 1.31 2007/04/04 09:02:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -89,7 +89,7 @@
     _bytes_loaded(0),
     _bytes_total(0)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("Creating XML data at %p \n", this);
 #endif
@@ -105,10 +105,10 @@
     _bytes_loaded(0),
     _bytes_total(0)
 {
-    GNASH_REPORT_FUNCTION;
-//#ifdef DEBUG_MEMORY_ALLOCATION
+    //GNASH_REPORT_FUNCTION;
+#ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("Creating XML data at %p \n", this);
-//#endif
+#endif
     parseXML(xml_in);
 }
 
@@ -275,7 +275,8 @@
 bool
 XML::parseDoc(xmlDocPtr document, bool mem)
 {
-    GNASH_REPORT_FUNCTION;  
+    //GNASH_REPORT_FUNCTION;  
+
     xmlNodePtr cur;
 
     if (document == 0) {
@@ -292,9 +293,6 @@
         _children.push_back(child);
     }  
 
-    log_msg("parseDoc: %u childrens for XML %p after parsing", _children.size(), (void*)this);
-
-    _loaded = true;
     return true;
 }
 
@@ -303,9 +301,9 @@
 bool
 XML::parseXML(const std::string& xml_in)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
-    log_msg("Parse XML from memory: %s", xml_in.c_str());
+    //log_msg("Parse XML from memory: %s", xml_in.c_str());
 
     if (xml_in.empty()) {
         log_error("XML data is empty!");
@@ -316,7 +314,7 @@
     //dump_memory_stats(__FUNCTION__, __LINE__, "before xmlParseMemory");
 #endif
 
-    _bytes_total = _bytes_loaded = xml_in.size();
+    //_bytes_total = _bytes_loaded = xml_in.size();
     
     bool ret=true;
 
@@ -375,6 +373,7 @@
     xmlCleanupParser();
     xmlFreeDoc(_doc);
     xmlMemoryDump();
+    _loaded = true;
 
     onLoadEvent(true);
 
@@ -564,27 +563,6 @@
     o.init_member("send", new builtin_function(xml_send));
     o.init_member("sendAndLoad", new builtin_function(xml_sendandload));
 
-    // Properties
-
-#if 0
-    boost::intrusive_ptr<builtin_function> gettersetter;
-
-    gettersetter = new builtin_function(&xml_nodename, NULL);
-    o.init_property("nodeName", *gettersetter, *gettersetter);
-
-    gettersetter = new builtin_function(&xml_nodevalue, NULL);
-    o.init_property("nodeValue", *gettersetter, *gettersetter);
-
-    gettersetter = new builtin_function(&xml_firstchild, NULL);
-    o.init_property("firstChild", *gettersetter, *gettersetter);
-
-    gettersetter = new builtin_function(&xml_lastchild, NULL);
-    o.init_property("lastChild", *gettersetter, *gettersetter);
-
-    gettersetter = new builtin_function(&xml_childnodes, NULL);
-    o.init_property("childNodes", *gettersetter, *gettersetter);
-#endif
-
 }
 
 static as_object*
@@ -738,13 +716,27 @@
 as_value xml_getbytesloaded(const fn_call& fn)
 {
     boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
+    if ( ptr->loaded() )
+	{
     return as_value(ptr->getBytesLoaded());
+    }
+	else
+	{
+		return as_value();
+    }
 }
 
 as_value xml_getbytestotal(const fn_call& fn)
 {
     boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
+    if ( ptr->loaded() )
+	{
     return as_value(ptr->getBytesTotal());
+	}
+	else
+	{
+		return as_value();
+	}
 }
 
 as_value xml_parsexml(const fn_call& fn)

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/xmlnode.cpp	4 Apr 2007 08:46:42 -0000	1.22
+++ server/asobj/xmlnode.cpp	4 Apr 2007 09:02:10 -0000	1.23
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.22 2007/04/04 08:46:42 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.23 2007/04/04 09:02:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -169,7 +169,7 @@
 boost::intrusive_ptr<XMLNode>
 XMLNode::firstChild()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 	if ( _children.empty() ) return NULL;
 	return _children.front();
 }
@@ -342,8 +342,10 @@
 
 //    log_msg("%s: processing for object %s <%p>\n", __PRETTY_FUNCTION__, nodename, xml);
 
+#ifdef GNASH_DEBUG
     log_msg("Stringifying node %p with name %s, value %s, %u attributes and %u childs",
                     (void*)&xml, nodename, nodevalue, xml._attributes.size(), xml._children.size());
+#endif
 
     // Create the beginning of the tag
     if (nodename)
@@ -572,13 +574,13 @@
 static as_value
 xmlnode_tostring(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     
     std::stringstream ss;
     ptr->toString(ss);
-    log_msg("Stringstream: %s", ss.str().c_str());
+    //log_msg("Stringstream: %s", ss.str().c_str());
 
     return as_value(ss.str());
 }

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/actionscript.all/XML.as	3 Apr 2007 13:22:24 -0000	1.20
+++ testsuite/actionscript.all/XML.as	4 Apr 2007 09:02:10 -0000	1.21
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.20 2007/04/03 13:22:24 strk Exp $";
+rcsid="$Id: XML.as,v 1.21 2007/04/04 09:02:10 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -265,8 +265,8 @@
 // Since we didn't *load* the XML, but we
 // just *parsed* it, expect getBytesLoaded 
 // and getBytesTotal to return undefined
-xcheck_equals(tmp.getBytesLoaded(), undefined);
-xcheck_equals(tmp.getBytesTotal(), undefined);
+check_equals(tmp.getBytesLoaded(), undefined);
+check_equals(tmp.getBytesTotal(), undefined);
 
 if (tmp.getBytesLoaded() == tmp.getBytesTotal()) {
     pass("bytes count are the same");



From MAILER-DAEMON Wed Apr 04 05:25:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ1ka-0000MR-IH
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 05:25:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ1kY-0000M5-Ra
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:25:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ1kX-0000Ll-Sk
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:25:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ1kX-0000LY-Ie
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:25:53 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ1hI-0006ck-4O
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:22:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ1hH-0004je-6E
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:22:31 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ1hG-0004jb-Th
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:22:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ1hG-0004jb-Th@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 09:22:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/arra...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 09:25:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 09:22:30

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: array.as 

Log message:
	* testsuite/actionscript.all/array.as: more tests added.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2775&r2=1.2776
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2775
retrieving revision 1.2776
diff -u -b -r1.2775 -r1.2776
--- ChangeLog	4 Apr 2007 09:02:10 -0000	1.2775
+++ ChangeLog	4 Apr 2007 09:22:30 -0000	1.2776
@@ -1,5 +1,6 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/array.as: more tests added.
 	* server/asobj/xml.cpp: remove debugging lines, return undefined
 	  from getBytesLoaded,getBytesTotal if the XML was not loaded.
 	* server/asobj/xmlnode.cpp: remove debugging lines.

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/actionscript.all/array.as	28 Mar 2007 14:58:30 -0000	1.15
+++ testsuite/actionscript.all/array.as	4 Apr 2007 09:22:30 -0000	1.16
@@ -5,15 +5,51 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.15 2007/03/28 14:58:30 strk Exp $";
+rcsid="$Id: array.as,v 1.16 2007/04/04 09:22:30 strk Exp $";
 
 #include "check.as"
 
+check_equals(typeof(Array), 'function');
+check_equals(typeof(Array.prototype), 'object');
+check_equals(typeof(Array.prototype.concat), 'function');
+check_equals(typeof(Array.prototype.join), 'function');
+check_equals(typeof(Array.prototype.pop), 'function');
+
+check_equals(typeof(Array.prototype.push), 'function');
+check_equals(typeof(Array.prototype.reverse), 'function');
+check_equals(typeof(Array.prototype.shift), 'function');
+check_equals(typeof(Array.prototype.slice), 'function');
+check_equals(typeof(Array.prototype.sort), 'function');
+check_equals(typeof(Array.prototype.sortOn), 'function');
+check_equals(typeof(Array.prototype.splice), 'function');
+check_equals(typeof(Array.prototype.unshift), 'function');
+check_equals(typeof(Array.prototype.toString), 'function');
+check_equals(typeof(Array.prototype.length), 'undefined');
+#if OUTPUT_VERSION >= 6
+check(Array.prototype.hasOwnProperty('concat'));
+check(Array.prototype.hasOwnProperty('join'));
+check(Array.prototype.hasOwnProperty('pop'));
+check(Array.prototype.hasOwnProperty('push'));
+check(Array.prototype.hasOwnProperty('reverse'));
+check(Array.prototype.hasOwnProperty('shift'));
+check(Array.prototype.hasOwnProperty('slice'));
+check(Array.prototype.hasOwnProperty('sort'));
+check(Array.prototype.hasOwnProperty('sortOn'));
+check(Array.prototype.hasOwnProperty('splice'));
+check(Array.prototype.hasOwnProperty('unshift'));
+check(Array.prototype.hasOwnProperty('toString'));
+check(!Array.prototype.hasOwnProperty('length'));
+#endif // OUTPUT_VERSION >= 6
+
 var a;
 var popped;
 a=[551,"asdf",12];
 
 check (a instanceOf Array);
+check_equals(a.length, 3);
+#if OUTPUT_VERSION >= 6
+xcheck(a.hasOwnProperty('length'));
+#endif
 
 b=[];
 b.push(551,"asdf",12);
@@ -254,6 +290,9 @@
 check_equals(c[8], undefined);
 
 // $Log: array.as,v $
+// Revision 1.16  2007/04/04 09:22:30  strk
+// * testsuite/actionscript.all/array.as: more tests added.
+//
 // Revision 1.15  2007/03/28 14:58:30  strk
 //         * server/array.{cpp,h}: implement Array.splice(),
 //           improve toString to actually call the user-provided



From MAILER-DAEMON Wed Apr 04 05:32:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ1qa-0002np-Cf
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 05:32:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ1qY-0002nj-4z
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:32:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ1qW-0002nX-L9
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:32:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ1qW-0002nU-Ck
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:32:04 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HZ1nG-0007Gd-W6
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:28:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ1nG-0004so-Gb
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:28:42 +0000
Received: from zoulunkai by savannah.gnu.org with local (Exim 4.50)
	id 1HZ1nG-0004sl-6n
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:28:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ1nG-0004sl-6n@savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 04 Apr 2007 09:28:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/reverse...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 09:32:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/04 09:28:42

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: reverse_execute_PlaceObject2_test1.c 

Log message:
	ensure total() is called at the last step

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2776&r2=1.2777
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2776
retrieving revision 1.2777
diff -u -b -r1.2776 -r1.2777
--- ChangeLog	4 Apr 2007 09:22:30 -0000	1.2776
+++ ChangeLog	4 Apr 2007 09:28:41 -0000	1.2777
@@ -1,3 +1,8 @@
+2007-04-04 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c
+	ensure that total() is called at the last step.
+	
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/array.as: more tests added.
@@ -23,7 +28,7 @@
 	* server/URLAccessManager.{cpp,h}: add allowHost interface.
 	* server/asobj/xmlsocket.cpp (connect): check host security.
 
-2007-04-03 Zou Lunkai <zoulunkai@gmail.com>
+2007-04-04 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/sprite_instance.cpp
 	first attempt to deprecate reverse execution of frame tags

Index: testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c	30 Mar 2007 07:59:21 -0000	1.1
+++ testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c	4 Apr 2007 09:28:42 -0000	1.2
@@ -34,7 +34,7 @@
 #include "ming_utils.h"
 
 #define OUTPUT_VERSION 6
-#define OUTPUT_FILENAME "reverse_execute_PlaceObject2_test1.swf"
+#define OUTPUT_FILENAME "reverse_execute_PLACEOBJECT2_test1.swf"
 
 
 int
@@ -85,10 +85,13 @@
   SWFMovie_nextFrame(mo); /* 4th frame */
 
   SWFDisplayItem_remove(it);
-  add_actions(mo, " gotoAndPlay(3); ");
-  add_actions(mo, " _root.totals(); stop(); ");
+  add_actions(mo, " if(stopflag != 1)  gotoAndPlay(3);  stopflag = 1; ");
   SWFMovie_nextFrame(mo); /* 5th frame */
 
+	//checks 
+	add_actions(mo, " _root.totals(); stop(); ");
+	SWFMovie_nextFrame(mo); /* 6th frame */
+	
   //Output movie
   puts("Saving " OUTPUT_FILENAME );
   SWFMovie_save(mo, OUTPUT_FILENAME);



From MAILER-DAEMON Wed Apr 04 05:35:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ1tm-00049X-89
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 05:35:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ1tk-000496-KJ
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:35:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ1tj-00048s-Gs
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:35:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ1tj-00048b-8v
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:35:23 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HZ1qT-0007iu-Sw
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:32:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ1qS-0005PU-TQ
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:32:00 +0000
Received: from zoulunkai by savannah.gnu.org with local (Exim 4.50)
	id 1HZ1qS-0005PO-PI
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:32:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ1qS-0005PO-PI@savannah.gnu.org>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 04 Apr 2007 09:32:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all reverse_execute_P...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 09:35:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/04 09:32:00

Modified files:
	testsuite/misc-ming.all: reverse_execute_PlaceObject2_test1.c 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: reverse_execute_PlaceObject2_test1.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- reverse_execute_PlaceObject2_test1.c	4 Apr 2007 09:28:42 -0000	1.2
+++ reverse_execute_PlaceObject2_test1.c	4 Apr 2007 09:32:00 -0000	1.3
@@ -34,7 +34,7 @@
 #include "ming_utils.h"
 
 #define OUTPUT_VERSION 6
-#define OUTPUT_FILENAME "reverse_execute_PLACEOBJECT2_test1.swf"
+#define OUTPUT_FILENAME "reverse_execute_PlaceObject2_test1.swf"
 
 
 int



From MAILER-DAEMON Wed Apr 04 05:53:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ2Av-0001Wu-KE
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 05:53:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ2Au-0001Wk-DN
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:53:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ2As-0001WL-Kp
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:53:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ2As-0001WI-EJ
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:53:06 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ27c-0001G8-PW
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 05:49:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ27b-0006pJ-FQ
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:49:43 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ27b-0006pG-8G
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 09:49:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ27b-0006pG-8G@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 09:49:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/array.cpp testsuite/actionscript.a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 09:53:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 09:49:43

Modified files:
	server         : array.cpp 
	testsuite/actionscript.all: array.as 

Log message:
	        * server/array.cpp: use a getter/setter for the 'length' property.
	        * testsuite/actionscript.all/array.as: another success.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/array.cpp	28 Mar 2007 14:58:30 -0000	1.55
+++ server/array.cpp	4 Apr 2007 09:49:43 -0000	1.56
@@ -47,6 +47,8 @@
 namespace gnash {
 
 static as_object* getArrayInterface();
+static void attachArrayProperties(as_object& proto);
+static void attachArrayInterface(as_object& proto);
 
 // Default as_value strict weak comparator (string based)
 class AsValueLessThen
@@ -144,6 +146,7 @@
 	elements(0)
 {
     //log_action("%s : %p\n", __FUNCTION__, (void*)this);
+	attachArrayProperties(*this);
 }
 
 as_array_object::as_array_object(const as_array_object& other)
@@ -362,12 +365,6 @@
 bool
 as_array_object::get_member(const std::string& name, as_value *val)
 {
-	if ( name == "length" ) 
-	{
-		val->set_double((double)size());
-		return true;
-	}
-
 	// an index has been requested
 	int index = index_requested(name);
 	if ( index >= 0 && (unsigned int)index < elements.size() )
@@ -390,13 +387,6 @@
 as_array_object::set_member(const std::string& name,
 		const as_value& val )
 {
-	if ( name == "length" ) 
-	{
-		//log_warning("Attempt to assign to Array.length - ignored");
-		resize(unsigned(val.to_number()));
-		return;
-	}
-
 	int index = index_requested(name);
 
 	// if we were sent a valid array index and not a normal member
@@ -824,6 +814,22 @@
 
 }
 
+static as_value
+array_length(const fn_call& fn)
+{
+	boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
+
+	if ( fn.nargs ) // setter
+	{
+		array->resize(unsigned(fn.arg(0).to_number(&(fn.env()))));
+		return as_value();
+	}
+	else // getter
+	{
+		return as_value(array->size());
+	}
+}
+
 as_value
 array_new(const fn_call& fn)
 {
@@ -831,8 +837,7 @@
 		log_action("array_new called, nargs = %d", fn.nargs);
 	);
 
-	//boost::intrusive_ptr<as_array_object>	ao = new as_array_object;
-	as_array_object* ao = new as_array_object;
+	boost::intrusive_ptr<as_array_object>	ao = new as_array_object;
 
 	if (fn.nargs == 0)
 	{
@@ -862,20 +867,25 @@
 	}
 
 	IF_VERBOSE_ACTION (
-		log_action("array_new setting object %p in result", (void*)ao);
+		log_action("array_new setting object %p in result", (void*)ao.get());
 	);
 
-	//return as_value(ao.get());
-	return as_value(ao);
+	return as_value(ao.get());
+	//return as_value(ao);
+}
+
+static void
+attachArrayProperties(as_object& proto)
+{
+	boost::intrusive_ptr<builtin_function> gettersetter;
+
+	gettersetter = new builtin_function(&array_length, NULL);
+	proto.init_property("length", *gettersetter, *gettersetter);
 }
 
 static void
 attachArrayInterface(as_object& proto)
 {
-	// we don't need an explicit member here,
-	// we will be handling 'length' requests
-	// within overridden get_member()
-	//proto->init_member("length", &array_length);
 
 	proto.init_member("join", new builtin_function(array_join));
 	proto.init_member("concat", new builtin_function(array_concat));

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/actionscript.all/array.as	4 Apr 2007 09:22:30 -0000	1.16
+++ testsuite/actionscript.all/array.as	4 Apr 2007 09:49:43 -0000	1.17
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.16 2007/04/04 09:22:30 strk Exp $";
+rcsid="$Id: array.as,v 1.17 2007/04/04 09:49:43 strk Exp $";
 
 #include "check.as"
 
@@ -48,7 +48,7 @@
 check (a instanceOf Array);
 check_equals(a.length, 3);
 #if OUTPUT_VERSION >= 6
-xcheck(a.hasOwnProperty('length'));
+check(a.hasOwnProperty('length'));
 #endif
 
 b=[];
@@ -290,6 +290,11 @@
 check_equals(c[8], undefined);
 
 // $Log: array.as,v $
+// Revision 1.17  2007/04/04 09:49:43  strk
+//
+//         * server/array.cpp: use a getter/setter for the 'length' property.
+//         * testsuite/actionscript.all/array.as: another success.
+//
 // Revision 1.16  2007/04/04 09:22:30  strk
 // * testsuite/actionscript.all/array.as: more tests added.
 //



From MAILER-DAEMON Wed Apr 04 06:05:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ2Mq-0006oN-Dw
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 06:05:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ2Mo-0006kt-Mg
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:05:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ2Mo-0006kT-3M
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:05:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ2Mn-0006kQ-VL
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:05:26 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ2JY-0002ro-5m
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:02:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ2JX-000756-93
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:02:03 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ2JW-000753-U6
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:02:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ2JW-000753-U6@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 10:02:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 10:05:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 10:02:02

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/misc-ming.all/Makefile.am: enable
	          reverse_execute_PlaceObject2_test1runner in 'check' rule.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2777&r2=1.2778
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2777
retrieving revision 1.2778
diff -u -b -r1.2777 -r1.2778
--- ChangeLog	4 Apr 2007 09:28:41 -0000	1.2777
+++ ChangeLog	4 Apr 2007 10:02:02 -0000	1.2778
@@ -1,3 +1,10 @@
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/Makefile.am: enable
+	  reverse_execute_PlaceObject2_test1runner in 'check' rule.
+	* server/array.cpp: use a getter/setter for the 'length' property.
+	* testsuite/actionscript.all/array.as: another success.
+
 2007-04-04 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- testsuite/misc-ming.all/Makefile.am	30 Mar 2007 08:31:04 -0000	1.86
+++ testsuite/misc-ming.all/Makefile.am	4 Apr 2007 10:02:02 -0000	1.87
@@ -839,6 +839,7 @@
 	action_execution_order_test3runner \
 	action_execution_order_test4runner \
 	action_execution_order_test5runner \
+	reverse_execute_PlaceObject2_test1runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS



From MAILER-DAEMON Wed Apr 04 06:36:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ2qY-0002Xu-4E
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 06:36:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ2qW-0002Xp-3h
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:36:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ2qU-0002Xa-Bb
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:36:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ2qU-0002XV-4o
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:36:06 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ2nE-0006Lt-7u
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 06:32:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ2nD-0000GL-Gh
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:32:43 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ2nD-0000GC-44
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:32:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ2nD-0000GC-44@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 10:32:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/array.cpp server/array.h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 10:36:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 10:32:42

Modified files:
	.              : ChangeLog 
	server         : array.cpp array.h 
	server/asobj   : xmlnode.cpp xml.cpp 

Log message:
	        * server/array.{cpp,h}: const-corrected push and unshift
	          methods.
	        * server/asobj/xmlnode.cpp: implement childNodes getter/setter.
	        * server/asobj/xml.cpp: cleanups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2778&r2=1.2779
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2778
retrieving revision 1.2779
diff -u -b -r1.2778 -r1.2779
--- ChangeLog	4 Apr 2007 10:02:02 -0000	1.2778
+++ ChangeLog	4 Apr 2007 10:32:42 -0000	1.2779
@@ -1,5 +1,12 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* server/array.{cpp,h}: const-corrected push and unshift
+	  methods.
+	* server/asobj/xmlnode.cpp: implement childNodes getter/setter.
+	* server/asobj/xml.cpp: cleanups.
+
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/Makefile.am: enable
 	  reverse_execute_PlaceObject2_test1runner in 'check' rule.
 	* server/array.cpp: use a getter/setter for the 'length' property.

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/array.cpp	4 Apr 2007 09:49:43 -0000	1.56
+++ server/array.cpp	4 Apr 2007 10:32:42 -0000	1.57
@@ -176,13 +176,13 @@
 }
 
 void
-as_array_object::push(as_value& val)
+as_array_object::push(const as_value& val)
 {
 	elements.push_back(val);
 }
 
 void
-as_array_object::unshift(as_value& val)
+as_array_object::unshift(const as_value& val)
 {
 	elements.push_front(val);
 }

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/array.h	28 Mar 2007 14:58:30 -0000	1.23
+++ server/array.h	4 Apr 2007 10:32:42 -0000	1.24
@@ -68,9 +68,9 @@
 
 	as_array_object(const as_array_object& other);
 
-	void push(as_value& val);
+	void push(const as_value& val);
 
-	void unshift(as_value& val);
+	void unshift(const as_value& val);
 
 	as_value shift();
 

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/xmlnode.cpp	4 Apr 2007 09:02:10 -0000	1.23
+++ server/asobj/xmlnode.cpp	4 Apr 2007 10:32:42 -0000	1.24
@@ -14,38 +14,37 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.23 2007/04/04 09:02:10 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.24 2007/04/04 10:32:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <vector>
 #include "log.h"
 #include "tu_config.h"
 #include "fn_call.h"
 #include "builtin_function.h"
-
-//#define DEBUG_MEMORY_ALLOCATION 1
-
+#include "array.h" // for childNodes
 #include "xmlnode.h"
-
-#ifdef DEBUG_MEMORY_ALLOCATION
 #include "log.h"
-#endif
 
-#include <unistd.h>
 #include <string>
 #include <sstream>
+#include <vector>
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include <libxml/xmlmemory.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xmlreader.h>
 
+
 using namespace std;
 
+//#define DEBUG_MEMORY_ALLOCATION 1
+
 namespace gnash {
 
 static as_value xmlnode_new(const fn_call& fn);
@@ -63,6 +62,7 @@
 static as_value xmlnode_lastchild(const fn_call& fn);
 static as_value xmlnode_nextsibling(const fn_call& fn);
 static as_value xmlnode_previoussibling(const fn_call& fn);
+static as_value xmlnode_childNodes(const fn_call& fn);
 as_object* getXMLNodeInterface();
 
 static LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
@@ -414,7 +414,8 @@
     o.init_property("attributes", *gettersetter, *gettersetter);
 
     // These two return an array of objects
-    o.init_member("childNodes", as_value(""));
+    gettersetter = new builtin_function(xmlnode_childNodes, NULL);
+    o.init_property("childNodes", *gettersetter, *gettersetter);
 
     /// \fn MLNode::firstChild
     /// \brief XMLNode::firstChild property
@@ -786,6 +787,35 @@
     return rv;
 }
 
+// Both a getter and a (do-nothing) setter for childNodes
+static as_value
+xmlnode_childNodes(const fn_call& fn)
+{
+//    GNASH_REPORT_FUNCTION;
+    boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
+    boost::intrusive_ptr<as_array_object> ary = new as_array_object();
+
+    if ( fn.nargs )  // setter
+    {
+        IF_VERBOSE_ASCODING_ERRORS(
+	    log_aserror("Tried to set read-only property XMLNode.childNodes");
+	    );
+        return as_value();
+    }
+
+    typedef XMLNode::ChildList ChildList;
+
+    ChildList& child = ptr->childNodes();
+    for ( ChildList::const_iterator it=child.begin(), itEnd=child.end();
+                    it != itEnd; ++it )
+    {
+            boost::intrusive_ptr<XMLNode> node = *it;
+            ary->push(as_value(node.get()));
+    }
+
+    return as_value(ary.get());
+}
+
 // extern (used by Global.cpp)
 void xmlnode_class_init(as_object& global)
 {

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/asobj/xml.cpp	4 Apr 2007 09:02:10 -0000	1.31
+++ server/asobj/xml.cpp	4 Apr 2007 10:32:42 -0000	1.32
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.31 2007/04/04 09:02:10 strk Exp $ */
+/* $Id: xml.cpp,v 1.32 2007/04/04 10:32:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -395,83 +395,6 @@
     GNASH_REPORT_FUNCTION;
 }
 
-#if 0
-void
-XML::setupFrame(as_object *obj, XMLNode *xml, bool mem)
-{
-//    GNASH_REPORT_FUNCTION;
-    
-    int		 child;
-    unsigned int i;
-    const char    *nodename;
-    //const char    *nodevalue;
-    //AS_value      nodevalue;
-    int           length;
-    XMLNode       *childnode;
-    XMLNode *xmlchildnode_obj;
-    xmlattr_as_object* attr_obj;
-
-    //log_msg("\t%s: processing node %s for object %p, mem is %d\n", __FUNCTION__, xml->_name, obj, mem);
-  
-    // Get the data for this node
-    nodename   = xml->_name;
-    length     = xml->length();
-
-    // Set these members in the top level object passed in. This are used
-    // primarily by the disk based XML parser, where at least in all my current
-    // test cases this is referenced with firstChild first, then nodeName and
-    // childNodes.
-    //obj->set_member("nodeName", nodename); // use the getter/setter !
-    obj->set_member("length", length); // FIXME: use a getter/setter !
-
-    // Process the attributes, if any
-    if (xml->_attributes.size() == 0)
-    {
-        //log_msg("\t\tNo attributes for node %s, created empty object at %p\n", nodename, attr_obj);
-    }
-    else
-    {
-        attr_obj = new xmlattr_as_object;
-        for (i=0; i<xml->_attributes.size(); i++) {
-            attr_obj->set_member(xml->_attributes[i]->_name, xml->_attributes[i]->_value);
-        }
-        obj->set_member("attributes", attr_obj);
-    }
-
-    //xml->_attributes.resize(0);
-    //obj->set_member("attributes", attr_obj);
-
-    // Process the children, if there are any
-    if (length)
-    {
-        //log_msg("\tProcessing %d children nodes for %s\n", length, nodename);
-        int inum;
-        inum = 0;
-        for (child=0; child<length; child++) {
-            // Create a new AS object for this node's children
-            xmlchildnode_obj = new XMLNode;
-            // When parsing XML from memory, the test movies I have expect the firstChild
-            // to be the first element of the array instead.
-            if (mem) {
-                childnode = xml;
-            } else {
-                childnode = xml->_children[child];
-            }
-            setupFrame(xmlchildnode_obj, childnode, false); // setup child node
-
-            obj->set_member(boost::lexical_cast<std::string>(inum), xmlchildnode_obj);
-            ++inum;
-        }
-    }
-    else
-    {
-        //log_msg("\tNode %s has no children\n", nodename);
-    }  
-
-}
-#endif
-
-
 /// \brief add or change the HTTP Request header
 ///
 /// Method; adds or changes HTTP request headers (such as Content-Type
@@ -742,18 +665,14 @@
 as_value xml_parsexml(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    const char *text;
     as_value	method;
     as_value	val;    
     boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
 
     if (fn.nargs > 0)
     {
-        text = fn.arg(0).to_string(); 
-	    if (ptr->parseXML(text))
-        {
-	        //ptr->setupFrame(ptr.get(), ptr->firstChild().get(), false);
-	    }
+        std::string text = fn.arg(0).to_std_string(&(fn.env()));
+        ptr->parseXML(text);
     }
     
     return as_value();



From MAILER-DAEMON Wed Apr 04 10:24:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ6PP-000336-09
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 10:24:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ6PN-000331-0X
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:24:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ6PL-00032p-8L
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:24:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ6PL-00032m-3T
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:24:19 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ6M4-00017L-7t
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:20:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ6M3-0004WC-09
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 14:20:55 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ6M2-0004W9-Pz
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 14:20:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ6M2-0004W9-Pz@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 14:20:54 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/asobj xmlsocket.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 14:24:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 14:20:54

Modified files:
	server/asobj   : xmlsocket.cpp 

Log message:
	some indenting

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20



From MAILER-DAEMON Wed Apr 04 10:25:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ6Qc-0003wW-Cv
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 10:25:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ6Qa-0003vo-CY
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:25:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ6QZ-0003vQ-Fj
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:25:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ6QZ-0003vM-AV
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:25:35 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ6NI-0001HR-82
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:22:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ6NH-0004ZN-U9
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 14:22:12 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ6NH-0004ZK-Lg
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 14:22:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ6NH-0004ZK-Lg@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 14:22:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 14:25:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 14:22:11

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xml.h xmlnode.cpp 
	testsuite/actionscript.all: XML.as XMLNode.as 

Log message:
	        * server/asobj/xmlnode.cpp: don't attacy XMLNode interface
	          to XMLNode instances.
	        * server/asobj/xml.{h,cpp}: override get_member and set_member
	          to handled non-proper properties 'loaded' and 'status'
	        * testsuite/actionscript.all/XMLNode.as: less failures
	        * testsuite/actionscript.all/XML.as: more tests !

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2779&r2=1.2780
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XMLNode.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2779
retrieving revision 1.2780
diff -u -b -r1.2779 -r1.2780
--- ChangeLog	4 Apr 2007 10:32:42 -0000	1.2779
+++ ChangeLog	4 Apr 2007 14:22:11 -0000	1.2780
@@ -1,5 +1,14 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xmlnode.cpp: don't attacy XMLNode interface
+	  to XMLNode instances.
+	* server/asobj/xml.{h,cpp}: override get_member and set_member
+	  to handled non-proper properties 'loaded' and 'status'
+	* testsuite/actionscript.all/XMLNode.as: less failures
+	* testsuite/actionscript.all/XML.as: more tests !
+
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
 	* server/array.{cpp,h}: const-corrected push and unshift
 	  methods.
 	* server/asobj/xmlnode.cpp: implement childNodes getter/setter.

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/xml.cpp	4 Apr 2007 10:32:42 -0000	1.32
+++ server/asobj/xml.cpp	4 Apr 2007 14:22:11 -0000	1.33
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.32 2007/04/04 10:32:42 strk Exp $ */
+/* $Id: xml.cpp,v 1.33 2007/04/04 14:22:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -58,6 +58,8 @@
 //#define DEBUG_MEMORY_ALLOCATION 1
 
 static as_object* getXMLInterface();
+static void attachXMLInterface(as_object& o);
+static void attachXMLProperties(as_object& o);
 
 // Callback functions for xmlReadIO
 static int closeTuFile (void * context);
@@ -74,9 +76,6 @@
 static as_value xml_send(const fn_call& fn);
 static as_value xml_sendandload(const fn_call& fn);
 
-// These are the event handlers called for this object
-static as_value xml_loaded(const fn_call& fn);
-
 static LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 #ifdef USE_DEBUGGER
 static Debugger& debugger = Debugger::getDefaultInstance();
@@ -85,15 +84,17 @@
 XML::XML() 
     :
     XMLNode(getXMLInterface()),
-    _loaded(false), 
+    _loaded(-1), 
     _bytes_loaded(0),
-    _bytes_total(0)
+    _bytes_total(0),
+    _status(sOK)
 {
     //GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("Creating XML data at %p \n", this);
 #endif
     //log_msg("%s: %p \n", __FUNCTION__, this);
+    attachXMLProperties(*this);
 }
 
 
@@ -101,9 +102,10 @@
 XML::XML(const std::string& xml_in)
     :
     XMLNode(getXMLInterface()),
-    _loaded(false), 
+    _loaded(-1), 
     _bytes_loaded(0),
-    _bytes_total(0)
+    _bytes_total(0),
+    _status(sOK)
 {
     //GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
@@ -115,9 +117,10 @@
 XML::XML(struct node * /* childNode */)
     :
     XMLNode(getXMLInterface()),
-    _loaded(false), 
+    _loaded(-1), 
     _bytes_loaded(0),
-    _bytes_total(0)
+    _bytes_total(0),
+    _status(sOK)
 {
     GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
@@ -126,6 +129,39 @@
     //log_msg("%s: %p \n", __FUNCTION__, this);
 }
 
+bool
+XML::get_member(const std::string& name, as_value *val)
+{
+        if ( name == "status" ) 
+        {
+                val->set_int(_status);
+                return true;
+        }
+        else if ( name == "loaded" )
+        {
+                if ( _loaded < 0 ) val->set_undefined();
+                else val->set_bool(_loaded);
+                return true;
+        }
+
+        return get_member_default(name, val);
+}
+
+void
+XML::set_member(const std::string& name, const as_value& val)
+{
+        if ( name == "status" ) return;
+        else if ( name == "loaded" )
+        {
+                bool b = val.to_bool();
+		log_msg("set_member 'loaded' (%s) became boolean %d", val.to_debug_string().c_str(), b);
+                if ( b ) _loaded = 1;
+                else _loaded = 0;
+                return;
+        }
+
+        set_member_default(name, val);
+}
 
 XML::~XML()
 {
@@ -356,13 +392,18 @@
 
     log_msg("Load XML file from url: %s", url.str().c_str());
 
-    xmlInitParser();
+    initParser();
 
-    _doc = xmlReadIO(readFromTuFile, closeTuFile, str.get(), url.str().c_str(), NULL, 0);
+    /// see: http://xmlsoft.org/html/libxml-parser.html#xmlParserOption
+    int options = XML_PARSE_RECOVER | XML_PARSE_NOWARNING | XML_PARSE_NOERROR;
+    _doc = xmlReadIO(readFromTuFile, closeTuFile, str.get(), url.str().c_str(), NULL, options);
     _bytes_total = str->get_size();
 
-    if (_doc == 0) {
-        log_error("Can't read XML file (IO): %s!", url.str().c_str());
+    if (_doc == 0)
+    {
+        xmlErrorPtr err = xmlGetLastError();
+        log_error("Can't read XML file %s (%s)!", url.str().c_str(), err->message);
+        _loaded = 0;
         onLoadEvent(false);
         return false;
     }
@@ -373,7 +414,7 @@
     xmlCleanupParser();
     xmlFreeDoc(_doc);
     xmlMemoryDump();
-    _loaded = true;
+    _loaded = 1;
 
     onLoadEvent(true);
 
@@ -470,12 +511,17 @@
     return rv;
 }
 
-void
-attachXMLInterface(as_object& o)
+static void
+attachXMLProperties(as_object& /*o*/)
 {
-    // FIXME: this doesn't appear to exist in the MM player, should it ?
-    o.init_member("loaded", new builtin_function(xml_loaded));
+    // if we use a proper member here hasOwnProperty() would return true
+    // but we want it to return false instead. See XML.as
+    //o.init_member("status", as_value(XML::sOK));
+}
 	
+static void
+attachXMLInterface(as_object& o)
+{
     o.init_member("addRequestHeader", new builtin_function(xml_addrequestheader));
     o.init_member("createElement", new builtin_function(xml_createelement));
     o.init_member("createTextNode", new builtin_function(xml_createtextnode));
@@ -548,25 +594,6 @@
 // of the class.
 //
 
-// determines whether the document-loading process initiated by the XML.load()
-// call has completed. If the process completes successfully, the method
-// returns true; otherwise, it returns false.
-as_value
-xml_loaded(const fn_call& fn)
-{
-    GNASH_REPORT_FUNCTION;
-    as_value	method;
-    as_value	val;
-
-    log_msg("%s:\n", __FUNCTION__);
-    
-    boost::intrusive_ptr<XML> ptr = ensureType<XML>(fn.this_ptr);
-    std::string filespec = fn.arg(0).to_string();
-    //fn.result->set(ptr->loaded());
-    return as_value(ptr->loaded());
-}
-
-
 as_value xml_addrequestheader(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
@@ -715,11 +742,9 @@
     // This is going to be the global XML "class"/"function"
     static boost::intrusive_ptr<builtin_function> cl;
 
-    if ( cl == NULL ) {
+    if ( cl == NULL )
+    {
 	cl=new builtin_function(&xml_new, getXMLInterface());
-	// replicate all interface to class, to be able to access
-	// all methods as static functions
-	attachXMLInterface(*cl);
     }
     
     // Register _global.String
@@ -747,6 +772,38 @@
         return 0; // no error
 }
 
+#if 0 // not time for this (yet)
+static
+void _xmlErrorHandler(void* ctx, const char* fmt, ...)
+{
+    va_list ap;
+    static const unsigned long BUFFER_SIZE = 128;
+    char tmp[BUFFER_SIZE];
+
+    va_start (ap, fmt);
+    vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
+    tmp[BUFFER_SIZE-1] = '\0';
+
+    log_warning("XML parser: %s", tmp);
+    
+    va_end (ap);    
+}
+#endif // disabled
+
+void
+XML::initParser()
+{
+    static bool initialized = false;
+    if ( ! initialized )
+    {
+        xmlInitParser();
+        //xmlGenericErrorFunc func = _xmlErrorHandler;
+        //initGenericErrorDefaultFunc(&func);
+        initialized = true;
+    }
+}
+
+
 } // end of gnash namespace
 
 // Local Variables:

Index: server/asobj/xml.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/xml.h	4 Apr 2007 07:53:28 -0000	1.12
+++ server/asobj/xml.h	4 Apr 2007 14:22:11 -0000	1.13
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -54,11 +54,58 @@
 {
 public:
 
+    typedef enum {
+
+            /// Parsing was successful
+            sOK = 0,
+
+            /// Unterminated CDATA section
+            sECDATA = -2,
+
+            /// Unterminated XML declaration
+            sEXMLDECL = -3,
+
+            /// Unterminated DOCTYPE declaration
+            sEDOCTYPEDECL = -4,
+
+            /// Unterminated comment
+            sECOMM = -5,
+
+            /// Malformed XML element structure
+            sESTRUCT = -6,
+
+            /// Out of memory
+            sEMEM = -7,
+
+            /// Unterminated attribute value
+            sEATTR = -8,
+
+            /// Missing close tag (orphaned open tag)
+            sEOPENTAG = -9,
+
+            /// Missing start tag (orphaned close tag)
+            sECLOSETAG = -10
+
+    } Status;
+
+
     XML();
     XML(const std::string& xml_in);
     XML(struct node * childNode);
     virtual ~XML();
   
+    /// This is overridden to provide the 'status' and 'loaded' members,
+    /// which are NOT proper properties !
+    /// See actionscript.all/XML.as
+    ///
+    bool get_member(const std::string& name, as_value *val);
+
+    /// This is overridden to provide the 'status' and 'loaded' members,
+    /// which are NOT proper properties !
+    /// See actionscript.all/XML.as
+    ///
+	void set_member(const std::string& name, const as_value& val );
+
     // Methods
     // This is the base method used by both parseXML() and load().
     bool parseDoc(xmlDocPtr document, bool mem);
@@ -111,14 +158,16 @@
     xmlDocPtr _doc;
     xmlNodePtr _firstChild;
     
-    // Properties
-    bool _loaded;
+    // -1 if never asked to load anything
+    //  0 if asked to load but not yet loaded (or failure)
+    //  1 if successfully loaded
+    int _loaded;
 
     size_t      _bytes_loaded;
  
     size_t      _bytes_total;
     
-    bool        _status;	// TODO Should be Number
+    Status      _status;	
 
     /// Trigger the onLoad event, if any
     void onLoadEvent(bool success);
@@ -135,7 +184,12 @@
 
     void setupFrame(gnash::as_object *xml, XMLNode *data, bool src);
   
+private:
+
+    /// Initialize the libxml2 parser
+    void initParser();
 
+    //static void _xmlErrorHandler(void *ctx, const char* fmt, ...);
 };
 
 

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/xmlnode.cpp	4 Apr 2007 10:32:42 -0000	1.24
+++ server/asobj/xmlnode.cpp	4 Apr 2007 14:22:11 -0000	1.25
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.24 2007/04/04 10:32:42 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.25 2007/04/04 14:22:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -823,11 +823,9 @@
     // This is going to be the global XMLNode "class"/"function"
     static boost::intrusive_ptr<builtin_function> cl;
 
-    if ( cl == NULL ) {
+    if ( cl == NULL )
+    {
 	cl=new builtin_function(&xmlnode_new, getXMLNodeInterface());
-	// replicate all interface to class, to be able to access
-	// all methods as static functions
-	attachXMLNodeInterface(*cl);	     
     }
 
     // Register _global.String

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/actionscript.all/XML.as	4 Apr 2007 09:02:10 -0000	1.21
+++ testsuite/actionscript.all/XML.as	4 Apr 2007 14:22:11 -0000	1.22
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.21 2007/04/04 09:02:10 strk Exp $";
+rcsid="$Id: XML.as,v 1.22 2007/04/04 14:22:11 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -38,6 +38,8 @@
 check(! XML.prototype.hasOwnProperty("cloneNode") );
 check(! XML.prototype.hasOwnProperty("toString") );
 check(! XML.prototype.hasOwnProperty("length") );
+check(! XML.prototype.hasOwnProperty("status"));
+check(! XML.prototype.hasOwnProperty("loaded"));
 check(XML.prototype.hasOwnProperty("createElement") );
 check(XML.prototype.hasOwnProperty("addRequestHeader") );
 check(XML.prototype.hasOwnProperty("createTextNode") );
@@ -48,6 +50,16 @@
 check(XML.prototype.hasOwnProperty("send") );
 check(XML.prototype.hasOwnProperty("sendAndLoad") );
 
+check(!XML.hasOwnProperty("createElement") );
+check(!XML.hasOwnProperty("addRequestHeader") );
+check(!XML.hasOwnProperty("createTextNode") );
+check(!XML.hasOwnProperty("getBytesLoaded") );
+check(!XML.hasOwnProperty("getBytesTotal") );
+check(!XML.hasOwnProperty("load") );
+check(!XML.hasOwnProperty("parseXML") );
+check(!XML.hasOwnProperty("send") );
+check(!XML.hasOwnProperty("sendAndLoad") );
+
 check(XMLNode.prototype.hasOwnProperty("appendChild") );
 check(XMLNode.prototype.hasOwnProperty("cloneNode") );
 check(XMLNode.prototype.hasOwnProperty("hasChildNodes") );
@@ -65,11 +77,37 @@
 check(! XMLNode.prototype.hasOwnProperty("parseXML") );
 check(! XMLNode.prototype.hasOwnProperty("send") );
 check(! XMLNode.prototype.hasOwnProperty("sendAndLoad") );
+check(! XMLNode.prototype.hasOwnProperty("status"));
+check(! XMLNode.prototype.hasOwnProperty("loaded"));
+
+check(! XMLNode.hasOwnProperty("appendChild") );
+check(! XMLNode.hasOwnProperty("cloneNode") );
+check(! XMLNode.hasOwnProperty("hasChildNodes") );
+check(! XMLNode.hasOwnProperty("insertBefore") );
+check(! XMLNode.hasOwnProperty("removeNode") );
+check(! XMLNode.hasOwnProperty("toString") );
+check(! XMLNode.hasOwnProperty("cloneNode") );
 #endif
 
 var tmp = new XML();
+check_equals(typeof(tmp.length), 'undefined');
 check(! tmp.hasOwnProperty("length"));
 
+check_equals(typeof(tmp.status), 'number');
+check(! tmp.hasOwnProperty("status"));
+
+check_equals(typeof(tmp.loaded), 'undefined');
+check(! tmp.hasOwnProperty("loaded"));
+
+tmp.loaded = 5;
+check_equals(typeof(tmp.loaded), 'boolean');
+check(tmp.loaded);
+tmp.loaded = 0;
+check_equals(typeof(tmp.loaded), 'boolean');
+check(!tmp.loaded);
+check(! tmp.hasOwnProperty("loaded"));
+
+
 // test the XML constuctor
 if (tmp) {
     pass("XML::XML() constructor");
@@ -198,19 +236,36 @@
 check(XML);
 
 check(XML);
-tmp.onLoad = function (success) {
-    if (success) {
-        with (tmp.firstChild) {
-            trace("FIXME: firstChild found: " + nodeName);
+tmp.checkParsed = function ()
+{
+	note("tmp.checkParsed called");
+	check(this.hasChildNodes());
+	check(this.childNodes instanceof Array);
+	check_equals(this.firstChild, this.lastChild);
+	check_equals(typeof(this.childNodes.length), 'number');
+	check_equals(this.childNodes.length, 1);
+	check_equals(this.childNodes[0], this.firstChild);
+	check_equals(this.childNodes[0], this.lastChild);
+#if OUTPUT_VERSION > 5
+	check(this.childNodes.hasOwnProperty('length'));
+	check(this.childNodes[0] === this.firstChild);
+	check(this.childNodes[0] === this.lastChild);
+#endif
+
+    // childNodes is a read-only property !
+    this.childNodes = 5;
+	check(this.childNodes instanceof Array);
+
+        with (this.firstChild) {
+            //trace("FIXME: firstChild found: " + nodeName);
             if (nodeName == 'TOPNODE') {
-                trace("FIXME: topnode found: "+ childNodes.length);
+                //trace("FIXME: topnode found: "+ childNodes.length);
                 childa = 0;
                 while (childa < childNodes.length) {
-                    trace("FIXME: children found");
+                    //trace("FIXME: children found");
                     check(childNodes[childa] != undefined);
                     with (childNodes[childa]) {
                         if (nodeName == 'SUBNODE1') {
-                            trace("FIXME: subnode1 found");
                             childb = 0;
                             while (childb < childNodes.length) {
                                 with (childNodes[childb]) {
@@ -235,15 +290,19 @@
                 }
             }
         }
-    }
 };
-check(XML);
 
 check_equals( typeof(tmp.parseXML), 'function');
+check(tmp.childNodes instanceOf Array);
+check_equals(tmp.childNodes.length, 0);
+
 // parseXML doesn't return anything
-tmp.parseXML(xml_in);
-check_equals(typeof(tmp.firstChild), 'object');
-note("Parsed XML: "+tmp.toString());
+ret = tmp.parseXML(xml_in);
+check_equals(typeof(ret), 'undefined');
+
+tmp.checkParsed(); // onLoad won't be called
+//note("Parsed XML: "+tmp.toString());
+check_equals(tmp.toString(), xml_in);
 check(XML.prototype instanceof XMLNode);
 check(tmp instanceof XML);
 check(tmp instanceof XMLNode);
@@ -365,14 +424,44 @@
 myxml.onLoad = function(success)
 {
 	note("myxml.onLoad("+success+") called");
+
+	check_equals(typeof(myxml.status), 'number');
+	check_equals(typeof(myxml.loaded), 'boolean');
+#if OUTPUT_VERSION >= 6
+	check(! myxml.hasOwnProperty('status'));
+	check(! myxml.hasOwnProperty('loaded'));
+#endif // OUTPUT_VERSION >= 6
+
 	if ( ! success )
 	{
 		note("No success loading gnash.xml");
+		check_equals(myxml.status, 0);
+		check(! myxml.loaded);
 		return;
 	}
 	note("gnash.xml successfully loaded");
 	note("myxml status is "+myxml.status);
-	note("myxml.toString(): "+myxml.toString());
+
+	check_equals(myxml.status, 0);
+	check(myxml.loaded);
+
+	// Check 'loaded' and 'status' to be "overridable"
+
+	var loaded_backup = myxml.loaded;
+	myxml.loaded = 'a string';
+	check_equals(typeof(myxml.loaded), 'boolean');
+	myxml.loaded = ! loaded_backup;
+	check(myxml.loaded != loaded_backup);
+	myxml.loaded = loaded_backup;
+
+	var status_backup = myxml.status;
+	myxml.status = 'a string';
+	check_equals(typeof(myxml.status), 'number');
+	xcheck(myxml.status != status_backup);
+	myxml.status = status_backup;
+
+
+	//note("myxml.toString(): "+myxml.toString());
 	check_equals(typeof(myxml.attributes), 'object');
 	xcheck(! myxml.attributes instanceof Object);
 	xcheck_equals(typeof(myxml.attributes.__proto__), 'undefined');
@@ -384,7 +473,27 @@
 	check_equals(topnode.nodeName, 'XML');
 	check_equals(topnode.attributes.attr1, 'attr1 value');
 };
-myxml.load( MEDIA(gnash.xml) );
+check_equals(typeof(myxml.status), 'number');
+#if OUTPUT_VERSION < 7
+xcheck_equals(typeof(myxml.STATUS), 'number');
+#endif // OUTPUT_VERSION < 7
+check_equals(typeof(myxml.__proto__.status), 'undefined');
+check_equals(typeof(myxml.loaded), 'undefined');
+#if OUTPUT_VERSION >= 6
+check(!myxml.hasOwnProperty('status'));
+check(!myxml.hasOwnProperty('loaded'));
+#endif // OUTPUT_VERSION >= 6
+ret = myxml.load( MEDIA(gnash.xml) );
+
+check_equals(typeof(myxml.loaded), 'boolean');
+#if OUTPUT_VERSION < 7
+xcheck_equals(typeof(myxml.LOADED), 'boolean');
+#endif // OUTPUT_VERSION < 7
+xcheck(! myxml.loaded ); // is really loaded in a background thread
+
+xcheck_equals(myxml.loaded, false ); // is really loaded in a background thread
+note("myxml.loaded = "+myxml.loaded);
+note("myxml.load() returned "+ret);
 
 // We're done
 //totals();

Index: testsuite/actionscript.all/XMLNode.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XMLNode.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/XMLNode.as	3 Apr 2007 12:34:43 -0000	1.10
+++ testsuite/actionscript.all/XMLNode.as	4 Apr 2007 14:22:11 -0000	1.11
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XMLNode.as,v 1.10 2007/04/03 12:34:43 strk Exp $";
+rcsid="$Id: XMLNode.as,v 1.11 2007/04/04 14:22:11 strk Exp $";
 
 #include "dejagnu.as"
 
@@ -79,7 +79,7 @@
 
 check_equals(node1.firstChild.nodeValue, "first text node");
 check_equals(typeof(node1.lastChild.nodeValue), 'null');
-xcheck_equals(node2.lastChild.toString(), "second text node"); 
+check_equals(node2.lastChild.toString(), "second text node"); 
 
 var node3 = doc.createElement("node3");
 var textnode3 = doc.createTextNode("third text node");



From MAILER-DAEMON Wed Apr 04 10:37:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ6bb-0000rN-Rs
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 10:36:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ6ba-0000r9-6r
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:36:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ6bZ-0000qh-C1
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:36:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ6bZ-0000qc-6r
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:36:57 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ6YI-000347-9A
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 10:33:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ6YH-0005Uh-BT
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 14:33:33 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ6YH-0005Ue-2G
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 14:33:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ6YH-0005Ue-2G@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 14:33:33 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all XML.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 14:36:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 14:33:33

Modified files:
	testsuite/actionscript.all: XML.as 

Log message:
	fixed case-sensitiveness test

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- XML.as	4 Apr 2007 14:22:11 -0000	1.22
+++ XML.as	4 Apr 2007 14:33:32 -0000	1.23
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.22 2007/04/04 14:22:11 strk Exp $";
+rcsid="$Id: XML.as,v 1.23 2007/04/04 14:33:32 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -475,8 +475,10 @@
 };
 check_equals(typeof(myxml.status), 'number');
 #if OUTPUT_VERSION < 7
-xcheck_equals(typeof(myxml.STATUS), 'number');
-#endif // OUTPUT_VERSION < 7
+check_equals(typeof(myxml.STATUS), 'number');
+#else // OUTPUT_VERSION >= 7
+check_equals(typeof(myxml.STATUS), 'undefined');
+#endif // OUTPUT_VERSION >= 7
 check_equals(typeof(myxml.__proto__.status), 'undefined');
 check_equals(typeof(myxml.loaded), 'undefined');
 #if OUTPUT_VERSION >= 6
@@ -487,8 +489,10 @@
 
 check_equals(typeof(myxml.loaded), 'boolean');
 #if OUTPUT_VERSION < 7
-xcheck_equals(typeof(myxml.LOADED), 'boolean');
-#endif // OUTPUT_VERSION < 7
+check_equals(typeof(myxml.LOADED), 'boolean');
+#else // OUTPUT_VERSION >= 7
+check_equals(typeof(myxml.LOADED), 'undefined');
+#endif // OUTPUT_VERSION >= 7
 xcheck(! myxml.loaded ); // is really loaded in a background thread
 
 xcheck_equals(myxml.loaded, false ); // is really loaded in a background thread



From MAILER-DAEMON Wed Apr 04 11:50:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ7l3-0007dJ-6s
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 11:50:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ7l1-0007dA-TU
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:50:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ7l0-0007ce-U1
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:50:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ7l0-0007cb-R1
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:50:46 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ7hj-0006SJ-Bu
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:47:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ7hi-0001lp-Lg
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 15:47:22 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ7hi-0001ll-9y
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 15:47:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ7hi-0001ll-9y@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 15:47:22 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 15:50:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 15:47:22

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xmlnode.cpp xmlnode.h 
	testsuite/actionscript.all: XML.as 

Log message:
	        * server/asobj/xml.cpp: fix parsing of text nodes
	        * server/asobj/xmlnode.{cpp,h}: use std::string, not
	          C strings for name and value. Add an enum for NodeType.
	        * testsuite/actionscript.all/XML.as: more tests for
	          the memory-parsed XML.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2780&r2=1.2781
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2780
retrieving revision 1.2781
diff -u -b -r1.2780 -r1.2781
--- ChangeLog	4 Apr 2007 14:22:11 -0000	1.2780
+++ ChangeLog	4 Apr 2007 15:47:21 -0000	1.2781
@@ -1,5 +1,13 @@
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xml.cpp: fix parsing of text nodes
+	* server/asobj/xmlnode.{cpp,h}: use std::string, not
+	  C strings for name and value. Add an enum for NodeType.
+	* testsuite/actionscript.all/XML.as: more tests for
+	  the memory-parsed XML.
+
+2007-04-04 Sandro Santilli <strk@keybit.net>
+
 	* server/asobj/xmlnode.cpp: don't attacy XMLNode interface
 	  to XMLNode instances.
 	* server/asobj/xml.{h,cpp}: override get_member and set_member

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/xml.cpp	4 Apr 2007 14:22:11 -0000	1.33
+++ server/asobj/xml.cpp	4 Apr 2007 15:47:22 -0000	1.34
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.33 2007/04/04 14:22:11 strk Exp $ */
+/* $Id: xml.cpp,v 1.34 2007/04/04 15:47:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -150,7 +150,11 @@
 void
 XML::set_member(const std::string& name, const as_value& val)
 {
-        if ( name == "status" ) return;
+        if ( name == "status" )
+	{
+		_status = XML::Status(val.to_number());
+		return;
+	}
         else if ( name == "loaded" )
         {
                 bool b = val.to_bool();
@@ -230,10 +234,8 @@
 XML::extractNode(XMLNode& element, xmlNodePtr node, bool mem)
 {
     xmlAttrPtr attr;
-    xmlNodePtr childnode;
     xmlChar *ptr = NULL;
     boost::intrusive_ptr<XMLNode> child;
-    int len;
 
 //    log_msg("Created new element for %s at %p\n", node->name, element);
 
@@ -248,43 +250,33 @@
         XMLAttr attrib(reinterpret_cast<const char*>(attr->name),
 			reinterpret_cast<const char*>(attr->children->content));
 
-#if 0
-        len = memadjust(strlen(reinterpret_cast<const char *>(attr->name))+1);
-        attrib->_name = (char *)new char[len];
-        memset(attrib->_name, 0, len);
-        strcpy(attrib->_name, reinterpret_cast<const char *>(attr->name));
-
-        len = memadjust(strlen(reinterpret_cast<const char *>(attr->children->content))+1);
-        attrib->_value = (char *)new char[len];
-        memset(attrib->_value, 0, len);
-        strcpy(attrib->_value, reinterpret_cast<const char *>(attr->children->content));
-#endif
-
         //log_msg("\tPushing attribute %s for element %s has value %s\n",
         //        attr->name, node->name, attr->children->content);
         element._attributes.push_back(attrib);
         attr = attr->next;
     }
 
-    len = memadjust(strlen(reinterpret_cast<const char *>(node->name))+1);
-    element._name = (char *)new char[len];
-    memset(element._name, 0, len);
-    strcpy(element._name, reinterpret_cast<const char *>(node->name));
-    //element._name = reinterpret_cast<const char *>(node->name);
-    if (node->children) {
-        //ptr = node->children->content;
-        ptr = xmlNodeGetContent(node->children);
-        if (ptr != NULL) {
-            if ((strchr((const char *)ptr, '\n') == 0) && (ptr[0] != 0)) {
-                if (node->children->content == NULL) {
-                    //log_msg("Node %s has no contents\n", node->name);
-                } else {
-                    //log_msg("extractChildNode from text for %s has contents %s\n", node->name, ptr);
-                    len = memadjust(strlen(reinterpret_cast<const char *>(ptr))+1);
-                    element._value = (char *)new char[len];
-                    memset(element._value, 0, len);
-                    strcpy(element._value, reinterpret_cast<const char *>(ptr));
-                    //element->_value = reinterpret_cast<const char *>(ptr);
+    if (node->type == XML_ELEMENT_NODE)
+    {
+            element.nodeTypeSet(tElement);
+
+            std::string name(reinterpret_cast<const char*>(node->name));
+            element.nodeNameSet(name);
+    }
+    else if ( node->type == XML_TEXT_NODE )
+    {
+            element.nodeTypeSet(tText);
+
+            ptr = xmlNodeGetContent(node);
+            if (ptr != NULL)
+            {
+                if ((strchr((const char *)ptr, '\n') == 0) && (ptr[0] != 0))
+                {
+                    if (node->content)
+                    {
+                        log_msg("extractChildNode from text for %s has contents %s\n", node->name, ptr);
+                        std::string val(reinterpret_cast<const char*>(ptr));
+                        element.nodeValueSet(val);
                 }
             }
             xmlFree(ptr);
@@ -292,16 +284,13 @@
     }
     
     // See if we have any data (content)
-    childnode = node->children;
+    xmlNodePtr childnode = node->children;
 
-    while (childnode != NULL)
-    {
-        if (childnode->type == XML_ELEMENT_NODE)
+    while (childnode)
         {
             child = new XMLNode();
             extractNode(*child, childnode, mem);
             element._children.push_back(child);
-        }
         childnode = childnode->next;
     }
 
@@ -614,7 +603,8 @@
 /// the XML.createTextNode() method are the constructor methods for
 /// creating nodes for an XML object. 
 
-as_value xml_createelement(const fn_call& fn)
+static as_value
+xml_createelement(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
     
@@ -623,7 +613,7 @@
 	XMLNode *xml_obj = new XMLNode();
 //	cerr << "create new child XMLNode is at " << (void *)xml_obj << endl;
 	xml_obj->nodeNameSet(text);
-	xml_obj->nodeTypeSet(XML_ELEMENT_NODE);
+	xml_obj->nodeTypeSet(XMLNode::tText);
 //	ptr->set_member(text, xml_obj); // FIXME: use a getter/setter !
 	// no return code from this method
 	return as_value(xml_obj);
@@ -643,7 +633,8 @@
 /// XML.createElement() method are the constructor methods for
 /// creating nodes for an XML object.
 
-as_value xml_createtextnode(const fn_call& fn)
+as_value
+xml_createtextnode(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
 
@@ -654,7 +645,7 @@
 	text = fn.arg(0).to_string(); 
 	xml_obj = new XMLNode;
 	xml_obj->nodeValueSet(text);
-	xml_obj->nodeTypeSet(XML_TEXT_NODE);
+	xml_obj->nodeTypeSet(XMLNode::tText);
 	return as_value(xml_obj);
 //	log_msg("%s: xml obj is %p\n", __PRETTY_FUNCTION__, xml_obj);
     } else {

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/xmlnode.cpp	4 Apr 2007 14:22:11 -0000	1.25
+++ server/asobj/xmlnode.cpp	4 Apr 2007 15:47:22 -0000	1.26
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.25 2007/04/04 14:22:11 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.26 2007/04/04 15:47:22 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -73,10 +73,8 @@
 XMLNode::XMLNode()
     :
     as_object(getXMLNodeInterface()),
-    _name(0),
-    _value(0),
-    _type(XML_ELEMENT_NODE),
-    _parent(0)
+    _parent(0),
+    _type(tElement)
 {
     //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
 #ifdef DEBUG_MEMORY_ALLOCATION
@@ -87,10 +85,8 @@
 XMLNode::XMLNode(as_object* overridden_interface)
     :
     as_object(overridden_interface),
-    _name(0),
-    _value(0),
-    _type(XML_ELEMENT_NODE),
-    _parent(0)
+    _parent(0),
+    _type(tElement)
 {
     //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
 #ifdef DEBUG_MEMORY_ALLOCATION
@@ -101,10 +97,10 @@
 XMLNode::XMLNode(const XMLNode& tpl, bool deep)
     :
     as_object(getXMLNodeInterface()),
+    _parent(tpl._parent),
     _name(tpl._name),
     _value(tpl._value),
-    _type(tpl._type),
-    _parent(tpl._parent)
+    _type(tpl._type)
 {
     if ( ! deep )
     {
@@ -123,37 +119,11 @@
 
 XMLNode::~XMLNode()
 {
-    unsigned int i;
     //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\tDeleting XMLNode data %s at %p\n", this->_name, this);
+    log_msg("\tDeleting XMLNode data %s at %p", this->_name.c_str(), this);
 #endif
   
-    for (i=0; i<_children.size(); i++) {
-	if (_children[i]->_name) {
-	    delete [] _children[i]->_name;
-	}
-	if (_children[i]->_value) {
-	    delete [] _children[i]->_value;
-	}
-    }
-
-    for (i=0; i<_attributes.size(); i++)
-    {
-            // shouldn't we delete attributes here ??
-            // TODO: plug this leak somehow !!
-    }
-
-    _children.clear();
-    _attributes.clear();
-
-    if (_name) {
-        delete [] _name;
-    }
-    if (_value) {
-        delete [] _value;
-    }
-    //  _value.set_undefined();
 }
 
 bool
@@ -186,54 +156,6 @@
 	return _children.back();
 }
 
-void
-XMLNode::nodeNameSet(const char *name)
-{
-    int len = strlen(name) + 1;
- 
-    if (!_name) {
-	_name = (char *)new char[len];
-	memset(_name, 0, len);
-	strcpy(_name, name);
-    }
-}
-
-void
-XMLNode::nodeValueSet(const char *value)
-{
-    int len = strlen(value) + 1;
- 
-    // Should we use std::string here ?
-    delete [] _value;
-    _value = new char[len];
-    memset(_value, 0, len);
-    strcpy(_value, value);
-}
-
-/// \brief Get the type of an XML Node.
-///
-
-/// Read-only property; a nodeType value, either 1 for an XML element
-/// or 3 for a text node. The nodeType is a numeric value from the
-/// NodeType enumeration in the W3C DOM Level 1 recommendation:
-/// www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core.html.
-/// The following table lists the values.
-int
-XMLNode::nodeType() 
-{
-    switch (_type) {
-      case XML_TEXT_NODE:
-	  return 3;
-	  break;
-      case XML_ELEMENT_NODE:
-	  return 1;
-	  break;
-      default:
-	  return 0;
-    }
-    // you should never get here
-    return -1;
-}
 
 void
 XMLNode::appendChild(boost::intrusive_ptr<XMLNode> node)
@@ -336,8 +258,9 @@
 XMLNode::stringify(const XMLNode& xml, std::ostream& xmlout) 
 {
 //    GNASH_REPORT_FUNCTION;
-    const char* nodevalue = xml.nodeValue();
-    const char* nodename = xml.nodeName();
+    const std::string& nodevalue = xml.nodeValue();
+    const std::string& nodename = xml.nodeName();
+    NodeType type = xml.nodeType();
 
 
 //    log_msg("%s: processing for object %s <%p>\n", __PRETTY_FUNCTION__, nodename, xml);
@@ -348,7 +271,7 @@
 #endif
 
     // Create the beginning of the tag
-    if (nodename)
+    if ( nodename.size() )
     {
         xmlout << "<" << nodename;
     
@@ -365,7 +288,7 @@
     }
 
     // Node value first, then childs
-    if ( nodevalue )
+    if ( type == tText )
     {
 	    xmlout << nodevalue;
     }
@@ -374,17 +297,15 @@
     ChildList::const_iterator itx;
     for (itx = xml._children.begin(); itx != xml._children.end(); itx++)
     {
-//      log_msg("Found One XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
+//      log_msg("Found One XMLNode child !!!! %s <%p>\n", (*itx)->nodeName().c_str(), (void*)*itx);
 //      cerr << "<" << (*it)->nodeName() << ">" << endl;
         (*itx)->toString(xmlout);
     }
 
-    if (nodename)
+    if ( nodename.size() )
     {
-	    assert(nodename);
 	    xmlout << "</" << nodename << ">";
     }
-
 }
 
 void
@@ -470,11 +391,12 @@
 //    GNASH_REPORT_FUNCTION;
     
     XMLNode *xml_obj = new XMLNode;
-    if ( fn.nargs > 0 )	{
-	xml_obj->nodeTypeSet(static_cast<xmlElementType>(
-				 static_cast<int>(fn.arg(0).to_number())));
-	if (fn.nargs > 1)	{
-	    xml_obj->nodeValueSet(fn.arg(1).to_string());
+    if ( fn.nargs > 0 )
+    {
+        xml_obj->nodeTypeSet(XMLNode::NodeType(int(fn.arg(0).to_number())));
+        if (fn.nargs > 1)
+        {
+            xml_obj->nodeValueSet(fn.arg(1).to_std_string(&(fn.env())));
 	}
     }
     
@@ -508,30 +430,6 @@
 	ptr->appendChild(xml_obj);
 	return as_value(); // undefined
 
-#if 0
-	if (xml_obj->nodeType() == XML_ELEMENT_NODE) {
-	    ptr->appendChild(xml_obj.get());
-	} else {
-	    ptr->nodeValueSet(xml_obj->nodeValue());
-	}
-	
-//    log_msg("%s: %p \n", __PRETTY_FUNCTION__, xml_obj);
-	int length = ptr->length();
-	if (length > 0) {
-	    XMLNode *ass = xml_obj->previousSibling(); // or is it 'ptr' ??
-// FIXME: This shouldn't always be NULL
-// 	log_msg("%s: ASS is %p, length is %d\n", __PRETTY_FUNCTION__,
-// 		ass, length);
-	    ptr->set_member("previousSibling", ass); // FIXME: don't do this, rely on getter/setter
-//  	ptr->set_member("nextSibling", xml_obj->obj.nextSibling(ptr->obj.length()));
-	}
-	// The last child in the list is always the one we just appended
-	ptr->set_member("lastChild", xml_obj.get()); // FIXME: don't do this, rely on getter/setter
-    } else {
-        log_msg("ERROR: no child XMLNode paramaters!\\n");
-    }
-    return as_value();
-#endif
 }
 
 static as_value
@@ -607,14 +505,14 @@
     //log_msg("xmlnode_nodevalue called with %d args against 'this' = %p", fn.nargs, ptr);
     if ( fn.nargs == 0 )
     {
-	    //log_msg("  nodeValue() returns '%s'", ptr->nodeValue());
-        const char* val = ptr->nodeValue();
-        if ( val ) rv = val;
+	    //log_msg("  nodeValue() returns '%s'", ptr->nodeValue().c_str());
+        const std::string& val = ptr->nodeValue();
+        if ( ! val.empty() ) rv = val;
     }
     else
     {
         //log_msg(" arg(0) == '%s'", fn.arg(0).to_string());
-        ptr->nodeValueSet(fn.arg(0).to_string());
+        ptr->nodeValueSet(fn.arg(0).to_std_string(&(fn.env())));
     }
     return rv;
 }
@@ -629,8 +527,8 @@
     rv.set_null();
 
     if ( fn.nargs == 0 ) {
-        const char* val = ptr->nodeName();
-        if ( val ) rv = val;
+        const std::string& val = ptr->nodeName();
+        if ( ! val.empty() ) rv = val;
     }
     else
     {

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/xmlnode.h	3 Apr 2007 13:22:24 -0000	1.9
+++ server/asobj/xmlnode.h	4 Apr 2007 15:47:22 -0000	1.10
@@ -47,10 +47,55 @@
 
 namespace gnash {  
  
-/// XML Node 
+/// XMLNode  ActionScript class
+//
+/// This is the base class for the XML ActionScript class
+///
 class DSOLOCAL XMLNode : public gnash::as_object
 {
 public:
+
+
+    typedef enum {
+
+        /// Element
+        tElement = 1,
+
+        /// Attribute
+        tAttribute = 2,
+
+        /// Text
+        tText = 3,
+
+        /// CDATA section 
+        tCdata = 4,
+
+        /// Entity reference
+        tEntityRef = 5,
+        
+        /// Entity
+        tEntity = 6,
+        
+        /// Processing instruction
+        tProcInstr = 7,
+                
+        /// Comment
+        tComment = 8,
+
+        /// Document
+        tDocument = 9,
+
+        /// Document type
+        tDocType = 10,
+
+        /// Document fragment
+        tDocFgarment = 11,
+
+        /// Notation
+        tNotation = 12
+
+    } NodeType;
+
     XMLNode();
 
     // This constructor is used by the XML class
@@ -61,25 +106,27 @@
 
     size_t length() const { return _children.size(); }
 
-    const char* nodeName() const { return _name; }
+    const std::string& nodeName() const { return _name; }
+
+    const std::string& nodeValue() const { return _value; }
 
-    const char* nodeValue() const { return _value; }
+    /// Get the type of an XML Node.
+    NodeType nodeType() const { return _type; }
 
-    int nodeType();
-    void nodeTypeSet(xmlElementType type) {
+    /// Set the type of an XML Node.
+    void nodeTypeSet(NodeType type)
+    {
 	    _type = type;
     }
 
-    //    char *valueGet();
-  
     /// Set name of this node, but only if it doesn't have a name yet
     //
     /// TODO: check if this is the correct behaviour
     ///
-    void nodeNameSet(const char *name);
+    void nodeNameSet(const std::string& name) { _name = name; }
 
     /// Set value of this node, overriding any previous value
-    void nodeValueSet(const char *value);
+    void nodeValueSet(const std::string& value) { _value = value; }
     //  nodeType 	XML.nodeType
 
     ///  Returns true if the specified node has child nodes; otherwise, returns false.
@@ -172,13 +219,6 @@
 
     void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
 
-
-    // why don't we use std::strings here ?
-    // code would be much simpler and safer!
-    char                *_name;
-    char                *_value;
-
-    xmlElementType      _type;
     XMLNode		*_parent;
     ChildList		_children;
     AttribList      _attributes;
@@ -187,6 +227,12 @@
 
     // TODO: make a lot more things private !
 
+    std::string _name;
+
+    std::string _value;
+
+    NodeType     _type;
+
     static void stringify(const XMLNode& xml, std::ostream& xmlout);
 
 };

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/actionscript.all/XML.as	4 Apr 2007 14:33:32 -0000	1.23
+++ testsuite/actionscript.all/XML.as	4 Apr 2007 15:47:22 -0000	1.24
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.23 2007/04/04 14:33:32 strk Exp $";
+rcsid="$Id: XML.as,v 1.24 2007/04/04 15:47:22 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -256,37 +256,84 @@
     this.childNodes = 5;
 	check(this.childNodes instanceof Array);
 
-        with (this.firstChild) {
-            //trace("FIXME: firstChild found: " + nodeName);
-            if (nodeName == 'TOPNODE') {
-                //trace("FIXME: topnode found: "+ childNodes.length);
-                childa = 0;
-                while (childa < childNodes.length) {
-                    //trace("FIXME: children found");
-                    check(childNodes[childa] != undefined);
-                    with (childNodes[childa]) {
-                        if (nodeName == 'SUBNODE1') {
-                            childb = 0;
-                            while (childb < childNodes.length) {
-                                with (childNodes[childb]) {
-                                    if (nodeName == 'SUBSUBNODE1') {
-                                        _global.child1 = firstChild.nodeValue;
-note("Set _global.child1 to "+_global.child1);
-                                    } else {
-                                        if (nodeName == 'SUBNODE2') {
-                                            _global.child2 = firstChild.nodeValue;
-                                        } else {
-                                            if (nodeName == 'SUBSUBNODE1') {
-                                                _global.child3 = firstChild.nodeValue;
+        with (this.firstChild)
+	{
+		check_equals(nodeName, 'TOPNODE');
+		check_equals(typeof(nodeValue), 'null');
+
+		// Check that nodeValue is overridable
+		nodeValue = 4;
+		check_equals(typeof(nodeValue), 'string');
+		check_equals(nodeValue, '4');
+
+		check_equals(nodeType, 1); // element
+		check_equals(childNodes.length, 2);
+
+		with (firstChild)
+		{
+			check_equals(nodeName, 'SUBNODE1');
+			check_equals(typeof(nodeValue), 'null');
+			check_equals(nodeType, 1); // element
+			check_equals(childNodes.length, 2);
+			with (firstChild)
+			{
+				check_equals(nodeName, 'SUBSUBNODE1');
+				check_equals(typeof(nodeValue), 'null');
+				check_equals(nodeType, 1); // element
+				check_equals(childNodes.length, 1);
+				with (firstChild)
+				{
+					check_equals(typeof(nodeName), 'null')
+					check_equals(nodeValue, 'sub sub1 node data 1')
+					check_equals(nodeType, 3); // text
                                             }
                                         }
+			with (lastChild)
+			{
+				check_equals(nodeName, 'SUBSUBNODE2');
+				check_equals(typeof(nodeValue), 'null');
+				check_equals(nodeType, 1); // element
+				check_equals(childNodes.length, 1);
+				with (firstChild)
+				{
+					check_equals(typeof(nodeName), 'null')
+					check_equals(nodeValue, 'sub sub1 node data 2')
+					check_equals(nodeType, 3); // text
                                     }
                                 }
-                                ++childb;
+		}
+
+		with (lastChild)
+		{
+			check_equals(nodeName, 'SUBNODE2');
+			check_equals(typeof(nodeValue), 'null');
+			check_equals(nodeType, 1); // element
+			check_equals(childNodes.length, 2);
+			with (firstChild)
+			{
+				check_equals(nodeName, 'SUBSUBNODE1');
+				check_equals(typeof(nodeValue), 'null');
+				check_equals(nodeType, 1); // element
+				check_equals(childNodes.length, 1);
+				with (firstChild)
+				{
+					check_equals(typeof(nodeName), 'null')
+					check_equals(nodeValue, 'sub sub2 node data 1')
+					check_equals(nodeType, 3); // text
                             }
                         }
+			with (lastChild)
+			{
+				check_equals(nodeName, 'SUBSUBNODE2');
+				check_equals(typeof(nodeValue), 'null');
+				check_equals(nodeType, 1); // element
+				check_equals(childNodes.length, 1);
+				with (firstChild)
+				{
+					check_equals(typeof(nodeName), 'null')
+					check_equals(nodeValue, 'sub sub2 node data 2')
+					check_equals(nodeType, 3); // text
                     }
-                    ++childa;
                 }
             }
         }
@@ -457,7 +504,8 @@
 	var status_backup = myxml.status;
 	myxml.status = 'a string';
 	check_equals(typeof(myxml.status), 'number');
-	xcheck(myxml.status != status_backup);
+	check(myxml.status != status_backup);
+	note("myxml.status is == "+myxml.status+" after being set to 'a string'");
 	myxml.status = status_backup;
 
 



From MAILER-DAEMON Wed Apr 04 11:54:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZ7oT-0000nu-DG
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 11:54:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZ7oR-0000lA-QD
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:54:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZ7oR-0000k1-63
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:54:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZ7oR-0000js-3B
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:54:19 -0400
Received: from savannah.gnu.org ([199.232.41.3])
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZ7l9-0006vI-Rn
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 11:50:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=savannah.gnu.org)
	by savannah.gnu.org with esmtp (Exim 4.50) id 1HZ7l9-0001qq-AE
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 15:50:55 +0000
Received: from strk by savannah.gnu.org with local (Exim 4.50)
	id 1HZ7l9-0001qn-3s
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 15:50:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZ7l9-0001qn-3s@savannah.gnu.org>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 04 Apr 2007 15:50:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/asobj xmlsocket.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 15:54:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/04 15:50:55

Modified files:
	server/asobj   : xmlsocket.cpp 

Log message:
	cleaned up some debugging output

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- xmlsocket.cpp	4 Apr 2007 14:20:54 -0000	1.20
+++ xmlsocket.cpp	4 Apr 2007 15:50:55 -0000	1.21
@@ -187,7 +187,7 @@
 bool
 XMLSocket::anydata(int fd, MessageList& msgs)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     fd_set                fdset;
     struct timeval        tval;
@@ -227,14 +227,13 @@
             return false;
         }
         if (ret == 0) {
-            log_msg("%s: There is no data in the socket for fd #%d!",
-                __FUNCTION__, fd);
+            //log_msg("%s: There is no data in the socket for fd #%d!",
+            //   __FUNCTION__, fd);
             return false;
         }
         if (ret > 0) {
-            log_msg("%s: There is data in the socket for fd #%d!",
-                __FUNCTION__, fd);
-            //break;
+            //log_msg("%s: There is data in the socket for fd #%d!",
+            //    __FUNCTION__, fd);
         }
         memset(buf, 0, INBUF);
         ret = ::read(_sockfd, buf, INBUF-2);
@@ -520,7 +519,7 @@
 as_value
 xmlsocket_inputChecker(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     as_value	method;
     as_value	val;



From MAILER-DAEMON Wed Apr 04 16:34:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZCBQ-0007Su-T2
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 16:34:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZCBP-0007QR-Ce
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 16:34:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZCBO-0007Ph-74
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 16:34:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZCBO-0007Pc-2s
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 16:34:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HZC85-0002Am-4o
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 16:30:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZC7y-00011Y-Kt
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 20:30:46 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HZC7y-00011V-7U
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 20:30:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZC7y-00011V-7U@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Wed, 04 Apr 2007 20:30:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_agg_styl...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Apr 2007 20:34:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/04 20:30:45

Modified files:
	.              : ChangeLog 
	backend        : render_handler_agg_style.h 
	gui            : gui.cpp 
	libamf         : amf.cpp 
	server         : movie_root.cpp shm.cpp sprite_instance.cpp 
	                 textformat.cpp 
	server/asobj   : Boolean.cpp Date.cpp NetStreamFfmpeg.cpp 
	                 SoundFfmpeg.cpp xml.cpp xmlsocket.cpp 
	server/parser  : movie_def_impl.h 
	server/swf     : DefineFontAlignZonesTag.cpp 
	server/vm      : ActionExec.cpp 

Log message:
	        * gui/gui.cpp, backend/render_handler_agg_style.h,
	        server/{swf/DefineFontAlignZonesTag.cpp, textformat.cpp}:
	        Comment out unused variables.
	        * libamf/amf.cpp: Remove unneeded casts. Replace some
	        C-style casts by C++-style ones. Don't modify const type;
	        instead, use a temporary (el->data).
	        * server/{movie_root.cpp, shm.cpp, sprite_instance.cpp,
	                  vm/ActionExec.cpp, asobj/xmlsocket.cpp}: More
	        use of SIZET_FMT.
	        * server/{Boolean.cpp, Date.cpp}: Don't assign string
	        literals to character pointers, which will soon be
	        deprecated by GCC. Instead, use array declarations.
	        * server/asobj/{NetStreamFfmpeg.cpp, SoundFfmpeg.cpp}:
	        Don't compare unsigned with signed ints.
	        * server/asobj/xml.cpp: Comment out include that is used
	        by commented out code.
	        * server/parser/movie_def_impl.h: Fix typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2781&r2=1.2782
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_style.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.221&r2=1.222
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Boolean.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2781
retrieving revision 1.2782
diff -u -b -r1.2781 -r1.2782
--- ChangeLog	4 Apr 2007 15:47:21 -0000	1.2781
+++ ChangeLog	4 Apr 2007 20:30:45 -0000	1.2782
@@ -1,3 +1,23 @@
+2007-04-04 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* gui/gui.cpp, backend/render_handler_agg_style.h,
+	server/{swf/DefineFontAlignZonesTag.cpp, textformat.cpp}: 
+	Comment out unused variables. 
+	* libamf/amf.cpp: Remove unneeded casts. Replace some
+	C-style casts by C++-style ones. Don't modify const type;
+	instead, use a temporary (el->data).
+	* server/{movie_root.cpp, shm.cpp, sprite_instance.cpp,
+	          vm/ActionExec.cpp, asobj/xmlsocket.cpp}: More
+	use of SIZET_FMT.
+	* server/{Boolean.cpp, Date.cpp}: Don't assign string
+	literals to character pointers, which will soon be
+	deprecated by GCC. Instead, use array declarations.
+	* server/asobj/{NetStreamFfmpeg.cpp, SoundFfmpeg.cpp}:
+	Don't compare unsigned with signed ints.
+	* server/asobj/xml.cpp: Comment out include that is used
+	by commented out code.
+	* server/parser/movie_def_impl.h: Fix typo.
+
 2007-04-04 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/xml.cpp: fix parsing of text nodes

Index: backend/render_handler_agg_style.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg_style.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- backend/render_handler_agg_style.h	22 Feb 2007 10:21:02 -0000	1.12
+++ backend/render_handler_agg_style.h	4 Apr 2007 20:30:45 -0000	1.13
@@ -631,12 +631,12 @@
   {
   }
 
-  bool is_solid(unsigned style) const
+  bool is_solid(unsigned /*style*/) const
   {
     return true;
   }
   
-  const agg::gray8& color(unsigned style) const 
+  const agg::gray8& color(unsigned /*style*/) const 
   {
     return m_color;
   }

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- gui/gui.cpp	2 Apr 2007 15:45:22 -0000	1.68
+++ gui/gui.cpp	4 Apr 2007 20:30:45 -0000	1.69
@@ -477,7 +477,7 @@
 }
 
 void
-Gui::setInvalidatedRegion(const rect& bounds)
+Gui::setInvalidatedRegion(const rect& /*bounds*/)
 {
 }
 

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- libamf/amf.cpp	3 Apr 2007 16:13:07 -0000	1.29
+++ libamf/amf.cpp	4 Apr 2007 20:30:45 -0000	1.30
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.29 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: amf.cpp,v 1.30 2007/04/04 20:30:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -349,7 +349,7 @@
     switch (type) {
         // Encode the data as a 64 bit, big-endian, numeric value
       case NUMBER:
-          x = out = (char *)new char[pktsize];
+          x = out = new char[pktsize];
           memset(x, 0, pktsize);
           *x++ = (char)AMF::NUMBER;
           memcpy(&num, in, AMF_NUMBER_SIZE);
@@ -358,15 +358,15 @@
           break;
       case BOOLEAN:
           // Encode a boolean value. 0 for false, 1 for true
-          out = (char *)new char[pktsize];
+          out = new char[pktsize];
           x = out;    
           *x++ = (char)AMF::BOOLEAN;
-          *x = *(char *)in;
+          *x = *static_cast<const char *>(in);
           break;
       case STRING:
           // Encode a string value. The data follows a 2 byte length
           // field. (which must be big-endian)
-          x = out = (char *)new char[pktsize];
+          x = out = new char[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::STRING;
           num = nbytes;
@@ -385,7 +385,7 @@
           log_msg("Null unimplemented\n");
           break;
       case UNDEFINED:
-          x = out = (char *)new char[pktsize];
+          x = out = new char[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::UNDEFINED;
           num = nbytes;
@@ -408,10 +408,10 @@
           break;
           // Encode the date as a 64 bit, big-endian, numeric value
       case DATE:
-          x = out = (char *)new char[pktsize];
+          x = out = new char[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::DATE;
-          num = *(amfnum_t *)in;
+          num = *static_cast<const amfnum_t*>(in);
           swapBytes(&num, 8);
           memcpy(x, &num, 8);
           break;
@@ -427,7 +427,7 @@
       case XML_OBJECT:
           // Encode an XML object. The data follows a 4 byte length
           // field. (which must be big-endian)
-          x = out = (char *)new char[pktsize];
+          x = out = new char[pktsize];
           memset(x, 0, pktsize);
           *x++ = AMF::STRING;
           num = nbytes;
@@ -699,7 +699,7 @@
 {
     GNASH_REPORT_FUNCTION;
     char *buf = NULL;
-    char *x = const_cast<char *>(in);
+    char *x = const_cast<char*>(in);
     short length;
     
     if (*x == AMF::STRING) {
@@ -1160,11 +1160,13 @@
     
     switch (type) {
       case NUMBER:
+        {
           memcpy(buffer, tmpptr, AMF_NUMBER_SIZE);
           swapBytes(buffer, AMF_NUMBER_SIZE);
-          el->data = new unsigned char[AMF_NUMBER_SIZE+1];
-	  memset((void *)el->data, 0, AMF_NUMBER_SIZE+1);
-          memcpy((void *)el->data, buffer, AMF_NUMBER_SIZE);
+          unsigned char* tmp = new unsigned char[AMF_NUMBER_SIZE+1];
+          memset(tmp, 0, AMF_NUMBER_SIZE+1);
+          memcpy(tmp, buffer, AMF_NUMBER_SIZE);
+          el->data = tmp;
           unsigned char hexint[AMF_NUMBER_SIZE*3];
           hexify((unsigned char *)hexint, (unsigned char *)buffer,
 		 AMF_NUMBER_SIZE, false);
@@ -1173,14 +1175,18 @@
 //          amfnum_t *num = extractNumber(tmpptr);
           tmpptr += 8;
           break;
+        }
       case BOOLEAN:
+        {
 //          int value = *tmpptr;
-          el->data = new unsigned char[1];
-	  memcpy((void *)el->data, tmpptr, 1); 
+          unsigned char* tmp = new unsigned char[1];
+          memcpy(tmp, tmpptr, 1); 
+          el->data = tmp;
 	  dbglogfile << "Boolean \"" << el->name.c_str() << "\" is: "
 		     << ( (*tmpptr == 0) ? "true" :"false") << endl;
 	  tmpptr += 1;
 	  break;
+        }
       case STRING:
 	  length = ntohs((*(const short *)tmpptr) & 0xffff);
           tmpptr += sizeof(short);

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/movie_root.cpp	3 Apr 2007 16:32:05 -0000	1.54
+++ server/movie_root.cpp	4 Apr 2007 20:30:45 -0000	1.55
@@ -514,7 +514,7 @@
 	int id = _intervalTimers.size()+1;
 	if ( _intervalTimers.size() >= 255 )
 	{
-		log_error("FIXME: %u timers currently active, won't add another one", _intervalTimers.size());
+		log_error("FIXME: " SIZET_FMT " timers currently active, won't add another one", _intervalTimers.size());
 	}
 
 	// TODO: find first NULL element in vector for reuse ?

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/shm.cpp	20 Mar 2007 15:01:20 -0000	1.29
+++ server/shm.cpp	4 Apr 2007 20:30:45 -0000	1.30
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: shm.cpp,v 1.29 2007/03/20 15:01:20 strk Exp $ */
+/* $Id: shm.cpp,v 1.30 2007/04/04 20:30:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -101,7 +101,7 @@
     filespec = absfilespec.c_str();
     strncpy(_filespec, absfilespec.c_str(), MAX_SHM_NAME_SIZE);
     if (static_cast<int>(absfilespec.size()) > MAX_SHM_NAME_SIZE) {
-	log_error("Shared Memory segment name is %d bytes too long!\n",
+	log_error("Shared Memory segment name is " SIZET_FMT " bytes too long!\n",
 		  absfilespec.size() - MAX_SHM_NAME_SIZE);
     }    
     

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -b -r1.221 -r1.222
--- server/sprite_instance.cpp	4 Apr 2007 07:00:02 -0000	1.221
+++ server/sprite_instance.cpp	4 Apr 2007 20:30:45 -0000	1.222
@@ -1693,8 +1693,8 @@
 	testInvariant();
 
 	IF_VERBOSE_ACTION(
-		log_action("Executing " SIZET_FMT " actions in frame %u/"
-			SIZET_FMT " of sprite %s",
+		log_action("Executing " SIZET_FMT " actions in frame " SIZET_FMT
+			"/" SIZET_FMT " of sprite %s",
 			m_action_list.size(),
 			m_current_frame+1,
 			m_def->get_frame_count(), getTargetPath().c_str());

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/textformat.cpp	28 Mar 2007 20:38:35 -0000	1.21
+++ server/textformat.cpp	4 Apr 2007 20:30:45 -0000	1.22
@@ -114,7 +114,7 @@
 }
 #endif
 
-as_value textformat_new(const fn_call& fn)
+as_value textformat_new(const fn_call& /* fn */)
 {
   //log_msg("%s: args=%d\n", __FUNCTION__, nargs);
 

Index: server/asobj/Boolean.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Boolean.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/Boolean.cpp	20 Mar 2007 16:41:00 -0000	1.12
+++ server/asobj/Boolean.cpp	4 Apr 2007 20:30:45 -0000	1.13
@@ -83,16 +83,13 @@
 
 as_value boolean_tostring(const fn_call& fn)
 {
-	static char* strtrue = "true";
-	static char* strfalse = "false";
-
 	boost::intrusive_ptr<boolean_as_object> boolobj = ensureType<boolean_as_object>(fn.this_ptr);
 
 	
 	if (boolobj->val) 
-		return as_value(strtrue);
+		return as_value("true");
 	else
-		return as_value(strfalse);
+		return as_value("false");
 }
 
 

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/Date.cpp	2 Apr 2007 10:42:21 -0000	1.38
+++ server/asobj/Date.cpp	4 Apr 2007 20:30:45 -0000	1.39
@@ -1041,9 +1041,9 @@
 
 static as_value date_tostring(const fn_call& fn) {
 	char buffer[40]; // 32 chars + slop
-	char* monthname[12] =
+	char monthname[][12] =
 		{"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
-	char* dayweekname[7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
+	char dayweekname[][7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"};
 
 	boost::intrusive_ptr<date_as_object> date = ensureType<date_as_object>(fn.this_ptr);
 	

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/NetStreamFfmpeg.cpp	2 Apr 2007 16:46:32 -0000	1.28
+++ server/asobj/NetStreamFfmpeg.cpp	4 Apr 2007 20:30:45 -0000	1.29
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.28 2007/04/02 16:46:32 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.29 2007/04/04 20:30:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -425,7 +425,7 @@
 	ns->m_video_index = -1;
 	ns->m_audio_index = -1;
 	//assert(ns->m_FormatCtx->nb_streams >= 0); useless assert. 
-	for (unsigned int i = 0; i < ns->m_FormatCtx->nb_streams; i++)
+	for (int i = 0; i < ns->m_FormatCtx->nb_streams; i++)
 	{
 		AVCodecContext* enc = ns->m_FormatCtx->streams[i]->codec; 
 

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/asobj/SoundFfmpeg.cpp	9 Mar 2007 14:38:29 -0000	1.5
+++ server/asobj/SoundFfmpeg.cpp	4 Apr 2007 20:30:45 -0000	1.6
@@ -148,7 +148,7 @@
 	// Find the first audio stream
 	so->audioIndex = -1;
 
-	for (unsigned int i = 0; i < so->formatCtx->nb_streams; i++)
+	for (int i = 0; i < so->formatCtx->nb_streams; i++)
 	{
 		AVCodecContext* enc = so->formatCtx->streams[i]->codec; 
 

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/asobj/xml.cpp	4 Apr 2007 15:47:22 -0000	1.34
+++ server/asobj/xml.cpp	4 Apr 2007 20:30:45 -0000	1.35
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.34 2007/04/04 15:47:22 strk Exp $ */
+/* $Id: xml.cpp,v 1.35 2007/04/04 20:30:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,7 +47,7 @@
 #include <string>
 #include <sstream>
 #include <vector>
-#include <boost/lexical_cast.hpp>
+//#include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <memory>
 

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/xmlsocket.cpp	4 Apr 2007 15:50:55 -0000	1.21
+++ server/asobj/xmlsocket.cpp	4 Apr 2007 20:30:45 -0000	1.22
@@ -254,7 +254,7 @@
                 *eom = 0;
             }
             msgs.push_back( packet );
-            printf("%d: Pushing Packet of size %d at %p\n", __LINE__, strlen(packet), packet);
+            printf("%d: Pushing Packet of size " SIZET_FMT " at %p\n", __LINE__, strlen(packet), packet);
             processing(false);
             return true;
         }

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/parser/movie_def_impl.h	3 Apr 2007 08:58:09 -0000	1.34
+++ server/parser/movie_def_impl.h	4 Apr 2007 20:30:45 -0000	1.35
@@ -450,9 +450,10 @@
 	void	add_execute_tag(execute_tag* e)
 	{
 	    assert(e);
-	    if (_frames_loaded < m_playlist.size());
+	    if (_frames_loaded < m_playlist.size()) {
 	    m_playlist[_frames_loaded].push_back(e);
 	}
+	}
 
 	/// Need to execute the given tag before entering the
 	/// currently-loading frame for the first time.

Index: server/swf/DefineFontAlignZonesTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/DefineFontAlignZonesTag.cpp	21 Feb 2007 13:22:37 -0000	1.1
+++ server/swf/DefineFontAlignZonesTag.cpp	4 Apr 2007 20:30:45 -0000	1.2
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: DefineFontAlignZonesTag.cpp,v 1.1 2007/02/21 13:22:37 strk Exp $ */
+/* $Id: DefineFontAlignZonesTag.cpp,v 1.2 2007/04/04 20:30:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,7 +31,8 @@
 namespace SWF {
 namespace tag_loaders {
 
-DefineFontAlignZonesTag::DefineFontAlignZonesTag(movie_definition& m, stream& in)
+DefineFontAlignZonesTag::DefineFontAlignZonesTag(movie_definition& /* m */, 
+	stream& /* in */)
 {
 }
 

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/vm/ActionExec.cpp	30 Mar 2007 07:34:15 -0000	1.24
+++ server/vm/ActionExec.cpp	4 Apr 2007 20:30:45 -0000	1.25
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ActionExec.cpp,v 1.24 2007/03/30 07:34:15 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.25 2007/04/04 20:30:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -261,7 +261,7 @@
     } else if ( _initial_stack_size < env.stack_size() ) {
 	// We can argue this would be an "size-optimized" SWF instead...
 	IF_VERBOSE_MALFORMED_SWF(
-	    log_warning("%u elements left on the stack after block execution. "
+	    log_warning(SIZET_FMT " elements left on the stack after block execution. "
 		    "Cleaning up.", env.stack_size()-_initial_stack_size);
 	    );
 	env.drop(env.stack_size()-_initial_stack_size);



From MAILER-DAEMON Wed Apr 04 21:32:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZGpg-0000zb-4C
	for mharc-gnash-commit@gnu.org; Wed, 04 Apr 2007 21:32:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZGpe-0000z0-Ax
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 21:32:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZGpd-0000yP-Bf
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 21:32:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZGpc-0000yK-V3
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 21:32:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HZGmI-0003FF-O9
	for gnash-commit@gnu.org; Wed, 04 Apr 2007 21:28:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZGmG-00014T-P6
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 01:28:40 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HZGmG-00014Q-BB
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 01:28:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZGmG-00014Q-BB@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 05 Apr 2007 01:28:40 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 01:32:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/05 01:28:40

Modified files:
	.              : ChangeLog 
	backend        : render_handler_ogl.cpp 
Added files:
	server/asobj   : TextFormat.cpp TextFormat.h 

Log message:
	Added stub for class TextFormat.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2782&r2=1.2783
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextFormat.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextFormat.h?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2782
retrieving revision 1.2783
diff -u -b -r1.2782 -r1.2783
--- ChangeLog	4 Apr 2007 20:30:45 -0000	1.2782
+++ ChangeLog	5 Apr 2007 01:28:39 -0000	1.2783
@@ -1,3 +1,7 @@
+2007-04-04 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* server/asobj/TextFormat.{cpp,h} - Added stub for class TextFormat.
+
 2007-04-04 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* gui/gui.cpp, backend/render_handler_agg_style.h,

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- backend/render_handler_ogl.cpp	3 Apr 2007 21:46:37 -0000	1.67
+++ backend/render_handler_ogl.cpp	5 Apr 2007 01:28:40 -0000	1.68
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.67 2007/04/03 21:46:37 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.68 2007/04/05 01:28:40 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -29,7 +29,7 @@
 // 1 = hardware (experimental, should be fast, somewhat buggy)
 // 2 = fast software bilinear (default)
 // 3 = use image::resample(), slow software resampling
-#define RESAMPLE_METHOD 2
+#define RESAMPLE_METHOD 1
 
 
 // Determines whether to generate mipmaps for smoother rendering of

Index: server/asobj/TextFormat.cpp
===================================================================
RCS file: server/asobj/TextFormat.cpp
diff -N server/asobj/TextFormat.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/TextFormat.cpp	5 Apr 2007 01:28:40 -0000	1.1
@@ -0,0 +1,108 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+/* $Id: TextFormat.cpp,v 1.1 2007/04/05 01:28:40 nihilus Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "TextFormat.h"
+#include "as_object.h" // for inheritance
+#include "log.h"
+#include "fn_call.h"
+#include "smart_ptr.h" // for boost intrusive_ptr
+#include "builtin_function.h" // need builtin_function
+
+
+as_value textformat_tostring(const fn_call& fn);
+as_value textformat_ctor(const fn_call& fn);
+
+static void
+attachTextFormatInterface(as_object& o)
+{
+	// is this really needed ? shouldn't toString be
+	// derived from Object inheritance ?
+	o.init_member("toString", new builtin_function(textformat_tostring));
+}
+
+static as_object*
+getTextFormatInterface()
+{
+	static boost::intrusive_ptr<as_object> o;
+	if ( ! o )
+	{
+		o = new as_object();
+		attachTextFormatInterface(*o);
+	}
+	return o.get();
+}
+
+class textformat_as_object: public as_object
+{
+
+public:
+
+	textformat_as_object()
+		:
+		as_object(getTextFormatInterface())
+	{}
+
+	// override from as_object ?
+	//const char* get_text_value() const { return "TextFormat"; }
+
+	// override from as_object ?
+	//double get_numeric_value() const { return 0; }
+};
+
+as_value textformat_tostring(const fn_call& /*fn*/) {
+    log_warning("%s: unimplemented \n", __FUNCTION__);
+    return as_value();
+}
+
+as_value
+textformat_ctor(const fn_call& /* fn */)
+{
+	boost::intrusive_ptr<as_object> obj = new textformat_as_object;
+	
+	return as_value(obj.get()); // will keep alive
+}
+
+// extern (used by Global.cpp)
+void textformat_class_init(as_object& global)
+{
+	// This is going to be the global TextFormat "class"/"function"
+	static boost::intrusive_ptr<builtin_function> cl;
+
+	if ( cl == NULL )
+	{
+		cl=new builtin_function(&textformat_ctor, getTextFormatInterface());
+		// replicate all interface to class, to be able to access
+		// all methods as static functions
+		attachTextFormatInterface(*cl);
+		     
+	}
+
+	// Register _global.TextFormat
+	global.init_member("TextFormat", cl.get());
+
+}
+
+
+} // end of gnash namespace
+

Index: server/asobj/TextFormat.h
===================================================================
RCS file: server/asobj/TextFormat.h
diff -N server/asobj/TextFormat.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/asobj/TextFormat.h	5 Apr 2007 01:28:40 -0000	1.1
@@ -0,0 +1,45 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+/* $Id: TextFormat.h,v 1.1 2007/04/05 01:28:40 nihilus Exp $ */
+
+#ifndef __GNASH_ASOBJ_TEXTFORMAT_H__
+#define __GNASH_ASOBJ_TEXTFORMAT_H__
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
+#include <memory> // for auto_ptr
+
+namespace gnash {
+
+class as_object;
+
+/// Initialize the global Boolean class
+void textformat_class_init(as_object& global);
+
+/// Return a TextFormat instance (in case the core lib needs it)
+//std::auto_ptr<as_object> init_textformat_instance();
+  
+} // end of gnash namespace
+
+// __GNASH_ASOBJ_BOOLEAN_H__
+#endif
+



From MAILER-DAEMON Thu Apr 05 02:35:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZLZM-00007P-K3
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 02:35:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZLZL-00006m-4B
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 02:35:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZLZJ-00006a-Rn
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 02:35:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZLZJ-00006W-NF
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 02:35:37 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HZLVx-0001aH-FD
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 02:32:10 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l356W3408515;
	Thu, 5 Apr 2007 08:32:03 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 5 Apr 2007 08:32:03 +0200
To: Markus Gothe <markus@unixrus.se>
Subject: Re: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...
Message-ID: <20070405063203.GD67543@keybit.net>
Mail-Followup-To: Markus Gothe <markus@unixrus.se>, gnash-commit@gnu.org
References: <E1HZGmG-00014Q-BB@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HZGmG-00014Q-BB@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 06:35:39 -0000

On Thu, Apr 05, 2007 at 01:28:40AM +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/04/05 01:28:40
> 
> Modified files:
> 	.              : ChangeLog 
> 	backend        : render_handler_ogl.cpp 
> Added files:
> 	server/asobj   : TextFormat.cpp TextFormat.h 
> 
> Log message:
> 	Added stub for class TextFormat.

It was in server/textformat.{cpp,h} already, did you check that part ?
--strk;



From MAILER-DAEMON Thu Apr 05 03:07:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZM3w-0005tM-2i
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:07:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZM3u-0005sw-E4
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:07:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZM3s-0005sk-Uf
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:07:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZM3s-0005sh-RO
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:07:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HZM0X-00060v-1V
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:03:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZM0V-0003Rp-SZ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:03:43 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HZM0V-0003Rl-Dr
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:03:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZM0V-0003Rl-Dr@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 05 Apr 2007 07:03:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/action_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:07:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/05 07:03:43

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: action_execution_order_test6.c 
Added files:
	testsuite/misc-ming.all: reverse_execute_PlaceObject2_test2.c 

Log message:
	a new testcase

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2783&r2=1.2784
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test6.c?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2783
retrieving revision 1.2784
diff -u -b -r1.2783 -r1.2784
--- ChangeLog	5 Apr 2007 01:28:39 -0000	1.2783
+++ ChangeLog	5 Apr 2007 07:03:43 -0000	1.2784
@@ -1,3 +1,12 @@
+2007-04-05 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all: reverse_execute_PlaceObject2_test2.c
+	another testcase for reverse execution of frame tags. 
+	* testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c
+	add notes that reverse execution is likely to be deprecated.
+	* testsuite/misc-ming.all/action_execution_order_test6.c
+	do checks and stop movie at the last frame.
+	
 2007-04-04 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* server/asobj/TextFormat.{cpp,h} - Added stub for class TextFormat.

Index: testsuite/misc-ming.all/action_execution_order_test6.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_test6.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/action_execution_order_test6.c	22 Mar 2007 08:26:10 -0000	1.2
+++ testsuite/misc-ming.all/action_execution_order_test6.c	5 Apr 2007 07:03:43 -0000	1.3
@@ -29,7 +29,7 @@
  * 3rd frm of _root:
  *    place mc1 and  mc2;
  * 4th frm of _root:
- *    stop and do checks
+ *    record the order of all triggered events and goto the 10th frame
  * 5th frm of _root
  *    gotoAndPlay(4);
  *    remove mc1 and mc2; 
@@ -41,6 +41,8 @@
  *    remove mc3;
  * 9th frm of _root
  *    gotoAndPlay(5);
+ * 10th frm of _root
+ *    stop and check
  *  
  * expected actions order:
  * At frame2 go forward to frame9:
@@ -184,8 +186,7 @@
     
   SWFMovie_nextFrame(mo); /* 3rd frame */
   
-  xcheck_equals(mo, "_root.x1", "'1+2+3+4+5+6+7+8+9+1+2+4+x+5+xx+'");
-  add_actions(mo, " _root.totals(); stop(); ");
+  add_actions(mo, " if(flag == 1) { _root.check_result = _root.x1; gotoAndStop(10); } ");
   SWFMovie_nextFrame(mo); /* 4th frame */
   
   add_actions(mo, " gotoAndPlay(4); ");
@@ -223,9 +224,12 @@
   SWFDisplayItem_remove(it3); 
   SWFMovie_nextFrame(mo); /* 8th frame */
   
-  add_actions(mo, " gotoAndPlay(5); ");
+  add_actions(mo, " gotoAndPlay(5); flag = 1;");
   SWFMovie_nextFrame(mo); /* 9th frame */
   
+  xcheck_equals(mo, "_root.check_result", "'1+2+3+4+5+6+7+8+9+1+2+4+x+5+xx+'");
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 10th frame */
   
   //Output movie
   puts("Saving " OUTPUT_FILENAME );

Index: testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c
===================================================================
RCS file: testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c
diff -N testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c	5 Apr 2007 07:03:43 -0000	1.1
@@ -0,0 +1,109 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, zoulunkai@gmail.com
+ *
+ * This file was intended to test reverse execution of frame tags. 
+ * However, the concept of reverse execution may be deprecated someday.
+ *
+ * frame2: place mc
+ * frame3: move mc
+ * frame4: move mc
+ * frame5: do nothing
+ * frame6: remove mc and goto frame5
+ *
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "reverse_execute_PlaceObject2_test2.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc, dejagnuclip;
+  SWFShape  sh;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  SWFMovie_nextFrame(mo); /* 1st frame */
+
+  
+  mc = newSWFMovieClip();
+  sh = make_fill_square (0, 0, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc, (SWFBlock)sh);  
+  SWFMovieClip_nextFrame(mc);//1st frame
+ 
+  /* add mc to _root and name it as "mc" */
+  SWFDisplayItem it;
+  it = SWFMovie_add(mo, (SWFBlock)mc);  
+  SWFDisplayItem_setDepth(it, 10); 
+  SWFDisplayItem_setName(it, "mc"); 
+  check_equals(mo, "_root.mc._x", "0");
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+
+  check_equals(mo, "_root.mc._x", "300");
+  SWFDisplayItem_move(it, 300.0, 300.0);
+  SWFMovie_nextFrame(mo); /* 3rd frame */ 
+
+  check_equals(mo, "_root.mc._x", "900");
+  SWFDisplayItem_move(it, 600.0, 600.0);
+  SWFMovie_nextFrame(mo); /* 4th frame */
+  
+  check_equals(mo, "_root.mc._x", "900");
+  SWFMovie_nextFrame(mo); /* 5th frame */
+  
+  SWFDisplayItem_remove(it);
+  add_actions(mo, " if(stopflag != 1)  gotoAndPlay(5);  stopflag = 1; ");
+  SWFMovie_nextFrame(mo); /* 6th frame */
+
+  //checks 
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 7th frame */
+  
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+



From MAILER-DAEMON Thu Apr 05 03:12:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZM91-00086x-5H
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:12:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZM8z-00085t-R4
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:12:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZM8y-00084S-3C
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:12:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZM8x-00084L-Rr
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:12:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HZM5c-0006qC-40
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:09:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZM5b-0003bt-IQ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:08:59 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HZM5b-0003bq-Cb
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:08:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZM5b-0003bq-Cb@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 05 Apr 2007 07:08:59 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all reverse_execute_P...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:12:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/05 07:08:59

Modified files:
	testsuite/misc-ming.all: reverse_execute_PlaceObject2_test1.c 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: reverse_execute_PlaceObject2_test1.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test1.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- reverse_execute_PlaceObject2_test1.c	4 Apr 2007 09:32:00 -0000	1.3
+++ reverse_execute_PlaceObject2_test1.c	5 Apr 2007 07:08:59 -0000	1.4
@@ -19,6 +19,9 @@
 /*
  * Zou Lunkai, zoulunkai@gmail.com
  *
+ * This file was intended to test reverse execution of frame tags. 
+ * However, the concept of reverse execution may be deprecated someday.
+ *
  * frame1: place mc
  * frame2: move mc to (300, 300)
  * frame3: do nothing



From MAILER-DAEMON Thu Apr 05 03:21:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZMHJ-0001SV-TJ
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:21:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZMHI-0001SQ-Fu
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:21:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZMHH-0001SD-Gw
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:21:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZMHH-0001S8-BA
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:21:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZMDv-00088o-G9
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:17:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZMDu-0003w1-VL
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:17:35 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZMDu-0003vx-PS
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:17:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZMDu-0003vx-PS@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 07:17:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:21:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 07:17:34

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp 

Log message:
	        * server/as_environment.cpp (find_object_dotsyntax):
	          more verbose debugging for cases in which a dot-syntax
	          path contains non-object members.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2784&r2=1.2785
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.61&r2=1.62

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2784
retrieving revision 1.2785
diff -u -b -r1.2784 -r1.2785
--- ChangeLog	5 Apr 2007 07:03:43 -0000	1.2784
+++ ChangeLog	5 Apr 2007 07:17:34 -0000	1.2785
@@ -1,3 +1,9 @@
+2007-04-05 Sandro Santilli <strk@keybit.net>
+
+	* server/as_environment.cpp (find_object_dotsyntax): 
+	  more verbose debugging for cases in which a dot-syntax
+	  path contains non-object members.
+
 2007-04-05 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all: reverse_execute_PlaceObject2_test2.c

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/as_environment.cpp	28 Mar 2007 16:24:39 -0000	1.61
+++ server/as_environment.cpp	5 Apr 2007 07:17:34 -0000	1.62
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.61 2007/03/28 16:24:39 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.62 2007/04/05 07:17:34 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -655,7 +655,9 @@
 	// Debugging only:
 	if ( ! tmp.is_object() ) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Member %s for object %p found but doesn't cast to an as_object", subpart.c_str(), env);
+		log_aserror("Member %s for object %p found but doesn't cast to an as_object during "
+			"evaluation of target path %s",
+			subpart.c_str(), env, path.c_str());
 		);
 		return NULL;
 	}



From MAILER-DAEMON Thu Apr 05 03:35:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZMVK-0008WN-Fy
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:35:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZMVJ-0008WI-9c
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:35:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZMVI-0008W6-QD
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:35:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZMVI-0008W3-Jv
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:35:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZMRu-00017f-Fg
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:32:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZMRM-0004le-RQ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:31:28 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZMRM-0004lQ-BA
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:31:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZMRM-0004lQ-BA@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 07:31:28 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/timers.cpp server/timers...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:35:33 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 07:31:28

Modified files:
	.              : ChangeLog 
	server         : timers.cpp timers.h 
	server/asobj   : LoadVars.cpp xmlsocket.cpp 

Log message:
	        * server/timers.{cpp,h}: drop the as_environment member
	          for Timers as we can't ensure it will be kept alive.
	          We'll use a newly created environment for calling
	          the timer function.
	        * server/asobj/: LoadVars.cpp, xmlsocket.cpp: update use of
	          timers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2785&r2=1.2786
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2785
retrieving revision 1.2786
diff -u -b -r1.2785 -r1.2786
--- ChangeLog	5 Apr 2007 07:17:34 -0000	1.2785
+++ ChangeLog	5 Apr 2007 07:31:27 -0000	1.2786
@@ -1,5 +1,11 @@
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
+	* server/timers.{cpp,h}: drop the as_environment member
+	  for Timers as we can't ensure it will be kept alive.
+	  We'll use a newly created environment for calling
+	  the timer function.
+	* server/asobj/: LoadVars.cpp, xmlsocket.cpp: update use of
+	  timers.
 	* server/as_environment.cpp (find_object_dotsyntax): 
 	  more verbose debugging for cases in which a dot-syntax
 	  path contains non-object members.

Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/timers.cpp	30 Mar 2007 10:18:29 -0000	1.27
+++ server/timers.cpp	5 Apr 2007 07:31:28 -0000	1.28
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: timers.cpp,v 1.27 2007/03/30 10:18:29 strk Exp $ */
+/* $Id: timers.cpp,v 1.28 2007/04/05 07:31:28 strk Exp $ */
 
 #include "timers.h"
 #include "as_function.h" // for class as_function
@@ -37,8 +37,7 @@
   Timer::Timer() :
       _interval(0),
       _start(0),
-      _object(0),
-      _env(0)
+      _object(0)
   {
   }
   
@@ -49,24 +48,22 @@
   
 
   void
-  Timer::setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr, as_environment *env)
+  Timer::setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr)
   {
     _function = &method;
     _interval = ms * 1000; // transform to microseconds 
     //log_msg("_interval microseconds: %lu", _interval);
-    _env = env;
     _object = this_ptr;
     start();
   }
 
   void
-  Timer::setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr, as_environment *env,
+  Timer::setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr, 
 		  std::vector<as_value>& args)
   {
     _function = &method;
     _interval = ms * 1000; // transform to microseconds 
     //log_msg("_interval microseconds: %lu", _interval);
-    _env = env;
     _object = this_ptr;
     _args = args;
     start();
@@ -119,17 +116,19 @@
 
     as_value timer_method(_function.get());
 
+    as_environment env;
+
     // Push args to the as_environment stack if needed
     for ( ArgsContainer::reverse_iterator it=_args.rbegin(), itEnd=_args.rend();
 		    it != itEnd; ++it )
     {
 	    //log_msg("Env-pushing %s", it->to_debug_string().c_str());
-	    _env->push(*it);
+	    env.push(*it);
     }
 
-    size_t firstArgBottomIndex = _env->stack_size()-1; 
+    size_t firstArgBottomIndex = env.stack_size()-1; 
 
-    as_value val = call_method(timer_method, _env, _object.get(),
+    as_value val = call_method(timer_method, &env, _object.get(),
 		    _args.size(), firstArgBottomIndex);
 
 }
@@ -223,7 +222,7 @@
 	}
 
 	Timer timer;
-	timer.setInterval(*as_func, ms, fn.this_ptr, &fn.env(), args);
+	timer.setInterval(*as_func, ms, fn.this_ptr, args);
     
 	movie_root& root = VM::get().getRoot();
 	int id = root.add_interval_timer(timer);

Index: server/timers.h
===================================================================
RCS file: /sources/gnash/gnash/server/timers.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/timers.h	30 Mar 2007 10:18:29 -0000	1.17
+++ server/timers.h	5 Apr 2007 07:31:28 -0000	1.18
@@ -89,11 +89,7 @@
       ///	It is allowed to be NULL as long as fn_call is allowed
       ///	a NULL as 'this_ptr' (we might want to change this).
       ///
-      /// @param env
-      /// 	The environment in which the associated function will be run.
-      ///	Not sure we should provide this rather then extracting from this_ptr...
-      ///
-      void setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr, as_environment *env);
+      void setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr);
 
       /// Setup the Timer, enabling it.
       //
@@ -110,14 +106,10 @@
       ///	It is allowed to be NULL as long as fn_call is allowed
       ///	a NULL as 'this_ptr' (we might want to change this).
       ///
-      /// @param env
-      /// 	The environment in which the associated function will be run.
-      ///	Not sure we should provide this rather then extracting from this_ptr...
-      ///
       /// @param args
       /// 	The list of arguments to pass to the function being invoked.
       ///
-      void setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr, as_environment *env,
+      void setInterval(as_function& method, unsigned ms, boost::intrusive_ptr<as_object> this_ptr, 
 		      std::vector<as_value>& args);
 
       /// Clear the timer, ready for reuse
@@ -162,9 +154,6 @@
       /// Context for the function call. Will be used as 'this' pointer.
       boost::intrusive_ptr<as_object> _object;
 
-      /// how to keep this alive ?
-      as_environment *_env;
-
       /// List of arguments
       ArgsContainer _args;
 };

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/LoadVars.cpp	22 Mar 2007 22:37:45 -0000	1.18
+++ server/asobj/LoadVars.cpp	5 Apr 2007 07:31:28 -0000	1.19
@@ -364,7 +364,7 @@
 		using boost::intrusive_ptr;
 		intrusive_ptr<builtin_function> loadsChecker = new builtin_function(
 			&LoadVars::checkLoads_wrapper, NULL);
-		Timer timer; timer.setInterval(*loadsChecker, 50, this, _env);
+		Timer timer; timer.setInterval(*loadsChecker, 50, this);
 		_loadCheckerTimer = VM::get().getRoot().add_interval_timer(timer);
 	}
 

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/xmlsocket.cpp	4 Apr 2007 20:30:45 -0000	1.22
+++ server/asobj/xmlsocket.cpp	5 Apr 2007 07:31:28 -0000	1.23
@@ -463,7 +463,7 @@
         Timer timer;
         boost::intrusive_ptr<builtin_function> ondata_handler = new builtin_function(&xmlsocket_inputChecker, NULL);
         unsigned interval = 50; // just make sure it's expired at every frame iteration (20 FPS used here)
-        timer.setInterval(*ondata_handler, interval, boost::dynamic_pointer_cast<as_object>(ptr), &fn.env());
+        timer.setInterval(*ondata_handler, interval, boost::dynamic_pointer_cast<as_object>(ptr));
         VM::get().getRoot().add_interval_timer(timer);
 
         log_warning("Timer set");



From MAILER-DAEMON Thu Apr 05 03:40:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZMa3-00013d-IN
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:40:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZMa2-00013C-CU
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:40:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZMZy-00011h-Ol
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:40:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZMZy-00011b-GP
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:40:22 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HZMWU-0001lC-RW
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:36:53 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l357a1309465;
	Thu, 5 Apr 2007 09:36:01 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 5 Apr 2007 09:36:01 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/action_...
Message-ID: <20070405073601.GG67543@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1HZM0V-0003Rl-Dr@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HZM0V-0003Rl-Dr@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:40:26 -0000

Zou, I tried enabling action_execution_order_test6runner and found out
that the Test data is reset:


09:33:11: TRACE: XFAILED: expected: '1+2+3+4+5+6+7+8+9+1+2+4+x+5+xx+' obtained: 1+2+3+6+7+9+1+2+6+7+1+2+ [/home/strk/src/gnash/gnash-head/testsuite/misc-ming.all/action_execution_order_test6.c:230]
09:33:11: TRACE: #passed: 0
09:33:11: TRACE: #failed: 0

As you can see there's a failure but it's not reported in the final summary.
I bet this is due to the first frame (Dejagnu stuff) being unloaded and reloaded, thus being
reset to 0 values for all members.

I'm asking COmpany now on IRC about how to tell what to unload and what not.

--strk;



From MAILER-DAEMON Thu Apr 05 03:53:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZMmq-0001rU-ME
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:53:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZMmp-0001n5-6h
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:53:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZMmn-0001k6-Kz
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:53:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZMmn-0001k3-GP
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:53:37 -0400
Received: from ik-out-1112.google.com ([66.249.90.183])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HZMjP-0003zg-Pw
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:50:08 -0400
Received: by ik-out-1112.google.com with SMTP id b32so311130ika
	for <gnash-commit@gnu.org>; Thu, 05 Apr 2007 00:50:01 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Ft7lj2SlxKZho1aI6dIh0bLxDNJya4NQeo/cifDEoebPGBQNLF5fttJqcMRiA44mFbuuts3uwhwfzniCgHadOg7ReHNOF3IIF8op0iolBc3iYCIL141vof8Qn/mX3vmiqGWnz+b9HDpBaka1V9p6nQK9T/oPkIC4gY6vrbnY/4g=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=G3x11vlFl0v23iL3crd8BQAAY+451GOmLhNayEHLaUhDrCp9iYGVHn7Eytvg6fmtOponlRPy2VpoJgqUZhZUQFxvwanewVqtuvwJTvJTGs8VXSFvNUzBGMYqDChWcX5XMLZQxEgDoD5rnuuEGBdk1kaQWpFM2MDR7rw+2N6YfZQ=
Received: by 10.114.168.1 with SMTP id q1mr598594wae.1175759400893;
	Thu, 05 Apr 2007 00:50:00 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Thu, 5 Apr 2007 00:50:00 -0700 (PDT)
Message-ID: <ca4b43ff0704050050r3cbdd693r4ba6b2ec2642df4@mail.gmail.com>
Date: Thu, 5 Apr 2007 15:50:00 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Zou Lunkai" <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/action_...
In-Reply-To: <20070405073601.GG67543@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HZM0V-0003Rl-Dr@cvs> <20070405073601.GG67543@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:53:39 -0000

check with proprietary player here:
xpassed: ...
passed:0
failed:0

On 4/5/07, strk <strk@keybit.net> wrote:
> Zou, I tried enabling action_execution_order_test6runner and found out
> that the Test data is reset:
>
>
> 09:33:11: TRACE: XFAILED: expected: '1+2+3+4+5+6+7+8+9+1+2+4+x+5+xx+' obtained: 1+2+3+6+7+9+1+2+6+7+1+2+ [/home/strk/src/gnash/gnash-head/testsuite/misc-ming.all/action_execution_order_test6.c:230]
> 09:33:11: TRACE: #passed: 0
> 09:33:11: TRACE: #failed: 0
>
> As you can see there's a failure but it's not reported in the final summary.
> I bet this is due to the first frame (Dejagnu stuff) being unloaded and reloaded, thus being
> reset to 0 values for all members.
>
> I'm asking COmpany now on IRC about how to tell what to unload and what not.
>
> --strk;
>



From MAILER-DAEMON Thu Apr 05 03:59:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZMsF-0006S6-Rw
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 03:59:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZMsE-0006S1-Fe
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:59:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZMsD-0006Rp-2v
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:59:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZMsC-0006Rm-UR
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:59:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HZMoq-0004i6-Qp
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 03:55:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZMoq-0006S5-41
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:55:44 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HZMop-0006S2-Rw
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:55:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZMop-0006S2-Rw@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 05 Apr 2007 07:55:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/reverse...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 07:59:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/05 07:55:43

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: reverse_execute_PlaceObject2_test2.c 

Log message:
	add more tests for MovieClip events

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2786&r2=1.2787
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2786
retrieving revision 1.2787
diff -u -b -r1.2786 -r1.2787
--- ChangeLog	5 Apr 2007 07:31:27 -0000	1.2786
+++ ChangeLog	5 Apr 2007 07:55:43 -0000	1.2787
@@ -1,3 +1,8 @@
+2007-04-05 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c
+	add more tests of MovieClip events
+	
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
 	* server/timers.{cpp,h}: drop the as_environment member

Index: testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c	5 Apr 2007 07:03:43 -0000	1.1
+++ testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c	5 Apr 2007 07:55:43 -0000	1.2
@@ -63,6 +63,7 @@
 
   dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  add_actions(mo, " _root.x1 = ''; _root.x2 = ''; ");
   SWFMovie_nextFrame(mo); /* 1st frame */
 
   
@@ -75,6 +76,14 @@
   SWFDisplayItem it;
   it = SWFMovie_add(mo, (SWFBlock)mc);  
   SWFDisplayItem_setDepth(it, 10); 
+  
+  SWFDisplayItem_addAction(it,
+    compileSWFActionCode(" _root.x1 += 'onLoad+'; "),
+    SWFACTION_ONLOAD);
+  SWFDisplayItem_addAction(it,
+    compileSWFActionCode(" _root.x2 += 'onUnload+'; "),
+    SWFACTION_UNLOAD);
+    
   SWFDisplayItem_setName(it, "mc"); 
   check_equals(mo, "_root.mc._x", "0");
   SWFMovie_nextFrame(mo); /* 2nd frame */
@@ -95,6 +104,8 @@
   SWFMovie_nextFrame(mo); /* 6th frame */
 
   //checks 
+  check_equals(mo, "_root.x1", "'onLoad+onLoad+'" );
+  check_equals(mo, "_root.x2", "'onUnload+onUnload+'" );
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); /* 7th frame */
   



From MAILER-DAEMON Thu Apr 05 04:39:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZNVa-000554-6s
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 04:39:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZNVX-00050i-VA
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:39:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZNVW-0004wI-Ag
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:39:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZNVW-0004vt-3q
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:39:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZNS9-0001iH-Tr
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:36:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZNS9-0000Sr-2o
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 08:36:21 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZNS8-0000So-RL
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 08:36:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZNS8-0000So-RL@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 08:36:20 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ming_ut...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 08:39:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 08:36:20

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: ming_utils.c 

Log message:
	        * testsuite/misc-ming.all/ming_utils.c (get_dejagnu_actions):
	          property initialize the xpassed and xfailed counters.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2787&r2=1.2788
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.c?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2787
retrieving revision 1.2788
diff -u -b -r1.2787 -r1.2788
--- ChangeLog	5 Apr 2007 07:55:43 -0000	1.2787
+++ ChangeLog	5 Apr 2007 08:36:20 -0000	1.2788
@@ -1,3 +1,8 @@
+2007-04-05 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/ming_utils.c (get_dejagnu_actions):
+	  property initialize the xpassed and xfailed counters.
+
 2007-04-05 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/reverse_execute_PlaceObject2_test2.c

Index: testsuite/misc-ming.all/ming_utils.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/misc-ming.all/ming_utils.c	3 Apr 2007 17:00:59 -0000	1.25
+++ testsuite/misc-ming.all/ming_utils.c	5 Apr 2007 08:36:20 -0000	1.26
@@ -168,6 +168,8 @@
 		"TestState = function() {\n"
 		" this.passed = 0;\n"
 		" this.failed = 0;\n"
+		" this.xpassed = 0;\n"
+		" this.xfailed = 0;\n"
 		" this.untest = 0;\n"
 		" this.unresolve = 0;\n"
 		"};\n"



From MAILER-DAEMON Thu Apr 05 04:56:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZNlb-0005H1-BB
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 04:56:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZNlY-0005F9-Sx
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:56:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZNlX-0005Dw-FX
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:56:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZNlW-0005DG-Vn
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:56:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZNiA-0003PW-IZ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 04:52:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZNi3-00010t-3h
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 08:52:47 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZNi2-00010p-RJ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 08:52:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZNi2-00010p-RJ@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 08:52:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 08:56:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 08:52:46

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/misc-ming.all/Makefile.am: enabled run of
	          reverse_execute_PlaceObject2_test2runner and
	          action_execution_order_test6runner.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2788&r2=1.2789
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.87&r2=1.88

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2788
retrieving revision 1.2789
diff -u -b -r1.2788 -r1.2789
--- ChangeLog	5 Apr 2007 08:36:20 -0000	1.2788
+++ ChangeLog	5 Apr 2007 08:52:46 -0000	1.2789
@@ -1,5 +1,8 @@
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/Makefile.am: enabled run of
+	  reverse_execute_PlaceObject2_test2runner and
+	  action_execution_order_test6runner.
 	* testsuite/misc-ming.all/ming_utils.c (get_dejagnu_actions):
 	  property initialize the xpassed and xfailed counters.
 

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- testsuite/misc-ming.all/Makefile.am	4 Apr 2007 10:02:02 -0000	1.87
+++ testsuite/misc-ming.all/Makefile.am	5 Apr 2007 08:52:46 -0000	1.88
@@ -97,6 +97,7 @@
 	action_execution_order_test5 \
 	action_execution_order_test6 \
 	reverse_execute_PlaceObject2_test1 \
+	reverse_execute_PlaceObject2_test2 \
 	loadMovieTest \
 	loadMovieTestRunner \
 	eventSoundTest1 \
@@ -133,6 +134,8 @@
 	action_execution_order_test4runner \
 	action_execution_order_test5runner \
 	action_execution_order_test6runner \
+	reverse_execute_PlaceObject2_test1runner \
+	reverse_execute_PlaceObject2_test2runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -581,6 +584,20 @@
 	sh $< $(top_builddir) reverse_execute_PlaceObject2_test1.swf > $@
 	chmod 755 $@
 
+reverse_execute_PlaceObject2_test2_SOURCES =	\
+	reverse_execute_PlaceObject2_test2.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+reverse_execute_PlaceObject2_test2_LDADD = $(MING_LIBS)
+
+reverse_execute_PlaceObject2_test2.swf: reverse_execute_PlaceObject2_test2
+	./reverse_execute_PlaceObject2_test2 $(top_srcdir)/testsuite/media
+
+reverse_execute_PlaceObject2_test2runner: $(srcdir)/../generic-testrunner.sh reverse_execute_PlaceObject2_test2.swf
+	sh $< $(top_builddir) reverse_execute_PlaceObject2_test2.swf > $@
+	chmod 755 $@
+
 action_execution_order_extend_test_SOURCES =	\
 	action_execution_order_extend_test.c	\
 	ming_utils.h		\
@@ -839,7 +856,9 @@
 	action_execution_order_test3runner \
 	action_execution_order_test4runner \
 	action_execution_order_test5runner \
+	action_execution_order_test6runner \
 	reverse_execute_PlaceObject2_test1runner \
+	reverse_execute_PlaceObject2_test2runner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS



From MAILER-DAEMON Thu Apr 05 07:19:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZQ0I-0006gz-Qc
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 07:19:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZQ0H-0006dt-4r
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:19:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZQ0E-0006ZL-Vy
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:19:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZQ0E-0006ZA-Sr
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:19:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZPwr-0004ZG-OM
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 07:16:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZPwq-00085T-KV
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:16:12 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZPwq-00085N-0w
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:16:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZPwq-00085N-0w@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 11:16:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 11:19:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 11:16:11

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 
	server/vm      : ASHandlers.cpp 
	testsuite/swfdec: PASSING 

Log message:
	        * server/sprite_instance.{cpp,h} (get_frame_number):
	          Changed signature to report invalid frame specifications;
	          simplified and clened implementation of Zou Lunkai.
	        * server/vm/ASHandlers.cpp: updated calls to get_frame_number.
	        * testsuite/swfdec/PASSING: gotoframe.swf now passes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2789&r2=1.2790
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.222&r2=1.223
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2789
retrieving revision 1.2790
diff -u -b -r1.2789 -r1.2790
--- ChangeLog	5 Apr 2007 08:52:46 -0000	1.2789
+++ ChangeLog	5 Apr 2007 11:16:11 -0000	1.2790
@@ -1,5 +1,13 @@
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.{cpp,h} (get_frame_number):
+	  Changed signature to report invalid frame specifications;
+	  simplified and clened implementation of Zou Lunkai.
+	* server/vm/ASHandlers.cpp: updated calls to get_frame_number.
+	* testsuite/swfdec/PASSING: gotoframe.swf now passes.
+
+2007-04-05 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/Makefile.am: enabled run of
 	  reverse_execute_PlaceObject2_test2runner and
 	  action_execution_order_test6runner.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- server/sprite_instance.cpp	4 Apr 2007 20:30:45 -0000	1.222
+++ server/sprite_instance.cpp	5 Apr 2007 11:16:11 -0000	1.223
@@ -1706,27 +1706,28 @@
 	testInvariant();
 }
 
-size_t
-sprite_instance::get_frame_number(const as_value& frame_spec) const
+bool
+sprite_instance::get_frame_number(const as_value& frame_spec, size_t& frameno) const
 {
+	//GNASH_REPORT_FUNCTION;
 	size_t frame_number;
 
-	// Figure out what frame to call.
-	if (frame_spec.is_string())
-	{
-		if (m_def->get_labeled_frame(frame_spec.to_string(), &frame_number) == false)
-		{
-			// Try converting to integer.
-			frame_number = (size_t)frame_spec.to_number();
-		}
-	}
-	else
+	as_environment* env = const_cast<as_environment*>(&m_as_environment);
+
+	double num =  frame_spec.to_number(env);
+
+	// TODO: check if a frame labeled "0" or "-3" or "Infinite"
+	//       takes precedence over the numerical value.
+	if ( isnan(num) )
 	{
-		// convert from 1-based to 0-based
-		frame_number = (size_t) frame_spec.to_number() - 1;
+		return m_def->get_labeled_frame(frame_spec.to_string(env), &frameno);
 	}
 
-	return frame_number;
+	// TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
+	if ( num < 1 ) return false;
+
+	frameno = iclamp(num, 1, m_def->get_frame_count())-1;
+	return true;
 }
 
 /// Execute the actions for the specified frame. 
@@ -1735,13 +1736,12 @@
 ///
 void sprite_instance::call_frame_actions(const as_value& frame_spec)
 {
-	size_t	frame_number = get_frame_number(frame_spec);
-
-	if (frame_number >= m_def->get_frame_count())
+	size_t frame_number;
+	if ( ! get_frame_number(frame_spec, frame_number) )
 	{
 		// No dice.
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("call_frame('%s') -- unknown frame", frame_spec.to_string());
+		log_aserror("call_frame('%s') -- invalid frame", frame_spec.to_debug_string().c_str());
 		);
 		return;
 	}

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/sprite_instance.h	3 Apr 2007 13:43:32 -0000	1.87
+++ server/sprite_instance.h	5 Apr 2007 11:16:11 -0000	1.88
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.87 2007/04/03 13:43:32 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.88 2007/04/05 11:16:11 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -277,11 +277,27 @@
 	///
 	void	goto_frame(size_t target_frame_number);
 
-	/// \brief
-	/// Parse frame spec and return frame number.
-	/// Frame spec can either be a number of a string (label)
+	/// Parse frame spec and return a 0-based frame number.
+	//
+	/// If frame spec cannot be converted to !NAN number
+	/// it will be converted to a string and considered a
+	/// frame label (returns false if referring to an
+	/// unknwown label).
+	///
+	/// If frame spec can be converted to a non-zero positive
+	/// integer it will be "clamped" to the valid range.
+	///
+	/// @param frame_spec
+	///	The frame specification.
+	///
+	/// @param frameno
+	///	The evaluated frame number (0-based)
+	///
+	/// @return
+	///	True if the frame_spec could be resolved to a frame number.
+	///	False if the frame_spec was invalid.
 	///
-	size_t get_frame_number(const as_value& frame_spec) const;
+	bool get_frame_number(const as_value& frame_spec, size_t& frameno) const;
 
 
 	/// Look up the labeled frame, and jump to it.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/vm/ASHandlers.cpp	3 Apr 2007 16:33:14 -0000	1.80
+++ server/vm/ASHandlers.cpp	5 Apr 2007 11:16:11 -0000	1.81
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.80 2007/04/03 16:33:14 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.81 2007/04/05 11:16:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1438,7 +1438,7 @@
 
 	// env.top(0) contains frame specification,
 	// evaluated as for ActionGotoExpression
-	as_value& framespec = env.top(0);
+	as_value framespec = env.pop();
 	
 	character* target = env.get_target();
 	sprite_instance* target_sprite = target->to_movie();
@@ -1446,11 +1446,20 @@
 	{
 		log_error("environment target is not a sprite_instance "
 			"while executing ActionWaitForFrameExpression");
-		env.drop(1);
 		return;
 	}
 
-	size_t framenum = target_sprite->get_frame_number(framespec);
+	size_t framenum;
+        if ( ! target_sprite->get_frame_number(framespec, framenum) )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Frame spec found on stack "
+			"at ActionWaitForFrame doesn't evaluate "
+		        "to a valid frame: %s",
+			framespec.to_debug_string().c_str());
+		);
+		return;
+	}
 
 #ifdef REALLY_WAIT_ON_WAIT_FOR_FRAME
 	target_sprite->get_movie_definition()->ensure_frame_loaded(framenum);
@@ -1465,8 +1474,6 @@
 		thread.skip_actions(skip);
 	}
 
-	env.drop(1);
-	
 	//dbglogfile << __PRETTY_FUNCTION__ << ": testing" << endl;
 }
 
@@ -1999,7 +2006,18 @@
 
 	as_value expression = env.pop();
 
-	size_t frame_number = target->get_frame_number(expression);
+	size_t frame_number;
+	if ( ! target->get_frame_number(expression, frame_number) )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Frame spec found on stack "
+			"at ActionGotoExpression doesn't evaluate "
+		        "to a valid frame: %s",
+			expression.to_debug_string().c_str());
+		);
+		return;
+	}
+
 	target->goto_frame(frame_number);
 	target->set_play_state(state);
 		  

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/swfdec/PASSING	29 Mar 2007 08:58:59 -0000	1.13
+++ testsuite/swfdec/PASSING	5 Apr 2007 11:16:11 -0000	1.14
@@ -15,6 +15,7 @@
 goto3.swf
 goto4.swf
 goto5.swf
+gotoframe.swf
 names.swf
 array.swf
 DoInitAction-once.swf



From MAILER-DAEMON Thu Apr 05 09:40:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZSC4-0005S5-H9
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 09:40:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZSC2-0005Ru-Bl
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 09:40:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZSC0-0005Qv-5z
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 09:40:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZSC0-0005Qg-2n
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 09:40:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZS8c-00009X-Dy
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 09:36:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZS8a-0007wX-Fm
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 13:36:28 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZS8a-0007wU-9H
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 13:36:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZS8a-0007wU-9H@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 13:36:28 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server as_environment.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 13:40:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 13:36:28

Modified files:
	server         : as_environment.cpp 

Log message:
	more verbose actionscript coding error

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- as_environment.cpp	5 Apr 2007 07:17:34 -0000	1.62
+++ as_environment.cpp	5 Apr 2007 13:36:28 -0000	1.63
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.62 2007/04/05 07:17:34 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.63 2007/04/05 13:36:28 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -645,7 +645,7 @@
 		if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Element '%s' of variable '%s' not found in object %p nor in _global",
+			log_aserror("Element '%s' of variable '%s' not found in object %p nor in _global (dotsyntax)",
 				subpart.c_str(), path.c_str(), env);
 			);
 			return NULL;
@@ -789,7 +789,7 @@
 			if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("Element '%s' of variable '%s' not found in object %p nor in _global",
+				log_aserror("Element '%s' of variable '%s' not found in object %p nor in _global (slashsyntax)",
 					subpart.c_str(), path.c_str(), env);
 				);
 				return NULL;



From MAILER-DAEMON Thu Apr 05 11:02:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZTU8-0008G0-Cf
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 11:02:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZTU6-0008Ex-9Y
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:02:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZTU4-0008E7-K3
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:02:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZTU4-0008Dz-DL
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:02:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZTQg-0004LB-EJ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 10:59:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZTQe-0003MQ-JV
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 14:59:12 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZTQe-0003MK-B9
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 14:59:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZTQe-0003MK-B9@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 14:59:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server as_environment.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 15:02:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 14:59:12

Modified files:
	server         : as_environment.cpp 

Log message:
	More informative messages about problem with variable paths resolution

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.63&r2=1.64

Patches:
Index: as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- as_environment.cpp	5 Apr 2007 13:36:28 -0000	1.63
+++ as_environment.cpp	5 Apr 2007 14:59:11 -0000	1.64
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.63 2007/04/05 13:36:28 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.64 2007/04/05 14:59:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -638,7 +638,10 @@
 		// Try _global, but only at first iteration...
 		if ( depth > 0 ) 
 		{
-			log_msg("Member %s for object %p not found", subpart.c_str(), env);
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("Member %s for object %p not found (dotsyntax). Path was %s.",
+				subpart.c_str(), env, path.c_str());
+			);
 			return NULL;
 		}
 
@@ -655,9 +658,9 @@
 	// Debugging only:
 	if ( ! tmp.is_object() ) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Member %s for object %p found but doesn't cast to an as_object during "
-			"evaluation of target path %s",
-			subpart.c_str(), env, path.c_str());
+		log_aserror("Member %s of object %p doesn't cast to an Object (%s) "
+			"evaluating target path %s (dotsyntax)",
+			subpart.c_str(), env, tmp.to_debug_string().c_str(), path.c_str());
 		);
 		return NULL;
 	}
@@ -781,7 +784,8 @@
 			if ( depth > 0 ) 
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("Member %s for object %p not found", subpart.c_str(), env);
+				log_aserror("Member %s for object %p not found (slashsytax). Path was %s",
+					subpart.c_str(), env, path.c_str());
 				);
 				return NULL;
 			}
@@ -798,7 +802,11 @@
 
 		// Debugging only:
 		if ( ! tmp.is_object() ) {
-			log_msg("Member %s for object %p found but doesn't cast to an as_object", subpart.c_str(), env);
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("Member %s of object %p doesn't cast to an Object (%s) "
+				"evaluating target path %s (slashsyntax)",
+				subpart.c_str(), env, tmp.to_debug_string().c_str(), path.c_str());
+				);
 			return NULL;
 		}
 



From MAILER-DAEMON Thu Apr 05 11:07:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZTYb-0003bX-MT
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 11:07:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZTYa-0003bH-4Q
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:07:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZTYZ-0003b5-EC
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:07:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZTYZ-0003b2-Aj
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:07:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZTVB-00056s-5z
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:03:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZTV8-0003St-Lx
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:03:50 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZTV8-0003Sq-FJ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:03:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZTV8-0003Sq-FJ@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 15:03:50 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 15:07:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 15:03:50

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	Fix a stack underrun

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.40&r2=1.41

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- MovieClip.as	28 Mar 2007 20:52:37 -0000	1.40
+++ MovieClip.as	5 Apr 2007 15:03:50 -0000	1.41
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.40 2007/03/28 20:52:37 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.41 2007/04/05 15:03:50 strk Exp $";
 
 #include "check.as"
 
@@ -360,6 +360,7 @@
 check_equals(b, "/");
 
 asm {
+	push "a"
 	push "_root"
 	push 13 // _name
 	getproperty
@@ -372,6 +373,7 @@
 #endif
 
 asm {
+	push "b"
 	push "_root"
 	push 11 // _target
 	getproperty



From MAILER-DAEMON Thu Apr 05 11:08:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZTZa-0004Aq-Bv
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 11:08:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZTZY-0004Ag-GK
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:08:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZTZY-0004AQ-3t
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:08:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZTZX-0004AN-St
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:08:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZTW9-0005Ix-QJ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 11:04:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZTW8-0003Ux-Ci
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:04:52 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZTW7-0003Uu-Vb
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:04:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZTW7-0003Uu-Vb@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 15:04:51 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 15:08:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 15:04:51

Modified files:
	.              : ChangeLog 

Log message:
	stack underrun fix log

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2790&r2=1.2791

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2790
retrieving revision 1.2791
diff -u -b -r1.2790 -r1.2791
--- ChangeLog	5 Apr 2007 11:16:11 -0000	1.2790
+++ ChangeLog	5 Apr 2007 15:04:51 -0000	1.2791
@@ -1,5 +1,7 @@
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as: fix couple of stack
+	  underruns.
 	* server/sprite_instance.{cpp,h} (get_frame_number):
 	  Changed signature to report invalid frame specifications;
 	  simplified and clened implementation of Zou Lunkai.



From MAILER-DAEMON Thu Apr 05 13:44:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZW0O-0006lU-8p
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 13:44:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZW0M-0006l1-Ew
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 13:44:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZW0K-0006kA-9p
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 13:44:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZW0K-0006jg-0W
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 13:44:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZVwv-0002y7-7I
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 13:40:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZVwt-0002uA-Ok
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 17:40:39 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZVwt-0002u7-D2
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 17:40:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZVwt-0002u7-D2@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 17:40:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 17:44:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 17:40:39

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: add softreference
	          test (MovieClip values kept by absolute _target).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2791&r2=1.2792
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2791
retrieving revision 1.2792
diff -u -b -r1.2791 -r1.2792
--- ChangeLog	5 Apr 2007 15:04:51 -0000	1.2791
+++ ChangeLog	5 Apr 2007 17:40:39 -0000	1.2792
@@ -1,5 +1,7 @@
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as: add softreference
+	  test (MovieClip values kept by absolute _target).
 	* testsuite/actionscript.all/MovieClip.as: fix couple of stack
 	  underruns.
 	* server/sprite_instance.{cpp,h} (get_frame_number):

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- testsuite/actionscript.all/MovieClip.as	5 Apr 2007 15:03:50 -0000	1.41
+++ testsuite/actionscript.all/MovieClip.as	5 Apr 2007 17:40:39 -0000	1.42
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.41 2007/04/05 15:03:50 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.42 2007/04/05 17:40:39 strk Exp $";
 
 #include "check.as"
 
@@ -221,6 +221,10 @@
 check(mc._xmouse != undefined);
 check(mc._xscale != undefined);
 
+//----------------------------------------------
+// Test createEmptyMovieClip
+//----------------------------------------------
+
 #if OUTPUT_VERSION >= 6
 // Test movieclip creation
 var mc2 = createEmptyMovieClip("mc2_mc", 50, 0, 0, 0);
@@ -269,6 +273,28 @@
 check_equals(mc5._parent, mc4);
 #endif
 
+//--------------------------------------------------------------------------
+// Test "soft" references
+// See: // http://thread.gmane.org/gmane.comp.web.flashcoders.devel/84030
+//--------------------------------------------------------------------------
+
+#if OUTPUT_VERSION >= 6
+softref = _root.createEmptyMovieClip("hardref", 60);
+check_equals(typeof(hardref), 'movieclip');
+check_equals(typeof(softref), 'movieclip');
+softref.member = 1;
+check_equals(typeof(softref.member), 'number');
+check_equals(softref.member, 1);
+removeMovieClip(hardref); // use the _global removeMovieClip !
+xcheck_equals(typeof(hardref), 'undefined');
+check_equals(typeof(softref), 'movieclip');
+xcheck_equals(typeof(softref.member), 'undefined');
+_root.createEmptyMovieClip("hardref", 60);
+hardref.member = 2;
+check_equals(typeof(softref.member), 'number');
+check_equals(softref.member, 2);
+#endif // OUTPUT_VERSION >= 6
+
 //----------------------------------------------
 // Test timeline variables
 //----------------------------------------------



From MAILER-DAEMON Thu Apr 05 15:37:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZXm1-0006HG-9D
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 15:37:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZXm0-0006HB-Fk
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:37:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZXly-0006Gw-Cn
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:37:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZXly-0006Gp-6Q
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:37:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZXiY-0000uX-PM
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 15:33:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZXiV-0001M9-0W
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 19:33:55 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZXiU-0001M4-Hr
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 19:33:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZXiU-0001M4-Hr@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 05 Apr 2007 19:33:54 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp testsu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Apr 2007 19:37:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/05 19:33:54

Modified files:
	.              : ChangeLog 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/vm/ASHandlers.cpp (ActionRemoveClip): properly parse
	          the given argument rather then assuming that it refers to
	          a child of the current target movie. (fixes the softreference
	          tests).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2792&r2=1.2793
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.42&r2=1.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2792
retrieving revision 1.2793
diff -u -b -r1.2792 -r1.2793
--- ChangeLog	5 Apr 2007 17:40:39 -0000	1.2792
+++ ChangeLog	5 Apr 2007 19:33:53 -0000	1.2793
@@ -1,5 +1,9 @@
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (ActionRemoveClip): properly parse
+	  the given argument rather then assuming that it refers to
+	  a child of the current target movie. (fixes the softreference
+	  tests).
 	* testsuite/actionscript.all/MovieClip.as: add softreference
 	  test (MovieClip values kept by absolute _target).
 	* testsuite/actionscript.all/MovieClip.as: fix couple of stack

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/vm/ASHandlers.cpp	5 Apr 2007 11:16:11 -0000	1.81
+++ server/vm/ASHandlers.cpp	5 Apr 2007 19:33:54 -0000	1.82
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.81 2007/04/05 11:16:11 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.82 2007/04/05 19:33:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1169,12 +1169,34 @@
 
 	thread.ensureStack(1); 
 
-	sprite_instance* tgt = env.get_target()->to_movie();
-	assert(tgt);
+	std::string path = env.pop().to_std_string();
+
+	character* ch = env.find_target(path);
+	if ( ! ch )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Path given to removeMovieClip(%s) doesn't point to a character",
+			path.c_str());
+		);
+		return;
+	}
+
+	sprite_instance* sprite = ch->to_movie();
+	if ( ! sprite )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Path given to removeMovieClip(%s) is not a sprite",
+			path.c_str());
+		);
+		return;
+	}
+
+	sprite_instance* parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
+	if (parent)
+	{
+		parent->remove_display_object(sprite->get_depth(), 0);
+	}
 
-	// strk: why not using pop() ?
-	tgt->remove_display_object(env.top(0).to_tu_string());
-	env.drop(1);
 }
 
 /// \brief Trace messages from the Flash movie using trace();

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- testsuite/actionscript.all/MovieClip.as	5 Apr 2007 17:40:39 -0000	1.42
+++ testsuite/actionscript.all/MovieClip.as	5 Apr 2007 19:33:54 -0000	1.43
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.42 2007/04/05 17:40:39 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.43 2007/04/05 19:33:54 strk Exp $";
 
 #include "check.as"
 
@@ -275,24 +275,29 @@
 
 //--------------------------------------------------------------------------
 // Test "soft" references
-// See: // http://thread.gmane.org/gmane.comp.web.flashcoders.devel/84030
+// See http://thread.gmane.org/gmane.comp.web.flashcoders.devel/84030
 //--------------------------------------------------------------------------
 
 #if OUTPUT_VERSION >= 6
+
 softref = _root.createEmptyMovieClip("hardref", 60);
 check_equals(typeof(hardref), 'movieclip');
 check_equals(typeof(softref), 'movieclip');
 softref.member = 1;
 check_equals(typeof(softref.member), 'number');
 check_equals(softref.member, 1);
-removeMovieClip(hardref); // use the _global removeMovieClip !
-xcheck_equals(typeof(hardref), 'undefined');
+removeMovieClip(hardref); // using ActionRemoveClip (0x25)
+//_global.removeMovieClip(softref); // using the _global removeMovieClip 
+//hardref.removeMovieClip(); // using the sprite's removeMovieClip 
+//softref.removeMovieClip(); // use the softref's removeMovieClip 
+check_equals(typeof(hardref), 'undefined');
 check_equals(typeof(softref), 'movieclip');
-xcheck_equals(typeof(softref.member), 'undefined');
-_root.createEmptyMovieClip("hardref", 60);
+check_equals(typeof(softref.member), 'undefined');
+_root.createEmptyMovieClip("hardref", 61);
 hardref.member = 2;
 check_equals(typeof(softref.member), 'number');
 check_equals(softref.member, 2);
+
 #endif // OUTPUT_VERSION >= 6
 
 //----------------------------------------------



From MAILER-DAEMON Thu Apr 05 22:47:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZeU3-0003fV-Qn
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 22:47:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZeU2-0003fP-6P
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 22:47:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZeU0-0003fD-QJ
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 22:47:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZeU0-0003fA-I3
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 22:47:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HZeQZ-0004wR-4Z
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 22:43:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZeQY-0000dU-LL
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 02:43:50 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HZeQY-0000dQ-Bd
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 02:43:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZeQY-0000dQ-Bd@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 06 Apr 2007 02:43:50 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Date.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 02:47:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/06 02:43:50

Modified files:
	.              : ChangeLog 
	server/asobj   : Date.cpp 

Log message:
	fix passing parameter to utctime()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2793&r2=1.2794
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2793
retrieving revision 1.2794
diff -u -b -r1.2793 -r1.2794
--- ChangeLog	5 Apr 2007 19:33:53 -0000	1.2793
+++ ChangeLog	6 Apr 2007 02:43:49 -0000	1.2794
@@ -1,3 +1,8 @@
+2007-04-05 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/asobj/Date.cpp
+	fix passing parameter to utctime();
+	
 2007-04-05 Sandro Santilli <strk@keybit.net>
 
 	* server/vm/ASHandlers.cpp (ActionRemoveClip): properly parse

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/asobj/Date.cpp	4 Apr 2007 20:30:45 -0000	1.39
+++ server/asobj/Date.cpp	6 Apr 2007 02:43:50 -0000	1.40
@@ -179,7 +179,7 @@
 {
 #if USE_UTCCONV
 	double msec;
-	utctime(*t * 1000.0, &tm, &msec);
+	utctime(*t * 1000.0, tm, &msec);
 #else
 	struct tm *tmp;
 	tmp = gmtime(t);



From MAILER-DAEMON Thu Apr 05 23:22:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZf21-0005XH-M8
	for mharc-gnash-commit@gnu.org; Thu, 05 Apr 2007 23:22:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZf20-0005XC-A5
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 23:22:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZf1y-0005X0-PT
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 23:22:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZf1y-0005Wx-KY
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 23:22:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HZeyW-0001Pp-W8
	for gnash-commit@gnu.org; Thu, 05 Apr 2007 23:18:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZeyV-0001Yi-ON
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:18:55 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HZeyV-0001Yf-Jh
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:18:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZeyV-0001Yf-Jh@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Fri, 06 Apr 2007 03:18:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/po
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 03:22:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/06 03:18:55

New directory:
	po

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/po/?cvsroot=gnash



From MAILER-DAEMON Fri Apr 06 03:54:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZjGk-000802-Qg
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 03:54:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZjGg-0007wM-K2
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:53:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZjGO-0007TA-9j
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:53:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZjGN-0007SE-FT
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:53:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HZjCq-0004fz-7E
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:50:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZjCm-00079p-Cl
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:49:56 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HZjCm-00079m-3l
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:49:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZjCm-00079m-3l@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Fri, 06 Apr 2007 07:49:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ABOUT-NLS config.rpath libbase/gettext.h ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 07:54:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/06 07:49:55

Added files:
	.              : ABOUT-NLS config.rpath 
	libbase        : gettext.h 
	macros         : codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 
	                 iconv.m4 intdiv0.m4 intmax.m4 inttypes-pri.m4 
	                 inttypes.m4 inttypes_h.m4 isc-posix.m4 
	                 lcmessage.m4 lib-ld.m4 lib-link.m4 
	                 lib-prefix.m4 longdouble.m4 longlong.m4 nls.m4 
	                 po.m4 printf-posix.m4 progtest.m4 signed.m4 
	                 size_max.m4 stdint_h.m4 uintmax_t.m4 
	                 ulonglong.m4 wchar_t.m4 wint_t.m4 xsize.m4 
	po             : LINGUAS Makefile.in.in POTFILES.in Rules-quot 
	                 boldquot.sed en@boldquot.header en@quot.header 
	                 es.po gnash.pot insert-header.sin quot.sed 
	                 remove-potcdate.sin Makevars 

Log message:
	Internationalize gnash.  Phase 1: use gettextize, update config files.
	
	* macros/{codeset.m4, gettext.m4, glibc2.m4, glibc21.m4,
	  iconv.m4, intdiv0.m4, intmax.m4, inttypes.m4, inttypes_h.m4,
	  inttypes-pri.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4,
	  lib-link.m4, lib-prefix.m4, longdouble.m4, longlong.m4, nls.m4,
	  po.m4, printf-posix.m4, progtest.m4, signed.m4, size_max.m4,
	  stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4,
	  xsize.m4}: New files, from gettext-0.14.6.
	* po: New directory for translated messages (Portable Object files)
	* po/{Makefile.in.in, boldquot.sed, en@boldquot.header,
	  en@quot.header, insert-header.sin, quot.sed,
	  remove-potcdate.sin, Rules-quot}: New files, from gettext-0.14.6.
	* ABOUT-NLS, config.rpath: New files, from gettext-0.14.6.
	* libbase/gettext.h:  New file, from gettext-0.14.6.
	* po/Makevars: New file: settings for gnash's message translation.
	* po/POTFILES.in: New file: source files with translatable strings.
	* po/LINGUAS: New file: languages we have translations for.
	* po/gnash.pot:  Message string catalog for testing.
	* po/es.po:  Dummy Spanish-language message string catalog for testing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ABOUT-NLS?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/config.rpath?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/gettext.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/codeset.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gettext.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glibc2.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glibc21.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/iconv.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/intdiv0.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/intmax.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/inttypes-pri.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/inttypes.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/inttypes_h.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/isc-posix.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lcmessage.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lib-ld.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lib-link.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lib-prefix.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/longdouble.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/longlong.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/nls.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/po.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/printf-posix.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/progtest.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/signed.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/size_max.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/stdint_h.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/uintmax_t.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ulonglong.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/wchar_t.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/wint_t.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/xsize.m4?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/LINGUAS?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Makefile.in.in?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/POTFILES.in?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Rules-quot?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/boldquot.sed?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/en%64boldquot.header?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/en%64quot.header?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/es.po?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/gnash.pot?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/insert-header.sin?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/quot.sed?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/remove-potcdate.sin?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Makevars?cvsroot=gnash&rev=1.1

Patches:
Index: ABOUT-NLS
===================================================================
RCS file: ABOUT-NLS
diff -N ABOUT-NLS
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ ABOUT-NLS	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,1066 @@
+1 Notes on the Free Translation Project
+***************************************
+
+Free software is going international!  The Free Translation Project is
+a way to get maintainers of free software, translators, and users all
+together, so that free software will gradually become able to speak many
+languages.  A few packages already provide translations for their
+messages.
+
+   If you found this `ABOUT-NLS' file inside a distribution, you may
+assume that the distributed package does use GNU `gettext' internally,
+itself available at your nearest GNU archive site.  But you do _not_
+need to install GNU `gettext' prior to configuring, installing or using
+this package with messages translated.
+
+   Installers will find here some useful hints.  These notes also
+explain how users should proceed for getting the programs to use the
+available translations.  They tell how people wanting to contribute and
+work on translations can contact the appropriate team.
+
+1.1 Quick configuration advice
+==============================
+
+[obsolete]
+
+1.2 INSTALL Matters
+===================
+
+Some packages are "localizable" when properly installed; the programs
+they contain can be made to speak your own native language.  Most such
+packages use GNU `gettext'.  Other packages have their own ways to
+internationalization, predating GNU `gettext'.
+
+   By default, this package will be installed to allow translation of
+messages.  It will automatically detect whether the system already
+provides the GNU `gettext' functions.  If not, the package will not
+be translated.
+Installers may use special options at configuration time for changing
+the default behaviour.  The command:
+
+     ./configure --disable-nls
+
+will, _totally_ disable translation of messages.
+
+   Internationalized packages usually have many `po/LL.po' files, where
+LL gives an ISO 639 two-letter code identifying the language.  Unless
+translations have been forbidden at `configure' time by using the
+`--disable-nls' switch, all available translations are installed
+together with the package.  However, the environment variable `LINGUAS'
+may be set, prior to configuration, to limit the installed set.
+`LINGUAS' should then contain a space separated list of two-letter
+codes, stating which languages are allowed.
+
+1.3 Using This Package
+======================
+
+As a user, if your language has been installed for this package, you
+only have to set the `LANG' environment variable to the appropriate
+`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
+and `CC' is an ISO 3166 two-letter country code.  For example, let's
+suppose that you speak German and live in Germany.  At the shell
+prompt, merely execute `setenv LANG de_DE' (in `csh'),
+`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
+This can be done from your `.login' or `.profile' file, once and for
+all.
+
+   You might think that the country code specification is redundant.
+But in fact, some languages have dialects in different countries.  For
+example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
+country code serves to distinguish the dialects.
+
+   The locale naming convention of `LL_CC', with `LL' denoting the
+language and `CC' denoting the country, is the one use on systems based
+on GNU libc.  On other systems, some variations of this scheme are
+used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
+locales supported by your system for your country by running the command
+`locale -a | grep '^LL''.
+
+   Not all programs have translations for all languages.  By default, an
+English message is shown in place of a nonexistent translation.  If you
+understand other languages, you can set up a priority list of languages.
+This is done through a different environment variable, called
+`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
+for the purpose of message handling, but you still need to have `LANG'
+set to the primary language; this is required by other parts of the
+system libraries.  For example, some Swedish users who would rather
+read translations in German than English for when Swedish is not
+available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.
+
+   Special advice for Norwegian users: The language code for Norwegian
+bokma*l changed from `no' to `nb' recently (in 2003).  During the
+transition period, while some message catalogs for this language are
+installed under `nb' and some older ones under `no', it's recommended
+for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and
+older translations are used.
+
+   In the `LANGUAGE' environment variable, but not in the `LANG'
+environment variable, `LL_CC' combinations can be abbreviated as `LL'
+to denote the language's main dialect.  For example, `de' is equivalent
+to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
+(Portuguese as spoken in Portugal) in this context.
+
+1.4 Translating Teams
+=====================
+
+For the Free Translation Project to be a success, we need interested
+people who like their own language and write it well, and who are also
+able to synergize with other translators speaking the same language.
+Each translation team has its own mailing list.  The up-to-date list of
+teams can be found at the Free Translation Project's homepage,
+`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
+area.
+
+   If you'd like to volunteer to _work_ at translating messages, you
+should become a member of the translating team for your own language.
+The subscribing address is _not_ the same as the list itself, it has
+`-request' appended.  For example, speakers of Swedish can send a
+message to `sv-request@li.org', having this message body:
+
+     subscribe
+
+   Keep in mind that team members are expected to participate
+_actively_ in translations, or at solving translational difficulties,
+rather than merely lurking around.  If your team does not exist yet and
+you want to start one, or if you are unsure about what to do or how to
+get started, please write to `translation@iro.umontreal.ca' to reach the
+coordinator for all translator teams.
+
+   The English team is special.  It works at improving and uniformizing
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
+
+1.5 Available Packages
+======================
+
+Languages are not equally supported in all packages.  The following
+matrix shows the current state of internationalization, as of June
+2006.  The matrix shows, in regard of each package, for which languages
+PO files have been submitted to translation coordination, with a
+translation percentage of at least 50%.
+
+     Ready PO files       af am ar az be bg bs ca cs cy da de el en en_GB eo
+                        +----------------------------------------------------+
+     GNUnet             |                                  []                |
+     a2ps               |             []                [] [] []     []      |
+     aegis              |                                  ()                |
+     ant-phone          |                                  ()                |
+     anubis             |                                  []                |
+     ap-utils           |                                                    |
+     aspell             |                         []    [] []        []      |
+     bash               |                      []          []             [] |
+     batchelor          |                                  []                |
+     bfd                |                                                    |
+     bibshelf           |                                  []                |
+     binutils           |                               []                   |
+     bison              |                               [] []                |
+     bison-runtime      |                                                    |
+     bluez-pin          | []                      []       [] []          [] |
+     cflow              |                               []                   |
+     clisp              |                                  []    []          |
+     console-tools      |                         []       []                |
+     coreutils          |                []    []       [] []                |
+     cpio               |                                                    |
+     cpplib             |                      []       [] []                |
+     cryptonit          |                                  []                |
+     darkstat           |                []             () []                |
+     dialog             |                      [] [] [] [] [] []             |
+     diffutils          |                      [] []    [] [] []          [] |
+     doodle             |                                  []                |
+     e2fsprogs          |                         []       []                |
+     enscript           |                      []       [] []        []      |
+     error              |                      []       [] []        []      |
+     fetchmail          |                      []       [] () []             |
+     fileutils          |                               [] []                |
+     findutils          |                []    []       []                   |
+     flex               |                      []       [] []                |
+     fslint             |                                  []                |
+     gas                |                                                    |
+     gawk               |                      []       [] []                |
+     gbiff              |                                  []                |
+     gcal               |                      []                            |
+     gcc                |                                  []                |
+     gettext-examples   | []                   []          [] []             |
+     gettext-runtime    |             []       []       [] []                |
+     gettext-tools      |                      []          []                |
+     gimp-print         |                         []    [] []        []      |
+     gip                |                []                                  |
+     gliv               |                                  []                |
+     glunarclock        |                []                                  |
+     gmult              | []                               []                |
+     gnubiff            |                                  ()                |
+     gnucash            |                                  () ()     []      |
+     gnucash-glossary   |                               [] ()                |
+     gnuedu             |                                                    |
+     gnulib             | []          [] []    []       [] []                |
+     gnunet-gtk         |                                                    |
+     gnutls             |                                                    |
+     gpe-aerial         |                         []       []                |
+     gpe-beam           |                         []       []                |
+     gpe-calendar       |                         []       []                |
+     gpe-clock          |                         []       []                |
+     gpe-conf           |                         []       []                |
+     gpe-contacts       |                                                    |
+     gpe-edit           |                         []                         |
+     gpe-filemanager    |                                                    |
+     gpe-go             |                         []                         |
+     gpe-login          |                         []       []                |
+     gpe-ownerinfo      |                         []       []                |
+     gpe-package        |                                                    |
+     gpe-sketchbook     |                         []       []                |
+     gpe-su             |                         []       []                |
+     gpe-taskmanager    |                         []       []                |
+     gpe-timesheet      |                         []                         |
+     gpe-today          |                         []       []                |
+     gpe-todo           |                                                    |
+     gphoto2            |                         []    [] []        []      |
+     gprof              |                               [] []                |
+     gpsdrive           |                                  ()    ()          |
+     gramadoir          | []                               []                |
+     grep               | []          [] []    []          [] []             |
+     gretl              |                                                    |
+     gsasl              |                                                    |
+     gss                |                                                    |
+     gst-plugins        | []                   [] []    []                   |
+     gst-plugins-base   |                []    []       []                   |
+     gst-plugins-good   | []       []    []    [] []    []           []      |
+     gstreamer          | []             []    [] []    [] []        []      |
+     gtick              | []                               ()                |
+     gtkam              |                         []    [] []                |
+     gtkorphan          |                []                []                |
+     gtkspell           |             []                   [] []          [] |
+     gutenprint         |                               []                   |
+     hello              |                      []       [] [] []          [] |
+     id-utils           |                               [] []                |
+     impost             |                                                    |
+     indent             |                      []          []             [] |
+     iso_3166           |                                  []             [] |
+     iso_3166_1         |                      [] []    [] [] []             |
+     iso_3166_2         |                                                    |
+     iso_3166_3         |                                  []                |
+     iso_4217           |                                  []                |
+     iso_639            |                                  []             [] |
+     jpilot             |                         []                         |
+     jtag               |                                                    |
+     jwhois             |                                                    |
+     kbd                |                         []    [] [] []             |
+     keytouch           |                                                    |
+     keytouch-editor    |                                                    |
+     keytouch-keyboa... |                                                    |
+     latrine            |                                  ()                |
+     ld                 |                               []                   |
+     leafpad            |                []    [] []       [] []             |
+     libc               |                      [] []    [] [] []             |
+     libexif            |                                  []                |
+     libextractor       |                                  []                |
+     libgpewidget       |                         []    [] []                |
+     libgpg-error       |                                  []                |
+     libgphoto2         |                               [] []                |
+     libgphoto2_port    |                               [] []                |
+     libgsasl           |                                                    |
+     libiconv           |                                                    |
+     libidn             |                               []                [] |
+     lifelines          |                               [] ()                |
+     lilypond           |                                  []                |
+     lingoteach         |                                                    |
+     lynx               |                      [] []    [] []                |
+     m4                 |                         []    [] [] []             |
+     mailutils          |                      []                            |
+     make               |                               [] []                |
+     man-db             |                      [] ()    [] []                |
+     minicom            |                         []    [] []                |
+     mysecretdiary      |                               [] []                |
+     nano               |                []    [] ()       []                |
+     nano_1_0           |                      [] ()    [] []                |
+     opcodes            |                                  []                |
+     parted             |                                                    |
+     pilot-qof          |                                            []      |
+     psmisc             |                []                                  |
+     pwdutils           |                                                    |
+     python             |                                                    |
+     qof                |                                                    |
+     radius             |                      []                            |
+     recode             |             []       []       [] [] []          [] |
+     rpm                |                         []    []                   |
+     screem             |                                                    |
+     scrollkeeper       |          [] []       [] [] [] [] []        []      |
+     sed                |                      []          []             [] |
+     sh-utils           |                               [] []                |
+     shared-mime-info   |                []       []                      [] |
+     sharutils          |                []    [] []    [] [] []             |
+     shishi             |                                                    |
+     silky              |                                                    |
+     skencil            |                               [] ()                |
+     sketch             |                               [] ()                |
+     solfege            |                                                    |
+     soundtracker       |                               [] []                |
+     sp                 |                                  []                |
+     stardict           |                         []                         |
+     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
+     tar                |                                                    |
+     texinfo            |                               [] []             [] |
+     textutils          |                      []       [] []                |
+     tin                |                                  ()        ()      |
+     tp-robot           |                                  []                |
+     tuxpaint           | []             []             [] []        []      |
+     unicode-han-tra... |                                                    |
+     unicode-transla... |                                                    |
+     util-linux         |                      [] []    [] []                |
+     vorbis-tools       |             []          []    []           []      |
+     wastesedge         |                                  ()                |
+     wdiff              |                      []       [] []        []      |
+     wget               |                      []          []                |
+     xchat              |                []    []          [] []     []      |
+     xkeyboard-config   |                                                    |
+     xpad               |                []             []                   |
+                        +----------------------------------------------------+
+                          af am ar az be bg bs ca cs cy da de el en en_GB eo
+                          11  0  1  2  8 20  1 42 43  2 62 97 18  1  16   13
+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    []       [] []                             () |
+     aegis              |                                                  |
+     ant-phone          |                []                                |
+     anubis             |                []                                |
+     ap-utils           |             [] []                                |
+     aspell             |                []  []                         [] |
+     bash               | []             []                    []          |
+     batchelor          |                []  []                            |
+     bfd                | []                                               |
+     bibshelf           | []                 []                         [] |
+     binutils           | []          [] []                                |
+     bison              | [] []          []  []                   []    [] |
+     bison-runtime      |    []          []  []                   []    [] |
+     bluez-pin          |             [] []  []                [] []       |
+     cflow              |                                                  |
+     clisp              | []             []                                |
+     console-tools      |                                                  |
+     coreutils          | [] []       [] []  []                []          |
+     cpio               | []             []  []                            |
+     cpplib             | []             []                                |
+     cryptonit          |                []                                |
+     darkstat           | []             ()  []                [] []       |
+     dialog             | [] [] []    [] []  []                []       [] |
+     diffutils          | []          [] []  [] []    []       [] []    [] |
+     doodle             |                    []                         [] |
+     e2fsprogs          | []             []                             [] |
+     enscript           |                []  []             []             |
+     error              | []          [] []  []                []          |
+     fetchmail          | []                                               |
+     fileutils          | [] []          []  []                []       [] |
+     findutils          |    []          []  []                []          |
+     flex               | []             []  []                            |
+     fslint             |                []                                |
+     gas                | []             []                                |
+     gawk               | []             []  []       []                   |
+     gbiff              |                []                                |
+     gcal               | []             []                                |
+     gcc                | []                                               |
+     gettext-examples   | []             []  []                []       [] |
+     gettext-runtime    | []          [] []  []                   []    [] |
+     gettext-tools      | []             []                             [] |
+     gimp-print         | []             []                                |
+     gip                | []    []       []                                |
+     gliv               |                ()                                |
+     glunarclock        |             []     []                []          |
+     gmult              |       []       []                             [] |
+     gnubiff            |                ()                             () |
+     gnucash            | ()             ()                    ()          |
+     gnucash-glossary   | []                                            [] |
+     gnuedu             | []                                               |
+     gnulib             | [] [] []    [] []  [] []             []          |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         | []             []                                |
+     gpe-beam           | []             []                                |
+     gpe-calendar       | []             []                    [] []       |
+     gpe-clock          | []          [] []                    []          |
+     gpe-conf           |                []                                |
+     gpe-contacts       | []             []                                |
+     gpe-edit           | []             []                    [] []       |
+     gpe-filemanager    | []                                               |
+     gpe-go             | []             []                    []          |
+     gpe-login          | []             []                    []          |
+     gpe-ownerinfo      | []          [] []                    [] []       |
+     gpe-package        | []                                               |
+     gpe-sketchbook     | []             []                                |
+     gpe-su             | []          [] []                    []          |
+     gpe-taskmanager    | []          [] []                                |
+     gpe-timesheet      | []             []  []                   []       |
+     gpe-today          | []          [] []  []                            |
+     gpe-todo           | []                                               |
+     gphoto2            | []          [] []                    []       [] |
+     gprof              | []             []  []                   []       |
+     gpsdrive           | ()             ()                    []       () |
+     gramadoir          |                []  []                            |
+     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
+     gretl              | []             []                             [] |
+     gsasl              |                    []                            |
+     gss                |                []                                |
+     gst-plugins        |                []                    []       [] |
+     gst-plugins-base   |                                      []       [] |
+     gst-plugins-good   |       []                             []       [] |
+     gstreamer          |             []                       []       [] |
+     gtick              |       []    [] []  []                         [] |
+     gtkam              | []             []                    []       [] |
+     gtkorphan          |                []                             [] |
+     gtkspell           | []    []    [] []  []                         [] |
+     gutenprint         |                                      []          |
+     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
+     id-utils           |                []  []                [] []    [] |
+     impost             |                []  []                            |
+     indent             | [] [] []    [] []  [] []             [] []    [] |
+     iso_3166           |             [] []                    []          |
+     iso_3166_1         | []    []    [] []  []                [] []       |
+     iso_3166_2         |                []                                |
+     iso_3166_3         |                []                                |
+     iso_4217           |    []       []        []             []          |
+     iso_639            |          [] [] []  []                []          |
+     jpilot             | []             []                                |
+     jtag               |                []                                |
+     jwhois             | []             []                    [] []    [] |
+     kbd                | []             []                                |
+     keytouch           |                    []                            |
+     keytouch-editor    |                    []                            |
+     keytouch-keyboa... |                    []                            |
+     latrine            |                []  []                         [] |
+     ld                 | []             []                                |
+     leafpad            | []             []  []       []       []       [] |
+     libc               | []          [] []     []             []          |
+     libexif            | []                                               |
+     libextractor       |                    []                            |
+     libgpewidget       | []             []  []                [] []       |
+     libgpg-error       |                                                  |
+     libgphoto2         | []             []                                |
+     libgphoto2_port    |                []                             [] |
+     libgsasl           |                []  []                            |
+     libiconv           |                                                  |
+     libidn             |                []                             [] |
+     lifelines          |                ()                                |
+     lilypond           |                []                                |
+     lingoteach         |                []                       []    [] |
+     lynx               |    []                                []       [] |
+     m4                 |                []  [] []                []       |
+     mailutils          | []             []                                |
+     make               | []          [] []  [] []    []    []    []       |
+     man-db             | ()                                               |
+     minicom            | []          [] []                    []          |
+     mysecretdiary      | []             []                       []       |
+     nano               |       []    () []  []                []       [] |
+     nano_1_0           | []             []     []                []    [] |
+     opcodes            | []          [] []  []                            |
+     parted             | []                                      []    [] |
+     pilot-qof          |                                                  |
+     psmisc             |       []                             []       [] |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                                  |
+     radius             | []             []                                |
+     recode             | []             []  [] []    []       [] []    [] |
+     rpm                |                []                       []       |
+     screem             |                                                  |
+     scrollkeeper       | []          []                       []          |
+     sed                | [] []          []  []                []          |
+     sh-utils           | [] []       [] []  []                []       [] |
+     shared-mime-info   | []    []    [] []                    []       [] |
+     sharutils          | [] []       [] []  [] []             []       [] |
+     shishi             |                                                  |
+     silky              |                []                                |
+     skencil            | []             []                                |
+     sketch             | []             []                                |
+     solfege            |                                               [] |
+     soundtracker       | []             []                             [] |
+     sp                 |                []                                |
+     stardict           |                                      []          |
+     system-tools-ba... | []    []    [] []                 [] [] []    [] |
+     tar                | [] []          []  []                         [] |
+     texinfo            |                []           []                   |
+     textutils          | []             []  [] []             []          |
+     tin                |    []          ()                                |
+     tp-robot           |             [] []                    []          |
+     tuxpaint           |                    []                []          |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                []  []                            |
+     util-linux         | [] []       [] []                    [] []    [] |
+     vorbis-tools       | []             []                                |
+     wastesedge         |                ()                                |
+     wdiff              | [] []          []  [] []             [] []    [] |
+     wget               |    []       [] []  []             [] [] []    [] |
+     xchat              | []    []    [] []        []    []    []       [] |
+     xkeyboard-config   |             [] []                    []       [] |
+     xpad               | []                 []                []          |
+                        +--------------------------------------------------+
+                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
+                          89 21 16  2 41 118 59 14  1  8  1  6 60 30  0 52
+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl  nn no
+                        +--------------------------------------------------+
+     GNUnet             |                                                  |
+     a2ps               |    ()                      []          []     () |
+     aegis              |                                        ()        |
+     ant-phone          |                                        []        |
+     anubis             |                            []    []    []        |
+     ap-utils           |                            []                    |
+     aspell             |                         []             []        |
+     bash               |                                        []        |
+     batchelor          |                            []          []        |
+     bfd                |                                                  |
+     bibshelf           |                            []                    |
+     binutils           |                                                  |
+     bison              |                            []    []    []        |
+     bison-runtime      |                            []    []    []        |
+     bluez-pin          |       []                   []          []        |
+     cflow              |                                                  |
+     clisp              |                                        []        |
+     console-tools      |                                                  |
+     coreutils          |                                        []        |
+     cpio               |                                                  |
+     cpplib             |                                        []        |
+     cryptonit          |                                        []        |
+     darkstat           |                            []          []        |
+     dialog             |                            []          []        |
+     diffutils          | []                         []          []        |
+     doodle             |                                                  |
+     e2fsprogs          |                                        []        |
+     enscript           |                                        []        |
+     error              |                                        []        |
+     fetchmail          | []                                     []        |
+     fileutils          | []          []                                   |
+     findutils          |                                        []        |
+     flex               |    []                                  []        |
+     fslint             |                            []          []        |
+     gas                |                                                  |
+     gawk               | []                                     []        |
+     gbiff              |                                        []        |
+     gcal               |                                                  |
+     gcc                |                                                  |
+     gettext-examples   | []                                     []        |
+     gettext-runtime    | [] []                                  []        |
+     gettext-tools      | [] []                                            |
+     gimp-print         | []                                     []        |
+     gip                |                            []          []        |
+     gliv               |                                        []        |
+     glunarclock        |                            []          []        |
+     gmult              | []                         []                    |
+     gnubiff            |                                                  |
+     gnucash            | ()                               ()              |
+     gnucash-glossary   |                                        []        |
+     gnuedu             |                                                  |
+     gnulib             | [] []                      []          []        |
+     gnunet-gtk         |                                                  |
+     gnutls             |                                                  |
+     gpe-aerial         |                                        []        |
+     gpe-beam           |                                        []        |
+     gpe-calendar       |                                        []        |
+     gpe-clock          |    []                                  []        |
+     gpe-conf           |    []                                  []        |
+     gpe-contacts       |    []                                            |
+     gpe-edit           |    []                                  []        |
+     gpe-filemanager    |    []                                            |
+     gpe-go             |    []                                  []        |
+     gpe-login          |    []                                  []        |
+     gpe-ownerinfo      |                                        []        |
+     gpe-package        |    []                                            |
+     gpe-sketchbook     |    []                                  []        |
+     gpe-su             |    []                                  []        |
+     gpe-taskmanager    |    [] []                               []        |
+     gpe-timesheet      |                                        []        |
+     gpe-today          |                                        []        |
+     gpe-todo           |                                                  |
+     gphoto2            | []                                     []        |
+     gprof              |                                                  |
+     gpsdrive           | ()                                     ()     () |
+     gramadoir          |                                        ()        |
+     grep               | []                               []    []        |
+     gretl              |                                                  |
+     gsasl              |                                        []        |
+     gss                |                                                  |
+     gst-plugins        |                                        []        |
+     gst-plugins-base   |                                                  |
+     gst-plugins-good   |                                        []        |
+     gstreamer          |                                        []        |
+     gtick              |                                        []        |
+     gtkam              | []                                               |
+     gtkorphan          |                                        []        |
+     gtkspell           |                         []             []        |
+     gutenprint         |                                                  |
+     hello              | [] []             []       []    []    []  [] [] |
+     id-utils           |                                        []        |
+     impost             |                                                  |
+     indent             | []                                     []        |
+     iso_3166           |                                        []        |
+     iso_3166_1         |                                        []     [] |
+     iso_3166_2         |                                        []        |
+     iso_3166_3         |                                        []        |
+     iso_4217           | []                      []             []        |
+     iso_639            | []                                     []  []    |
+     jpilot             | ()                                     ()     () |
+     jtag               |                                                  |
+     jwhois             |                                        []        |
+     kbd                |                                        []        |
+     keytouch           |                                        []        |
+     keytouch-editor    |                                                  |
+     keytouch-keyboa... |                                        []        |
+     latrine            |                                        []        |
+     ld                 |                                                  |
+     leafpad            | []             []                                |
+     libc               | [] []                            []    []     [] |
+     libexif            |                                                  |
+     libextractor       |                                                  |
+     libgpewidget       |                                        []        |
+     libgpg-error       |                                                  |
+     libgphoto2         | []                                               |
+     libgphoto2_port    | []                                               |
+     libgsasl           |                                        []        |
+     libiconv           |                                                  |
+     libidn             | []                                     []        |
+     lifelines          |                                        []        |
+     lilypond           |                                                  |
+     lingoteach         |                                        []        |
+     lynx               | []                                     []        |
+     m4                 | []                                     []        |
+     mailutils          |                                                  |
+     make               | [] []                                  []        |
+     man-db             | ()                                               |
+     minicom            | []                                               |
+     mysecretdiary      |                                        []        |
+     nano               |                            []    []    []        |
+     nano_1_0           |                            []    []        []    |
+     opcodes            |                                        []        |
+     parted             | []                                     []        |
+     pilot-qof          |                                                  |
+     psmisc             | []                               []    []        |
+     pwdutils           |                                                  |
+     python             |                                                  |
+     qof                |                                                  |
+     radius             |                                                  |
+     recode             |                                        []        |
+     rpm                | [] []                                            |
+     screem             | []                                               |
+     scrollkeeper       |                                  [] [] []  []    |
+     sed                | []                                     []        |
+     sh-utils           | []                               []              |
+     shared-mime-info   |    []          []                []    []  []    |
+     sharutils          | []                                     []        |
+     shishi             |                                                  |
+     silky              |                                        []        |
+     skencil            |                                                  |
+     sketch             |                                                  |
+     solfege            |                                                  |
+     soundtracker       |                                                  |
+     sp                 | ()                                               |
+     stardict           |                      []                []        |
+     system-tools-ba... | [] []          []                      []        |
+     tar                | []       []                            []        |
+     texinfo            | []                               []    []        |
+     textutils          | [] []                            []              |
+     tin                |                                                  |
+     tp-robot           |                                        []        |
+     tuxpaint           |                                            []    |
+     unicode-han-tra... |                                                  |
+     unicode-transla... |                                                  |
+     util-linux         | []                                     []        |
+     vorbis-tools       |                                        []        |
+     wastesedge         |                                        []        |
+     wdiff              |                            []    []              |
+     wget               | []                                     []        |
+     xchat              | [] []                []                []        |
+     xkeyboard-config   |                                        []        |
+     xpad               |    []                      []          []        |
+                        +--------------------------------------------------+
+                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl  nn no
+                          40 24  2  1  1  3  1  2  3 21  0 15  1 102  6  3
+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                        +------------------------------------------------------+
+     GNUnet             |                                                      |
+     a2ps               |           ()     []      [] []       []    [] []     |
+     aegis              |                          () ()                       |
+     ant-phone          |                          []                   []     |
+     anubis             |           []             [] []                       |
+     ap-utils           |           ()                                         |
+     aspell             |                          [] []                       |
+     bash               |                  []      [] []                       |
+     batchelor          |                          []                   []     |
+     bfd                |                                                      |
+     bibshelf           |                                               []     |
+     binutils           |                             []                []     |
+     bison              |           []     []      [] []                []     |
+     bison-runtime      |           []             []          []       []     |
+     bluez-pin          |           []     []   [] [] []    [] []    [] []     |
+     cflow              |           []                                         |
+     clisp              |                             []                       |
+     console-tools      |                             []                       |
+     coreutils          |           []                []       []       []     |
+     cpio               |           []                []                []     |
+     cpplib             |                                               []     |
+     cryptonit          |                  []                           []     |
+     darkstat           |           []     []      []       []       [] []     |
+     dialog             |           [] []  []   [] [] [] []          [] []     |
+     diffutils          |           []     []      [] []             [] []     |
+     doodle             |                                         []    []     |
+     e2fsprogs          |           []                                  []     |
+     enscript           |                  []      [] []       []       []     |
+     error              |                  []      []       []          []     |
+     fetchmail          |           []                []          []           |
+     fileutils          |           []             [] []       []       []     |
+     findutils          |           [] []          []       [] []       []     |
+     flex               |           []     []      [] []                []     |
+     fslint             |                  []      []                [] []     |
+     gas                |                                                      |
+     gawk               |           []     []      []                   []     |
+     gbiff              |                          []                          |
+     gcal               |                                               []     |
+     gcc                |                                                      |
+     gettext-examples   |           [] []          [] []    [] []    [] []     |
+     gettext-runtime    |           [] []          [] []    [] []    [] []     |
+     gettext-tools      |           []             [] []    [] []    [] []     |
+     gimp-print         |                                   []          []     |
+     gip                |                       []          []       [] []     |
+     gliv               |                  []      []       []          []     |
+     glunarclock        |                  []      [] []    []       [] []     |
+     gmult              |                       [] []                [] []     |
+     gnubiff            |                          ()                          |
+     gnucash            |           ()                                  []     |
+     gnucash-glossary   |              []                   []          []     |
+     gnuedu             |                                                      |
+     gnulib             |           []             [] []       []       []     |
+     gnunet-gtk         |                                               []     |
+     gnutls             |           []                                  []     |
+     gpe-aerial         |              []  []      [] []       []    [] []     |
+     gpe-beam           |              []  []      [] []       []    [] []     |
+     gpe-calendar       |              []  []      [] []    [] []    [] []     |
+     gpe-clock          |              []  []      [] []    [] []    [] []     |
+     gpe-conf           |              []  []      [] []    [] []       []     |
+     gpe-contacts       |                          [] []       []    [] []     |
+     gpe-edit           |              []  []      [] []    [] []    [] []     |
+     gpe-filemanager    |                                      []       []     |
+     gpe-go             |                  []      [] []       []    [] []     |
+     gpe-login          |              []  []      [] []    [] []    [] []     |
+     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     |
+     gpe-package        |                                      []       []     |
+     gpe-sketchbook     |              []  []      [] []    [] []    [] []     |
+     gpe-su             |              []  []      [] []    [] []    [] []     |
+     gpe-taskmanager    |              []  []      [] []    [] []    [] []     |
+     gpe-timesheet      |              []  []      [] []    [] []    [] []     |
+     gpe-today          |              []  []      [] []    [] []    [] []     |
+     gpe-todo           |                             []       []    [] []     |
+     gphoto2            |           []             []       []       [] []     |
+     gprof              |                  []      []                   []     |
+     gpsdrive           |        []                []                   []     |
+     gramadoir          |                                   []          []     |
+     grep               |           [] []  []      [] []       []    [] []     |
+     gretl              |           []                                         |
+     gsasl              |           []                                  []     |
+     gss                |           []             []                   []     |
+     gst-plugins        |     []                                  [] [] []     |
+     gst-plugins-base   |                                               []     |
+     gst-plugins-good   |     []                                  [] [] []     |
+     gstreamer          |                                         [] [] []     |
+     gtick              |                          [] []                []     |
+     gtkam              |           []     []         []                []     |
+     gtkorphan          |                                               []     |
+     gtkspell           |                  []   [] [] []    [] []    [] []     |
+     gutenprint         |                                               []     |
+     hello              |           []     []      [] []    [] []    [] []     |
+     id-utils           |                  []      [] []                []     |
+     impost             |                                               []     |
+     indent             |                  []      [] []    []       [] []     |
+     iso_3166           |              []                []    [] [] [] []     |
+     iso_3166_1         |                                   [] [] [] []        |
+     iso_3166_2         |                                                      |
+     iso_3166_3         |                          []    []    []    []        |
+     iso_4217           |                                []    []    [] []     |
+     iso_639            |                                []    []    [] []     |
+     jpilot             |                                                      |
+     jtag               |                                   []                 |
+     jwhois             |           []     []      []                   []     |
+     kbd                |           []             []                   []     |
+     keytouch           |                                               []     |
+     keytouch-editor    |                                               []     |
+     keytouch-keyboa... |                                               []     |
+     latrine            |                          []                   []     |
+     ld                 |                                               []     |
+     leafpad            |           [] []             []    []          []  [] |
+     libc               |           []     []         []    []          []     |
+     libexif            |           []                                         |
+     libextractor       |                          []                   []     |
+     libgpewidget       |              []  []      []       [] []    [] []     |
+     libgpg-error       |           []             []                          |
+     libgphoto2         |           []                                         |
+     libgphoto2_port    |           []                []                       |
+     libgsasl           |           []             []                [] []     |
+     libiconv           |                                                      |
+     libidn             |           []                               [] ()     |
+     lifelines          |           []                                  []     |
+     lilypond           |                                                      |
+     lingoteach         |                  []                                  |
+     lynx               |                  []         []                []     |
+     m4                 |           []     []      [] []                []     |
+     mailutils          |           []             [] []                []     |
+     make               |           []     []         []                []     |
+     man-db             |                          []                   []     |
+     minicom            |           []     []      [] []                []     |
+     mysecretdiary      |                  []      [] []                []     |
+     nano               |                          []                   []     |
+     nano_1_0           |           []             [] []                []     |
+     opcodes            |                          []                   []     |
+     parted             |           []                                         |
+     pilot-qof          |                                               []     |
+     psmisc             |           []                                  []     |
+     pwdutils           |           []                                  []     |
+     python             |                                                      |
+     qof                |                                               []     |
+     radius             |           []                []                       |
+     recode             |           [] []  []      [] []       []       []     |
+     rpm                |           [] []             []                []     |
+     screem             |                                                      |
+     scrollkeeper       |           []             [] []    []    [] [] []     |
+     sed                |           [] []  []      [] []    [] []    [] []     |
+     sh-utils           |                             []       []    []        |
+     shared-mime-info   |              []  []                     [] [] []     |
+     sharutils          |           []                []             [] []     |
+     shishi             |           []                                         |
+     silky              |                                   []                 |
+     skencil            |              []  []                           []     |
+     sketch             |              []  []                           []     |
+     solfege            |                                               []     |
+     soundtracker       |                                   []          []     |
+     sp                 |                                                      |
+     stardict           |                             []    []          []     |
+     system-tools-ba... |        [] [] []  []      []             [] [] []  [] |
+     tar                |           []             [] []       []       []     |
+     texinfo            |           []             [] []                []     |
+     textutils          |                             []       []       []     |
+     tin                |                             ()                       |
+     tp-robot           |                             []                       |
+     tuxpaint           |              []                      [] [] [] []     |
+     unicode-han-tra... |                                                      |
+     unicode-transla... |                                                      |
+     util-linux         |                  []         []       []       []     |
+     vorbis-tools       |                          [] []                       |
+     wastesedge         |                                                      |
+     wdiff              |           []     []      [] []    []          []     |
+     wget               |              []             []    []          []     |
+     xchat              |        []                   []    [] [] [] [] []     |
+     xkeyboard-config   |                                      []       []     |
+     xpad               |                                   [] []       []     |
+                        +------------------------------------------------------+
+                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
+                           0   2  3 58 31  53    5 76 72  5 42 48 12 51 128  2
+
+                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+                        +---------------------------------------------------+
+     GNUnet             |                    []                             |  2
+     a2ps               |          [] []     []                             | 19
+     aegis              |                                                   |  0
+     ant-phone          |          []        []                             |  6
+     anubis             |          [] []     []                             | 11
+     ap-utils           |             ()     []                             |  4
+     aspell             |             []     []  []                         | 14
+     bash               |                    []                             | 11
+     batchelor          |          []        []                             |  9
+     bfd                |                                                   |  1
+     bibshelf           |                    []                             |  7
+     binutils           |          []        []                     []      |  9
+     bison              |          []        []                     []      | 19
+     bison-runtime      |                    []         []          []      | 15
+     bluez-pin          |          [] []     []  []     []          []      | 28
+     cflow              |             []     []                             |  4
+     clisp              |                                                   |  6
+     console-tools      |          []        []                             |  5
+     coreutils          |          []        []                             | 17
+     cpio               |          [] []     []                             |  9
+     cpplib             |          []        []         []          []      | 11
+     cryptonit          |                                                   |  5
+     darkstat           |                    []         ()          ()      | 15
+     dialog             |          [] []     []         []          []      | 30
+     diffutils          |          []        []         []          []      | 28
+     doodle             |                    []                             |  6
+     e2fsprogs          |          []        []                             | 10
+     enscript           |          [] []     []                             | 16
+     error              |          []        []         []          []      | 18
+     fetchmail          |          []        []                             | 12
+     fileutils          |          []                   []          []      | 18
+     findutils          |          []        []                     []      | 17
+     flex               |          []        []                             | 15
+     fslint             |                    []                             |  9
+     gas                |          []                                       |  3
+     gawk               |          []        []                             | 15
+     gbiff              |                    []                             |  5
+     gcal               |          []                                       |  5
+     gcc                |          []                   []          []      |  5
+     gettext-examples   |          [] []     []         []          []      | 24
+     gettext-runtime    |          [] []     []         []          []      | 26
+     gettext-tools      |          [] []     []         []          []      | 19
+     gimp-print         |             []     []                             | 12
+     gip                |                    []                     []      | 12
+     gliv               |          []        []                             |  8
+     glunarclock        |                    []  []                 []      | 15
+     gmult              |          []        []         []          []      | 15
+     gnubiff            |                    []                             |  1
+     gnucash            |          ()                                       |  2
+     gnucash-glossary   |                    []                     []      |  9
+     gnuedu             |                    []                             |  2
+     gnulib             |          [] []     []         []          []      | 28
+     gnunet-gtk         |                                                   |  1
+     gnutls             |                                                   |  2
+     gpe-aerial         |                    []         []                  | 14
+     gpe-beam           |                    []         []                  | 14
+     gpe-calendar       |                    []  []     []          []      | 19
+     gpe-clock          |          []        []  []     []                  | 20
+     gpe-conf           |                    []         []                  | 14
+     gpe-contacts       |                    []         []                  | 10
+     gpe-edit           |          []        []  []                 []      | 19
+     gpe-filemanager    |                    []                             |  5
+     gpe-go             |          []        []                             | 14
+     gpe-login          |          []        []  []     []          []      | 20
+     gpe-ownerinfo      |          []        []         []          []      | 20
+     gpe-package        |                    []                             |  5
+     gpe-sketchbook     |          []        []                             | 16
+     gpe-su             |          []        []         []                  | 19
+     gpe-taskmanager    |          []        []         []                  | 19
+     gpe-timesheet      |          []        []         []          []      | 18
+     gpe-today          |          []        []  []     []          []      | 20
+     gpe-todo           |                    []                             |  6
+     gphoto2            |             []     []         []          []      | 20
+     gprof              |          []        []                             | 11
+     gpsdrive           |                                                   |  4
+     gramadoir          |                    []                             |  7
+     grep               |          [] []     []                     []      | 33
+     gretl              |                                                   |  4
+     gsasl              |                    []         []                  |  6
+     gss                |                    []                             |  5
+     gst-plugins        |             []     []                     []      | 15
+     gst-plugins-base   |             []     []         []                  |  9
+     gst-plugins-good   |             []     []         []                  | 18
+     gstreamer          |          [] []     []                             | 17
+     gtick              |                    []                             | 11
+     gtkam              |                    []                             | 13
+     gtkorphan          |                    []                             |  7
+     gtkspell           |             []     []  []     []    []    []      | 26
+     gutenprint         |                                                   |  3
+     hello              |          [] []     []         []          []      | 39
+     id-utils           |          []        []                             | 14
+     impost             |                    []                             |  4
+     indent             |          []        []         []          []      | 25
+     iso_3166           |       [] []        []                             | 15
+     iso_3166_1         |          []            []                         | 20
+     iso_3166_2         |                                                   |  2
+     iso_3166_3         |                        []     []                  |  9
+     iso_4217           |          []        []                             | 14
+     iso_639            |                    []  []                         | 16
+     jpilot             |          [] []     []         []                  |  7
+     jtag               |                    []                             |  3
+     jwhois             |          []        []                     []      | 13
+     kbd                |          []        []                             | 12
+     keytouch           |                    []                             |  4
+     keytouch-editor    |                                                   |  2
+     keytouch-keyboa... |                    []                             |  4
+     latrine            |          []        []                             |  8
+     ld                 |          []        []         []                  |  7
+     leafpad            |          []        []         []          []      | 23
+     libc               |          []                   []          []      | 23
+     libexif            |                    []                             |  4
+     libextractor       |                    []                             |  5
+     libgpewidget       |                    []  []     []                  | 19
+     libgpg-error       |                    []                             |  4
+     libgphoto2         |             []                                    |  7
+     libgphoto2_port    |             []     []                     []      | 10
+     libgsasl           |                    []                             |  8
+     libiconv           |                                                   |  0
+     libidn             |                    []         []                  | 10
+     lifelines          |                                                   |  4
+     lilypond           |                                                   |  2
+     lingoteach         |                    []                             |  6
+     lynx               |          [] []     []                             | 15
+     m4                 |                    []         []          []      | 18
+     mailutils          |             []                                    |  8
+     make               |          []        []         []                  | 20
+     man-db             |                    []                             |  6
+     minicom            |                    []                             | 14
+     mysecretdiary      |          []        []                             | 12
+     nano               |                    []                     []      | 15
+     nano_1_0           |          [] []     []                             | 18
+     opcodes            |          []        []                             | 10
+     parted             |          [] []                            []      |  9
+     pilot-qof          |                    []                             |  3
+     psmisc             |                    []                             | 10
+     pwdutils           |                    []                             |  3
+     python             |                                                   |  0
+     qof                |                    []                             |  2
+     radius             |             []                                    |  6
+     recode             |          []        []         []                  | 25
+     rpm                |          [] []     []                             | 13
+     screem             |                    []                             |  2
+     scrollkeeper       |          [] []     []                     []      | 26
+     sed                |          []        []                     []      | 22
+     sh-utils           |          []                                       | 15
+     shared-mime-info   |             []     []         []          []      | 23
+     sharutils          |          []        []                     []      | 23
+     shishi             |                                                   |  1
+     silky              |                    []                             |  4
+     skencil            |                    []                             |  7
+     sketch             |                                                   |  6
+     solfege            |                                                   |  2
+     soundtracker       |          []        []                             |  9
+     sp                 |          []                                       |  3
+     stardict           |             []     []         []          []      | 11
+     system-tools-ba... |    []    [] []     []     []  []          []      | 37
+     tar                |          [] []     []                     []      | 17
+     texinfo            |          []        []         []                  | 15
+     textutils          |          []                   []          []      | 17
+     tin                |                                                   |  1
+     tp-robot           |                    []         []          []      |  9
+     tuxpaint           |                    []  []                 []      | 16
+     unicode-han-tra... |                                                   |  0
+     unicode-transla... |                                                   |  2
+     util-linux         |          [] []     []                             | 20
+     vorbis-tools       |             []     []                             | 11
+     wastesedge         |                                                   |  1
+     wdiff              |          []        []                             | 22
+     wget               |          []        []                     []      | 19
+     xchat              |             []     []         []          []      | 28
+     xkeyboard-config   |          [] []     []                     []      | 11
+     xpad               |                    []         []          []      | 14
+                        +---------------------------------------------------+
+       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
+      172 domains          0  1  1 78 39  0  135 14  1  50     1    52    0  2040
+
+   Some counters in the preceding matrix are higher than the number of
+visible blocks let us expect.  This is because a few extra PO files are
+used for implementing regional variants of languages, or language
+dialects.
+
+   For a PO file in the matrix above to be effective, the package to
+which it applies should also have been internationalized and
+distributed as such by its maintainer.  There might be an observable
+lag between the mere existence a PO file and its wide availability in a
+distribution.
+
+   If June 2006 seems to be old, you may fetch a more recent copy of
+this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
+matrix with full percentage details can be found at
+`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
+
+1.6 Using `gettext' in new packages
+===================================
+
+If you are writing a freely available program and want to
+internationalize it you are welcome to use GNU `gettext' in your
+package.  Of course you have to respect the GNU Library General Public
+License which covers the use of the GNU `gettext' library.  This means
+in particular that even non-free programs can use `libintl' as a shared
+library, whereas only free software can use `libintl' as a static
+library or use modified versions of `libintl'.
+
+   Once the sources are changed appropriately and the setup can handle
+the use of `gettext' the only thing missing are the translations.  The
+Free Translation Project is also available for packages which are not
+developed inside the GNU project.  Therefore the information given above
+applies also for every other Free Software Project.  Contact
+`translation@iro.umontreal.ca' to make the `.pot' files available to
+the translation teams.
+

Index: config.rpath
===================================================================
RCS file: config.rpath
diff -N config.rpath
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ config.rpath	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,571 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
+# run time search path of shared libraries in an executable.
+#
+#   Copyright 1996-2005 Free Software Foundation, Inc.
+#   Taken from GNU libtool, 2001
+#   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+#
+#   This file is free software; the Free Software Foundation gives
+#   unlimited permission to copy and/or distribute it, with or without
+#   modifications, as long as this notice is preserved.
+#
+# The first argument passed to this file is the canonical host specification,
+#    CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or
+#    CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
+# should be set by the caller.
+#
+# The set of defined variables is at the end of this script.
+
+# Known limitations:
+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
+#   than 256 bytes, otherwise the compiler driver will dump core. The only
+#   known workaround is to choose shorter directory names for the build
+#   directory and/or the installation directory.
+
+# All known linkers require a `.a' archive for static linking (except M$VC,
+# which needs '.lib').
+libext=a
+shrext=.so
+
+host="$1"
+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+
+cc_basename=`echo "$CC" | sed -e 's%^.*/%%'`
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC.
+
+wl=
+if test "$GCC" = yes; then
+  wl='-Wl,'
+else
+  case "$host_os" in
+    aix*)
+      wl='-Wl,'
+      ;;
+    darwin*)
+      case "$cc_basename" in
+        xlc*)
+          wl='-Wl,'
+          ;;
+      esac
+      ;;
+    mingw* | pw32* | os2*)
+      ;;
+    hpux9* | hpux10* | hpux11*)
+      wl='-Wl,'
+      ;;
+    irix5* | irix6* | nonstopux*)
+      wl='-Wl,'
+      ;;
+    newsos6)
+      ;;
+    linux*)
+      case $cc_basename in
+        icc* | ecc*)
+          wl='-Wl,'
+          ;;
+        pgcc | pgf77 | pgf90)
+          wl='-Wl,'
+          ;;
+        ccc*)
+          wl='-Wl,'
+          ;;
+        como)
+          wl='-lopt='
+          ;;
+      esac
+      ;;
+    osf3* | osf4* | osf5*)
+      wl='-Wl,'
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      wl='-Wl,'
+      ;;
+    sunos4*)
+      wl='-Qoption ld '
+      ;;
+    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+      wl='-Wl,'
+      ;;
+    sysv4*MP*)
+      ;;
+    unicos*)
+      wl='-Wl,'
+      ;;
+    uts4*)
+      ;;
+  esac
+fi
+
+# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS.
+
+hardcode_libdir_flag_spec=
+hardcode_libdir_separator=
+hardcode_direct=no
+hardcode_minus_L=no
+
+case "$host_os" in
+  cygwin* | mingw* | pw32*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test "$GCC" != yes; then
+      with_gnu_ld=no
+    fi
+    ;;
+  openbsd*)
+    with_gnu_ld=no
+    ;;
+esac
+
+ld_shlibs=yes
+if test "$with_gnu_ld" = yes; then
+  case "$host_os" in
+    aix3* | aix4* | aix5*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test "$host_cpu" != ia64; then
+        ld_shlibs=no
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+      # that the semantics of dynamic libraries on AmigaOS, at least up
+      # to version 4, is to share data among multiple programs linked
+      # with the same dynamic library.  Since this doesn't match the
+      # behavior of shared libraries on other platforms, we cannot use
+      # them.
+      ld_shlibs=no
+      ;;
+    beos*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    cygwin* | mingw* | pw32*)
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec='-L$libdir'
+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    netbsd*)
+      ;;
+    solaris* | sysv5*)
+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+        ld_shlibs=no
+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    sunos4*)
+      hardcode_direct=yes
+      ;;
+    linux*)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+    *)
+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+        :
+      else
+        ld_shlibs=no
+      fi
+      ;;
+  esac
+  if test "$ld_shlibs" = yes; then
+    # Unlike libtool, we use -rpath here, not --rpath, since the documented
+    # option of GNU ld is called -rpath, not --rpath.
+    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+  fi
+else
+  case "$host_os" in
+    aix3*)
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      hardcode_minus_L=yes
+      if test "$GCC" = yes; then
+        # Neither direct hardcoding nor static linking is supported with a
+        # broken collect2.
+        hardcode_direct=unsupported
+      fi
+      ;;
+    aix4* | aix5*)
+      if test "$host_cpu" = ia64; then
+        # On IA64, the linker does run time linking by default, so we don't
+        # have to do anything special.
+        aix_use_runtimelinking=no
+      else
+        aix_use_runtimelinking=no
+        # Test if we are trying to use run time linking or normal
+        # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+        # need to do runtime linking.
+        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+          for ld_flag in $LDFLAGS; do
+            if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+              aix_use_runtimelinking=yes
+              break
+            fi
+          done
+        esac
+      fi
+      hardcode_direct=yes
+      hardcode_libdir_separator=':'
+      if test "$GCC" = yes; then
+        case $host_os in aix4.[012]|aix4.[012].*)
+          collect2name=`${CC} -print-prog-name=collect2`
+          if test -f "$collect2name" && \
+            strings "$collect2name" | grep resolve_lib_name >/dev/null
+          then
+            # We have reworked collect2
+            hardcode_direct=yes
+          else
+            # We have old collect2
+            hardcode_direct=unsupported
+            hardcode_minus_L=yes
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_libdir_separator=
+          fi
+        esac
+      fi
+      # Begin _LT_AC_SYS_LIBPATH_AIX.
+      echo 'int main () { return 0; }' > conftest.c
+      ${CC} ${LDFLAGS} conftest.c -o conftest
+      aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      if test -z "$aix_libpath"; then
+        aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+}'`
+      fi
+      if test -z "$aix_libpath"; then
+        aix_libpath="/usr/lib:/lib"
+      fi
+      rm -f conftest.c conftest
+      # End _LT_AC_SYS_LIBPATH_AIX.
+      if test "$aix_use_runtimelinking" = yes; then
+        hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+      else
+        if test "$host_cpu" = ia64; then
+          hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+        else
+          hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+        fi
+      fi
+      ;;
+    amigaos*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      # see comment about different semantics on the GNU ld section
+      ld_shlibs=no
+      ;;
+    bsdi[45]*)
+      ;;
+    cygwin* | mingw* | pw32*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      hardcode_libdir_flag_spec=' '
+      libext=lib
+      ;;
+    darwin* | rhapsody*)
+      hardcode_direct=no
+      if test "$GCC" = yes ; then
+        :
+      else
+        case "$cc_basename" in
+          xlc*)
+            ;;
+          *)
+            ld_shlibs=no
+            ;;
+        esac
+      fi
+      ;;
+    dgux*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    freebsd1*)
+      ld_shlibs=no
+      ;;
+    freebsd2.2*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    freebsd2*)
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    freebsd* | kfreebsd*-gnu | dragonfly*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    hpux9*)
+      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+      hardcode_libdir_separator=:
+      hardcode_direct=yes
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      hardcode_minus_L=yes
+      ;;
+    hpux10* | hpux11*)
+      if test "$with_gnu_ld" = no; then
+        case "$host_cpu" in
+          hppa*64*)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=no
+            ;;
+          ia64*)
+            hardcode_libdir_flag_spec='-L$libdir'
+            hardcode_direct=no
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+            hardcode_libdir_separator=:
+            hardcode_direct=yes
+            # hardcode_minus_L: Not really in the search PATH,
+            # but as the default location of the library.
+            hardcode_minus_L=yes
+            ;;
+        esac
+      fi
+      ;;
+    irix5* | irix6* | nonstopux*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    netbsd*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      hardcode_direct=yes
+      ;;
+    newsos6)
+      hardcode_direct=yes
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    openbsd*)
+      hardcode_direct=yes
+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+        case "$host_os" in
+          openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+            hardcode_libdir_flag_spec='-R$libdir'
+            ;;
+          *)
+            hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+            ;;
+        esac
+      fi
+      ;;
+    os2*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_minus_L=yes
+      ;;
+    osf3*)
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      hardcode_libdir_separator=:
+      ;;
+    osf4* | osf5*)
+      if test "$GCC" = yes; then
+        hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+      else
+        # Both cc and cxx compiler support -rpath directly
+        hardcode_libdir_flag_spec='-rpath $libdir'
+      fi
+      hardcode_libdir_separator=:
+      ;;
+    sco3.2v5*)
+      ;;
+    solaris*)
+      hardcode_libdir_flag_spec='-R$libdir'
+      ;;
+    sunos4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      hardcode_direct=yes
+      hardcode_minus_L=yes
+      ;;
+    sysv4)
+      case $host_vendor in
+        sni)
+          hardcode_direct=yes # is this really true???
+          ;;
+        siemens)
+          hardcode_direct=no
+          ;;
+        motorola)
+          hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+          ;;
+      esac
+      ;;
+    sysv4.3*)
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+        ld_shlibs=yes
+      fi
+      ;;
+    sysv4.2uw2*)
+      hardcode_direct=yes
+      hardcode_minus_L=no
+      ;;
+    sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
+      ;;
+    sysv5*)
+      hardcode_libdir_flag_spec=
+      ;;
+    uts4*)
+      hardcode_libdir_flag_spec='-L$libdir'
+      ;;
+    *)
+      ld_shlibs=no
+      ;;
+  esac
+fi
+
+# Check dynamic linker characteristics
+# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER.
+libname_spec='lib$name'
+case "$host_os" in
+  aix3*)
+    ;;
+  aix4* | aix5*)
+    ;;
+  amigaos*)
+    ;;
+  beos*)
+    ;;
+  bsdi[45]*)
+    ;;
+  cygwin* | mingw* | pw32*)
+    shrext=.dll
+    ;;
+  darwin* | rhapsody*)
+    shrext=.dylib
+    ;;
+  dgux*)
+    ;;
+  freebsd1*)
+    ;;
+  kfreebsd*-gnu)
+    ;;
+  freebsd*)
+    ;;
+  gnu*)
+    ;;
+  hpux9* | hpux10* | hpux11*)
+    case "$host_cpu" in
+      ia64*)
+        shrext=.so
+        ;;
+      hppa*64*)
+        shrext=.sl
+        ;;
+      *)
+        shrext=.sl
+        ;;
+    esac
+    ;;
+  irix5* | irix6* | nonstopux*)
+    case "$host_os" in
+      irix5* | nonstopux*)
+        libsuff= shlibsuff=
+        ;;
+      *)
+        case $LD in
+          *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
+          *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
+          *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
+          *) libsuff= shlibsuff= ;;
+        esac
+        ;;
+    esac
+    ;;
+  linux*oldld* | linux*aout* | linux*coff*)
+    ;;
+  linux*)
+    ;;
+  knetbsd*-gnu)
+    ;;
+  netbsd*)
+    ;;
+  newsos6)
+    ;;
+  nto-qnx*)
+    ;;
+  openbsd*)
+    ;;
+  os2*)
+    libname_spec='$name'
+    shrext=.dll
+    ;;
+  osf3* | osf4* | osf5*)
+    ;;
+  sco3.2v5*)
+    ;;
+  solaris*)
+    ;;
+  sunos4*)
+    ;;
+  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+    ;;
+  sysv4*MP*)
+    ;;
+  uts4*)
+    ;;
+esac
+
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
+shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
+
+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
+
+# How to pass a linker flag through the compiler.
+wl="$escaped_wl"
+
+# Static library suffix (normally "a").
+libext="$libext"
+
+# Shared library suffix (normally "so").
+shlibext="$shlibext"
+
+# Flag to hardcode \$libdir into a binary during linking.
+# This must work even if \$libdir does not exist.
+hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator="$hardcode_libdir_separator"
+
+# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct="$hardcode_direct"
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF

Index: libbase/gettext.h
===================================================================
RCS file: libbase/gettext.h
diff -N libbase/gettext.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ libbase/gettext.h	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,79 @@
+/* Convenience header for conditional use of GNU <libintl.h>.
+   Copyright (C) 1995-1998, 2000-2002, 2004 Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify it
+   under the terms of the GNU Library General Public License as published
+   by the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+   USA.  */
+
+#ifndef _LIBGETTEXT_H
+#define _LIBGETTEXT_H 1
+
+/* NLS can be disabled through the configure --disable-nls option.  */
+#if ENABLE_NLS
+
+/* Get declarations of GNU message catalog functions.  */
+# include <libintl.h>
+
+#else
+
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
+/* Many header files from the libstdc++ coming with g++ 3.3 or newer include
+   <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
+   it now, to make later inclusions of <libintl.h> a NOP.  */
+#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+# include <cstdlib>
+# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H
+#  include <libintl.h>
+# endif
+#endif
+
+/* Disabled NLS.
+   The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.
+   On pre-ANSI systems without 'const', the config.h file is supposed to
+   contain "#define const".  */
+# define gettext(Msgid) ((const char *) (Msgid))
+# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
+# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
+# define ngettext(Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dngettext(Domainname, Msgid1, Msgid2, N) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
+    ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
+# define textdomain(Domainname) ((const char *) (Domainname))
+# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
+
+#endif
+
+/* A pseudo function call that serves as a marker for the automated
+   extraction of messages, but does not call gettext().  The run-time
+   translation is done at a different place in the code.
+   The argument, String, should be a literal string.  Concatenated strings
+   and other string expressions won't work.
+   The macro's expansion is not parenthesized, so that it is suitable as
+   initializer for static 'char[]' or 'const char[]' variables.  */
+#define gettext_noop(String) String
+
+#endif /* _LIBGETTEXT_H */

Index: macros/codeset.m4
===================================================================
RCS file: macros/codeset.m4
diff -N macros/codeset.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/codeset.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,21 @@
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_LANGINFO_CODESET],
+[
+  AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
+    [AC_TRY_LINK([#include <langinfo.h>],
+      [char* cs = nl_langinfo(CODESET);],
+      am_cv_langinfo_codeset=yes,
+      am_cv_langinfo_codeset=no)
+    ])
+  if test $am_cv_langinfo_codeset = yes; then
+    AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
+      [Define if you have <langinfo.h> and nl_langinfo(CODESET).])
+  fi
+])

Index: macros/gettext.m4
===================================================================
RCS file: macros/gettext.m4
diff -N macros/gettext.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/gettext.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,549 @@
+# gettext.m4 serial 37 (gettext-0.14.4)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+dnl Macro to add for using GNU gettext.
+
+dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
+dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
+dnl    default (if it is not specified or empty) is 'no-libtool'.
+dnl    INTLSYMBOL should be 'external' for packages with no intl directory,
+dnl    and 'no-libtool' or 'use-libtool' for packages with an intl directory.
+dnl    If INTLSYMBOL is 'use-libtool', then a libtool library
+dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
+dnl    depending on --{enable,disable}-{shared,static} and on the presence of
+dnl    AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
+dnl    $(top_builddir)/intl/libintl.a will be created.
+dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
+dnl    implementations (in libc or libintl) without the ngettext() function
+dnl    will be ignored.  If NEEDSYMBOL is specified and is
+dnl    'need-formatstring-macros', then GNU gettext implementations that don't
+dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
+dnl INTLDIR is used to find the intl libraries.  If empty,
+dnl    the value `$(top_builddir)/intl/' is used.
+dnl
+dnl The result of the configuration is one of three cases:
+dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
+dnl    and used.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 2) GNU gettext has been found in the system's C library.
+dnl    Catalog format: GNU --> install in $(datadir)
+dnl    Catalog extension: .mo after installation, .gmo in source tree
+dnl 3) No internationalization, always use English msgid.
+dnl    Catalog format: none
+dnl    Catalog extension: none
+dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
+dnl The use of .gmo is historical (it was needed to avoid overwriting the
+dnl GNU format catalogs when building on a platform with an X/Open gettext),
+dnl but we keep it in order not to force irrelevant filename changes on the
+dnl maintainers.
+dnl
+AC_DEFUN([AM_GNU_GETTEXT],
+[
+  dnl Argument checking.
+  ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
+    [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
+])])])])])
+  ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
+    [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
+])])])])
+  define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
+  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+
+  AC_REQUIRE([AM_PO_SUBDIRS])dnl
+  ifelse(gt_included_intl, yes, [
+    AC_REQUIRE([AM_INTL_SUBDIR])dnl
+  ])
+
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Sometimes libintl requires libiconv, so first search for libiconv.
+  dnl Ideally we would do this search only after the
+  dnl      if test "$USE_NLS" = "yes"; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+  dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
+  dnl the configure script would need to contain the same shell code
+  dnl again, outside any 'if'. There are two solutions:
+  dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
+  dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
+  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
+  dnl documented, we avoid it.
+  ifelse(gt_included_intl, yes, , [
+    AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+  ])
+
+  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
+  gt_INTL_MACOSX
+
+  dnl Set USE_NLS.
+  AM_NLS
+
+  ifelse(gt_included_intl, yes, [
+    BUILD_INCLUDED_LIBINTL=no
+    USE_INCLUDED_LIBINTL=no
+  ])
+  LIBINTL=
+  LTLIBINTL=
+  POSUB=
+
+  dnl If we use NLS figure out what method
+  if test "$USE_NLS" = "yes"; then
+    gt_use_preinstalled_gnugettext=no
+    ifelse(gt_included_intl, yes, [
+      AC_MSG_CHECKING([whether included gettext is requested])
+      AC_ARG_WITH(included-gettext,
+        [  --with-included-gettext use the GNU gettext library included here],
+        nls_cv_force_use_gnu_gettext=$withval,
+        nls_cv_force_use_gnu_gettext=no)
+      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
+
+      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
+      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+    ])
+        dnl User does not insist on using GNU NLS library.  Figure out what
+        dnl to use.  If GNU gettext is available we use this.  Else we have
+        dnl to fall back to GNU NLS library.
+
+        dnl Add a version number to the cache macros.
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, ifelse([$2], [need-ngettext], 2, 1)))
+        define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc])
+        define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+         [AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern int *_nl_domain_bindings;],
+            [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            gt_cv_func_gnugettext_libc=yes,
+            gt_cv_func_gnugettext_libc=no)])
+
+        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
+          dnl Sometimes libintl requires libiconv, so first search for libiconv.
+          ifelse(gt_included_intl, yes, , [
+            AM_ICONV_LINK
+          ])
+          dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
+          dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
+          dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
+          dnl even if libiconv doesn't exist.
+          AC_LIB_LINKFLAGS_BODY([intl])
+          AC_CACHE_CHECK([for GNU gettext in libintl],
+            gt_cv_func_gnugettext_libintl,
+           [gt_save_CPPFLAGS="$CPPFLAGS"
+            CPPFLAGS="$CPPFLAGS $INCINTL"
+            gt_save_LIBS="$LIBS"
+            LIBS="$LIBS $LIBINTL"
+            dnl Now see whether libintl exists and does not depend on libiconv.
+            AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+              [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+              gt_cv_func_gnugettext_libintl=yes,
+              gt_cv_func_gnugettext_libintl=no)
+            dnl Now see whether libintl exists and depends on libiconv.
+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then
+              LIBS="$LIBS $LIBICONV"
+              AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
+extern
+#ifdef __cplusplus
+"C"
+#endif
+const char *_nl_expand_alias (const char *);],
+                [bindtextdomain ("", "");
+return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
+               [LIBINTL="$LIBINTL $LIBICONV"
+                LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+                gt_cv_func_gnugettext_libintl=yes
+               ])
+            fi
+            CPPFLAGS="$gt_save_CPPFLAGS"
+            LIBS="$gt_save_LIBS"])
+        fi
+
+        dnl If an already present or preinstalled GNU gettext() is found,
+        dnl use it.  But if this macro is used in GNU gettext, and GNU
+        dnl gettext is already preinstalled in libintl, we update this
+        dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
+        if test "$gt_cv_func_gnugettext_libc" = "yes" \
+           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
+                && test "$PACKAGE" != gettext-runtime \
+                && test "$PACKAGE" != gettext-tools; }; then
+          gt_use_preinstalled_gnugettext=yes
+        else
+          dnl Reset the values set by searching for libintl.
+          LIBINTL=
+          LTLIBINTL=
+          INCINTL=
+        fi
+
+    ifelse(gt_included_intl, yes, [
+        if test "$gt_use_preinstalled_gnugettext" != "yes"; then
+          dnl GNU gettext is not found in the C library.
+          dnl Fall back on included GNU gettext library.
+          nls_cv_use_gnu_gettext=yes
+        fi
+      fi
+
+      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions used to generate GNU NLS library.
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
+        LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      fi
+
+      CATOBJEXT=
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Mark actions to use GNU gettext tools.
+        CATOBJEXT=.gmo
+      fi
+    ])
+
+    if test -n "$INTL_MACOSX_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+        dnl Some extra flags are needed during linking.
+        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
+      fi
+    fi
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes" \
+       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_DEFINE(ENABLE_NLS, 1,
+        [Define to 1 if translation of program messages to the user's native language
+   is requested.])
+    else
+      USE_NLS=no
+    fi
+  fi
+
+  AC_MSG_CHECKING([whether to use NLS])
+  AC_MSG_RESULT([$USE_NLS])
+  if test "$USE_NLS" = "yes"; then
+    AC_MSG_CHECKING([where the gettext function comes from])
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        gt_source="external libintl"
+      else
+        gt_source="libc"
+      fi
+    else
+      gt_source="included intl directory"
+    fi
+    AC_MSG_RESULT([$gt_source])
+  fi
+
+  if test "$USE_NLS" = "yes"; then
+
+    if test "$gt_use_preinstalled_gnugettext" = "yes"; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
+        AC_MSG_CHECKING([how to link with libintl])
+        AC_MSG_RESULT([$LIBINTL])
+        AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
+      fi
+
+      dnl For backward compatibility. Some packages may be using this.
+      AC_DEFINE(HAVE_GETTEXT, 1,
+       [Define if the GNU gettext() function is already present or preinstalled.])
+      AC_DEFINE(HAVE_DCGETTEXT, 1,
+       [Define if the GNU dcgettext() function is already present or preinstalled.])
+    fi
+
+    dnl We need to process the po/ directory.
+    POSUB=po
+  fi
+
+  ifelse(gt_included_intl, yes, [
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+
+    dnl Make all variables we use known to autoconf.
+    AC_SUBST(BUILD_INCLUDED_LIBINTL)
+    AC_SUBST(USE_INCLUDED_LIBINTL)
+    AC_SUBST(CATOBJEXT)
+
+    dnl For backward compatibility. Some configure.ins may be using this.
+    nls_cv_header_intl=
+    nls_cv_header_libgt=
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    DATADIRNAME=share
+    AC_SUBST(DATADIRNAME)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INSTOBJEXT=.mo
+    AC_SUBST(INSTOBJEXT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    GENCAT=gencat
+    AC_SUBST(GENCAT)
+
+    dnl For backward compatibility. Some Makefiles may be using this.
+    INTLOBJS=
+    if test "$USE_INCLUDED_LIBINTL" = yes; then
+      INTLOBJS="\$(GETTOBJS)"
+    fi
+    AC_SUBST(INTLOBJS)
+
+    dnl Enable libtool support if the surrounding package wishes it.
+    INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
+    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
+  ])
+
+  dnl For backward compatibility. Some Makefiles may be using this.
+  INTLLIBS="$LIBINTL"
+  AC_SUBST(INTLLIBS)
+
+  dnl Make all documented variables known to autoconf.
+  AC_SUBST(LIBINTL)
+  AC_SUBST(LTLIBINTL)
+  AC_SUBST(POSUB)
+])
+
+
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
+[
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([gt_GLIBC2])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([AC_ISC_POSIX])dnl
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([bh_C_SIGNED])dnl
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([gl_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+  AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
+  fi
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
+  fi
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
+  fi
+  AC_SUBST([HAVE_WPRINTF])
+
+  AM_ICONV
+  AM_LANGINFO_CODESET
+  if test $ac_cv_header_locale_h = yes; then
+    gt_LC_MESSAGES
+  fi
+
+  if test -n "$INTL_MACOSX_LIBS"; then
+    CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+  fi
+
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
+])
+
+
+dnl Checks for special options needed on MacOS X.
+dnl Defines INTL_MACOSX_LIBS.
+AC_DEFUN([gt_INTL_MACOSX],
+[
+  dnl Check for API introduced in MacOS X 10.2.
+  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
+    gt_cv_func_CFPreferencesCopyAppValue,
+    [gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFPreferences.h>],
+       [CFPreferencesCopyAppValue(NULL, NULL)],
+       [gt_cv_func_CFPreferencesCopyAppValue=yes],
+       [gt_cv_func_CFPreferencesCopyAppValue=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
+    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
+      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
+  fi
+  dnl Check for API introduced in MacOS X 10.3.
+  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
+    [gt_save_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
+     gt_save_LIBS="$LIBS"
+     LIBS="$LIBS -framework CoreFoundation"
+     AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
+       [gt_cv_func_CFLocaleCopyCurrent=yes],
+       [gt_cv_func_CFLocaleCopyCurrent=no])
+     CPPFLAGS="$gt_save_CPPFLAGS"
+     LIBS="$gt_save_LIBS"])
+  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
+      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
+  fi
+  INTL_MACOSX_LIBS=
+  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  fi
+  AC_SUBST([INTL_MACOSX_LIBS])
+])
+
+
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
+[
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+])
+
+
+dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
+AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])

Index: macros/glibc2.m4
===================================================================
RCS file: macros/glibc2.m4
diff -N macros/glibc2.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/glibc2.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,30 @@
+# glibc2.m4 serial 1
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.0 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gt_GLIBC2],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2 or newer,
+      ac_cv_gnu_library_2,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ >= 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2=yes,
+	ac_cv_gnu_library_2=no)
+      ]
+    )
+    AC_SUBST(GLIBC2)
+    GLIBC2="$ac_cv_gnu_library_2"
+  ]
+)

Index: macros/glibc21.m4
===================================================================
RCS file: macros/glibc21.m4
diff -N macros/glibc21.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/glibc21.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,30 @@
+# glibc21.m4 serial 3
+dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# Test for the GNU C Library, version 2.1 or newer.
+# From Bruno Haible.
+
+AC_DEFUN([gl_GLIBC21],
+  [
+    AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
+      ac_cv_gnu_library_2_1,
+      [AC_EGREP_CPP([Lucky GNU user],
+	[
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
+  Lucky GNU user
+ #endif
+#endif
+	],
+	ac_cv_gnu_library_2_1=yes,
+	ac_cv_gnu_library_2_1=no)
+      ]
+    )
+    AC_SUBST(GLIBC21)
+    GLIBC21="$ac_cv_gnu_library_2_1"
+  ]
+)

Index: macros/iconv.m4
===================================================================
RCS file: macros/iconv.m4
diff -N macros/iconv.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/iconv.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,101 @@
+# iconv.m4 serial AM4 (gettext-0.11.3)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
+[
+  dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([iconv])
+])
+
+AC_DEFUN([AM_ICONV_LINK],
+[
+  dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
+  dnl those with the standalone portable GNU libiconv installed).
+
+  dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
+  dnl accordingly.
+  AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
+
+  dnl Add $INCICONV to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed libiconv and not disabled its use
+  dnl via --without-libiconv-prefix, he wants to use it. The first
+  dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
+  am_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
+
+  AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
+    am_cv_func_iconv="no, consider installing GNU libiconv"
+    am_cv_lib_iconv=no
+    AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+      [iconv_t cd = iconv_open("","");
+       iconv(cd,NULL,NULL,NULL,NULL);
+       iconv_close(cd);],
+      am_cv_func_iconv=yes)
+    if test "$am_cv_func_iconv" != yes; then
+      am_save_LIBS="$LIBS"
+      LIBS="$LIBS $LIBICONV"
+      AC_TRY_LINK([#include <stdlib.h>
+#include <iconv.h>],
+        [iconv_t cd = iconv_open("","");
+         iconv(cd,NULL,NULL,NULL,NULL);
+         iconv_close(cd);],
+        am_cv_lib_iconv=yes
+        am_cv_func_iconv=yes)
+      LIBS="$am_save_LIBS"
+    fi
+  ])
+  if test "$am_cv_func_iconv" = yes; then
+    AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
+  fi
+  if test "$am_cv_lib_iconv" = yes; then
+    AC_MSG_CHECKING([how to link with libiconv])
+    AC_MSG_RESULT([$LIBICONV])
+  else
+    dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
+    dnl either.
+    CPPFLAGS="$am_save_CPPFLAGS"
+    LIBICONV=
+    LTLIBICONV=
+  fi
+  AC_SUBST(LIBICONV)
+  AC_SUBST(LTLIBICONV)
+])
+
+AC_DEFUN([AM_ICONV],
+[
+  AM_ICONV_LINK
+  if test "$am_cv_func_iconv" = yes; then
+    AC_MSG_CHECKING([for iconv declaration])
+    AC_CACHE_VAL(am_cv_proto_iconv, [
+      AC_TRY_COMPILE([
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+#if defined(__STDC__) || defined(__cplusplus)
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+#else
+size_t iconv();
+#endif
+], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
+      am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
+    am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
+    AC_MSG_RESULT([$]{ac_t:-
+         }[$]am_cv_proto_iconv)
+    AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
+      [Define as const if the declaration of iconv() needs const.])
+  fi
+])

Index: macros/intdiv0.m4
===================================================================
RCS file: macros/intdiv0.m4
diff -N macros/intdiv0.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/intdiv0.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,70 @@
+# intdiv0.m4 serial 1 (gettext-0.11.3)
+dnl Copyright (C) 2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gt_INTDIV0],
+[
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+  AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+    gt_cv_int_divbyzero_sigfpe,
+    [
+      AC_TRY_RUN([
+#include <stdlib.h>
+#include <signal.h>
+
+static void
+#ifdef __cplusplus
+sigfpe_handler (int sig)
+#else
+sigfpe_handler (sig) int sig;
+#endif
+{
+  /* Exit with code 0 if SIGFPE, with code 1 if any other signal.  */
+  exit (sig != SIGFPE);
+}
+
+int x = 1;
+int y = 0;
+int z;
+int nan;
+
+int main ()
+{
+  signal (SIGFPE, sigfpe_handler);
+/* IRIX and AIX (when "xlc -qcheck" is used) yield signal SIGTRAP.  */
+#if (defined (__sgi) || defined (_AIX)) && defined (SIGTRAP)
+  signal (SIGTRAP, sigfpe_handler);
+#endif
+/* Linux/SPARC yields signal SIGILL.  */
+#if defined (__sparc__) && defined (__linux__)
+  signal (SIGILL, sigfpe_handler);
+#endif
+
+  z = x / y;
+  nan = y / y;
+  exit (1);
+}
+], gt_cv_int_divbyzero_sigfpe=yes, gt_cv_int_divbyzero_sigfpe=no,
+        [
+          # Guess based on the CPU.
+          case "$host_cpu" in
+            alpha* | i[34567]86 | m68k | s390*)
+              gt_cv_int_divbyzero_sigfpe="guessing yes";;
+            *)
+              gt_cv_int_divbyzero_sigfpe="guessing no";;
+          esac
+        ])
+    ])
+  case "$gt_cv_int_divbyzero_sigfpe" in
+    *yes) value=1;;
+    *) value=0;;
+  esac
+  AC_DEFINE_UNQUOTED(INTDIV0_RAISES_SIGFPE, $value,
+    [Define if integer division by zero raises signal SIGFPE.])
+])

Index: macros/intmax.m4
===================================================================
RCS file: macros/intmax.m4
diff -N macros/intmax.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/intmax.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,30 @@
+# intmax.m4 serial 2 (gettext-0.14.2)
+dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the system has the 'intmax_t' type, but don't attempt to
+dnl find a replacement if it is lacking.
+
+AC_DEFUN([gt_TYPE_INTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
+    [AC_TRY_COMPILE([
+#include <stddef.h>
+#include <stdlib.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+#include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+#include <inttypes.h>
+#endif
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
+  if test $gt_cv_c_intmax_t = yes; then
+    AC_DEFINE(HAVE_INTMAX_T, 1,
+      [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])

Index: macros/inttypes-pri.m4
===================================================================
RCS file: macros/inttypes-pri.m4
diff -N macros/inttypes-pri.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/inttypes-pri.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,30 @@
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+# Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
+# macros to non-string values.  This is the case on AIX 4.3.3.
+
+AC_DEFUN([gt_INTTYPES_PRI],
+[
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
+      gt_cv_inttypes_pri_broken,
+      [
+        AC_TRY_COMPILE([#include <inttypes.h>
+#ifdef PRId32
+char *p = PRId32;
+#endif
+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes)
+      ])
+  fi
+  if test "$gt_cv_inttypes_pri_broken" = yes; then
+    AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
+      [Define if <inttypes.h> exists and defines unusable PRI* macros.])
+  fi
+])

Index: macros/inttypes.m4
===================================================================
RCS file: macros/inttypes.m4
diff -N macros/inttypes.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/inttypes.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,25 @@
+# inttypes.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H if <inttypes.h> exists and doesn't clash with
+# <sys/types.h>.
+
+AC_DEFUN([gt_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h,
+  [
+    AC_TRY_COMPILE(
+      [#include <sys/types.h>
+#include <inttypes.h>],
+      [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no)
+  ])
+  if test $gt_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1,
+      [Define if <inttypes.h> exists and doesn't clash with <sys/types.h>.])
+  fi
+])

Index: macros/inttypes_h.m4
===================================================================
RCS file: macros/inttypes_h.m4
diff -N macros/inttypes_h.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/inttypes_h.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,26 @@
+# inttypes_h.m4 serial 6
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+[
+  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <inttypes.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    gl_cv_header_inttypes_h=yes,
+    gl_cv_header_inttypes_h=no)])
+  if test $gl_cv_header_inttypes_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
+      [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])

Index: macros/isc-posix.m4
===================================================================
RCS file: macros/isc-posix.m4
diff -N macros/isc-posix.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/isc-posix.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,24 @@
+# isc-posix.m4 serial 2 (gettext-0.11.2)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+# This file is not needed with autoconf-2.53 and newer.  Remove it in 2005.
+
+# This test replaces the one in autoconf.
+# Currently this macro should have the same name as the autoconf macro
+# because gettext's gettext.m4 (distributed in the automake package)
+# still uses it.  Otherwise, the use in gettext.m4 makes autoheader
+# give these diagnostics:
+#   configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
+#   configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
+
+undefine([AC_ISC_POSIX])
+
+AC_DEFUN([AC_ISC_POSIX],
+  [
+    dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
+    AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
+  ]
+)

Index: macros/lcmessage.m4
===================================================================
RCS file: macros/lcmessage.m4
diff -N macros/lcmessage.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/lcmessage.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,30 @@
+# lcmessage.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
+
+# Check whether LC_MESSAGES is available in <locale.h>.
+
+AC_DEFUN([gt_LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
+  if test $gt_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])

Index: macros/lib-ld.m4
===================================================================
RCS file: macros/lib-ld.m4
diff -N macros/lib-ld.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/lib-ld.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,110 @@
+# lib-ld.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl Subroutines of libtool.m4,
+dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
+dnl with libtool.m4.
+
+dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
+AC_DEFUN([AC_LIB_PROG_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  acl_cv_prog_gnu_ld=yes ;;
+*)
+  acl_cv_prog_gnu_ld=no ;;
+esac])
+with_gnu_ld=$acl_cv_prog_gnu_ld
+])
+
+dnl From libtool-1.4. Sets the variable LD.
+AC_DEFUN([AC_LIB_PROG_LD],
+[AC_ARG_WITH(gnu-ld,
+[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by GCC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]* | [A-Za-z]:[\\/]*)]
+      [re_direlt='/[^/][^/]*/\.\./']
+      # Canonicalize the path of ld
+      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD="$ac_prog"
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test "$with_gnu_ld" = yes; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(acl_cv_path_LD,
+[if test -z "$LD"; then
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      acl_cv_path_LD="$ac_dir/$ac_prog"
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some GNU ld's only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
+      *GNU* | *'with BFD'*)
+	test "$with_gnu_ld" != no && break ;;
+      *)
+	test "$with_gnu_ld" != yes && break ;;
+      esac
+    fi
+  done
+  IFS="$ac_save_ifs"
+else
+  acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi])
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+AC_LIB_PROG_LD_GNU
+])

Index: macros/lib-link.m4
===================================================================
RCS file: macros/lib-link.m4
diff -N macros/lib-link.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/lib-link.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,553 @@
+# lib-link.m4 serial 6 (gettext-0.14.3)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_PREREQ(2.50)
+
+dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
+dnl augments the CPPFLAGS variable.
+AC_DEFUN([AC_LIB_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
+    AC_LIB_LINKFLAGS_BODY([$1], [$2])
+    ac_cv_lib[]Name[]_libs="$LIB[]NAME"
+    ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
+    ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
+  ])
+  LIB[]NAME="$ac_cv_lib[]Name[]_libs"
+  LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
+  INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
+  dnl results of this search when this library appears as a dependency.
+  HAVE_LIB[]NAME=yes
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
+dnl searches for libname and the libraries corresponding to explicit and
+dnl implicit dependencies, together with the specified include files and
+dnl the ability to compile and link the specified testcode. If found, it
+dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
+dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
+dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
+dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
+AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
+[
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  AC_REQUIRE([AC_LIB_RPATH])
+  define([Name],[translit([$1],[./-], [___])])
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+
+  dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
+  dnl accordingly.
+  AC_LIB_LINKFLAGS_BODY([$1], [$2])
+
+  dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
+  dnl because if the user has installed lib[]Name and not disabled its use
+  dnl via --without-lib[]Name-prefix, he wants to use it.
+  ac_save_CPPFLAGS="$CPPFLAGS"
+  AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
+
+  AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIB[]NAME"
+    AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
+    LIBS="$ac_save_LIBS"
+  ])
+  if test "$ac_cv_lib[]Name" = yes; then
+    HAVE_LIB[]NAME=yes
+    AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
+    AC_MSG_CHECKING([how to link with lib[]$1])
+    AC_MSG_RESULT([$LIB[]NAME])
+  else
+    HAVE_LIB[]NAME=no
+    dnl If $LIB[]NAME didn't lead to a usable library, we don't need
+    dnl $INC[]NAME either.
+    CPPFLAGS="$ac_save_CPPFLAGS"
+    LIB[]NAME=
+    LTLIB[]NAME=
+  fi
+  AC_SUBST([HAVE_LIB]NAME)
+  AC_SUBST([LIB]NAME)
+  AC_SUBST([LTLIB]NAME)
+  undefine([Name])
+  undefine([NAME])
+])
+
+dnl Determine the platform dependent parameters needed to use rpath:
+dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
+dnl hardcode_direct, hardcode_minus_L.
+AC_DEFUN([AC_LIB_RPATH],
+[
+  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
+  AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
+  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
+  AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
+  AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
+    CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+    ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+    . ./conftest.sh
+    rm -f ./conftest.sh
+    acl_cv_rpath=done
+  ])
+  wl="$acl_cv_wl"
+  libext="$acl_cv_libext"
+  shlibext="$acl_cv_shlibext"
+  hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+  hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+  hardcode_direct="$acl_cv_hardcode_direct"
+  hardcode_minus_L="$acl_cv_hardcode_minus_L"
+  dnl Determine whether the user wants rpath handling at all.
+  AC_ARG_ENABLE(rpath,
+    [  --disable-rpath         do not hardcode runtime library paths],
+    :, enable_rpath=yes)
+])
+
+dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
+dnl the libraries corresponding to explicit and implicit dependencies.
+dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
+AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
+[
+  define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
+                               [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib$1-prefix],
+[  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
+  --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  dnl Search the library and its dependencies in $additional_libdir and
+  dnl $LDFLAGS. Using breadth-first-seach.
+  LIB[]NAME=
+  LTLIB[]NAME=
+  INC[]NAME=
+  rpathdirs=
+  ltrpathdirs=
+  names_already_handled=
+  names_next_round='$1 $2'
+  while test -n "$names_next_round"; do
+    names_this_round="$names_next_round"
+    names_next_round=
+    for name in $names_this_round; do
+      already_handled=
+      for n in $names_already_handled; do
+        if test "$n" = "$name"; then
+          already_handled=yes
+          break
+        fi
+      done
+      if test -z "$already_handled"; then
+        names_already_handled="$names_already_handled $name"
+        dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
+        dnl or AC_LIB_HAVE_LINKFLAGS call.
+        uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+        eval value=\"\$HAVE_LIB$uppername\"
+        if test -n "$value"; then
+          if test "$value" = yes; then
+            eval value=\"\$LIB$uppername\"
+            test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
+            eval value=\"\$LTLIB$uppername\"
+            test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
+          else
+            dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
+            dnl that this library doesn't exist. So just drop it.
+            :
+          fi
+        else
+          dnl Search the library lib$name in $additional_libdir and $LDFLAGS
+          dnl and the already constructed $LIBNAME/$LTLIBNAME.
+          found_dir=
+          found_la=
+          found_so=
+          found_a=
+          if test $use_additional = yes; then
+            if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
+              found_dir="$additional_libdir"
+              found_so="$additional_libdir/lib$name.$shlibext"
+              if test -f "$additional_libdir/lib$name.la"; then
+                found_la="$additional_libdir/lib$name.la"
+              fi
+            else
+              if test -f "$additional_libdir/lib$name.$libext"; then
+                found_dir="$additional_libdir"
+                found_a="$additional_libdir/lib$name.$libext"
+                if test -f "$additional_libdir/lib$name.la"; then
+                  found_la="$additional_libdir/lib$name.la"
+                fi
+              fi
+            fi
+          fi
+          if test "X$found_dir" = "X"; then
+            for x in $LDFLAGS $LTLIB[]NAME; do
+              AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+              case "$x" in
+                -L*)
+                  dir=`echo "X$x" | sed -e 's/^X-L//'`
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
+                    found_dir="$dir"
+                    found_so="$dir/lib$name.$shlibext"
+                    if test -f "$dir/lib$name.la"; then
+                      found_la="$dir/lib$name.la"
+                    fi
+                  else
+                    if test -f "$dir/lib$name.$libext"; then
+                      found_dir="$dir"
+                      found_a="$dir/lib$name.$libext"
+                      if test -f "$dir/lib$name.la"; then
+                        found_la="$dir/lib$name.la"
+                      fi
+                    fi
+                  fi
+                  ;;
+              esac
+              if test "X$found_dir" != "X"; then
+                break
+              fi
+            done
+          fi
+          if test "X$found_dir" != "X"; then
+            dnl Found the library.
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
+            if test "X$found_so" != "X"; then
+              dnl Linking with a shared library. We attempt to hardcode its
+              dnl directory into the executable's runpath, unless it's the
+              dnl standard /usr/lib.
+              if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+                dnl No hardcoding is needed.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+              else
+                dnl Use an explicit option to hardcode DIR into the resulting
+                dnl binary.
+                dnl Potentially add DIR to ltrpathdirs.
+                dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                haveit=
+                for x in $ltrpathdirs; do
+                  if test "X$x" = "X$found_dir"; then
+                    haveit=yes
+                    break
+                  fi
+                done
+                if test -z "$haveit"; then
+                  ltrpathdirs="$ltrpathdirs $found_dir"
+                fi
+                dnl The hardcoding into $LIBNAME is system dependent.
+                if test "$hardcode_direct" = yes; then
+                  dnl Using DIR/libNAME.so during linking hardcodes DIR into the
+                  dnl resulting binary.
+                  LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                else
+                  if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+                    dnl Use an explicit option to hardcode DIR into the resulting
+                    dnl binary.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    dnl Potentially add DIR to rpathdirs.
+                    dnl The rpathdirs will be appended to $LIBNAME at the end.
+                    haveit=
+                    for x in $rpathdirs; do
+                      if test "X$x" = "X$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      rpathdirs="$rpathdirs $found_dir"
+                    fi
+                  else
+                    dnl Rely on "-L$found_dir".
+                    dnl But don't add it if it's already contained in the LDFLAGS
+                    dnl or the already constructed $LIBNAME
+                    haveit=
+                    for x in $LDFLAGS $LIB[]NAME; do
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                      if test "X$x" = "X-L$found_dir"; then
+                        haveit=yes
+                        break
+                      fi
+                    done
+                    if test -z "$haveit"; then
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
+                    fi
+                    if test "$hardcode_minus_L" != no; then
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
+                    else
+                      dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
+                      dnl here, because this doesn't fit in flags passed to the
+                      dnl compiler. So give up. No hardcoding. This affects only
+                      dnl very old systems.
+                      dnl FIXME: Not sure whether we should use
+                      dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
+                      dnl here.
+                      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+                    fi
+                  fi
+                fi
+              fi
+            else
+              if test "X$found_a" != "X"; then
+                dnl Linking with a static library.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
+              else
+                dnl We shouldn't come here, but anyway it's good to have a
+                dnl fallback.
+                LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
+              fi
+            fi
+            dnl Assume the include files are nearby.
+            additional_includedir=
+            case "$found_dir" in
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+                additional_includedir="$basedir/include"
+                ;;
+            esac
+            if test "X$additional_includedir" != "X"; then
+              dnl Potentially add $additional_includedir to $INCNAME.
+              dnl But don't add it
+              dnl   1. if it's the standard /usr/include,
+              dnl   2. if it's /usr/local/include and we are using GCC on Linux,
+              dnl   3. if it's already present in $CPPFLAGS or the already
+              dnl      constructed $INCNAME,
+              dnl   4. if it doesn't exist as a directory.
+              if test "X$additional_includedir" != "X/usr/include"; then
+                haveit=
+                if test "X$additional_includedir" = "X/usr/local/include"; then
+                  if test -n "$GCC"; then
+                    case $host_os in
+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                    esac
+                  fi
+                fi
+                if test -z "$haveit"; then
+                  for x in $CPPFLAGS $INC[]NAME; do
+                    AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                    if test "X$x" = "X-I$additional_includedir"; then
+                      haveit=yes
+                      break
+                    fi
+                  done
+                  if test -z "$haveit"; then
+                    if test -d "$additional_includedir"; then
+                      dnl Really add $additional_includedir to $INCNAME.
+                      INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
+                    fi
+                  fi
+                fi
+              fi
+            fi
+            dnl Look for dependencies.
+            if test -n "$found_la"; then
+              dnl Read the .la file. It defines the variables
+              dnl dlname, library_names, old_library, dependency_libs, current,
+              dnl age, revision, installed, dlopen, dlpreopen, libdir.
+              save_libdir="$libdir"
+              case "$found_la" in
+                */* | *\\*) . "$found_la" ;;
+                *) . "./$found_la" ;;
+              esac
+              libdir="$save_libdir"
+              dnl We use only dependency_libs.
+              for dep in $dependency_libs; do
+                case "$dep" in
+                  -L*)
+                    additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+                    dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
+                    dnl But don't add it
+                    dnl   1. if it's the standard /usr/lib,
+                    dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
+                    dnl   3. if it's already present in $LDFLAGS or the already
+                    dnl      constructed $LIBNAME,
+                    dnl   4. if it doesn't exist as a directory.
+                    if test "X$additional_libdir" != "X/usr/lib"; then
+                      haveit=
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
+                        if test -n "$GCC"; then
+                          case $host_os in
+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                          esac
+                        fi
+                      fi
+                      if test -z "$haveit"; then
+                        haveit=
+                        for x in $LDFLAGS $LIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LIBNAME.
+                            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                        haveit=
+                        for x in $LDFLAGS $LTLIB[]NAME; do
+                          AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+                          if test "X$x" = "X-L$additional_libdir"; then
+                            haveit=yes
+                            break
+                          fi
+                        done
+                        if test -z "$haveit"; then
+                          if test -d "$additional_libdir"; then
+                            dnl Really add $additional_libdir to $LTLIBNAME.
+                            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
+                          fi
+                        fi
+                      fi
+                    fi
+                    ;;
+                  -R*)
+                    dir=`echo "X$dep" | sed -e 's/^X-R//'`
+                    if test "$enable_rpath" != no; then
+                      dnl Potentially add DIR to rpathdirs.
+                      dnl The rpathdirs will be appended to $LIBNAME at the end.
+                      haveit=
+                      for x in $rpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        rpathdirs="$rpathdirs $dir"
+                      fi
+                      dnl Potentially add DIR to ltrpathdirs.
+                      dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
+                      haveit=
+                      for x in $ltrpathdirs; do
+                        if test "X$x" = "X$dir"; then
+                          haveit=yes
+                          break
+                        fi
+                      done
+                      if test -z "$haveit"; then
+                        ltrpathdirs="$ltrpathdirs $dir"
+                      fi
+                    fi
+                    ;;
+                  -l*)
+                    dnl Handle this in the next round.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+                    ;;
+                  *.la)
+                    dnl Handle this in the next round. Throw away the .la's
+                    dnl directory; it is already contained in a preceding -L
+                    dnl option.
+                    names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+                    ;;
+                  *)
+                    dnl Most likely an immediate library name.
+                    LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
+                    LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
+                    ;;
+                esac
+              done
+            fi
+          else
+            dnl Didn't find the library; assume it is in the system directories
+            dnl known to the linker and runtime loader. (All the system
+            dnl directories known to the linker should also be known to the
+            dnl runtime loader, otherwise the system is severely misconfigured.)
+            LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
+            LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
+          fi
+        fi
+      fi
+    done
+  done
+  if test "X$rpathdirs" != "X"; then
+    if test -n "$hardcode_libdir_separator"; then
+      dnl Weird platform: only the last -rpath option counts, the user must
+      dnl pass all path elements in one option. We can arrange that for a
+      dnl single library, but not when more than one $LIBNAMEs are used.
+      alldirs=
+      for found_dir in $rpathdirs; do
+        alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+      done
+      dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
+      acl_save_libdir="$libdir"
+      libdir="$alldirs"
+      eval flag=\"$hardcode_libdir_flag_spec\"
+      libdir="$acl_save_libdir"
+      LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+    else
+      dnl The -rpath options are cumulative.
+      for found_dir in $rpathdirs; do
+        acl_save_libdir="$libdir"
+        libdir="$found_dir"
+        eval flag=\"$hardcode_libdir_flag_spec\"
+        libdir="$acl_save_libdir"
+        LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
+      done
+    fi
+  fi
+  if test "X$ltrpathdirs" != "X"; then
+    dnl When using libtool, the option that works for both libraries and
+    dnl executables is -R. The -R options are cumulative.
+    for found_dir in $ltrpathdirs; do
+      LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
+    done
+  fi
+])
+
+dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
+dnl unless already present in VAR.
+dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
+dnl contains two or three consecutive elements that belong together.
+AC_DEFUN([AC_LIB_APPENDTOVAR],
+[
+  for element in [$2]; do
+    haveit=
+    for x in $[$1]; do
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+      if test "X$x" = "X$element"; then
+        haveit=yes
+        break
+      fi
+    done
+    if test -z "$haveit"; then
+      [$1]="${[$1]}${[$1]:+ }$element"
+    fi
+  done
+])

Index: macros/lib-prefix.m4
===================================================================
RCS file: macros/lib-prefix.m4
diff -N macros/lib-prefix.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/lib-prefix.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,153 @@
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
+dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
+dnl require excessive bracketing.
+ifdef([AC_HELP_STRING],
+[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+
+dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
+dnl to access previously installed libraries. The basic assumption is that
+dnl a user will want packages to use other packages he previously installed
+dnl with the same --prefix option.
+dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
+dnl libraries, but is otherwise very convenient.
+AC_DEFUN([AC_LIB_PREFIX],
+[
+  AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
+  dnl By default, look in $includedir and $libdir.
+  use_additional=yes
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
+  AC_LIB_ARG_WITH([lib-prefix],
+[  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
+  --without-lib-prefix    don't search for libraries in includedir and libdir],
+[
+    if test "X$withval" = "Xno"; then
+      use_additional=no
+    else
+      if test "X$withval" = "X"; then
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
+      else
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
+      fi
+    fi
+])
+  if test $use_additional = yes; then
+    dnl Potentially add $additional_includedir to $CPPFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/include,
+    dnl   2. if it's already present in $CPPFLAGS,
+    dnl   3. if it's /usr/local/include and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_includedir" != "X/usr/include"; then
+      haveit=
+      for x in $CPPFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
+      fi
+    fi
+    dnl Potentially add $additional_libdir to $LDFLAGS.
+    dnl But don't add it
+    dnl   1. if it's the standard /usr/lib,
+    dnl   2. if it's already present in $LDFLAGS,
+    dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
+    dnl   4. if it doesn't exist as a directory.
+    if test "X$additional_libdir" != "X/usr/lib"; then
+      haveit=
+      for x in $LDFLAGS; do
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
+      done
+      if test -z "$haveit"; then
+        if test "X$additional_libdir" = "X/usr/local/lib"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
+      fi
+    fi
+  fi
+])
+
+dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
+dnl acl_final_exec_prefix, containing the values to which $prefix and
+dnl $exec_prefix will expand at the end of the configure script.
+AC_DEFUN([AC_LIB_PREPARE_PREFIX],
+[
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    acl_final_prefix="$ac_default_prefix"
+  else
+    acl_final_prefix="$prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    acl_final_exec_prefix='${prefix}'
+  else
+    acl_final_exec_prefix="$exec_prefix"
+  fi
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
+])

Index: macros/longdouble.m4
===================================================================
RCS file: macros/longdouble.m4
diff -N macros/longdouble.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/longdouble.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,28 @@
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the compiler supports the 'long double' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_LONGDOUBLE],
+[
+  AC_CACHE_CHECK([for long double], gt_cv_c_long_double,
+    [if test "$GCC" = yes; then
+       gt_cv_c_long_double=yes
+     else
+       AC_TRY_COMPILE([
+         /* The Stardent Vistra knows sizeof(long double), but does not support it.  */
+         long double foo = 0.0;
+         /* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
+         int array [2*(sizeof(long double) >= sizeof(double)) - 1];
+         ], ,
+         gt_cv_c_long_double=yes, gt_cv_c_long_double=no)
+     fi])
+  if test $gt_cv_c_long_double = yes; then
+    AC_DEFINE(HAVE_LONG_DOUBLE, 1, [Define if you have the 'long double' type.])
+  fi
+])

Index: macros/longlong.m4
===================================================================
RCS file: macros/longlong.m4
diff -N macros/longlong.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/longlong.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,23 @@
+# longlong.m4 serial 5
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_LONG_LONG if 'long long' works.
+
+AC_DEFUN([gl_AC_TYPE_LONG_LONG],
+[
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
+  if test $ac_cv_type_long_long = yes; then
+    AC_DEFINE(HAVE_LONG_LONG, 1,
+      [Define if you have the 'long long' type.])
+  fi
+])

Index: macros/nls.m4
===================================================================
RCS file: macros/nls.m4
diff -N macros/nls.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/nls.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,51 @@
+# nls.m4 serial 2 (gettext-0.14.3)
+dnl Copyright (C) 1995-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl Tell automake >= 1.10 to complain if mkinstalldirs is missing.
+  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([mkinstalldirs])])
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])

Index: macros/po.m4
===================================================================
RCS file: macros/po.m4
diff -N macros/po.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/po.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,429 @@
+# po.m4 serial 7 (gettext-0.14.3)
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
+dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+dnl Checks for all prerequisites of the po subdirectory.
+AC_DEFUN([AM_PO_SUBDIRS],
+[
+  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AM_NLS])dnl
+
+  dnl Perform the following tests also if --disable-nls has been given,
+  dnl because they are needed for "make dist" to work.
+
+  dnl Search for GNU msgfmt in the PATH.
+  dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
+  dnl The second test excludes FreeBSD msgfmt.
+  AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+
+  dnl Search for GNU xgettext 0.12 or newer in the PATH.
+  dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
+  dnl The second test excludes FreeBSD xgettext.
+  AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+     (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
+    :)
+  dnl Remove leftover from FreeBSD xgettext call.
+  rm -f messages.po
+
+  dnl Search for GNU msgmerge 0.11 or newer in the PATH.
+  AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU msgfmt.
+  if test "$GMSGFMT" != ":"; then
+    dnl If it is no GNU msgfmt we define it as : so that the
+    dnl Makefiles still can work.
+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      AC_MSG_RESULT(
+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
+      GMSGFMT=":"
+    fi
+  fi
+
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU xgettext.
+  if test "$XGETTEXT" != ":"; then
+    dnl If it is no GNU xgettext we define it as : so that the
+    dnl Makefiles still can work.
+    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      AC_MSG_RESULT(
+        [found xgettext program is not GNU xgettext; ignore it])
+      XGETTEXT=":"
+    fi
+    dnl Remove leftover from FreeBSD xgettext call.
+    rm -f messages.po
+  fi
+
+  AC_OUTPUT_COMMANDS([
+    for ac_file in $CONFIG_FILES; do
+      # Support "outfile[:infile[:infile...]]"
+      case "$ac_file" in
+        *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+      esac
+      # PO directories have a Makefile.in generated from Makefile.in.in.
+      case "$ac_file" in */Makefile.in)
+        # Adjust a relative srcdir.
+        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+        # In autoconf-2.13 it is called $ac_given_srcdir.
+        # In autoconf-2.50 it is called $srcdir.
+        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+        case "$ac_given_srcdir" in
+          .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+          /*) top_srcdir="$ac_given_srcdir" ;;
+          *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        esac
+        # Treat a directory as a PO directory if and only if it has a
+        # POTFILES.in file. This allows packages to have multiple PO
+        # directories under different names or in different locations.
+        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+          rm -f "$ac_dir/POTFILES"
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+          cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
+          POMAKEFILEDEPS="POTFILES.in"
+          # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
+          # on $ac_dir but don't depend on user-specified configuration
+          # parameters.
+          if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+            # The LINGUAS file contains the set of available languages.
+            if test -n "$OBSOLETE_ALL_LINGUAS"; then
+              test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+            fi
+            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake.
+            eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+            POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+          else
+            # The set of available languages was given in configure.in.
+            eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
+          fi
+          # Compute POFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+          # Compute UPDATEPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+          # Compute DUMMYPOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+          # Compute GMOFILES
+          # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+          case "$ac_given_srcdir" in
+            .) srcdirpre= ;;
+            *) srcdirpre='$(srcdir)/' ;;
+          esac
+          POFILES=
+          UPDATEPOFILES=
+          DUMMYPOFILES=
+          GMOFILES=
+          for lang in $ALL_LINGUAS; do
+            POFILES="$POFILES $srcdirpre$lang.po"
+            UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+            DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+            GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+          done
+          # CATALOGS depends on both $ac_dir and the user's LINGUAS
+          # environment variable.
+          INST_LINGUAS=
+          if test -n "$ALL_LINGUAS"; then
+            for presentlang in $ALL_LINGUAS; do
+              useit=no
+              if test "%UNSET%" != "$LINGUAS"; then
+                desiredlanguages="$LINGUAS"
+              else
+                desiredlanguages="$ALL_LINGUAS"
+              fi
+              for desiredlang in $desiredlanguages; do
+                # Use the presentlang catalog if desiredlang is
+                #   a. equal to presentlang, or
+                #   b. a variant of presentlang (because in this case,
+                #      presentlang can be used as a fallback for messages
+                #      which are not translated in the desiredlang catalog).
+                case "$desiredlang" in
+                  "$presentlang"*) useit=yes;;
+                esac
+              done
+              if test $useit = yes; then
+                INST_LINGUAS="$INST_LINGUAS $presentlang"
+              fi
+            done
+          fi
+          CATALOGS=
+          if test -n "$INST_LINGUAS"; then
+            for lang in $INST_LINGUAS; do
+              CATALOGS="$CATALOGS $lang.gmo"
+            done
+          fi
+          test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
+          sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
+          for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
+            if test -f "$f"; then
+              case "$f" in
+                *.orig | *.bak | *~) ;;
+                *) cat "$f" >> "$ac_dir/Makefile" ;;
+              esac
+            fi
+          done
+        fi
+        ;;
+      esac
+    done],
+   [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
+    # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+    # from automake.
+    eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
+    # Capture the value of LINGUAS because we need it to compute CATALOGS.
+    LINGUAS="${LINGUAS-%UNSET%}"
+   ])
+])
+
+dnl Postprocesses a Makefile in a directory containing PO files.
+AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
+[
+  # When this code is run, in config.status, two variables have already been
+  # set:
+  # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
+  # - LINGUAS is the value of the environment variable LINGUAS at configure
+  #   time.
+
+changequote(,)dnl
+  # Adjust a relative srcdir.
+  ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+  ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+  ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+  # In autoconf-2.13 it is called $ac_given_srcdir.
+  # In autoconf-2.50 it is called $srcdir.
+  test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  case "$ac_given_srcdir" in
+    .)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+    /*) top_srcdir="$ac_given_srcdir" ;;
+    *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  esac
+
+  # Find a way to echo strings without interpreting backslash.
+  if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
+    gt_echo='echo'
+  else
+    if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
+      gt_echo='printf %s\n'
+    else
+      echo_func () {
+        cat <<EOT
+$*
+EOT
+      }
+      gt_echo='echo_func'
+    fi
+  fi
+
+  # A sed script that extracts the value of VARIABLE from a Makefile.
+  sed_x_variable='
+# Test if the hold space is empty.
+x
+s/P/P/
+x
+ta
+# Yes it was empty. Look if we have the expected variable definition.
+/^[	 ]*VARIABLE[	 ]*=/{
+  # Seen the first line of the variable definition.
+  s/^[	 ]*VARIABLE[	 ]*=//
+  ba
+}
+bd
+:a
+# Here we are processing a line from the variable definition.
+# Remove comment, more precisely replace it with a space.
+s/#.*$/ /
+# See if the line ends in a backslash.
+tb
+:b
+s/\\$//
+# Print the line, without the trailing backslash.
+p
+tc
+# There was no trailing backslash. The end of the variable definition is
+# reached. Clear the hold space.
+s/^.*$//
+x
+bd
+:c
+# A trailing backslash means that the variable definition continues in the
+# next line. Put a nonempty string into the hold space to indicate this.
+s/^.*$/P/
+x
+:d
+'
+changequote([,])dnl
+
+  # Set POTFILES to the value of the Makefile variable POTFILES.
+  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`"
+  POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
+  # Compute POTFILES_DEPS as
+  #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
+  POTFILES_DEPS=
+  for file in $POTFILES; do
+    POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
+  done
+  POMAKEFILEDEPS=""
+
+  if test -n "$OBSOLETE_ALL_LINGUAS"; then
+    test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
+  fi
+  if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
+    # The LINGUAS file contains the set of available languages.
+    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+    POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
+  else
+    # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
+    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`"
+    ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+  fi
+  # Hide the ALL_LINGUAS assigment from automake.
+  eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
+  # Compute POFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
+  # Compute UPDATEPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
+  # Compute DUMMYPOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
+  # Compute GMOFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
+  # Compute PROPERTIESFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
+  # Compute CLASSFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
+  # Compute QMFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
+  # Compute MSGFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
+  # Compute RESOURCESDLLFILES
+  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
+  case "$ac_given_srcdir" in
+    .) srcdirpre= ;;
+    *) srcdirpre='$(srcdir)/' ;;
+  esac
+  POFILES=
+  UPDATEPOFILES=
+  DUMMYPOFILES=
+  GMOFILES=
+  PROPERTIESFILES=
+  CLASSFILES=
+  QMFILES=
+  MSGFILES=
+  RESOURCESDLLFILES=
+  for lang in $ALL_LINGUAS; do
+    POFILES="$POFILES $srcdirpre$lang.po"
+    UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
+    DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
+    GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
+    PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+    CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
+    QMFILES="$QMFILES $srcdirpre$lang.qm"
+    frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+    MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
+    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+    RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
+  done
+  # CATALOGS depends on both $ac_dir and the user's LINGUAS
+  # environment variable.
+  INST_LINGUAS=
+  if test -n "$ALL_LINGUAS"; then
+    for presentlang in $ALL_LINGUAS; do
+      useit=no
+      if test "%UNSET%" != "$LINGUAS"; then
+        desiredlanguages="$LINGUAS"
+      else
+        desiredlanguages="$ALL_LINGUAS"
+      fi
+      for desiredlang in $desiredlanguages; do
+        # Use the presentlang catalog if desiredlang is
+        #   a. equal to presentlang, or
+        #   b. a variant of presentlang (because in this case,
+        #      presentlang can be used as a fallback for messages
+        #      which are not translated in the desiredlang catalog).
+        case "$desiredlang" in
+          "$presentlang"*) useit=yes;;
+        esac
+      done
+      if test $useit = yes; then
+        INST_LINGUAS="$INST_LINGUAS $presentlang"
+      fi
+    done
+  fi
+  CATALOGS=
+  JAVACATALOGS=
+  QTCATALOGS=
+  TCLCATALOGS=
+  CSHARPCATALOGS=
+  if test -n "$INST_LINGUAS"; then
+    for lang in $INST_LINGUAS; do
+      CATALOGS="$CATALOGS $lang.gmo"
+      JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
+      QTCATALOGS="$QTCATALOGS $lang.qm"
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
+    done
+  fi
+
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
+  if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang.msg: $lang.po
+	@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
+	\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
+    # Add dependencies that cannot be formulated as a simple suffix rule.
+    for lang in $ALL_LINGUAS; do
+      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
+      cat >> "$ac_file.tmp" <<EOF
+$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
+	@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
+	\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
+EOF
+    done
+  fi
+  if test -n "$POMAKEFILEDEPS"; then
+    cat >> "$ac_file.tmp" <<EOF
+Makefile: $POMAKEFILEDEPS
+EOF
+  fi
+  mv "$ac_file.tmp" "$ac_file"
+])

Index: macros/printf-posix.m4
===================================================================
RCS file: macros/printf-posix.m4
diff -N macros/printf-posix.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/printf-posix.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,44 @@
+# printf-posix.m4 serial 2 (gettext-0.13.1)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether the printf() function supports POSIX/XSI format strings with
+dnl positions.
+
+AC_DEFUN([gt_PRINTF_POSIX],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_CACHE_CHECK([whether printf() supports POSIX/XSI format strings],
+    gt_cv_func_printf_posix,
+    [
+      AC_TRY_RUN([
+#include <stdio.h>
+#include <string.h>
+/* The string "%2$d %1$d", with dollar characters protected from the shell's
+   dollar expansion (possibly an autoconf bug).  */
+static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+static char buf[100];
+int main ()
+{
+  sprintf (buf, format, 33, 55);
+  return (strcmp (buf, "55 33") != 0);
+}], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no,
+      [
+        AC_EGREP_CPP(notposix, [
+#if defined __NetBSD__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__
+  notposix
+#endif
+        ], gt_cv_func_printf_posix="guessing no",
+           gt_cv_func_printf_posix="guessing yes")
+      ])
+    ])
+  case $gt_cv_func_printf_posix in
+    *yes)
+      AC_DEFINE(HAVE_POSIX_PRINTF, 1,
+        [Define if your printf() function supports format strings with positions.])
+      ;;
+  esac
+])

Index: macros/progtest.m4
===================================================================
RCS file: macros/progtest.m4
diff -N macros/progtest.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/progtest.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,92 @@
+# progtest.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+AC_PREREQ(2.50)
+
+# Search path for a program which passes the given test.
+
+dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+AC_DEFUN([AM_PATH_PROG_WITH_TEST],
+[
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! /bin/sh" >conf$$.sh
+  echo  "exit 0"   >>conf$$.sh
+  chmod +x conf$$.sh
+  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conf$$.sh
+fi
+
+# Find out how to test for executable files. Don't use a zero-byte file,
+# as systems may use methods other than mode bits to determine executability.
+cat >conf$$.file <<_ASEOF
+#! /bin/sh
+exit 0
+_ASEOF
+chmod +x conf$$.file
+if test -x conf$$.file >/dev/null 2>&1; then
+  ac_executable_p="test -x"
+else
+  ac_executable_p="test -f"
+fi
+rm -f conf$$.file
+
+# Extract the first word of "$2", so it can be a program name with args.
+set dummy $2; ac_word=[$]2
+AC_MSG_CHECKING([for $ac_word])
+AC_CACHE_VAL(ac_cv_path_$1,
+[case "[$]$1" in
+  [[\\/]]* | ?:[[\\/]]*)
+    ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+    ;;
+  *)
+    ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+    for ac_dir in ifelse([$5], , $PATH, [$5]); do
+      IFS="$ac_save_IFS"
+      test -z "$ac_dir" && ac_dir=.
+      for ac_exec_ext in '' $ac_executable_extensions; do
+        if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
+          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          if [$3]; then
+            ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
+            break 2
+          fi
+        fi
+      done
+    done
+    IFS="$ac_save_IFS"
+dnl If no 4th arg is given, leave the cache variable unset,
+dnl so AC_PATH_PROGS will keep looking.
+ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+])dnl
+    ;;
+esac])dnl
+$1="$ac_cv_path_$1"
+if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+  AC_MSG_RESULT([$]$1)
+else
+  AC_MSG_RESULT(no)
+fi
+AC_SUBST($1)dnl
+])

Index: macros/signed.m4
===================================================================
RCS file: macros/signed.m4
diff -N macros/signed.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/signed.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,17 @@
+# signed.m4 serial 1 (gettext-0.10.40)
+dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([bh_C_SIGNED],
+[
+  AC_CACHE_CHECK([for signed], bh_cv_c_signed,
+   [AC_TRY_COMPILE(, [signed char x;], bh_cv_c_signed=yes, bh_cv_c_signed=no)])
+  if test $bh_cv_c_signed = no; then
+    AC_DEFINE(signed, ,
+              [Define to empty if the C compiler doesn't support this keyword.])
+  fi
+])

Index: macros/size_max.m4
===================================================================
RCS file: macros/size_max.m4
diff -N macros/size_max.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/size_max.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,59 @@
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_SIZE_MAX],
+[
+  AC_CHECK_HEADERS(stdint.h)
+  dnl First test whether the system already has SIZE_MAX.
+  AC_MSG_CHECKING([for SIZE_MAX])
+  result=
+  AC_EGREP_CPP([Found it], [
+#include <limits.h>
+#if HAVE_STDINT_H
+#include <stdint.h>
+#endif
+#ifdef SIZE_MAX
+Found it
+#endif
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
+      else
+        result="$res_hi$res_lo"UL
+      fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
+    fi
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
+      [Define as the maximum value of type 'size_t', if the system doesn't define it.])
+  fi
+])

Index: macros/stdint_h.m4
===================================================================
RCS file: macros/stdint_h.m4
diff -N macros/stdint_h.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/stdint_h.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,26 @@
+# stdint_h.m4 serial 5
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
+# doesn't clash with <sys/types.h>, and declares uintmax_t.
+
+AC_DEFUN([gl_AC_HEADER_STDINT_H],
+[
+  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
+  [AC_TRY_COMPILE(
+    [#include <sys/types.h>
+#include <stdint.h>],
+    [uintmax_t i = (uintmax_t) -1;],
+    gl_cv_header_stdint_h=yes,
+    gl_cv_header_stdint_h=no)])
+  if test $gl_cv_header_stdint_h = yes; then
+    AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
+      [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
+       and declares uintmax_t. ])
+  fi
+])

Index: macros/uintmax_t.m4
===================================================================
RCS file: macros/uintmax_t.m4
diff -N macros/uintmax_t.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/uintmax_t.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,30 @@
+# uintmax_t.m4 serial 9
+dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+AC_PREREQ(2.13)
+
+# Define uintmax_t to 'unsigned long' or 'unsigned long long'
+# if it is not already defined in <stdint.h> or <inttypes.h>.
+
+AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
+[
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
+    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+    test $ac_cv_type_unsigned_long_long = yes \
+      && ac_type='unsigned long long' \
+      || ac_type='unsigned long'
+    AC_DEFINE_UNQUOTED(uintmax_t, $ac_type,
+      [Define to unsigned long or unsigned long long
+       if <stdint.h> and <inttypes.h> don't define.])
+  else
+    AC_DEFINE(HAVE_UINTMAX_T, 1,
+      [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.])
+  fi
+])

Index: macros/ulonglong.m4
===================================================================
RCS file: macros/ulonglong.m4
diff -N macros/ulonglong.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/ulonglong.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,23 @@
+# ulonglong.m4 serial 4
+dnl Copyright (C) 1999-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Paul Eggert.
+
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
+
+AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
+[
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
+  if test $ac_cv_type_unsigned_long_long = yes; then
+    AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
+      [Define if you have the 'unsigned long long' type.])
+  fi
+])

Index: macros/wchar_t.m4
===================================================================
RCS file: macros/wchar_t.m4
diff -N macros/wchar_t.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/wchar_t.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,20 @@
+# wchar_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <stddef.h> has the 'wchar_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WCHAR_T],
+[
+  AC_CACHE_CHECK([for wchar_t], gt_cv_c_wchar_t,
+    [AC_TRY_COMPILE([#include <stddef.h>
+       wchar_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wchar_t=yes, gt_cv_c_wchar_t=no)])
+  if test $gt_cv_c_wchar_t = yes; then
+    AC_DEFINE(HAVE_WCHAR_T, 1, [Define if you have the 'wchar_t' type.])
+  fi
+])

Index: macros/wint_t.m4
===================================================================
RCS file: macros/wint_t.m4
diff -N macros/wint_t.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/wint_t.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,20 @@
+# wint_t.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+dnl Test whether <wchar.h> has the 'wint_t' type.
+dnl Prerequisite: AC_PROG_CC
+
+AC_DEFUN([gt_TYPE_WINT_T],
+[
+  AC_CACHE_CHECK([for wint_t], gt_cv_c_wint_t,
+    [AC_TRY_COMPILE([#include <wchar.h>
+       wint_t foo = (wchar_t)'\0';], ,
+       gt_cv_c_wint_t=yes, gt_cv_c_wint_t=no)])
+  if test $gt_cv_c_wint_t = yes; then
+    AC_DEFINE(HAVE_WINT_T, 1, [Define if you have the 'wint_t' type.])
+  fi
+])

Index: macros/xsize.m4
===================================================================
RCS file: macros/xsize.m4
diff -N macros/xsize.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros/xsize.m4	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,13 @@
+# xsize.m4 serial 3
+dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_XSIZE],
+[
+  dnl Prerequisites of lib/xsize.h.
+  AC_REQUIRE([gl_SIZE_MAX])
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS(stdint.h)
+])

Index: po/LINGUAS
===================================================================
RCS file: po/LINGUAS
diff -N po/LINGUAS
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/LINGUAS	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,2 @@
+# Set of available languages.
+es

Index: po/Makefile.in.in
===================================================================
RCS file: po/Makefile.in.in
diff -N po/Makefile.in.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/Makefile.in.in	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,384 @@
+# Makefile for PO directory in any package using GNU gettext.
+# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+#
+# This file can be copied and used freely without restrictions.  It can
+# be used in projects which are not available under the GNU General Public
+# License but which still want to provide support for the GNU gettext
+# functionality.
+# Please note that the actual code of GNU gettext is covered by the GNU
+# General Public License and is *not* in the public domain.
+#
+# Origin: gettext-0.14.4
+
+PACKAGE = @PACKAGE@
+VERSION = @VERSION@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+
+SHELL = /bin/sh
+@SET_MAKE@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+datadir = @datadir@
+localedir = $(datadir)/locale
+gettextsrcdir = $(datadir)/gettext/po
+
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
+MSGMERGE = msgmerge
+MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGINIT = msginit
+MSGCONV = msgconv
+MSGFILTER = msgfilter
+
+POFILES = @POFILES@
+GMOFILES = @GMOFILES@
+UPDATEPOFILES = @UPDATEPOFILES@
+DUMMYPOFILES = @DUMMYPOFILES@
+DISTFILES.common = Makefile.in.in remove-potcdate.sin \
+$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
+$(POFILES) $(GMOFILES) \
+$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
+
+POTFILES = \
+
+CATALOGS = @CATALOGS@
+
+# Makevars gets inserted here. (Don't remove this line!)
+
+.SUFFIXES:
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+
+.po.mo:
+	@echo "$(MSGFMT) -c -o $@ $<"; \
+	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+
+.po.gmo:
+	@lang=`echo $* | sed -e 's,.*/,,'`; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
+	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+
+.sin.sed:
+	sed -e '/^#/d' $< > t-$@
+	mv t-$@ $@
+
+
+all: all-@USE_NLS@
+
+all-yes: stamp-po
+all-no:
+
+# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
+# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
+# we don't want to bother translators with empty POT files). We assume that
+# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
+# In this case, stamp-po is a nop (i.e. a phony target).
+
+# stamp-po is a timestamp denoting the last time at which the CATALOGS have
+# been loosely updated. Its purpose is that when a developer or translator
+# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
+# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
+# invocations of "make" will do nothing. This timestamp would not be necessary
+# if updating the $(CATALOGS) would always touch them; however, the rule for
+# $(POFILES) has been designed to not touch files that don't need to be
+# changed.
+stamp-po: $(srcdir)/$(DOMAIN).pot
+	test ! -f $(srcdir)/$(DOMAIN).pot || \
+	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
+	  echo "touch stamp-po" && \
+	  echo timestamp > stamp-poT && \
+	  mv stamp-poT stamp-po; \
+	}
+
+# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
+# otherwise packages like GCC can not be built if only parts of the source
+# have been downloaded.
+
+# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
+# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
+	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
+	else \
+	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
+	fi; \
+	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
+	  --files-from=$(srcdir)/POTFILES.in \
+	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
+	  --msgid-bugs-address="$$msgid_bugs_address"
+	test ! -f $(DOMAIN).po || { \
+	  if test -f $(srcdir)/$(DOMAIN).pot; then \
+	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
+	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
+	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
+	    else \
+	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
+	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	    fi; \
+	  else \
+	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+	  fi; \
+	}
+
+# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
+# every "make" invocation, only create it when it is missing.
+# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
+$(srcdir)/$(DOMAIN).pot:
+	$(MAKE) $(DOMAIN).pot-update
+
+# This target rebuilds a PO file if $(DOMAIN).pot has changed.
+# Note that a PO file is not touched if it doesn't need to be changed.
+$(POFILES): $(srcdir)/$(DOMAIN).pot
+	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+	if test -f "$(srcdir)/$${lang}.po"; then \
+	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
+	else \
+	  $(MAKE) $${lang}.po-create; \
+	fi
+
+
+install: install-exec install-data
+install-exec:
+install-data: install-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    $(INSTALL_DATA) $(srcdir)/$$file \
+			    $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	  for file in Makevars; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+install-data-no: all
+install-data-yes: all
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
+	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
+	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
+	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
+	    fi; \
+	  done; \
+	done
+
+install-strip: install
+
+installdirs: installdirs-exec installdirs-data
+installdirs-exec:
+installdirs-data: installdirs-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
+	else \
+	  : ; \
+	fi
+installdirs-data-no:
+installdirs-data-yes:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)
+	@catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+	  $(mkinstalldirs) $(DESTDIR)$$dir; \
+	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
+	    if test -n "$$lc"; then \
+	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
+	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
+	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
+	         for file in *; do \
+	           if test -f $$file; then \
+	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
+	           fi; \
+	         done); \
+	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
+	      else \
+	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
+	          :; \
+	        else \
+	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
+	        fi; \
+	      fi; \
+	    fi; \
+	  done; \
+	done
+
+# Define this as empty until I found a useful application.
+installcheck:
+
+uninstall: uninstall-exec uninstall-data
+uninstall-exec:
+uninstall-data: uninstall-data-@USE_NLS@
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  for file in $(DISTFILES.common) Makevars.template; do \
+	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
+	  done; \
+	else \
+	  : ; \
+	fi
+uninstall-data-no:
+uninstall-data-yes:
+	catalogs='$(CATALOGS)'; \
+	for cat in $$catalogs; do \
+	  cat=`basename $$cat`; \
+	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
+	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
+	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
+	  done; \
+	done
+
+check: all
+
+info dvi ps pdf html tags TAGS ctags CTAGS ID:
+
+mostlyclean:
+	rm -f remove-potcdate.sed
+	rm -f stamp-poT
+	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
+	rm -fr *.o
+
+clean: mostlyclean
+
+distclean: clean
+	rm -f Makefile Makefile.in POTFILES *.mo
+
+maintainer-clean: distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	rm -f stamp-po $(GMOFILES)
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir:
+	$(MAKE) update-po
+	@$(MAKE) dist2
+# This is a separate target because 'update-po' must be executed before.
+dist2: stamp-po $(DISTFILES)
+	dists="$(DISTFILES)"; \
+	if test "$(PACKAGE)" = "gettext-tools"; then \
+	  dists="$$dists Makevars.template"; \
+	fi; \
+	if test -f $(srcdir)/$(DOMAIN).pot; then \
+	  dists="$$dists $(DOMAIN).pot stamp-po"; \
+	fi; \
+	if test -f $(srcdir)/ChangeLog; then \
+	  dists="$$dists ChangeLog"; \
+	fi; \
+	for i in 0 1 2 3 4 5 6 7 8 9; do \
+	  if test -f $(srcdir)/ChangeLog.$$i; then \
+	    dists="$$dists ChangeLog.$$i"; \
+	  fi; \
+	done; \
+	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
+	for file in $$dists; do \
+	  if test -f $$file; then \
+	    cp -p $$file $(distdir) || exit 1; \
+	  else \
+	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+	  fi; \
+	done
+
+update-po: Makefile
+	$(MAKE) $(DOMAIN).pot-update
+	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
+	$(MAKE) update-gmo
+
+# General rule for creating PO files.
+
+.nop.po-create:
+	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
+	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
+	exit 1
+
+# General rule for updating PO files.
+
+.nop.po-update:
+	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
+	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	cd $(srcdir); \
+	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "msgmerge for $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+$(DUMMYPOFILES):
+
+update-gmo: Makefile $(GMOFILES)
+	@:
+
+Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
+	       $(SHELL) ./config.status
+
+force:
+
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

Index: po/POTFILES.in
===================================================================
RCS file: po/POTFILES.in
diff -N po/POTFILES.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/POTFILES.in	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,4 @@
+# List of source files which contain translatable strings.
+utilities/dumpshm.cpp
+utilities/parser.cpp
+utilities/processor.cpp

Index: po/Rules-quot
===================================================================
RCS file: po/Rules-quot
diff -N po/Rules-quot
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/Rules-quot	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,47 @@
+# Special Makefile rules for English message catalogs with quotation marks.
+
+DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
+
+.SUFFIXES: .insert-header .po-update-en
+
+en@quot.po-create:
+	$(MAKE) en@quot.po-update
+en@boldquot.po-create:
+	$(MAKE) en@boldquot.po-update
+
+en@quot.po-update: en@quot.po-update-en
+en@boldquot.po-update: en@boldquot.po-update-en
+
+.insert-header.po-update-en:
+	@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
+	if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+	tmpdir=`pwd`; \
+	echo "$$lang:"; \
+	ll=`echo $$lang | sed -e 's/@.*//'`; \
+	LC_ALL=C; export LC_ALL; \
+	cd $(srcdir); \
+	if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
+	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
+	    rm -f $$tmpdir/$$lang.new.po; \
+	  else \
+	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
+	      :; \
+	    else \
+	      echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
+	      exit 1; \
+	    fi; \
+	  fi; \
+	else \
+	  echo "creation of $$lang.po failed!" 1>&2; \
+	  rm -f $$tmpdir/$$lang.new.po; \
+	fi
+
+en@quot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header
+
+en@boldquot.insert-header: insert-header.sin
+	sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header
+
+mostlyclean: mostlyclean-quot
+mostlyclean-quot:
+	rm -f *.insert-header

Index: po/boldquot.sed
===================================================================
RCS file: po/boldquot.sed
diff -N po/boldquot.sed
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/boldquot.sed	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,10 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g
+s/“/“[1m/g
+s/”/[0m”/g
+s/‘/‘[1m/g
+s/’/[0m’/g

Index: po/en@boldquot.header
===================================================================
RCS file: po/en@boldquot.header
diff -N po/en@boldquot.header
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/en@boldquot.header	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,25 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#
+# This catalog furthermore displays the text between the quotation marks in
+# bold face, assuming the VT100/XTerm escape sequences.
+#

Index: po/en@quot.header
===================================================================
RCS file: po/en@quot.header
diff -N po/en@quot.header
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/en@quot.header	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,22 @@
+# All this catalog "translates" are quotation characters.
+# The msgids must be ASCII and therefore cannot contain real quotation
+# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
+# and double quote (0x22). These substitutes look strange; see
+# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+#
+# This catalog translates grave accent (0x60) and apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019).
+# It also translates pairs of apostrophe (0x27) to
+# left single quotation mark (U+2018) and right single quotation mark (U+2019)
+# and pairs of quotation mark (0x22) to
+# left double quotation mark (U+201C) and right double quotation mark (U+201D).
+#
+# When output to an UTF-8 terminal, the quotation characters appear perfectly.
+# When output to an ISO-8859-1 terminal, the single quotation marks are
+# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to
+# grave/acute accent (by libiconv), and the double quotation marks are
+# transliterated to 0x22.
+# When output to an ASCII terminal, the single quotation marks are
+# transliterated to apostrophes, and the double quotation marks are
+# transliterated to 0x22.
+#

Index: po/es.po
===================================================================
RCS file: po/es.po
diff -N po/es.po
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/es.po	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,124 @@
+# ESpanol message translation template for GNU Gnash
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# John Gilmore <gnu@gnash-translation.toad.com>, 2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash cvs20070405\n"
+"Report-Msgid-Bugs-To: bug-gnash@gnu.org\n"
+"POT-Creation-Date: 2007-04-05 20:53-0700\n"
+"PO-Revision-Date: 2007-04-05 20:35-0700\n"
+"Last-Translator: John Gilmore <gnu@gnash-translation.toad.com>\n"
+"Language-Team: Espanol <ES@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: utilities/dumpshm.cpp:200
+msgid ""
+"Sorry, we can only list the files on systems with disk based shared memory"
+msgstr ""
+
+#: utilities/dumpshm.cpp:209
+msgid "No name specified, nuking everything..."
+msgstr ""
+
+#: utilities/dumpshm.cpp:216
+msgid "Removing segment: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:224
+msgid "Nuking the shared memory segment "
+msgstr ""
+
+#: utilities/dumpshm.cpp:250
+msgid "ERROR: couldn't read!"
+msgstr ""
+
+#: utilities/dumpshm.cpp:281
+msgid "This program dumps the internal data of a shared memory segment"
+msgstr "Esta programma dumpa la data de la memoria segmentia sharedia"
+
+#: utilities/dumpshm.cpp:283
+msgid "Usage: dumpmem [hdsanlif] filename"
+msgstr ""
+
+#: utilities/dumpshm.cpp:284
+msgid "-h\tHelp"
+msgstr ""
+
+#: utilities/dumpshm.cpp:285
+msgid "-d\tDump data"
+msgstr ""
+
+#: utilities/dumpshm.cpp:286
+msgid "-n [optional name]\tNuke everything"
+msgstr ""
+
+#: utilities/dumpshm.cpp:287
+msgid "-l\tLength of segment"
+msgstr ""
+
+#: utilities/dumpshm.cpp:288
+msgid "-i\tList segments"
+msgstr ""
+
+#: utilities/dumpshm.cpp:289
+msgid "-f\tForce to use builtin names for nuke"
+msgstr ""
+
+#: utilities/dumpshm.cpp:301
+msgid "\tBase address of this segment: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:303
+msgid "\tFilespec: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:304
+msgid "\t# Bytes allocated: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:305
+msgid "\tTotal # of bytes: "
+msgstr ""
+
+#: utilities/parser.cpp:138
+#, c-format
+msgid "has_scale = %d, has_rotate = %d\n"
+msgstr ""
+
+#: utilities/parser.cpp:163
+#, c-format
+msgid "x_min: %i, x_max: %i,\twidth: %i twips, %4.0f pixels\n"
+msgstr ""
+
+#: utilities/parser.cpp:164
+#, c-format
+msgid "y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n"
+msgstr ""
+
+#: utilities/parser.cpp:185
+#, c-format
+msgid "rgb: %d %d %d \n"
+msgstr ""
+
+#: utilities/parser.cpp:206
+#, c-format
+msgid "rgba: %d %d %d %d\n"
+msgstr ""
+
+#: utilities/parser.cpp:279
+msgid "cxform:\n"
+msgstr ""
+
+#: utilities/parser.cpp:280
+#, c-format
+msgid "has_add = %d, has_mult = %d\n"
+msgstr ""
+
+#: utilities/parser.cpp:298
+msgid ""
+"Movie ended\n"
+"\n"
+msgstr ""

Index: po/gnash.pot
===================================================================
RCS file: po/gnash.pot
diff -N po/gnash.pot
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/gnash.pot	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,126 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: bug-gnash@gnu.org\n"
+"POT-Creation-Date: 2007-04-05 20:53-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: John Gilmore <gnu@gnash-translation.toad.com>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: utilities/dumpshm.cpp:200
+msgid ""
+"Sorry, we can only list the files on systems with disk based shared memory"
+msgstr ""
+
+#: utilities/dumpshm.cpp:209
+msgid "No name specified, nuking everything..."
+msgstr ""
+
+#: utilities/dumpshm.cpp:216
+msgid "Removing segment: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:224
+msgid "Nuking the shared memory segment "
+msgstr ""
+
+#: utilities/dumpshm.cpp:250
+msgid "ERROR: couldn't read!"
+msgstr ""
+
+#: utilities/dumpshm.cpp:281
+msgid "This program dumps the internal data of a shared memory segment"
+msgstr ""
+
+#: utilities/dumpshm.cpp:283
+msgid "Usage: dumpmem [hdsanlif] filename"
+msgstr ""
+
+#: utilities/dumpshm.cpp:284
+msgid "-h\tHelp"
+msgstr ""
+
+#: utilities/dumpshm.cpp:285
+msgid "-d\tDump data"
+msgstr ""
+
+#: utilities/dumpshm.cpp:286
+msgid "-n [optional name]\tNuke everything"
+msgstr ""
+
+#: utilities/dumpshm.cpp:287
+msgid "-l\tLength of segment"
+msgstr ""
+
+#: utilities/dumpshm.cpp:288
+msgid "-i\tList segments"
+msgstr ""
+
+#: utilities/dumpshm.cpp:289
+msgid "-f\tForce to use builtin names for nuke"
+msgstr ""
+
+#: utilities/dumpshm.cpp:301
+msgid "\tBase address of this segment: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:303
+msgid "\tFilespec: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:304
+msgid "\t# Bytes allocated: "
+msgstr ""
+
+#: utilities/dumpshm.cpp:305
+msgid "\tTotal # of bytes: "
+msgstr ""
+
+#: utilities/parser.cpp:138
+#, c-format
+msgid "has_scale = %d, has_rotate = %d\n"
+msgstr ""
+
+#: utilities/parser.cpp:163
+#, c-format
+msgid "x_min: %i, x_max: %i,\twidth: %i twips, %4.0f pixels\n"
+msgstr ""
+
+#: utilities/parser.cpp:164
+#, c-format
+msgid "y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n"
+msgstr ""
+
+#: utilities/parser.cpp:185
+#, c-format
+msgid "rgb: %d %d %d \n"
+msgstr ""
+
+#: utilities/parser.cpp:206
+#, c-format
+msgid "rgba: %d %d %d %d\n"
+msgstr ""
+
+#: utilities/parser.cpp:279
+msgid "cxform:\n"
+msgstr ""
+
+#: utilities/parser.cpp:280
+#, c-format
+msgid "has_add = %d, has_mult = %d\n"
+msgstr ""
+
+#: utilities/parser.cpp:298
+msgid ""
+"Movie ended\n"
+"\n"
+msgstr ""

Index: po/insert-header.sin
===================================================================
RCS file: po/insert-header.sin
diff -N po/insert-header.sin
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/insert-header.sin	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,23 @@
+# Sed script that inserts the file called HEADER before the header entry.
+#
+# At each occurrence of a line starting with "msgid ", we execute the following
+# commands. At the first occurrence, insert the file. At the following
+# occurrences, do nothing. The distinction between the first and the following
+# occurrences is achieved by looking at the hold space.
+/^msgid /{
+x
+# Test if the hold space is empty.
+s/m/m/
+ta
+# Yes it was empty. First occurrence. Read the file.
+r HEADER
+# Output the file's contents by reading the next line. But don't lose the
+# current line while doing this.
+g
+N
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}

Index: po/quot.sed
===================================================================
RCS file: po/quot.sed
diff -N po/quot.sed
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/quot.sed	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,6 @@
+s/"\([^"]*\)"/“\1”/g
+s/`\([^`']*\)'/‘\1’/g
+s/ '\([^`']*\)' / ‘\1’ /g
+s/ '\([^`']*\)'$/ ‘\1’/g
+s/^'\([^`']*\)' /‘\1’ /g
+s/“”/""/g

Index: po/remove-potcdate.sin
===================================================================
RCS file: po/remove-potcdate.sin
diff -N po/remove-potcdate.sin
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/remove-potcdate.sin	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,19 @@
+# Sed script that remove the POT-Creation-Date line in the header entry
+# from a POT file.
+#
+# The distinction between the first and the following occurrences of the
+# pattern is achieved by looking at the hold space.
+/^"POT-Creation-Date: .*"$/{
+x
+# Test if the hold space is empty.
+s/P/P/
+ta
+# Yes it was empty. First occurrence. Remove the line.
+g
+d
+bb
+:a
+# The hold space was nonempty. Following occurrences. Do nothing.
+x
+:b
+}

Index: po/Makevars
===================================================================
RCS file: po/Makevars
diff -N po/Makevars
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/Makevars	6 Apr 2007 07:49:55 -0000	1.1
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = bug-gnash@gnu.org
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =



From MAILER-DAEMON Fri Apr 06 04:02:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZjOT-0002bu-N8
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 04:02:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZjOR-0002ZF-W3
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 04:02:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZjOQ-0002Y3-Sj
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 04:01:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZjOQ-0002Xt-HM
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 04:01:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=internal)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HZjKw-0005oC-7l
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 03:58:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by internal with esmtp (Exim 4.50) id 1HZjKq-0007Nd-Qu
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:58:16 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HZjKq-0007Na-CT
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:58:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZjKq-0007Na-CT@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Fri, 06 Apr 2007 07:58:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am configure.ac cygnal...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 08:02:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/06 07:58:16

Modified files:
	.              : ChangeLog Makefile.am configure.ac 
	cygnal         : Makefile.am cygnal.cpp 
	gui            : Makefile.am gnash.cpp 
	server         : gnash.h 
	utilities      : Makefile.am dumpshm.cpp processor.cpp 
	                 parser.cpp 

Log message:
	Internationalize gnash.  Phase 1: use gettextize, update config files.
	
	* po: New directory for translated messages (Portable Object files)
	* server/gnash.h: Include "gettext.h" for NLS.
	* Makefile.am (EXTRA_DIST): Add config.rpath.
	  (STD_DIRS): Add po.
	* configure.ac (AC_OUTPUT): Add po/Makefile.in.
	  (AM_GNU_GETTEXT):  Add, to configure gettext support.
	* cygnal/Makefile.am (localedir, INCLUDES),
	  gui/Makefile.am (localedir, INCLUDES),
	  utilities/Makefile.am (localedir, INCLUDES):  Define LOCALEDIR.
	* cygnal/cygnal.cpp (main), gui/gnash.cpp (main), 
	  utilities/{dumpshm,parser,processor}.cpp (main):
	  Set locale and initialize gettext upon startup.
	* utilities/{dumpshm,parser,processor}.cpp:  Flag strings with _
	  for translation, for testing.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2794&r2=1.2795
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.286&r2=1.287
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/dumpshm.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/processor.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/parser.cpp?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2794
retrieving revision 1.2795
diff -u -b -r1.2794 -r1.2795
--- ChangeLog	6 Apr 2007 02:43:49 -0000	1.2794
+++ ChangeLog	6 Apr 2007 07:58:15 -0000	1.2795
@@ -1,3 +1,39 @@
+2007-04-05  John Gilmore  <bug-gnu-gettext@gnu.org>
+
+	Internationalize gnash.  Phase 1: use gettextize, update config files.
+
+	* macros/{codeset.m4, gettext.m4, glibc2.m4, glibc21.m4,
+	  iconv.m4, intdiv0.m4, intmax.m4, inttypes.m4, inttypes_h.m4,
+	  inttypes-pri.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4,
+	  lib-link.m4, lib-prefix.m4, longdouble.m4, longlong.m4, nls.m4,
+	  po.m4, printf-posix.m4, progtest.m4, signed.m4, size_max.m4,
+	  stdint_h.m4, uintmax_t.m4, ulonglong.m4, wchar_t.m4, wint_t.m4,
+	  xsize.m4}: New files, from gettext-0.14.6.
+	* po: New directory for translated messages (Portable Object files)
+	* po/{Makefile.in.in, boldquot.sed, en@boldquot.header,
+	  en@quot.header, insert-header.sin, quot.sed,
+	  remove-potcdate.sin, Rules-quot}: New files, from gettext-0.14.6.
+	* ABOUT-NLS, config.rpath: New files, from gettext-0.14.6.
+	* libbase/gettext.h:  New file, from gettext-0.14.6.
+	* server/gnash.h: Include "gettext.h" for NLS.
+	* po/Makevars: New file: settings for gnash's message translation.
+	* po/POTFILES.in: New file: source files with translatable strings.
+	* po/LINGUAS: New file: languages we have translations for.
+	* Makefile.am (EXTRA_DIST): Add config.rpath.
+	  (STD_DIRS): Add po.
+	* configure.ac (AC_OUTPUT): Add po/Makefile.in.
+	  (AM_GNU_GETTEXT):  Add, to configure gettext support.
+	* cygnal/Makefile.am (localedir, INCLUDES),
+	  gui/Makefile.am (localedir, INCLUDES),
+	  utilities/Makefile.am (localedir, INCLUDES):  Define LOCALEDIR.
+	* cygnal/cygnal.cpp (main), gui/gnash.cpp (main), 
+	  utilities/{dumpshm,parser,processor}.cpp (main):
+	  Set locale and initialize gettext upon startup.
+	* utilities/{dumpshm,parser,processor}.cpp:  Flag strings with _
+	  for translation, for testing.
+	* po/gnash.pot:  Message string catalog for testing.
+	* po/es.po:  Spanish-language message string catalog for testing.
+
 2007-04-05 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/asobj/Date.cpp

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- Makefile.am	2 Apr 2007 16:46:31 -0000	1.66
+++ Makefile.am	6 Apr 2007 07:58:15 -0000	1.67
@@ -1,5 +1,5 @@
 # 
-#   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.66 2007/04/02 16:46:31 tgc Exp $
+# $Id: Makefile.am,v 1.67 2007/04/06 07:58:15 jgilmore Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -32,6 +32,7 @@
 	utilities \
 	gui \
 	testsuite \
+	po \
 	$(NULL)
 
 if PLUGIN
@@ -62,7 +63,7 @@
 
 DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
 
-EXTRA_DIST= $(man_MANS) macros/incllist macros/libslist
+EXTRA_DIST= config.rpath $(man_MANS) macros/incllist macros/libslist
 #EXTRA_DIST = macros
 # if HTTP
 # SUBDIRS += net $(STD_DIRS)

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -b -r1.286 -r1.287
--- configure.ac	3 Apr 2007 16:13:07 -0000	1.286
+++ configure.ac	6 Apr 2007 07:58:15 -0000	1.287
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.286 2007/04/03 16:13:07 bjacques Exp $
+dnl $Id: configure.ac,v 1.287 2007/04/06 07:58:15 jgilmore Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -54,6 +54,7 @@
 
 AC_DISABLE_STATIC dnl Disable building static libs.
 
+AM_GNU_GETTEXT([external])
 
 save_CFLAGS="$CFLAGS";
 CFLAGS="$CFLAGS -Werror -Wformat";
@@ -879,6 +880,7 @@
 AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
 
 AC_OUTPUT(Makefile
+po/Makefile.in
 libbase/Makefile
 libgeometry/Makefile
 server/Makefile

Index: cygnal/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/cygnal/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cygnal/Makefile.am	6 Mar 2007 18:06:13 -0000	1.4
+++ cygnal/Makefile.am	6 Apr 2007 07:58:15 -0000	1.5
@@ -1,5 +1,5 @@
 # 
-#   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 #   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-# $Id: Makefile.am,v 1.4 2007/03/06 18:06:13 rsavoye Exp $
+# $Id: Makefile.am,v 1.5 2007/04/06 07:58:15 jgilmore Exp $
 
 ## Process this file with automake to generate Makefile.in
 
@@ -36,11 +36,14 @@
 	$(BOOST_LIBS) \
 	$(PTHREAD_LIBS)
 
+localedir = $(datadir)/locale
+
 INCLUDES = -I.. \
         -I$(top_srcdir)	\
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/server \
+        -DLOCALEDIR=\"$(localedir)\" \
         $(LIBXML_CFLAGS) \
 	$(DMALLOC_CFLAGS) \
 	$(CURL_CFLAGS) \

Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cygnal/cygnal.cpp	5 Feb 2007 20:13:05 -0000	1.6
+++ cygnal/cygnal.cpp	6 Apr 2007 07:58:15 -0000	1.7
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: cygnal.cpp,v 1.6 2007/02/05 20:13:05 nihilus Exp $ */
+/* $Id: cygnal.cpp,v 1.7 2007/04/06 07:58:15 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -52,6 +52,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
 
@@ -106,6 +110,11 @@
 int
 main(int argc, char *argv[])
 {
+    // Initialize national language support
+    setlocale (LC_MESSAGES, "");
+    bindtextdomain (PACKAGE, LOCALEDIR);
+    textdomain (PACKAGE);
+
     // scan for the two main long GNU options
     int c;
     for (c=0; c<argc; c++) {

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- gui/Makefile.am	2 Apr 2007 16:46:32 -0000	1.62
+++ gui/Makefile.am	6 Apr 2007 07:58:15 -0000	1.63
@@ -1,6 +1,6 @@
 ## Process this file with automake to generate Makefile.in
 # 
-#   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+#   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +17,10 @@
 
 # 
 
-# $Id: Makefile.am,v 1.62 2007/04/02 16:46:32 tgc Exp $
+# $Id: Makefile.am,v 1.63 2007/04/06 07:58:15 jgilmore Exp $
 
 AUTOMAKE_OPTIONS = 
+localedir = $(datadir)/locale
 
 AM_CPPFLAGS = -I.. \
         -I$(top_srcdir) \
@@ -30,6 +31,7 @@
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \
         -I$(top_srcdir)/libgeometry \
+        -DLOCALEDIR=\"$(localedir)\" \
         $(LIBXML_CFLAGS) \
         $(SDL_CFLAGS) \
         $(DMALLOC_CFLAGS) \

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- gui/gnash.cpp	2 Apr 2007 16:46:32 -0000	1.67
+++ gui/gnash.cpp	6 Apr 2007 07:58:15 -0000	1.68
@@ -43,6 +43,10 @@
 #include <string>
 #include <iostream>
 
+#ifdef ENABLE_NLS
+#include <locale.h>
+#endif
+
 //using namespace gnash; // for dbglogfile
 
 using namespace std;
@@ -328,6 +332,11 @@
 {
 	gnash::Player player;
 
+	// Enable native language support, i.e. internationalization
+	setlocale (LC_MESSAGES, "");
+	bindtextdomain (PACKAGE, LOCALEDIR);
+	textdomain (PACKAGE);
+
 	rcfile.loadFiles();
 
 	parseCommandLine(argc, argv, player);

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/gnash.h	2 Apr 2007 15:45:22 -0000	1.89
+++ server/gnash.h	6 Apr 2007 07:58:16 -0000	1.90
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.89 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: gnash.h,v 1.90 2007/04/06 07:58:16 jgilmore Exp $ */
 
 /// \mainpage
 ///
@@ -39,6 +39,11 @@
 
 #include "as_value.h" // FIXME: for as_c_function_ptr typedef (register_component)
 
+// Support compilation with (or without) native language support
+#include "gettext.h"	// for internationalization (GNU gettext)
+#define	_(String) gettext (String)
+#define N_(String) gettext_noop (String)
+
 // FIXME: The local usage of these constants should probably be renamed in this
 // file because they conflict with definitions in the system header files. Luckily
 // they are used in files we don't need, so we should be able to safely redefine

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- utilities/Makefile.am	31 Mar 2007 21:16:49 -0000	1.50
+++ utilities/Makefile.am	6 Apr 2007 07:58:16 -0000	1.51
@@ -43,6 +43,8 @@
 	$(PTHREAD_LIBS) \
 	$(NULL)
 
+localedir = $(datadir)/locale
+
 #AM_CPPFLAGS = # -Wall
 AM_CPPFLAGS = -I.. \
         -I$(top_srcdir)	\
@@ -51,6 +53,7 @@
         -I$(top_srcdir)/server \
         -I$(top_srcdir)/server/parser \
         -I$(top_srcdir)/server/vm \
+        -DLOCALEDIR=\"$(localedir)\" \
 	$(BOOST_CFLAGS) \
         $(LIBXML_CFLAGS) \
         $(MYSQL_CFLAGS) \

Index: utilities/dumpshm.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/dumpshm.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- utilities/dumpshm.cpp	19 Nov 2006 17:39:01 -0000	1.9
+++ utilities/dumpshm.cpp	6 Apr 2007 07:58:16 -0000	1.10
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 //
 
 
-/* $Id: dumpshm.cpp,v 1.9 2006/11/19 17:39:01 nihilus Exp $ */
+/* $Id: dumpshm.cpp,v 1.10 2007/04/06 07:58:16 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,6 +63,7 @@
 #include "log.h"
 #include "rc.h"
 #include "shm.h"
+#include "gnash.h"
 
 using namespace std;
 using namespace gnash;
@@ -96,6 +97,11 @@
 //     strstream             *shmnames;
 // #endif
 
+    // Enable native language support, i.e. internationalization
+    setlocale (LC_MESSAGES, "");
+    bindtextdomain (PACKAGE, LOCALEDIR);
+    textdomain (PACKAGE);
+
     /* This initializes the DBG_MSG macros */ 
     while ((c = getopt (argc, argv, "hdnl:if")) != -1) {
         switch (c) {
@@ -197,8 +203,8 @@
                 }
             }
         } else {
-            cout << "Sorry, we can only list the files on systems with";
-            cout << "with disk based shared memory" << endl;
+            cout << _("Sorry, we can only list the files on systems with"
+		      " disk based shared memory") << endl;
         }
         exit(0);
     }
@@ -206,14 +212,14 @@
     //Destroy shared memory segments
     if (nuke) {
         if (filespec.size() == 0) {
-            cout << "No name specified, nuking everything..." << endl;
+            cout << _("No name specified, nuking everything...") << endl;
             for (i=0; entry>0; i++) {
                 entry = readdir(library_dir);
                 if (entry != NULL) {
                     tmpname = "/"; // prefix a / so shm_unlink can
                                    // use the correct path
                     tmpname += entry->d_name;
-                    cout << "Removing segment: " << tmpname << endl;
+                    cout << _("Removing segment: ") << tmpname << endl;
 #ifdef HAVE_SHM_UNLINK
                     shm_unlink(tmpname.c_str());
 #endif
@@ -221,7 +227,7 @@
             }
             exit(0);
         } else {
-            cout << "Nuking the shared memory segment " << filespec << endl;
+            cout << _("Nuking the shared memory segment ") << filespec << endl;
 #ifdef HAVE_SHM_UNLINK 
            shm_unlink(filespec.c_str());
 #endif
@@ -247,7 +253,7 @@
     
     if (!in.eof()) {
          if (!in.read(reinterpret_cast<char*>(&shmptr), sizeof(Shm))) {
-             cerr << "ERROR: couldn't read!" << endl;
+             cerr << _("ERROR: couldn't read!") << endl;
              exit(1);
          }
          dump_ctrl(&shmptr);
@@ -278,15 +284,15 @@
 static void
 usage (void)
 {
-    cerr << "This program dumps the internal data of a shared memory segment"
+    cerr << _("This program dumps the internal data of a shared memory segment")
          << endl;
-    cerr << "Usage: dumpmem [hdsanlif] filename" << endl;
-    cerr << "-h\tHelp" << endl;
-    cerr << "-d\tDump data" << endl;
-    cerr << "-n [optional name]\tNuke everything" << endl;
-    cerr << "-l\tLength of segment" << endl;
-    cerr << "-i\tList segments" << endl;
-    cerr << "-f\tForce to use builtin names for nuke" << endl;
+    cerr << _("Usage: dumpmem [hdsanlif] filename") << endl;
+    cerr << _("-h\tHelp") << endl;
+    cerr << _("-d\tDump data") << endl;
+    cerr << _("-n [optional name]\tNuke everything") << endl;
+    cerr << _("-l\tLength of segment") << endl;
+    cerr << _("-i\tList segments") << endl;
+    cerr << _("-f\tForce to use builtin names for nuke") << endl;
     exit (-1);
 }
 
@@ -298,11 +304,11 @@
 {
     Shm *ptr = static_cast<Shm *>(inmem);
     
-    cerr << "\tBase address of this segment: "
+    cerr << _("\tBase address of this segment: ")
          << static_cast<void *>(ptr->getAddr()) << endl;
-    cerr << "\tFilespec: " << ptr->getName() << endl;
-    cerr << "\t# Bytes allocated: " << ptr->getAllocated() << endl;
-    cerr << "\tTotal # of bytes: " << ptr->getSize() << endl;
+    cerr << _("\tFilespec: ") << ptr->getName() << endl;
+    cerr << _("\t# Bytes allocated: ") << ptr->getAllocated() << endl;
+    cerr << _("\tTotal # of bytes: ") << ptr->getSize() << endl;
 }
 
 

Index: utilities/processor.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/processor.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- utilities/processor.cpp	3 Apr 2007 16:13:07 -0000	1.54
+++ utilities/processor.cpp	6 Apr 2007 07:58:16 -0000	1.55
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: processor.cpp,v 1.54 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: processor.cpp,v 1.55 2007/04/06 07:58:16 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -133,6 +133,12 @@
 main(int argc, char *argv[])
 {
     assert(tu_types_validate());
+
+    // Enable native language support, i.e. internationalization
+    setlocale (LC_MESSAGES, "");
+    bindtextdomain (PACKAGE, LOCALEDIR);
+    textdomain (PACKAGE);
+
     int c;
 
     // scan for the two main standard GNU options

Index: utilities/parser.cpp
===================================================================
RCS file: /sources/gnash/gnash/utilities/parser.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- utilities/parser.cpp	6 Feb 2007 23:06:18 -0000	1.35
+++ utilities/parser.cpp	6 Apr 2007 07:58:16 -0000	1.36
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: parser.cpp,v 1.35 2007/02/06 23:06:18 rsavoye Exp $ */
+/* $Id: parser.cpp,v 1.36 2007/04/06 07:58:16 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -135,7 +135,7 @@
     static void write()
 	{
 	    ident++;
-	    log_msg("has_scale = %d, has_rotate = %d\n", has_scale, has_rotate);
+	    log_msg(_("has_scale = %d, has_rotate = %d\n"), has_scale, has_rotate);
 	    log_msg("| %4.4f %4.4f %4.4f |\n", m_[0][0], m_[0][1], TWIPS_TO_PIXELS(m_[0][2]));
 	    log_msg("| %4.4f %4.4f %4.4f |\n", m_[1][0], m_[1][1], TWIPS_TO_PIXELS(m_[1][2]));
 	    ident--;
@@ -160,8 +160,8 @@
     static void write()
 	{
 	    ident++;
-	    log_msg("x_min: %i, x_max: %i,	width: %i twips, %4.0f pixels\n", x_min, x_max, x_max - x_min, TWIPS_TO_PIXELS(x_max - x_min));
-	    log_msg("y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n", y_min, y_max, y_max - y_min, TWIPS_TO_PIXELS(y_max - y_min));
+	    log_msg(_("x_min: %i, x_max: %i,	width: %i twips, %4.0f pixels\n"), x_min, x_max, x_max - x_min, TWIPS_TO_PIXELS(x_max - x_min));
+	    log_msg(_("y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n"), y_min, y_max, y_max - y_min, TWIPS_TO_PIXELS(y_max - y_min));
 	    ident--;
 	}
 };
@@ -182,7 +182,7 @@
     static void write()
 	{
 	    ident++;
-	    log_msg("rgb: %d %d %d \n", m_r, m_g, m_b);
+	    log_msg(_("rgb: %d %d %d \n"), m_r, m_g, m_b);
 	    ident--;
 	}
 };
@@ -203,7 +203,7 @@
     static void write()
 	{
 	    ident++;
-	    log_msg("rgba: %d %d %d %d\n", m_r, m_g, m_b, m_a);
+	    log_msg(_("rgba: %d %d %d %d\n"), m_r, m_g, m_b, m_a);
 	    ident--;
 	}
 };
@@ -276,8 +276,8 @@
     static void write()
 	{
 	    ident++;
-	    log_msg("cxform:\n");
-	    log_msg("has_add = %d, has_mult = %d\n", has_add, has_mult);
+	    log_msg(_("cxform:\n"));
+	    log_msg(_("has_add = %d, has_mult = %d\n"), has_add, has_mult);
 	    log_msg("| %4.4f %4.4f |\n", m_[0][0], m_[0][1]);
 	    log_msg("| %4.4f %4.4f |\n", m_[1][0], m_[1][1]);
 	    log_msg("| %4.4f %4.4f |\n", m_[2][0], m_[2][1]);
@@ -295,7 +295,7 @@
     assert(tag_type == 0);
     ident--;
     log_msg("\n");
-    log_msg("Movie ended\n\n");
+    log_msg(_("Movie ended\n\n"));
 }
 
 // tag 1
@@ -605,6 +605,12 @@
 main(int argc, char *argv[])
 {
     int c;
+
+    // Enable native language support, i.e. internationalization
+    setlocale (LC_MESSAGES, "");
+    bindtextdomain (PACKAGE, LOCALEDIR);
+    textdomain (PACKAGE);
+
     // scan for the two main standard GNU options
     for (c = 0; c < argc; c++) {
 	if (strcmp("--help", argv[c]) == 0) {



From MAILER-DAEMON Fri Apr 06 05:27:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZkir-0002Ci-Sy
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 05:27:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZkio-00028T-Sc
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:27:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZkin-000266-6o
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:27:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZkin-00025u-1Y
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:27:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZkfJ-0001oF-IC
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:23:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZkfB-0003Y6-3W
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 09:23:21 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZkfA-0003Y3-Ox
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 09:23:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZkfA-0003Y3-Ox@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 09:23:20 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 09:27:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 09:23:20

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/sprite_instance.cpp (sprite_get_depth): only convert
	          depths to negative values for static clips.
	        * testsuite/actionscript.all/MovieClip.as: add a couple of
	          tests for getDepth() invoked against dynamic and static
	          clips.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2795&r2=1.2796
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.223&r2=1.224
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.43&r2=1.44

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2795
retrieving revision 1.2796
diff -u -b -r1.2795 -r1.2796
--- ChangeLog	6 Apr 2007 07:58:15 -0000	1.2795
+++ ChangeLog	6 Apr 2007 09:23:20 -0000	1.2796
@@ -1,3 +1,11 @@
+2007-04-06 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (sprite_get_depth): only convert
+	  depths to negative values for static clips.
+	* testsuite/actionscript.all/MovieClip.as: add a couple of
+	  tests for getDepth() invoked against dynamic and static
+	  clips.
+
 2007-04-05  John Gilmore  <bug-gnu-gettext@gnu.org>
 
 	Internationalize gnash.  Phase 1: use gettextize, update config files.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- server/sprite_instance.cpp	5 Apr 2007 11:16:11 -0000	1.223
+++ server/sprite_instance.cpp	6 Apr 2007 09:23:20 -0000	1.224
@@ -280,8 +280,14 @@
 
 	int n = sprite->get_depth();
 
+	if ( ! sprite->isDynamic() )
+	{
 	// Macromedia Flash help says: depth starts at -16383 (0x3FFF)
-	return as_value( - (n + 16383 - 1));
+		//n = - (n+16383-1);
+		n += -16384; 
+	}
+
+	return as_value(n);
 }
 
 //swapDepths(target:Object) : Void
@@ -1710,7 +1716,6 @@
 sprite_instance::get_frame_number(const as_value& frame_spec, size_t& frameno) const
 {
 	//GNASH_REPORT_FUNCTION;
-	size_t frame_number;
 
 	as_environment* env = const_cast<as_environment*>(&m_as_environment);
 
@@ -1726,7 +1731,7 @@
 	// TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
 	if ( num < 1 ) return false;
 
-	frameno = iclamp(num, 1, m_def->get_frame_count())-1;
+	frameno = iclamp(int(num), 1, m_def->get_frame_count())-1;
 	return true;
 }
 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- testsuite/actionscript.all/MovieClip.as	5 Apr 2007 19:33:54 -0000	1.43
+++ testsuite/actionscript.all/MovieClip.as	6 Apr 2007 09:23:20 -0000	1.44
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.43 2007/04/05 19:33:54 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.44 2007/04/06 09:23:20 strk Exp $";
 
 #include "check.as"
 
@@ -86,36 +86,36 @@
 #endif
 
 #if OUTPUT_VERSION >= 6
-	check(mc.beginFill);
-	check(mc.beginGradientFill);
-        check(mc.clear);
-	check(mc.createEmptyMovieClip);
-	check(mc.createTextField);
-	check(mc.curveTo);
-	check(mc.lineStyle);
-	check(mc.lineTo);
-	check(mc.moveTo);
-	check(mc.attachAudio);
-	check(mc.endFill);
-	check(mc.getDepth);
-	check(mc.getURL);
-	check(mc.gotoAndPlay);
-	check(mc.gotoAndStop);
-	check(mc.hitTest);
-	check(mc.nextFrame != undefined);
-	check(mc.play != undefined);
-	check(mc.prevFrame != undefined);
-	check(mc.stop != undefined);
-	check(mc.swapDepths != undefined);
+	check_equals(typeof(mc.beginFill), 'function');
+	check_equals(typeof(mc.beginGradientFill), 'function');
+        check_equals(typeof(mc.clear), 'function');
+	check_equals(typeof(mc.createEmptyMovieClip), 'function');
+	check_equals(typeof(mc.createTextField), 'function');
+	check_equals(typeof(mc.curveTo), 'function');
+	check_equals(typeof(mc.lineStyle), 'function');
+	check_equals(typeof(mc.lineTo), 'function');
+	check_equals(typeof(mc.moveTo), 'function');
+	check_equals(typeof(mc.attachAudio), 'function');
+	check_equals(typeof(mc.endFill), 'function');
+	check_equals(typeof(mc.getDepth), 'function');
+	check_equals(typeof(mc.getURL), 'function');
+	check_equals(typeof(mc.gotoAndPlay), 'function');
+	check_equals(typeof(mc.gotoAndStop), 'function');
+	check_equals(typeof(mc.hitTest), 'function');
+	check_equals(typeof(mc.nextFrame), 'function');
+	check_equals(typeof(mc.play), 'function');
+	check_equals(typeof(mc.prevFrame), 'function');
+	check_equals(typeof(mc.stop), 'function');
+	check_equals(typeof(mc.swapDepths), 'function');
 
 	// These two seem unavailable
 	// when targetting SWF > 6
 #if OUTPUT_VERSION > 6
-	check_equals(mc.loadMovie, undefined);
-	check_equals(mc.removeMovieClip, undefined);
+	check_equals(typeof(mc.loadMovie), 'undefined');
+	check_equals(typeof(mc.removeMovieClip), 'undefined');
 #else
-	check(mc.loadMovie);
-	check(mc.removeMovieClip);
+	check_equals(typeof(mc.loadMovie), 'function');
+	check_equals(typeof(mc.removeMovieClip), 'function');
 #endif
 
 #endif // OUTPUT_VERSION >= 6
@@ -236,6 +236,7 @@
 
 var mc3 = createEmptyMovieClip("mc3_mc", 50);
 check(mc3 != undefined);
+check_equals(mc3.getDepth(), 50);
 
 // By default useHandCursor is false in SWF5 and true in later versions
 #if OUTPUT_VERSION < 6
@@ -427,3 +428,26 @@
 xcheck_equals(typeof(textfieldTest), 'movieclip');
 xcheck(textfieldTest instanceof MovieClip);
 #endif
+
+//----------------------------------------------
+// Test getDepth
+//----------------------------------------------
+
+// A getDepth call against a script-created clip
+// is already tested in the createEmptyMovieClip test
+// section. Here we try to test it against a statically
+// defined movie. We hope that the 'dejagnu' clip
+// is statically defined, if it's not we'll raise a 
+// warning about it.
+
+static_clip_name = "__shared_assets";
+static_clip = eval(static_clip_name);
+if ( typeof(static_clip) == 'movieclip' )
+{
+	check_equals(static_clip.getDepth(), -16383);
+}
+else
+{
+	note("There is not '"+static_clip_name+"' clip statically-defined, so we could not test getDepth() against it");
+
+}



From MAILER-DAEMON Fri Apr 06 05:31:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZkmd-0005NE-S4
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 05:31:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZkmc-0005MP-DN
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:31:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZkmc-0005Li-0o
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:31:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZkmb-0005LK-Qo
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:31:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZkj8-0002SG-Dy
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:27:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZkj7-0003fL-Vg
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 09:27:26 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZkj7-0003fI-Nw
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 09:27:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZkj7-0003fI-Nw@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 09:27:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 09:31:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 09:27:25

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	don't test getDepth when in SWF5 mode

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.44&r2=1.45

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- MovieClip.as	6 Apr 2007 09:23:20 -0000	1.44
+++ MovieClip.as	6 Apr 2007 09:27:25 -0000	1.45
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.44 2007/04/06 09:23:20 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.45 2007/04/06 09:27:25 strk Exp $";
 
 #include "check.as"
 
@@ -440,6 +440,9 @@
 // is statically defined, if it's not we'll raise a 
 // warning about it.
 
+// getDepth was not available as of SWF5
+#if OUTPUT_VERSION > 5
+
 static_clip_name = "__shared_assets";
 static_clip = eval(static_clip_name);
 if ( typeof(static_clip) == 'movieclip' )
@@ -451,3 +454,5 @@
 	note("There is not '"+static_clip_name+"' clip statically-defined, so we could not test getDepth() against it");
 
 }
+
+#endif // OUTPUT_VERSION > 5



From MAILER-DAEMON Fri Apr 06 05:59:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZlEK-0003Z0-8j
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 05:59:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZlEJ-0003Yu-IO
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:59:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZlEI-0003YZ-Jh
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:59:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZlEI-0003YT-9W
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:59:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZlAo-0006A0-9F
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 05:56:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZlAn-0005tj-DC
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 09:56:01 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZlAn-0005tg-4Z
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 09:56:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZlAn-0005tg-4Z@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 09:56:01 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 09:59:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 09:56:01

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 
Added files:
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	        * testsuite/misc-ming.all/: Makefile.am, displaylist_depths_test.c:
	          Add a new interesting (failing) test showing that static characters
	          and dynamic characters use a completely different range
	          of depths !!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2796&r2=1.2797
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2796
retrieving revision 1.2797
diff -u -b -r1.2796 -r1.2797
--- ChangeLog	6 Apr 2007 09:23:20 -0000	1.2796
+++ ChangeLog	6 Apr 2007 09:56:00 -0000	1.2797
@@ -1,5 +1,9 @@
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/: Makefile.am, displaylist_depths_test.c:
+	  Add a new interesting (failing) test showing that static characters
+	  and dynamic characters use a completely different range
+	  of depths !!
 	* server/sprite_instance.cpp (sprite_get_depth): only convert
 	  depths to negative values for static clips.
 	* testsuite/actionscript.all/MovieClip.as: add a couple of

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- testsuite/misc-ming.all/Makefile.am	5 Apr 2007 08:52:46 -0000	1.88
+++ testsuite/misc-ming.all/Makefile.am	6 Apr 2007 09:56:00 -0000	1.89
@@ -77,6 +77,7 @@
 	move_object_test \
 	place_and_remove_object_test \
 	place_and_remove_object_insane_test \
+	displaylist_depths_test \
 	attachMovieTest \
 	attachMovieTestRunner \
 	attachMovieLoopingTest \
@@ -136,6 +137,7 @@
 	action_execution_order_test6runner \
 	reverse_execute_PlaceObject2_test1runner \
 	reverse_execute_PlaceObject2_test2runner \
+	displaylist_depths_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -354,6 +356,20 @@
 	sh $< -r5 $(top_builddir) place_and_remove_object_insane_test.swf > $@
 	chmod 755 $@
 
+displaylist_depths_test_SOURCES =	\
+	displaylist_depths_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+displaylist_depths_test_LDADD = $(MING_LIBS)
+
+displaylist_depths_test.swf: displaylist_depths_test
+	./displaylist_depths_test $(top_srcdir)/testsuite/media
+
+displaylist_depths_testrunner: $(srcdir)/../generic-testrunner.sh displaylist_depths_test.swf
+	sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
+	chmod 755 $@
+
 attachMovieTest_SOURCES =	\
 	attachMovieTest.c	\
 	ming_utils.h		\
@@ -859,6 +875,7 @@
 	action_execution_order_test6runner \
 	reverse_execute_PlaceObject2_test1runner \
 	reverse_execute_PlaceObject2_test2runner \
+	displaylist_depths_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: testsuite/misc-ming.all/displaylist_depths_test.c
diff -N testsuite/misc-ming.all/displaylist_depths_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/displaylist_depths_test.c	6 Apr 2007 09:56:00 -0000	1.1
@@ -0,0 +1,116 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Sandro Santilli, strk@keybit.net
+ *
+ * Test if dynamic and static objects at the same depth can coexist
+ *
+ * run as ./displaylist_depths_test
+ */
+
+#include "ming_utils.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "displaylist_depths_test.swf"
+
+static SWFMovieClip get_static_mc(void);
+
+SWFMovieClip
+get_static_mc()
+{
+	SWFShape sh;
+	SWFMovieClip mc;
+
+	sh = make_fill_square (0, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+	mc = newSWFMovieClip();
+	SWFMovieClip_add(mc, (SWFBlock)sh);
+	SWFMovieClip_nextFrame(mc);
+
+	return mc;
+}
+
+
+int
+main(int argc, char** argv)
+{
+	SWFMovie mo;
+	SWFMovieClip dejagnuclip;
+	SWFMovieClip mc1;
+	SWFDisplayItem it;
+
+	const char *srcdir=".";
+	if ( argc>1 ) 
+		srcdir=argv[1];
+	else
+	{
+   		//fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+   		//return 1;
+	}
+
+	Ming_init();
+	mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+	SWFMovie_setDimension(mo, 800, 600);
+	SWFMovie_setRate (mo, 12);
+
+	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+	SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+	SWFMovie_nextFrame(mo);  // end of frame 1
+
+
+	// Add a static red square at depth 3
+	mc1 = get_static_mc();
+	it = SWFMovie_add(mo, (SWFBlock)mc1); 
+	SWFDisplayItem_setDepth(it, 3); 
+	SWFDisplayItem_setName(it, "staticmc");
+	SWFMovie_nextFrame(mo); // end of frame 2
+
+	// Create an (dynamic) green movieclip at depth 3
+	add_actions(mo, "createEmptyMovieClip('dynamicmc', 3);"
+			"with (dynamicmc) {"
+			" lineStyle(1, 0x000000, 100);"	
+			" beginFill(0x00FF00, 100);"
+			" moveTo(20, 320);"
+			" lineTo(80, 320);"
+			" lineTo(80, 380);"
+			" lineTo(20, 380);"
+			" lineTo(20, 320);"
+			"}");
+	SWFMovie_nextFrame(mo); // end of frame 3
+	
+	// Check that both exist
+	check_equals(mo, "typeof(staticmc)", "'movieclip'");
+	check_equals(mo, "typeof(dynamicmc)", "'movieclip'");
+
+	// Check that the static one had been moved at negative depth !
+	check_equals(mo, "staticmc.getDepth()", "-16381");
+	check_equals(mo, "dynamicmc.getDepth()", "3");
+
+	add_actions(mo, "_root.totals(); stop();");
+	SWFMovie_nextFrame(mo);        
+
+	//Output movie
+	puts("Saving " OUTPUT_FILENAME );
+	SWFMovie_save(mo, OUTPUT_FILENAME);
+
+	return 0;
+}



From MAILER-DAEMON Fri Apr 06 07:47:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZmuc-0008Gi-Uj
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 07:47:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZmua-0008BZ-PC
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:47:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZmuZ-00089U-5f
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:47:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZmuZ-00089D-0N
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:47:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZmr4-000508-Jd
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 07:43:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZmr3-00049O-Ij
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:43:45 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZmr3-00049K-4m
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:43:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZmr3-00049K-4m@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 11:43:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/dlist...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 11:47:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 11:43:44

Modified files:
	.              : ChangeLog 
	server         : character.h dlist.cpp dlist.h 
	                 sprite_instance.cpp sprite_instance.h 
	server/swf     : tag_loaders.cpp 
	testsuite/actionscript.all: MovieClip.as 
	testsuite/misc-ming.all: ButtonEventsTest-Runner.cpp 
	                         loop_test-Runner.cpp 
	                         simple_loop_testrunner.cpp 
	testsuite/movies.all: gravity_embedded-TestRunner.cpp 
	testsuite/samples: clip_as_button2-TestRunner.cpp 

Log message:
	        * server/: character.h, dlist.{cpp,h}, sprite_instance.{cpp,h}:
	          Character instance depth is a _signed_ value !
	          Add a character::staticDepthOffset constant to use for converting
	          displaylist tag defined depths to negative values.
	        * server/swf/tag_loaders.cpp: convert displaylist tag defined depths
	          to negative values by adding character::staticDepthOffset
	        * testsuite/misc-ming.all/: ButtonEventsTest-Runner.cpp,
	          testsuite/samples/clip_as_button2-TestRunner.cpp,
	          testsuite/movies.all/gravity_embedded-TestRunner.cpp:
	          loop_test-Runner.cpp, simple_loop_testrunner.cpp: fix the
	          test runners to take staticDepthOffset into account.
	        * testsuite/actionscript.all/MovieClip.as: getNextHighestDepth()
	          test now succeeds.
	
	For more info, See:
	http://www.senocular.com/flash/tutorials/depths/?page=2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2797&r2=1.2798
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.224&r2=1.225
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loop_test-Runner.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/movies.all/gravity_embedded-TestRunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/clip_as_button2-TestRunner.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2797
retrieving revision 1.2798
diff -u -b -r1.2797 -r1.2798
--- ChangeLog	6 Apr 2007 09:56:00 -0000	1.2797
+++ ChangeLog	6 Apr 2007 11:43:44 -0000	1.2798
@@ -1,5 +1,22 @@
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
+	* server/: character.h, dlist.{cpp,h}, sprite_instance.{cpp,h}:
+	  Character instance depth is a _signed_ value !
+	  Add a character::staticDepthOffset constant to use for converting
+	  displaylist tag defined depths to negative values.
+	* server/swf/tag_loaders.cpp: convert displaylist tag defined depths
+	  to negative values by adding character::staticDepthOffset
+	* testsuite/misc-ming.all/: ButtonEventsTest-Runner.cpp,
+	  testsuite/samples/clip_as_button2-TestRunner.cpp,
+	  testsuite/movies.all/gravity_embedded-TestRunner.cpp:
+	  loop_test-Runner.cpp, simple_loop_testrunner.cpp: fix the
+	  test runners to take staticDepthOffset into account.
+	* testsuite/actionscript.all/MovieClip.as: getNextHighestDepth()
+	  test now succeeds.
+
+
+2007-04-06 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/: Makefile.am, displaylist_depths_test.c:
 	  Add a new interesting (failing) test showing that static characters
 	  and dynamic characters use a completely different range

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/character.h	2 Apr 2007 15:45:22 -0000	1.61
+++ server/character.h	6 Apr 2007 11:43:44 -0000	1.62
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.61 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: character.h,v 1.62 2007/04/06 11:43:44 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -72,7 +72,7 @@
 	cxform	m_color_transform;
 	matrix	m_matrix;
 	float	m_ratio;
-	uint16_t	m_clip_depth;
+	int	m_clip_depth;
 	Events _event_handlers;
 	void	(*m_display_callback)(void*);
 	void*	m_display_callback_user_ptr;
@@ -193,10 +193,20 @@
 
 public:
 
+    /// This is the amount substracted from displaylist tag defined depths.
+    /// Character placed by tags (vs. characters instantiated by ActionScript)
+    /// always have negative depths by effect of this offset.
+    //
+    /// Macromedia Flash help says: depth starts at -16383 (0x3FFF)
+    ///
+    /// See: http://www.senocular.com/flash/tutorials/depths/?page=2
+    ///
+    static const int staticDepthOffset = -16384;
+
     character(character* parent, int id)
 	:
 	m_id(id),
-	m_depth(-1),
+	m_depth(0),
 	m_ratio(0.0f),
 	m_clip_depth(0),
 	m_display_callback(NULL),
@@ -264,8 +274,9 @@
       if (f!=m_ratio) set_invalidated(); 
       m_ratio = f;       
     }
-    uint16_t	get_clip_depth() const { return m_clip_depth; }
-    void	set_clip_depth(uint16_t d) { m_clip_depth = d; }
+
+    int get_clip_depth() const { return m_clip_depth; }
+    void set_clip_depth(int d) { m_clip_depth = d; }
 
     virtual void set_name(const char* name) { _name = name; }
 
@@ -473,6 +484,7 @@
 	///
 	void setDynamic() {
 		_dynamicallyCreated = true;
+		//assert(get_depth() > 0);
 	}
 
 	/// \brief

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/dlist.cpp	2 Apr 2007 16:25:25 -0000	1.56
+++ server/dlist.cpp	6 Apr 2007 11:43:44 -0000	1.57
@@ -101,7 +101,7 @@
 int
 DisplayList::getNextHighestDepth() const
 {
-	unsigned int nexthighestdepth=0;
+	int nexthighestdepth=0;
 	for (const_iterator it = _characters.begin(),
 			itEnd = _characters.end();
 		it != itEnd; ++it)
@@ -109,7 +109,7 @@
 		character* ch = it->get();
 		assert(ch); // is this really needed ?
 
-		unsigned int chdepth = ch->get_depth();
+		int chdepth = ch->get_depth();
 		if ( chdepth >= nexthighestdepth )
 		{
 			nexthighestdepth = chdepth+1;
@@ -172,11 +172,11 @@
 void
 DisplayList::place_character(
 	character* ch, 
-	uint16_t depth,
+	int depth,
 	const cxform& color_xform, 
 	const matrix& mat, 
 	float ratio,
-	uint16_t clip_depth)
+	int clip_depth)
 {
 //	GNASH_REPORT_FUNCTION;
 	//IF_VERBOSE_DEBUG(log_msg("dl::add(%d, '%s')\n", depth, ch->get_name()));//xxxxx
@@ -185,7 +185,6 @@
 	//dump(std::cout);
 
 	assert(ch);
-	
 	ch->set_invalidated();
 	ch->set_depth(depth);
 	ch->set_cxform(color_xform);
@@ -247,13 +246,13 @@
 void
 DisplayList::replace_character(
 	character* ch,
-	uint16_t depth,
+	int depth,
 	bool use_cxform,
 	const cxform& color_xform,
 	bool use_matrix,
 	const matrix& mat,
 	float ratio,
-	uint16_t clip_depth)
+	int clip_depth)
 {
 	//GNASH_REPORT_FUNCTION;
 
@@ -314,13 +313,13 @@
 // the specified depth.
 void
 DisplayList::move_display_object(
-	uint16_t depth,
+	int depth,
 	bool use_cxform,
 	const cxform& color_xform,
 	bool use_matrix,
 	const matrix& mat,
 	float ratio,
-	uint16_t /* clip_depth */)
+	int /* clip_depth */)
 {
 	//GNASH_REPORT_FUNCTION;
 	//IF_VERBOSE_DEBUG(log_msg("dl::move(%d)\n", depth));//xxxxx
@@ -336,6 +335,7 @@
 		return;
 	}
 
+	// TODO: is sign of depth related to accepting anim moves ?
 	if (ch->get_accept_anim_moves() == false)
 	{
 		// This character is rejecting anim moves.  This happens after it
@@ -357,7 +357,7 @@
 	
 // Removes the object at the specified depth.
 void
-DisplayList::remove_display_object(uint16_t depth)
+DisplayList::remove_display_object(int depth)
 {
 	//GNASH_REPORT_FUNCTION;
 
@@ -423,7 +423,7 @@
 	}
 }
 	
-void DisplayList::clear_unaffected(std::vector<uint16>& affected_depths, bool call_unload)
+void DisplayList::clear_unaffected(std::vector<int>& affected_depths, bool call_unload)
 {
 	//GNASH_REPORT_FUNCTION;
 
@@ -632,11 +632,6 @@
 			continue;
 		}
 
-		if (ch->get_clip_depth() > 0)
-		{
-//				log_msg("depth %i, clip_depth %i\n", dobj.m_depth, dobj.m_clip_depth);
-		}
-
 		// check whether a previous mask should be disabled
 		if (masked)
 		{
@@ -658,11 +653,6 @@
 		
 		ch->display();
 
-		if (ch->get_clip_depth() > 0)
-		{
-//				log_msg("object drawn\n");
-		}
-		
 		// if this object should have become a mask,
 		// inform the renderer that it now has all
 		// information about it

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/dlist.h	2 Apr 2007 16:25:25 -0000	1.31
+++ server/dlist.h	6 Apr 2007 11:43:44 -0000	1.32
@@ -87,11 +87,11 @@
 	///
 	void	place_character(
 		character* ch,
-		uint16_t depth,
+		int depth,
 		const cxform& color_xform,
 		const matrix& mat,
 		float ratio,
-		uint16_t clip_depth);
+		int clip_depth);
 
 	/// \brief
 	/// Puts a new character at the specified depth, replacing any
@@ -106,32 +106,32 @@
 	///
 	void replace_character(
 		character* ch,
-		uint16_t depth,
+		int depth,
 		bool use_cxform,
 		const cxform& color_xform,
 		bool use_matrix,
 		const matrix& mat,
 		float ratio,
-		uint16_t clip_depth);
+		int clip_depth);
 
 	void swap_characters(character* ch, character* ch2);
 
 	/// Updates the transform properties of the object at
 	/// the specified depth.
 	void	move_display_object(
-		uint16_t depth,
+		int depth,
 		bool use_cxform,
 		const cxform& color_xform,
 		bool use_matrix,
 		const matrix& mat,
 		float ratio,
-		uint16_t clip_depth);
+		int clip_depth);
 
 	/// Removes the object at the specified depth.
 	//
 	/// Calls unload on the removed character.
 	///
-	void	remove_display_object(uint16_t depth);
+	void	remove_display_object(int depth);
 
 	/// Clear the display list.
 	//
@@ -207,7 +207,7 @@
 	///	If true, UNLOAD event will be invoked on the characters being
 	///	removed. False by default.
 	///
-	void clear_unaffected(std::vector<uint16>& affected_depths, bool call_unload=false);
+	void clear_unaffected(std::vector<int>& affected_depths, bool call_unload=false);
 
 	/// Just an alias for clear()
 	void reset() {
@@ -332,10 +332,7 @@
 		it != itEnd; ++it)
 	{
 		DisplayItem& di = *it;
-		if ( ! visitor(di.get()) )
-		{
-			break;
-		}
+		if ( ! visitor(di.get()) ) break;
 	}
 }
 
@@ -348,26 +345,7 @@
 		it != itEnd; ++it)
 	{
 		DisplayItem& di = *it;
-
-		//if ( ! di.get() ) continue;
-
-		if ( ! visitor(di.get()) )
-		{
-			break;
-
-// The following logic must be implemented in the VISITOR,
-// not in the visiting function !!
-// (Vitaly, did you mean to do this in the MouseEntityFinder?)
-#if 0
-			// Can so happens that the uppermost depth contains shape
-			// and under it the button lays
-			// therefore we skip empty(no events) depth
-			if (di->can_handle_mouse_event())
-			{
-				break;
-			}
-#endif
-		}
+		if ( ! visitor(di.get()) ) break;
 	}
 }
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -b -r1.224 -r1.225
--- server/sprite_instance.cpp	6 Apr 2007 09:23:20 -0000	1.224
+++ server/sprite_instance.cpp	6 Apr 2007 11:43:44 -0000	1.225
@@ -184,8 +184,8 @@
 
 	std::string newname = fn.arg(1).to_std_string();
 
-	// should we support negative depths ?
-	uint16_t depth_val = uint16_t(fn.arg(2).to_number());
+	// should we support negative depths ? YES !
+	int depth_val = uint16_t(fn.arg(2).to_number());
 
 	boost::intrusive_ptr<character> newch = exported_movie->create_character_instance(sprite.get(), depth_val);
 	assert( dynamic_cast<sprite_instance*>(newch.get()) );
@@ -280,13 +280,6 @@
 
 	int n = sprite->get_depth();
 
-	if ( ! sprite->isDynamic() )
-	{
-		// Macromedia Flash help says: depth starts at -16383 (0x3FFF)
-		//n = - (n+16383-1);
-		n += -16384; 
-	}
-
 	return as_value(n);
 }
 
@@ -776,7 +769,7 @@
 {
 	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
 
-	unsigned int nextdepth = sprite->getNextHighestDepth();
+	int nextdepth = sprite->getNextHighestDepth();
 	return as_value(static_cast<double>(nextdepth));
 }
 
@@ -1858,7 +1851,7 @@
 }
 
 void sprite_instance::clone_display_object(const std::string& name,
-	const std::string& newname, uint16_t depth)
+	const std::string& newname, int depth)
 {
 //            GNASH_REPORT_FUNCTION;
 
@@ -2600,7 +2593,7 @@
 }
 
 bool
-sprite_instance::attachCharacter(character& newch, uint16_t depth)
+sprite_instance::attachCharacter(character& newch, int depth)
 {
 
 	// place_character() will set depth on newch
@@ -2620,10 +2613,10 @@
 		uint16_t character_id,
 		const char* name,
 		const std::vector<swf_event*>& event_handlers,
-		uint16_t depth, 
+		int depth, 
 		bool replace_if_depth_is_occupied,
 		const cxform& color_transform, const matrix& matrix,
-		float ratio, uint16_t clip_depth)
+		float ratio, int clip_depth)
 {
 //	    GNASH_REPORT_FUNCTION;
 	assert(m_def != NULL);
@@ -2702,13 +2695,13 @@
 sprite_instance::replace_display_object(
 		uint16_t character_id,
 		const char* name,
-		uint16_t depth,
+		int depth,
 		bool use_cxform,
 		const cxform& color_transform,
 		bool use_matrix,
 		const matrix& mat,
 		float ratio,
-		uint16_t clip_depth)
+		int clip_depth)
 {
 	assert(m_def != NULL);
 	// log_msg("%s: character %s, id is %d", __FUNCTION__, name, character_id); // FIXME: debugging crap
@@ -2735,13 +2728,13 @@
 void sprite_instance::replace_display_object(
 		character* ch,
 		const char* name,
-		uint16_t depth,
+		int depth,
 		bool use_cxform,
 		const cxform& color_transform,
 		bool use_matrix,
 		const matrix& mat,
 		float ratio,
-		uint16_t clip_depth)
+		int clip_depth)
 {
     //printf("%s: character %s, id is %d\n", __FUNCTION__, name, ch->get_id()); // FIXME:
 
@@ -3328,13 +3321,13 @@
 	save_extern_movie(extern_movie.get());
 
 	const char* name = get_name().c_str();
-	uint16_t depth = get_depth();
+	int depth = get_depth();
 	bool use_cxform = false;
 	cxform color_transform = get_cxform();
 	bool use_matrix = false;
 	matrix mat = get_matrix();
 	float ratio = get_ratio();
-	uint16_t clip_depth = get_clip_depth();
+	int clip_depth = get_clip_depth();
 	//character* new_movie = extern_movie->get_root_movie();
 
 	// Get a pointer to our own parent 

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/sprite_instance.h	5 Apr 2007 11:16:11 -0000	1.88
+++ server/sprite_instance.h	6 Apr 2007 11:43:44 -0000	1.89
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.88 2007/04/05 11:16:11 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.89 2007/04/06 11:43:44 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -357,12 +357,12 @@
 		uint16_t character_id,
 		const char* name,
 		const SWFEventsVector& event_handlers,
-		uint16_t depth,
+		int depth,
 		bool replace_if_depth_is_occupied,
 		const cxform& color_transform,
 		const matrix& matrix,
 		float ratio,
-		uint16_t clip_depth);
+		int clip_depth);
 
 	/// Attach the given character instance to current display list
 	//
@@ -375,7 +375,7 @@
 	/// @return true on success, false on failure
 	///	FIXME: currently never returns false !
 	///
-	bool attachCharacter(character& newch, uint16_t depth);
+	bool attachCharacter(character& newch, int depth);
 
 	/// Construct this instance as an ActionScript object.
 	//
@@ -401,13 +401,13 @@
 	/// Updates the transform properties of the object at
 	/// the specified depth.
 	void	move_display_object(
-			uint16_t depth,
+			int depth,
 			bool use_cxform,
 			const cxform& color_xform,
 			bool use_matrix,
 			const matrix& mat,
 			float ratio,
-			uint16_t clip_depth)
+			int clip_depth)
 	{
 	    m_display_list.move_display_object(depth, use_cxform, color_xform, use_matrix, mat, ratio, clip_depth);
 	}
@@ -416,25 +416,25 @@
 	void	replace_display_object(
 			uint16_t character_id,
 			const char* name,
-			uint16_t depth,
+			int depth,
 			bool use_cxform,
 			const cxform& color_transform,
 			bool use_matrix,
 			const matrix& mat,
 			float ratio,
-			uint16_t clip_depth);
+			int clip_depth);
 
 
 	void	replace_display_object(
 			character* ch,
 			const char* name,
-			uint16_t depth,
+			int depth,
 			bool use_cxform,
 			const cxform& color_transform,
 			bool use_matrix,
 			const matrix& mat,
 			float ratio,
-			uint16_t clip_depth);
+			int clip_depth);
 
 
 	/// \brief
@@ -443,7 +443,7 @@
 	/// NOTE: the id parameter is unused, but currently
 	/// required to avoid break of inheritance from movie.h
 	///
-	void	remove_display_object(uint16_t depth, int /* id */)
+	void	remove_display_object(int depth, int /* id */)
 	{
 	    set_invalidated();
 	    m_display_list.remove_display_object(depth);
@@ -536,7 +536,7 @@
 	/// Duplicate the object with the specified name
 	/// and add it with a new name  at a new depth.
 	void clone_display_object(const std::string& name,
-		const std::string& newname, uint16_t depth);
+		const std::string& newname, int depth);
 
 	/// Remove the object with the specified name.
 	//
@@ -858,9 +858,9 @@
 
 protected:
 
-	void place_character(character* ch, uint16_t depth,
+	void place_character(character* ch, int depth,
 			const cxform& color_transform, const matrix& mat,
-			float ratio, uint16_t clip_depth)
+			float ratio, int clip_depth)
 	{
 		m_display_list.place_character(ch, depth, color_transform, mat, ratio, clip_depth);
 	}

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/swf/tag_loaders.cpp	2 Apr 2007 06:18:41 -0000	1.84
+++ server/swf/tag_loaders.cpp	6 Apr 2007 11:43:44 -0000	1.85
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.84 2007/04/02 06:18:41 zoulunkai Exp $ */
+/* $Id: tag_loaders.cpp,v 1.85 2007/04/06 11:43:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -777,9 +777,9 @@
     matrix	m_matrix;
     bool	m_has_matrix;
     bool	m_has_cxform;
-    uint16_t	m_depth;
+    int		m_depth;
     uint16_t	m_character_id;
-    uint16_t 	m_clip_depth;
+    int 	m_clip_depth;
     enum place_type {
 	PLACE,
 	MOVE,
@@ -819,13 +819,13 @@
 	{
 		// Original place_object tag; very simple.
 		m_character_id = in->read_u16();
-		m_depth = in->read_u16();
+		m_depth = in->read_u16()+character::staticDepthOffset;
 		m_matrix.read(in);
 
 		IF_VERBOSE_PARSE
 		(
 			log_parse("  char_id = %d", m_character_id);
-			log_parse("  depth = %d", m_depth);
+			log_parse("  depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
 			m_matrix.print();
 		);
 
@@ -1000,11 +1000,11 @@
 		bool	has_char = in->read_uint(1) ? true : false;
 		bool	flag_move = in->read_uint(1) ? true : false;
 
-		m_depth = in->read_u16();
+		m_depth = in->read_u16()+character::staticDepthOffset;
 
 		IF_VERBOSE_PARSE
 		(
-		    log_parse("  depth = %d", m_depth);
+                    log_parse("  depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
 		);
 
 		if (has_char)
@@ -1053,9 +1053,9 @@
 
 		if (has_clip_bracket)
 		{
-			m_clip_depth = in->read_u16(); 
+			m_clip_depth = in->read_u16()+character::staticDepthOffset; 
 			IF_VERBOSE_PARSE (
-				log_parse("  clip_depth = %d", m_clip_depth);
+				log_parse("  clip_depth = %d (%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
 			);
 		}
 
@@ -1284,7 +1284,7 @@
 		    // object per depth.
 		    m_id = in->read_u16();
 		}
-	    m_depth = in->read_u16();
+	    m_depth = in->read_u16()+character::staticDepthOffset;
 	}
 
     virtual void	execute(sprite_instance* m)

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- testsuite/actionscript.all/MovieClip.as	6 Apr 2007 09:27:25 -0000	1.45
+++ testsuite/actionscript.all/MovieClip.as	6 Apr 2007 11:43:44 -0000	1.46
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.45 2007/04/06 09:27:25 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.46 2007/04/06 11:43:44 strk Exp $";
 
 #include "check.as"
 
@@ -140,7 +140,7 @@
     check_equals(mc.hitArea, undefined);
     check_equals(mc.menu, undefined);
 
-    xcheck_equals(mc.getNextHighestDepth(), 0);
+    check_equals(mc.getNextHighestDepth(), 0);
 #else
     check_equals(mc.getNextHighestDepth(), undefined);
 #endif

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	31 Jan 2007 15:11:58 -0000	1.10
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	6 Apr 2007 11:43:44 -0000	1.11
@@ -120,7 +120,7 @@
 
 	const character* mc1 = tester.findDisplayItemByName(*root, "square1");
 	check(mc1);
-	check_equals(mc1->get_depth(), 2);
+	check_equals(mc1->get_depth(), 2+character::staticDepthOffset);
 
 	const character* text = tester.findDisplayItemByName(*root, "textfield");
 	check(text);
@@ -139,8 +139,8 @@
 
 	for (size_t fno=0; fno<root->get_frame_count(); fno++)
 	{
-		const character* square_back = tester.findDisplayItemByDepth(*root, 1);
-		const character* square_front = tester.findDisplayItemByDepth(*root, 3);
+		const character* square_back = tester.findDisplayItemByDepth(*root, 1+character::staticDepthOffset);
+		const character* square_front = tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset);
 
 		switch (fno)
 		{

Index: testsuite/misc-ming.all/loop_test-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loop_test-Runner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/loop_test-Runner.cpp	24 Jan 2007 10:11:54 -0000	1.3
+++ testsuite/misc-ming.all/loop_test-Runner.cpp	6 Apr 2007 11:43:44 -0000	1.4
@@ -70,11 +70,11 @@
 
 	const character* movieClip1 = tester.findDisplayItemByName(*root, "movieClip1");
 	check(movieClip1);
-	check_equals(movieClip1->get_depth(), 1);
+	check_equals(movieClip1->get_depth(), 1+character::staticDepthOffset);
 
 	const character* movieClip2 = tester.findDisplayItemByName(*root, "movieClip2");
 	check(movieClip2);
-	check_equals(movieClip2->get_depth(), 2);
+	check_equals(movieClip2->get_depth(), 2+character::staticDepthOffset);
 
 	// Advance to frame 27
 	for (int i=root->get_current_frame(); i<28; ++i) {
@@ -85,8 +85,8 @@
 	// change the characters depth
 	tester.advance();
 	check_equals(root->get_current_frame(), 29);
-	check_equals(movieClip1->get_depth(), 2);
-	check_equals(movieClip2->get_depth(), 1);
+	check_equals(movieClip1->get_depth(), 2+character::staticDepthOffset);
+	check_equals(movieClip2->get_depth(), 1+character::staticDepthOffset);
 
 	// Now keep advancing until last frame is reached
 	// (29, as framecount is 0-based)
@@ -95,8 +95,8 @@
 	}
 
 	check_equals(root->get_current_frame(), 29);
-	check_equals(movieClip1->get_depth(), 2);
-	check_equals(movieClip2->get_depth(), 1);
+	check_equals(movieClip1->get_depth(), 2+character::staticDepthOffset);
+	check_equals(movieClip2->get_depth(), 1+character::staticDepthOffset);
 
 
 	// Next advance will make the movie restart
@@ -104,8 +104,8 @@
 	check_equals(root->get_current_frame(), 0);
 
 	// We expect the depth to be kept on restart
-	check_equals(movieClip1->get_depth(), 2);
-	check_equals(movieClip2->get_depth(), 1);
+	check_equals(movieClip1->get_depth(), 2+character::staticDepthOffset);
+	check_equals(movieClip2->get_depth(), 1+character::staticDepthOffset);
 
 	// ... until next SwapDepth ...
 
@@ -113,19 +113,19 @@
 		tester.advance();
 	}
 
-	check_equals(movieClip1->get_depth(), 2);
-	check_equals(movieClip2->get_depth(), 1);
+	check_equals(movieClip1->get_depth(), 2+character::staticDepthOffset);
+	check_equals(movieClip2->get_depth(), 1+character::staticDepthOffset);
 
 	// we expect depths to be swapped again 
 	tester.advance();
 	check_equals(root->get_current_frame(), 29);
-	check_equals(movieClip1->get_depth(), 1);
-	check_equals(movieClip2->get_depth(), 2);
+	check_equals(movieClip1->get_depth(), 1+character::staticDepthOffset);
+	check_equals(movieClip2->get_depth(), 2+character::staticDepthOffset);
 
 	// .. and the new deptsh to be kept at restart
 	tester.advance();
 	check_equals(root->get_current_frame(), 0);
-	check_equals(movieClip1->get_depth(), 1);
-	check_equals(movieClip2->get_depth(), 2);
+	check_equals(movieClip1->get_depth(), 1+character::staticDepthOffset);
+	check_equals(movieClip2->get_depth(), 2+character::staticDepthOffset);
 }
 

Index: testsuite/misc-ming.all/simple_loop_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/simple_loop_testrunner.cpp	26 Jan 2007 10:51:52 -0000	1.3
+++ testsuite/misc-ming.all/simple_loop_testrunner.cpp	6 Apr 2007 11:43:44 -0000	1.4
@@ -64,7 +64,7 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 1);
 	check_equals(root->getDisplayList().size(), 1);
-	check( tester.findDisplayItemByDepth(*root, 2) );
+	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
 	check( invalidated.intersects(Bounds(0, 0, 60, 60)) );
 
@@ -73,8 +73,8 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 2);
 	check_equals(root->getDisplayList().size(), 2);
-	check( tester.findDisplayItemByDepth(*root, 2) );
-	check( tester.findDisplayItemByDepth(*root, 3) );
+	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
+	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
 	check( invalidated.intersects(Bounds(60, 0, 120, 60)) );
 
@@ -83,9 +83,9 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 3);
 	check_equals(root->getDisplayList().size(), 3);
-	check( tester.findDisplayItemByDepth(*root, 2) );
-	check( tester.findDisplayItemByDepth(*root, 3) );
-	check( tester.findDisplayItemByDepth(*root, 4) );
+	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
+	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
+	check( tester.findDisplayItemByDepth(*root, 4+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
 	check( invalidated.intersects(Bounds(120, 0, 180, 60)) );
 
@@ -102,7 +102,7 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 1);
 	check_equals(root->getDisplayList().size(), 1);
-	check( tester.findDisplayItemByDepth(*root, 2) );
+	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
 	check( invalidated.intersects(Bounds(0, 0, 60, 60)) );
 
@@ -111,8 +111,8 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 2);
 	check_equals(root->getDisplayList().size(), 2);
-	check( tester.findDisplayItemByDepth(*root, 2) );
-	check( tester.findDisplayItemByDepth(*root, 3) );
+	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
+	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
 	check( invalidated.intersects(Bounds(60, 0, 120, 60)) );
 
@@ -121,9 +121,9 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 3);
 	check_equals(root->getDisplayList().size(), 3);
-	check( tester.findDisplayItemByDepth(*root, 2) );
-	check( tester.findDisplayItemByDepth(*root, 3) );
-	check( tester.findDisplayItemByDepth(*root, 4) );
+	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
+	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
+	check( tester.findDisplayItemByDepth(*root, 4+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
 	check( invalidated.intersects(Bounds(120, 0, 180, 60)) );
 

Index: testsuite/movies.all/gravity_embedded-TestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/movies.all/gravity_embedded-TestRunner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/movies.all/gravity_embedded-TestRunner.cpp	11 Nov 2006 14:36:33 -0000	1.3
+++ testsuite/movies.all/gravity_embedded-TestRunner.cpp	6 Apr 2007 11:43:44 -0000	1.4
@@ -1,5 +1,5 @@
 /* 
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@
 	// used to get members
 	as_value tmp;
 
-	const character* loaded = tester.findDisplayItemByDepth(*root, 8);
+	const character* loaded = tester.findDisplayItemByDepth(*root, 0); // depends on getNextHighestDepth
 	check(loaded);
 	check_equals(loaded->get_parent(), root);
 
@@ -72,7 +72,7 @@
 	check_equals(loaded->get_height(), 2056);
 	check_equals(loaded->get_width(), 2056);
 
-	const character* text = tester.findDisplayItemByDepth(*root, 7);
+	const character* text = tester.findDisplayItemByDepth(*root, 7+character::staticDepthOffset);
 	check(text);
 	
 	check_equals(string(text->get_text_value()), "50");

Index: testsuite/samples/clip_as_button2-TestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/clip_as_button2-TestRunner.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/samples/clip_as_button2-TestRunner.cpp	17 Jan 2007 09:53:23 -0000	1.5
+++ testsuite/samples/clip_as_button2-TestRunner.cpp	6 Apr 2007 11:43:44 -0000	1.6
@@ -70,7 +70,7 @@
 	string msg_botleft = "big movie clip pressed";
 	string msg_botright = "small movie clip pressed";
 
-	const character* text = tester.findDisplayItemByDepth(*root, 3);
+	const character* text = tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset);
 	check(text);
 	check_equals(string(text->get_text_value()), msg_empty);
 	check(!tester.isMouseOverMouseEntity());



From MAILER-DAEMON Fri Apr 06 11:39:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZqXV-000458-Ai
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 11:39:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZqXS-00044i-Tc
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:39:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZqXR-00044S-BI
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:39:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZqXR-00044P-5c
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:39:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZqTv-00048F-Qp
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:36:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZqTu-0000fs-36
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:36:06 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZqTt-0000fl-Ob
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:36:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZqTt-0000fl-Ob@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 15:36:05 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 15:39:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 15:36:05

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 
	server/vm      : ASHandlers.cpp 
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	Good stuff:
	
	        * testsuite/misc-ming.all/displaylist_depths_test.c:
	          Add a bunch of new tests about removing from protected
	          depth ranges and using swapDepth to move between ranges.
	        * server/sprite_instance.{h,cpp}: Add a removeMovieClip
	          public method for common use by ActionRemoveClip tag,
	          global removeMovieClip function and MovieClip.removeMovieClip
	          method; fix swapDepths to accept a depth as argument;
	          fix removeMovieClip to check for allowed depth bounds.
	        * server/vm/ASHandlers.cpp (ActionRemoveClip): use the new
	          sprite_instance::removeMovieClip method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2798&r2=1.2799
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.225&r2=1.226
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2798
retrieving revision 1.2799
diff -u -b -r1.2798 -r1.2799
--- ChangeLog	6 Apr 2007 11:43:44 -0000	1.2798
+++ ChangeLog	6 Apr 2007 15:36:05 -0000	1.2799
@@ -1,5 +1,18 @@
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/displaylist_depths_test.c:
+	  Add a bunch of new tests about removing from protected
+	  depth ranges and using swapDepth to move between ranges.
+	* server/sprite_instance.{h,cpp}: Add a removeMovieClip
+	  public method for common use by ActionRemoveClip tag,
+	  global removeMovieClip function and MovieClip.removeMovieClip
+	  method; fix swapDepths to accept a depth as argument;
+	  fix removeMovieClip to check for allowed depth bounds.
+	* server/vm/ASHandlers.cpp (ActionRemoveClip): use the new
+	  sprite_instance::removeMovieClip method.
+
+2007-04-06 Sandro Santilli <strk@keybit.net>
+
 	* server/: character.h, dlist.{cpp,h}, sprite_instance.{cpp,h}:
 	  Character instance depth is a _signed_ value !
 	  Add a character::staticDepthOffset constant to use for converting

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -b -r1.225 -r1.226
--- server/sprite_instance.cpp	6 Apr 2007 11:43:44 -0000	1.225
+++ server/sprite_instance.cpp	6 Apr 2007 15:36:05 -0000	1.226
@@ -130,12 +130,7 @@
 static as_value sprite_remove_movieclip(const fn_call& fn)
 {
 	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
-
-	sprite_instance* parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
-	if (parent)
-	{
-		parent->remove_display_object(sprite->get_depth(), 0);
-	}
+	sprite->removeMovieClip();
 	return as_value();
 }
 
@@ -286,69 +281,108 @@
 //swapDepths(target:Object) : Void
 static as_value sprite_swap_depths(const fn_call& fn)
 {
-	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
+	typedef boost::intrusive_ptr<sprite_instance> SpritePtr;
+	typedef boost::intrusive_ptr<character> CharPtr;
+
+	SpritePtr sprite = ensureType<sprite_instance>(fn.this_ptr);
+	int this_depth = sprite->get_depth();
+
+	// Lower bound of source depth below which swapDepth has no effect
+	static const int lowerDepthBound = -16384;
 	
 	as_value rv;
+
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("swapDepths needs one arg");
+		log_aserror("%s.swapDepths() needs one arg.", sprite->getTarget().c_str());
 		);
 		return rv;
 	}
 
-	boost::intrusive_ptr<character> target = NULL;
-	if (fn.arg(0).is_object() )
+	if ( this_depth < lowerDepthBound )
 	{
-		target = boost::dynamic_pointer_cast<character>(fn.arg(0).to_object());
+		IF_VERBOSE_ASCODING_ERRORS(
+		stringstream ss; fn.dump_args(ss);
+		log_aserror("%s.swapDepths(%s) : won't swap a clip below depth %d (%d).",
+			sprite->getTarget().c_str(), ss.str().c_str(), lowerDepthBound, this_depth);
+		);
+		return rv;
 	}
-	else if (fn.arg(0).is_number() )
-	{
-		// Macromedia Flash help says: depth starts at -16383 (0x3FFF)
-		int target_depth = int(fn.arg(0).to_number()) + 16383 + 1;
 
-		boost::intrusive_ptr<sprite_instance> parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
-		if ( parent )
-		{
-			target = parent->get_character_at_depth(target_depth);
-		}
-	}
-	else
+
+	SpritePtr this_parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
+	if ( ! this_parent )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("swapDepths has received invalid arg\n");
+		stringstream ss; fn.dump_args(ss);
+		log_aserror("%s.swapDepths(%s): this sprite has no parent, "
+			"swapping depth of root ?",
+			sprite->getTarget().c_str(),
+			ss.str().c_str());
     		);
 		return rv;
 	}
 
-	if (sprite == NULL || target == NULL)
+
+	CharPtr target = NULL;
+	int target_depth = 0;
+
+	// sprite.swapDepth(sprite)
+	if ( SpritePtr target_sprite = fn.arg(0).to_sprite() )
+	{
+		if ( sprite == target_sprite )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("It is impossible to swap NULL character");
+			log_aserror("%s.swapDepths(%s): invalid call, swapping to self?",
+				sprite->getTarget().c_str(), target_sprite->getTarget().c_str());
 		);
 		return rv;
 	}
 
-	if (sprite->get_parent() == target->get_parent() && sprite->get_parent() != NULL)
+		SpritePtr target_parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
+		if ( this_parent != target_parent )
 	{
-		int target_depth = target->get_depth();
-		target->set_depth(sprite->get_depth());
-		sprite->set_depth(target_depth);
-
-		boost::intrusive_ptr<sprite_instance> parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
-		if ( parent )
-		{
-			parent->swap_characters(sprite.get(), target.get());
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("%s.swapDepths(%s): invalid call, the two characters don't have the same parent",
+				sprite->getTarget().c_str(), target_sprite->getTarget().c_str());
+			);
+			return rv;
 		}
+
+		target_depth = target_sprite->get_depth();
+		target = boost::dynamic_pointer_cast<character>(target_sprite);
 	}
 	else
 	{
+		// sprite.swapDepth(depth)
+		double td = fn.arg(0).to_number(&(fn.env()));
+		if ( isnan(td) )
+		{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Can't swap depth of MovieClips "
-			"with different parents");
+			stringstream ss; fn.dump_args(ss);
+			log_aserror("%s.swapDepths(%s): first argument invalid "
+				"(neither a sprite nor a number).",
+				sprite->getTarget().c_str(),
+				ss.str().c_str());
 		);
+			return rv;
+		}
+
+		// TODO : check other kind of validities ?
+
+		target_depth = int(td);
+		target = this_parent->get_character_at_depth(target_depth);
+	}
+
+	sprite->set_depth(target_depth);
+	if ( target )
+	{
+		target->set_depth(this_depth);
+		this_parent->swap_characters(sprite.get(), target.get());
 	}
 	return rv;
+
 }
 
 // TODO: wrap the functionality in a sprite_instance method
@@ -3439,4 +3473,33 @@
 	}
 }
 
+void
+sprite_instance::removeMovieClip()
+{
+	int depth = get_depth();
+	if ( depth < 0 || depth > 1048575 )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("removeMovieClip(%s): sprite depth (%d) out of the "
+			"'dynamic' zone [0..1048575], won't remove",
+			getTarget().c_str(), depth);
+		);
+		return;
+	}
+
+	sprite_instance* parent = dynamic_cast<sprite_instance*>(get_parent());
+	if (parent)
+	{
+		// second argument is arbitrary, see comments above
+		// the function declaration in sprite_instance.h
+		parent->remove_display_object(depth, 0);
+	}
+	else
+	{
+		// I guess this can only happen if someone uses _root.swapDepth([0..1048575])
+		log_error("Can't remove sprite %s as it has no parent!", getTarget().c_str());
+	}
+
+}
+
 } // namespace gnash

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/sprite_instance.h	6 Apr 2007 11:43:44 -0000	1.89
+++ server/sprite_instance.h	6 Apr 2007 15:36:05 -0000	1.90
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.89 2007/04/06 11:43:44 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.90 2007/04/06 15:36:05 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -666,6 +666,30 @@
 	/// _target and _target_dot.
 	virtual void set_name(const char* name);
 
+	/// Remove this sprite from the stage.
+	//
+	/// This function is intended to be called by 
+	/// effect of a removeMovieClip() ActionScript call
+	/// and implements the checks required for this specific
+	/// case.
+	///
+	/// Callers are:
+	///	- The ActionRemoveClip tag handler.
+	///	- The global removeMovieClip(target) function.
+	///	- The MovieClip.removeMovieClip() method.
+	///
+	/// The removal will not occur if the depth of this
+	/// characters is not in the "dynamic" range [0..1048575]
+	/// as described at the following URL:
+	/// 
+	///	http://www.senocular.com/flash/tutorials/depths/?page=2
+	///
+	/// A testcases for this behaviour can be found in 
+	///
+	///	testsuite/misc-ming.all/displaylist_depths_test.swf
+	///
+	void removeMovieClip();
+
 	/// @{ Drawing API
 	
 	void lineStyle(uint16_t thickness, const rgba& color)

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- server/vm/ASHandlers.cpp	5 Apr 2007 19:33:54 -0000	1.82
+++ server/vm/ASHandlers.cpp	6 Apr 2007 15:36:05 -0000	1.83
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.82 2007/04/05 19:33:54 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.83 2007/04/06 15:36:05 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1164,7 +1164,7 @@
 void
 SWFHandlers::ActionRemoveClip(ActionExec& thread)
 {
-//	GNASH_REPORT_FUNCTION;
+	//GNASH_REPORT_FUNCTION;
 	as_environment& env = thread.env;
 
 	thread.ensureStack(1); 
@@ -1191,12 +1191,7 @@
 		return;
 	}
 
-	sprite_instance* parent = dynamic_cast<sprite_instance*>(sprite->get_parent());
-	if (parent)
-	{
-		parent->remove_display_object(sprite->get_depth(), 0);
-	}
-
+	sprite->removeMovieClip();
 }
 
 /// \brief Trace messages from the Flash movie using trace();

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/displaylist_depths_test.c	6 Apr 2007 09:56:00 -0000	1.1
+++ testsuite/misc-ming.all/displaylist_depths_test.c	6 Apr 2007 15:36:05 -0000	1.2
@@ -33,20 +33,49 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "displaylist_depths_test.swf"
 
-static SWFMovieClip get_static_mc(void);
+void add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
+void add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
 
-SWFMovieClip
-get_static_mc()
+void
+add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
+{
+	SWFAction ac = compile_actions("createEmptyMovieClip('%s', %d);"
+			"with (%s) {"
+			" lineStyle(1, 0x000000, 100);"	
+			" beginFill(0x00FF00, 100);"
+			" moveTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" endFill();"
+			"}",
+			name, depth, name,
+			x, y,
+			x, y+height,
+			x+width, y+height,
+			x+width, y,
+			x, y);
+
+	SWFMovie_add(mo, (SWFBlock)ac);
+}
+
+void
+add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
 {
 	SWFShape sh;
 	SWFMovieClip mc;
+	SWFDisplayItem it;
 
-	sh = make_fill_square (0, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+	sh = make_fill_square (x, y, width, height, 255, 0, 0, 255, 0, 0);
 	mc = newSWFMovieClip();
 	SWFMovieClip_add(mc, (SWFBlock)sh);
 	SWFMovieClip_nextFrame(mc);
+	it = SWFMovie_add(mo, (SWFBlock)mc);
+	SWFDisplayItem_setDepth(it, depth); 
+	SWFDisplayItem_setName(it, name);
 
-	return mc;
+	SWFMovie_add(mo, (SWFBlock)mc);
 }
 
 
@@ -55,8 +84,6 @@
 {
 	SWFMovie mo;
 	SWFMovieClip dejagnuclip;
-	SWFMovieClip mc1;
-	SWFDisplayItem it;
 
 	const char *srcdir=".";
 	if ( argc>1 ) 
@@ -70,44 +97,140 @@
 	Ming_init();
 	mo = newSWFMovieWithVersion(OUTPUT_VERSION);
 	SWFMovie_setDimension(mo, 800, 600);
-	SWFMovie_setRate (mo, 12);
+	SWFMovie_setRate (mo, 2);
 
 	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
 	SWFMovie_add(mo, (SWFBlock)dejagnuclip);
-	SWFMovie_nextFrame(mo);  // end of frame 1
+	SWFMovie_nextFrame(mo); 
 
+	add_actions(mo, "note('Test placement of static and dynamic objects at different depth ranges.');");
+	add_actions(mo, "note('Characters placed in *reserved* zones will not be removed');");
+	add_actions(mo, "note('');");
+	add_actions(mo, "note('WARNING: Adobe flash player 9 seems to fail this test, but flash player 7 succeeds.');");
+	add_actions(mo, "note('         Remember this before blaming Gnash for breaking compatibility ;)');");
+	add_actions(mo, "note('');");
 
-	// Add a static red square at depth 3
-	mc1 = get_static_mc();
-	it = SWFMovie_add(mo, (SWFBlock)mc1); 
-	SWFDisplayItem_setDepth(it, 3); 
-	SWFDisplayItem_setName(it, "staticmc");
-	SWFMovie_nextFrame(mo); // end of frame 2
-
-	// Create an (dynamic) green movieclip at depth 3
-	add_actions(mo, "createEmptyMovieClip('dynamicmc', 3);"
-			"with (dynamicmc) {"
-			" lineStyle(1, 0x000000, 100);"	
-			" beginFill(0x00FF00, 100);"
-			" moveTo(20, 320);"
-			" lineTo(80, 320);"
-			" lineTo(80, 380);"
-			" lineTo(20, 380);"
-			" lineTo(20, 320);"
-			"}");
-	SWFMovie_nextFrame(mo); // end of frame 3
+	// Add a static red square at depth 3 and another one at depth 4
+	add_static_mc(mo, "staticmc", 3, 0, 300, 60, 60);
+
+	// Create a dynamic green movieclip at depth 3
+	add_dynamic_mc(mo, "dynamicmc", 3, 20, 320, 60, 60);
+
+	// Create a dynamic green movieclip at depth -2000 (just below the static one)
+	// The renderer seems to be still rendering this ABOVE the static one !
+	add_dynamic_mc(mo, "dynamicmc_2000", -2000, 20, 280, 60, 60);
+
+	// Create a dynamic green movieclip at depth -30000 (below the static range)
+	add_dynamic_mc(mo, "dynamicmc_30000", -30000, 20, 280, 60, 60);
+
+	// Create a dynamic green movieclip at depth 0 (first in "dynamic" zone)
+	add_dynamic_mc(mo, "dynamicmc0", 0, 90, 320, 60, 60);
 	
-	// Check that both exist
+	// Create a dynamic green movieclip at depth 1048575 (last in "dynamic" zone)
+	add_dynamic_mc(mo, "dynamicmc1048575", 1048575, 160, 320, 60, 60);
+
+	// Create a dynamic green movieclip at depth 1048576 (first in "reserve" zone)
+	add_dynamic_mc(mo, "dynamicmc1048576", 1048576, 0, 390, 60, 60);
+
+	// Create a dynamic green movieclip at depth 2130690045 (last in "reserve" zone)
+	// This seems to create the empty clip, but NOT render anything !
+	add_dynamic_mc(mo, "dynamicmc2130690045", 2130690045, 0, 390, 60, 60);
+	
+	// Create a static red movieclip at depth 0 
+	add_static_mc(mo, "staticmc0", 0, 0, 230, 60, 60);
+
+	// Check what depth has been each char created in
 	check_equals(mo, "typeof(staticmc)", "'movieclip'");
+	check_equals(mo, "staticmc.getDepth()", "-16381"); // converted at negative depth !
 	check_equals(mo, "typeof(dynamicmc)", "'movieclip'");
-
-	// Check that the static one had been moved at negative depth !
-	check_equals(mo, "staticmc.getDepth()", "-16381");
 	check_equals(mo, "dynamicmc.getDepth()", "3");
+	check_equals(mo, "typeof(dynamicmc_2000)", "'movieclip'");
+	check_equals(mo, "dynamicmc_2000.getDepth()", "-2000");
+	check_equals(mo, "typeof(dynamicmc_30000)", "'movieclip'");
+	check_equals(mo, "dynamicmc_30000.getDepth()", "-30000");
+	check_equals(mo, "typeof(dynamicmc0)", "'movieclip'");
+	check_equals(mo, "dynamicmc0.getDepth()", "0");
+	check_equals(mo, "typeof(dynamicmc1048575)", "'movieclip'");
+	check_equals(mo, "dynamicmc1048575.getDepth()", "1048575");
+	check_equals(mo, "typeof(dynamicmc1048576)", "'movieclip'");
+	check_equals(mo, "dynamicmc1048576.getDepth()", "1048576");
+	check_equals(mo, "typeof(dynamicmc2130690045)", "'movieclip'");
+	check_equals(mo, "dynamicmc2130690045.getDepth()", "2130690045");
+	check_equals(mo, "typeof(staticmc0)", "'movieclip'");
+	check_equals(mo, "staticmc0.getDepth()", "-16384"); // converted at negative depth !
+
+	SWFMovie_nextFrame(mo); 
+
+	// Try removing all characters
+	add_actions(mo, "removeMovieClip(staticmc);"
+			"removeMovieClip(dynamicmc);"
+			"removeMovieClip(dynamicmc_2000);"
+			"removeMovieClip(dynamicmc_30000);"
+			"removeMovieClip(dynamicmc0);"
+			"removeMovieClip(dynamicmc1048575);"
+			"removeMovieClip(dynamicmc1048576);"
+			"removeMovieClip(dynamicmc2130690045);"
+			"removeMovieClip(staticmc0);"
+			);
+
+	// Check what gets removed and what not
+	check_equals(mo, "typeof(staticmc)", "'movieclip'");
+	check_equals(mo, "typeof(dynamicmc)", "'undefined'");
+	check_equals(mo, "typeof(dynamicmc_2000)", "'movieclip'"); // clip at negative depth is not removed
+	check_equals(mo, "typeof(dynamicmc_30000)", "'movieclip'"); // clip at negative depth is not removed
+	check_equals(mo, "typeof(dynamicmc0)", "'undefined'");
+	check_equals(mo, "typeof(dynamicmc1048575)", "'undefined'");
+	check_equals(mo, "typeof(dynamicmc1048576)", "'movieclip'"); // clip in "reserved" zone not removed
+	check_equals(mo, "typeof(dynamicmc2130690045)", "'movieclip'"); // clip in "reserved" zone not removed
+	check_equals(mo, "typeof(staticmc0)", "'movieclip'");
+
+	SWFMovie_nextFrame(mo);
+
+	// Move all non-removed chars to the "dynamic" depth range
+	// and try removing them again.
+	add_actions(mo, "staticmc.swapDepths(1000);"
+			"dynamicmc_2000.swapDepths(1001);"
+			"dynamicmc1048576.swapDepths(1002);"
+			"dynamicmc2130690045.swapDepths(1003);"
+			"staticmc0.swapDepths(1004);"
+			"dynamicmc_30000.swapDepths(1005);"
+			);
+
+	check_equals(mo, "staticmc.getDepth()", "1000"); 
+	check_equals(mo, "dynamicmc_2000.getDepth()", "1001");
+	check_equals(mo, "dynamicmc1048576.getDepth()", "1002");
+	// MM bug: swapDepths aginst this char (in reserved zone) doesn't do
+	//         anything with player9. It works fine with player7.
+	check_equals(mo, "dynamicmc2130690045.getDepth()", "1003");
+	check_equals(mo, "staticmc0.getDepth()", "1004"); 
+	// swapDepth doesn't work for the clip at -30000 !!
+	check_equals(mo, "dynamicmc_30000.getDepth()", "-30000");
+
+	add_actions(mo, "removeMovieClip(staticmc);"
+			"removeMovieClip(dynamicmc_2000);"
+			"removeMovieClip(dynamicmc1048576);"
+			"removeMovieClip(dynamicmc2130690045);"
+			"removeMovieClip(staticmc0);"
+			);
+
+	// Check if we cleaned them all now
+	check_equals(mo, "typeof(staticmc)", "'undefined'");
+	check_equals(mo, "typeof(dynamicmc_2000)", "'undefined'"); 
+	check_equals(mo, "typeof(dynamicmc1048576)", "'undefined'"); 
+	// MM bug: swapDepths against this char (in reserved zone) didn't do
+	//         anything with player9, so the removeMovieClip call against
+	//         it still doesn't work. It works fine with player7.
+	check_equals(mo, "typeof(dynamicmc2130690045)", "'undefined'"); 
+	// MM bug?: altought the staticmc0 results undefined after the call
+	//          to removeMovieClip, it is sill rendered !!
+	check_equals(mo, "typeof(staticmc0)", "'undefined'");
 
 	add_actions(mo, "_root.totals(); stop();");
 	SWFMovie_nextFrame(mo);        
 
+	// TODO:
+	// - test the MovieClip and global version of removeMovieClip !
+
 	//Output movie
 	puts("Saving " OUTPUT_FILENAME );
 	SWFMovie_save(mo, OUTPUT_FILENAME);



From MAILER-DAEMON Fri Apr 06 11:57:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZqoD-0003bX-Nh
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 11:57:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZqoC-0003bG-Pw
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:57:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZqoB-0003aV-PG
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:57:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZqoB-0003aQ-Gm
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:57:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZqkg-0007Gm-7n
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 11:53:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZqkf-0001FH-7Y
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:53:25 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZqkf-0001FD-0d
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:53:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZqkf-0001FD-0d@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 15:53:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 15:57:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 15:53:24

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: test both
	          ActionRemoveClip and MovieClip.removeMovieClip; also
	          tests that there's no such think as a _global.removeMovieClip.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2799&r2=1.2800
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2799
retrieving revision 1.2800
diff -u -b -r1.2799 -r1.2800
--- ChangeLog	6 Apr 2007 15:36:05 -0000	1.2799
+++ ChangeLog	6 Apr 2007 15:53:24 -0000	1.2800
@@ -1,5 +1,8 @@
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as: test both
+	  ActionRemoveClip and MovieClip.removeMovieClip; also
+	  tests that there's no such think as a _global.removeMovieClip.
 	* testsuite/misc-ming.all/displaylist_depths_test.c:
 	  Add a bunch of new tests about removing from protected
 	  depth ranges and using swapDepth to move between ranges.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- testsuite/actionscript.all/MovieClip.as	6 Apr 2007 11:43:44 -0000	1.46
+++ testsuite/actionscript.all/MovieClip.as	6 Apr 2007 15:53:24 -0000	1.47
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.46 2007/04/06 11:43:44 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.47 2007/04/06 15:53:24 strk Exp $";
 
 #include "check.as"
 
@@ -279,6 +279,11 @@
 // See http://thread.gmane.org/gmane.comp.web.flashcoders.devel/84030
 //--------------------------------------------------------------------------
 
+// There's no such think as a _global.removeMovieClip
+// What is referred to the "global" function does actually
+// resolve to an ActionRemoveClip tag (0.25)
+check_equals(typeof(_global.removeMovieClip), 'undefined');
+
 #if OUTPUT_VERSION >= 6
 
 softref = _root.createEmptyMovieClip("hardref", 60);
@@ -287,10 +292,13 @@
 softref.member = 1;
 check_equals(typeof(softref.member), 'number');
 check_equals(softref.member, 1);
+#if OUTPUT_VERSION > 6
 removeMovieClip(hardref); // using ActionRemoveClip (0x25)
-//_global.removeMovieClip(softref); // using the _global removeMovieClip 
-//hardref.removeMovieClip(); // using the sprite's removeMovieClip 
+#else
+// just to test another way, ActionRemoveClip in SWF6 will work as well
+hardref.removeMovieClip(); // using the sprite's removeMovieClip 
 //softref.removeMovieClip(); // use the softref's removeMovieClip 
+#endif
 check_equals(typeof(hardref), 'undefined');
 check_equals(typeof(softref), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');



From MAILER-DAEMON Fri Apr 06 12:27:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZrHa-0001CM-7W
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 12:27:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZrHY-00018U-55
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:27:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZrHW-00013v-KH
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:27:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZrHW-00013K-Fk
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:27:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZrE1-0003fl-0X
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:23:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZrDz-0004dn-QS
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 16:23:43 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZrDz-0004dk-CO
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 16:23:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZrDz-0004dk-CO@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 16:23:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 16:27:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 16:23:43

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	        * server/sprite_instance.cpp (ScriptObjectFinder):
	          use character depth to tell wheter objects have to
	          be considered "script" objects or not. Fixes the
	          all.swf regression and doesn't change our testsuite
	          results.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2800&r2=1.2801
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.226&r2=1.227

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2800
retrieving revision 1.2801
diff -u -b -r1.2800 -r1.2801
--- ChangeLog	6 Apr 2007 15:53:24 -0000	1.2800
+++ ChangeLog	6 Apr 2007 16:23:43 -0000	1.2801
@@ -1,5 +1,10 @@
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (ScriptObjectFinder): 
+	  use character depth to tell wheter objects have to
+	  be considered "script" objects or not. Fixes the
+	  all.swf regression and doesn't change our testsuite
+	  results.
 	* testsuite/actionscript.all/MovieClip.as: test both
 	  ActionRemoveClip and MovieClip.removeMovieClip; also
 	  tests that there's no such think as a _global.removeMovieClip.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -b -r1.226 -r1.227
--- server/sprite_instance.cpp	6 Apr 2007 15:36:05 -0000	1.226
+++ server/sprite_instance.cpp	6 Apr 2007 16:23:43 -0000	1.227
@@ -1488,7 +1488,7 @@
 /// A DisplayList visitor used to extract script characters
 //
 /// Script characters are characters created or transformed
-/// by ActionScript
+/// by ActionScript. 
 ///
 class ScriptObjectsFinder {
 	std::vector<character*>& _dynamicChars;
@@ -1506,7 +1506,9 @@
 		// TODO: Are script-transformed object to be kept ?
 		//       Need a testcase for this
 		//if ( ! ch->get_accept_anim_moves() )
-		if ( ch->isDynamic() )
+		//if ( ch->isDynamic() )
+		int depth = ch->get_depth();
+		if ( depth < -16384 || depth >= 0 )
 		{
 			_dynamicChars.push_back(ch);
 		}
@@ -1518,29 +1520,6 @@
 	}
 };
 
-/// A DisplayList visitor used to extract static characters
-//
-/// Static characters are characters instantiaced trough display-list SWF tags
-///
-class StaticObjectsFinder {
-	std::vector<character*>& _chars;
-public:
-	StaticObjectsFinder(std::vector<character*>& chars)
-		:
-		_chars(chars)
-	{}
-
-	bool operator() (character* ch) 
-	{
-		//if ( ch->get_accept_anim_moves() )
-		if ( ! ch->isDynamic() )
-		{
-			_chars.push_back(ch);
-		}
-		return true; // keep scanning
-	}
-};
-
 /// A DisplayList visitor used to extract all characters
 //
 /// Script characters are characters created or transformed
@@ -2273,17 +2252,17 @@
 void
 sprite_instance::resetDisplayList()
 {
-	// Resort frame0 DisplayList as depth of
-	// characters in it might have been
-	// externally changed.
-	_frame0_chars.sort();
-
 	// Add script objects in current DisplayList
 	std::vector<character*> charsToAdd; 
 	std::vector<character*> charsToKeep; 
 	ScriptObjectsFinder scriptObjFinder(charsToAdd, charsToKeep);
 	m_display_list.visitForward(scriptObjFinder);
 
+	// Resort frame0 DisplayList as depth of
+	// characters in it might have been
+	// externally changed.
+	_frame0_chars.sort();
+
 	// Remove characters which have been removed
 	_frame0_chars.clear_except(charsToKeep);
 



From MAILER-DAEMON Fri Apr 06 12:35:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZrPO-0005up-HO
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 12:35:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZrPN-0005uk-CU
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:35:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZrPM-0005uO-JW
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:35:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZrPM-0005uL-GO
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:35:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZrLp-0004dQ-Hf
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:31:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZrLc-0005Cw-9e
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 16:31:36 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZrLc-0005Ct-5P
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 16:31:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZrLc-0005Ct-5P@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 16:31:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash AUTHORS
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 16:35:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 16:31:36

Modified files:
	.              : AUTHORS 

Log message:
	Cleanups - missing devels please add yourself

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/AUTHORS?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: AUTHORS
===================================================================
RCS file: /sources/gnash/gnash/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AUTHORS	30 Oct 2006 10:31:54 -0000	1.3
+++ AUTHORS	6 Apr 2007 16:31:36 -0000	1.4
@@ -1,4 +1,4 @@
-/* $Id: AUTHORS,v 1.3 2006/10/30 10:31:54 nihilus Exp $ */
+/* $Id: AUTHORS,v 1.4 2007/04/06 16:31:36 strk Exp $ */
 
 The maintainer of Gnash is:
 --------------------------
@@ -8,13 +8,12 @@
 Developers:
 -----------
 
-Sandro Santilli
-Bastiaan Jacques
-Vitaly Alexeev
-Tomas Groth
-Udo Giacomozzi
-Markus Gothe 
-Hannes Mayr
+Sandro Santilli <strk@keybit.net>
+Bastiaan Jacques <bastiaan@bjacques.org>
+Tomas Groth <tomasgroth@yahoo.dk>
+Udo Giacomozzi <udo.gnu@nova-sys.net>
+Markus Gothe <nietzsche@lysator.liu.se>
+Hannes Mayr <hannes.mayr@indunet.it>
 
 Plus a host of other contributors (see ChangeLog).
 



From MAILER-DAEMON Fri Apr 06 12:50:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZreD-0005X5-RY
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 12:50:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZreC-0005X0-Jm
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:50:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZreB-0005Wo-9N
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:50:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZreB-0005Wl-6I
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:50:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZraf-0007En-LW
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 12:47:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZrad-0006bf-Pe
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 16:47:07 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZrad-0006bc-Is
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 16:47:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZrad-0006bc-Is@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 16:47:07 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all displaylist_depth...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 16:50:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 16:47:07

Modified files:
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	minor comment update

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- displaylist_depths_test.c	6 Apr 2007 15:36:05 -0000	1.2
+++ displaylist_depths_test.c	6 Apr 2007 16:47:07 -0000	1.3
@@ -229,7 +229,7 @@
 	SWFMovie_nextFrame(mo);        
 
 	// TODO:
-	// - test the MovieClip and global version of removeMovieClip !
+	// - test the MovieClip version of removeMovieClip !
 
 	//Output movie
 	puts("Saving " OUTPUT_FILENAME );



From MAILER-DAEMON Fri Apr 06 15:59:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZubG-000775-KR
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 15:59:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZubE-00070E-GU
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:59:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZubD-0006ys-Rz
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:59:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZubD-0006yN-Mc
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:59:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HZuXh-0003yC-9k
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 15:56:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZuXg-0007oN-LM
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 19:56:16 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HZuXg-0007oK-Cp
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 19:56:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZuXg-0007oK-Cp@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 06 Apr 2007 19:56:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 19:59:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/06 19:56:16

Modified files:
	.              : ChangeLog 
	server         : character.cpp 
	server/asobj   : NetStreamGst.cpp 

Log message:
	        * server/character.cpp: stop notifying unload event queuing
	        * server/asobj/NetStreamGst.cpp: warn only once about fluendos
	          plugin being too old.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2801&r2=1.2802
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2801
retrieving revision 1.2802
diff -u -b -r1.2801 -r1.2802
--- ChangeLog	6 Apr 2007 16:23:43 -0000	1.2801
+++ ChangeLog	6 Apr 2007 19:56:15 -0000	1.2802
@@ -1,5 +1,11 @@
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
+	* server/character.cpp: stop notifying unload event queuing
+	* server/asobj/NetStreamGst.cpp: warn only once about fluendos
+	  plugin being too old.
+
+2007-04-06 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp (ScriptObjectFinder): 
 	  use character depth to tell wheter objects have to
 	  be considered "script" objects or not. Fixes the

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/character.cpp	2 Apr 2007 15:45:22 -0000	1.28
+++ server/character.cpp	6 Apr 2007 19:56:16 -0000	1.29
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.28 2007/04/02 15:45:22 strk Exp $ */
+/* $Id: character.cpp,v 1.29 2007/04/06 19:56:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -752,7 +752,7 @@
 character::unload()
 {
 	_unloaded = true;
-	log_msg("Queuing unload event for character %p", this);
+	//log_msg("Queuing unload event for character %p", this);
 	queueEventHandler(event_id::UNLOAD);
 	//on_event(event_id::UNLOAD);
 }

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/NetStreamGst.cpp	2 Apr 2007 16:46:32 -0000	1.20
+++ server/asobj/NetStreamGst.cpp	6 Apr 2007 19:56:16 -0000	1.21
@@ -495,8 +495,14 @@
 			ns->audiodecoder = gst_element_factory_make ("mad", NULL);
 			if (ns->audiodecoder == NULL) {
 				ns->audiodecoder = gst_element_factory_make ("flump3dec", NULL);
-				if (ns->audiodecoder != NULL && !gst_default_registry_check_feature_version("flump3dec", 0, 10, 4)) {
+				if (ns->audiodecoder != NULL && !gst_default_registry_check_feature_version("flump3dec", 0, 10, 4))
+				{
+					static bool warned = false;
+					if ( ! warned )
+					{
 					log_warning("This version of fluendos mp3 plugin does not support flash streaming sounds, please upgrade to version 0.10.4 or higher.");
+					warned=true;
+					}
 				}
 			}
 			// Check if the element was correctly created



From MAILER-DAEMON Fri Apr 06 18:20:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZwnC-0002dp-0u
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 18:20:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZwnA-0002dR-81
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 18:20:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZwn9-0002co-5m
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 18:20:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZwn9-0002cl-17
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 18:20:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HZwjb-0005jO-P7
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 18:16:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZwjV-00030b-3d
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 22:16:37 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HZwjU-00030Y-NB
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 22:16:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZwjU-00030Y-NB@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Fri, 06 Apr 2007 22:16:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Apr 2007 22:20:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/06 22:16:36

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStreamFfmpeg.cpp NetStreamFfmpeg.h 

Log message:
	Fix a deadlock on non-glibc
	platforms by waiting for a thread rather than hoping for a 
	certain execution order (which is fundamentally incompatible with
	threads)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2802&r2=1.2803
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2802
retrieving revision 1.2803
diff -u -b -r1.2802 -r1.2803
--- ChangeLog	6 Apr 2007 19:56:15 -0000	1.2802
+++ ChangeLog	6 Apr 2007 22:16:36 -0000	1.2803
@@ -1,3 +1,10 @@
+2007-04-07 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* server/NetStreamFfmpeg{.cpp, .h}: Fix a deadlock on non-glibc
+	platforms by waiting for a thread rather than hoping for a
+	certain execution order (which is fundamentally incompatible with
+	threads).
+
 2007-04-06 Sandro Santilli <strk@keybit.net>
 
 	* server/character.cpp: stop notifying unload event queuing

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/NetStreamFfmpeg.cpp	4 Apr 2007 20:30:45 -0000	1.29
+++ server/asobj/NetStreamFfmpeg.cpp	6 Apr 2007 22:16:36 -0000	1.30
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.29 2007/04/04 20:30:45 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.30 2007/04/06 22:16:36 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -246,9 +246,6 @@
 		// To avoid blocking while connecting, we use a thread.
 		startThread = new boost::thread(boost::bind(NetStreamFfmpeg::startPlayback, this));
 
-		// This lock prevents the decoding from starting before the Connection
-		// and decoder is ready.
-		lock = new boost::mutex::scoped_lock(start_mutex);
 	} else {
 		// We need to restart the audio
 		sound_handler* s = get_sound_handler();
@@ -364,7 +361,6 @@
 		ns->m_Frame = avcodec_alloc_frame();
 
 		// By deleting this lock we allow the av_streamer-thread to start its work
-		delete ns->lock;
 		return;
 	}
 
@@ -514,16 +510,17 @@
 
 	ns->m_pause = false;
 	
-	// By deleting this lock we allow the av_streamer-thread to start its work
-	delete ns->lock;
 	return;
 }
 
 // decoder thread
 void NetStreamFfmpeg::av_streamer(NetStreamFfmpeg* ns)
 {
-
-	boost::mutex::scoped_lock  lock(ns->start_mutex);
+	// Wait for startThread to finish.
+	// XXX if this method is to start right after startThread finishes, why is this
+	//     method not called directly by startThread, instead of having its own
+	//     execution thread?
+	ns->startThread->join();
 
 	// This should only happen if close() is called before setup is complete
 	if (!ns->m_go) return;

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/asobj/NetStreamFfmpeg.h	30 Mar 2007 13:57:27 -0000	1.16
+++ server/asobj/NetStreamFfmpeg.h	6 Apr 2007 22:16:36 -0000	1.17
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.16 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.17 2007/04/06 22:16:36 bjacques Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -211,8 +211,6 @@
 	boost::thread *m_thread;
 	boost::thread *startThread;
 	boost::mutex decoding_mutex;
-	boost::mutex start_mutex;
-	boost::mutex::scoped_lock *lock;
 
 	// Are the playing loop running or not
 	volatile bool m_go;



From MAILER-DAEMON Fri Apr 06 20:15:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HZyap-0004Lg-5b
	for mharc-gnash-commit@gnu.org; Fri, 06 Apr 2007 20:15:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HZyan-0004LF-D2
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 20:15:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HZyam-0004L1-FM
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 20:15:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HZyam-0004Ky-9n
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 20:15:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HZyXE-0003Ea-F6
	for gnash-commit@gnu.org; Fri, 06 Apr 2007 20:12:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HZyXC-0000BQ-81
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 00:12:02 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HZyXC-0000BN-37
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 00:12:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HZyXC-0000BN-37@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Sat, 07 Apr 2007 00:12:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 00:15:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/07 00:12:01

Modified files:
	.              : ChangeLog 
	backend        : render_handler_ogl.cpp 

Log message:
	Removed mipsmaps code, due to major clean up and rewrite (since it's not 
	used).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2803&r2=1.2804
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.68&r2=1.69

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2803
retrieving revision 1.2804
diff -u -b -r1.2803 -r1.2804
--- ChangeLog	6 Apr 2007 22:16:36 -0000	1.2803
+++ ChangeLog	7 Apr 2007 00:12:01 -0000	1.2804
@@ -1,3 +1,8 @@
+2007-04-08 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* backend/render_handler_ogl.cpp: Removed mipsmaps code, due to
+	  major clean up and rewrite (since it's not used).
+
 2007-04-07 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/NetStreamFfmpeg{.cpp, .h}: Fix a deadlock on non-glibc

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- backend/render_handler_ogl.cpp	5 Apr 2007 01:28:40 -0000	1.68
+++ backend/render_handler_ogl.cpp	7 Apr 2007 00:12:01 -0000	1.69
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.68 2007/04/05 01:28:40 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.69 2007/04/07 00:12:01 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -32,15 +32,6 @@
 #define RESAMPLE_METHOD 1
 
 
-// Determines whether to generate mipmaps for smoother rendering of
-// minified textures.  It actually tends to look OK to not use
-// mipmaps, though it is potentially a performance hit if you use big
-// textures.
-//
-// TODO: need to code mipmap LOD bias adjustment, to keep mipmaps from
-// looking too blurry.  (Also applies to text rendering.)
-#define GENERATE_MIPMAPS 0
-
 // bitmap_info_ogl declaration
 class bitmap_info_ogl : public gnash::bitmap_info
 {
@@ -886,7 +877,12 @@
 
 // bitmap_info_ogl implementation
 
+/*
+
+Markus: A. A. I still miss you and the easter 2006, you know.
+	A. J. I miss you too, but you'll probably not read this code ever... :/
 
+*/
 
 void	hardware_resample(int bytes_per_pixel, int src_width, int src_height, uint8* src_data, int dst_width, int dst_height)
 // Code from Alex Streit
@@ -939,29 +935,6 @@
 }
 
 
-void	generate_mipmaps(unsigned int internal_format, unsigned int input_format, int bytes_per_pixel, image::image_base* im)
-// DESTRUCTIVELY generate mipmaps of the given image.  The image data
-// and width/height of im are munged in this process.
-{
-//    GNASH_REPORT_FUNCTION;
-    int	level = 1;
-    while (im->m_width > 1 || im->m_height > 1)
-	{
-	    if (bytes_per_pixel == 3)
-		{
-		    image::make_next_miplevel((image::rgb*) im);
-		}
-	    else
-		{
-		    image::make_next_miplevel((image::rgba*) im);
-		}
-
-	    glTexImage2D(GL_TEXTURE_2D, level, internal_format, im->m_width, im->m_height, 0,
-			 input_format, GL_UNSIGNED_BYTE, im->m_data);
-	    level++;
-	}
-}
-
 
 void	software_resample(
     int bytes_per_pixel,
@@ -1035,19 +1008,6 @@
 			    psrc += 3;
 			}
 		}
-
-#ifdef DEBUG_WRITE_TEXTURES_TO_PPM
-	    static int s_image_sequence = 0;
-	    char temp[256];
-	    snprintf(temp, 256, "image%d.ppm", s_image_sequence++);
-	    FILE* f = fopen(temp, "wb");
-	    if (f)
-		{
-		    fprintf(f, "P6\n# test code\n%d %d\n255\n", dst_width, dst_height);
-		    fwrite(rescaled, dst_width * dst_height * 3, 1, f);
-		    fclose(f);
-		}
-#endif
 	}
     else
 	{
@@ -1082,12 +1042,6 @@
 
     glTexImage2D(GL_TEXTURE_2D, 0, internal_format, dst_width, dst_height, 0, input_format, GL_UNSIGNED_BYTE, rescaled);
 
-#if GENERATE_MIPMAPS
-    // Build mipmaps.
-    image::image_base	im(rescaled, dst_width, dst_height, dst_width * bytes_per_pixel);
-    generate_mipmaps(internal_format, input_format, bytes_per_pixel, &im);
-#endif // GENERATE_MIPMAPS
-
     delete [] rescaled;
 }
 
@@ -1124,11 +1078,7 @@
 		case image::image_base::RGB:
 		{
 
-#if GENERATE_MIPMAPS
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-#else
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-#endif
 
 			int	w = 1; while (w < im->m_width) { w <<= 1; }
 			int	h = 1; while (h < im->m_height) { h <<= 1; }
@@ -1165,9 +1115,6 @@
 					im, 0, 0, (float) im->m_width, (float) im->m_height);
 
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, rescaled->m_data);
-	#if GENERATE_MIPMAPS
-			generate_mipmaps(GL_RGB, GL_RGB, 3, rescaled);
-	#endif // GENERATE_MIPMAPS
 
 			delete rescaled;
 				}
@@ -1177,9 +1124,6 @@
 			{
 				// Use original image directly.
 				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB, GL_UNSIGNED_BYTE, im->m_data);
-#if GENERATE_MIPMAPS
-				generate_mipmaps(GL_RGB, GL_RGB, 3, im);
-#endif // GENERATE_MIPMAPS
 			}
 
 			break;
@@ -1187,11 +1131,7 @@
 		case image::image_base::RGBA:
 		{
 
-#if GENERATE_MIPMAPS
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-#else
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-#endif
 
 			int	w = 1; while (w < im->m_width) { w <<= 1; }
 			int	h = 1; while (h < im->m_height) { h <<= 1; }
@@ -1228,9 +1168,6 @@
 					im, 0, 0, (float) im->m_width, (float) im->m_height);
 
 			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, rescaled->m_data);
-#if GENERATE_MIPMAPS
-			generate_mipmaps(GL_RGBA, GL_RGBA, 4, rescaled);
-#endif // GENERATE_MIPMAPS
 
 			delete rescaled;
 				}
@@ -1240,9 +1177,6 @@
 			{
 				// Use original image directly.
 				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, im->m_data);
-#if GENERATE_MIPMAPS
-				generate_mipmaps(GL_RGBA, GL_RGBA, 4, im);
-#endif // GENERATE_MIPMAPS
 			}
 
 			break;



From MAILER-DAEMON Sat Apr 07 02:49:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ha4jw-0005ZN-R9
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 02:49:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ha4jv-0005ZH-C2
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 02:49:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ha4js-0005Z5-DQ
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 02:49:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ha4js-0005Z2-6Y
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 02:49:32 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Ha4gG-0004ZS-Rl
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 02:45:49 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l376jci54820;
	Sat, 7 Apr 2007 08:45:38 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Sat, 7 Apr 2007 08:45:37 +0200
To: Bastiaan Jacques <bastiaan@bjacques.org>
Subject: Re: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...
Message-ID: <20070407064537.GF35069@keybit.net>
Mail-Followup-To: Bastiaan Jacques <bastiaan@bjacques.org>,
	gnash-commit@gnu.org
References: <E1HZwjU-00030Y-NB@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HZwjU-00030Y-NB@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 06:49:35 -0000

On Fri, Apr 06, 2007 at 10:16:36PM +0000, Bastiaan Jacques wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Bastiaan Jacques <bjacques>	07/04/06 22:16:36
> 
> Modified files:
> 	.              : ChangeLog 
> 	server/asobj   : NetStreamFfmpeg.cpp NetStreamFfmpeg.h 
> 
> Log message:
> 	Fix a deadlock on non-glibc
> 	platforms by waiting for a thread rather than hoping for a 
> 	certain execution order (which is fundamentally incompatible with
> 	threads)

Great!  Is ther a chence you can look at NetStreamGst.cpp too ?

--strk;



From MAILER-DAEMON Sat Apr 07 07:36:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ha9Da-00017O-SR
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 07:36:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ha9DY-00014N-Pq
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:36:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ha9DX-000127-IF
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:36:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ha9DX-00011m-C7
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:36:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Ha99w-0007yW-AI
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:32:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Ha99o-0002fH-Kj
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:32:36 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Ha99o-0002fC-4N
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:32:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Ha99o-0002fC-4N@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 07 Apr 2007 11:32:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 11:36:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/07 11:32:35

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

Log message:
	        * server/vm/ASHandlers.cpp (ActionCallMethod): stop warning
	          about ActionCallMethod arg being not a function (seems
	          to be common behaviour for invoking constructors).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2804&r2=1.2805
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2804
retrieving revision 1.2805
diff -u -b -r1.2804 -r1.2805
--- ChangeLog	7 Apr 2007 00:12:01 -0000	1.2804
+++ ChangeLog	7 Apr 2007 11:32:35 -0000	1.2805
@@ -1,4 +1,10 @@
-2007-04-08 Markus Gothe <nietzsche@lysator.liu.se>
+2007-04-07 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ASHandlers.cpp (ActionCallMethod): stop warning
+	  about ActionCallMethod arg being not a function (seems
+	  to be common behaviour for invoking constructors).
+
+2007-04-07 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* backend/render_handler_ogl.cpp: Removed mipsmaps code, due to
 	  major clean up and rewrite (since it's not used).

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- server/vm/ASHandlers.cpp	6 Apr 2007 15:36:05 -0000	1.83
+++ server/vm/ASHandlers.cpp	7 Apr 2007 11:32:35 -0000	1.84
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.83 2007/04/06 15:36:05 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.84 2007/04/07 11:32:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2730,9 +2730,11 @@
 				return;
 			}
 
+#ifdef GNASH_DEBUG
 			log_warning("Function object given to ActionCallMethod"
 				       " is not a function, will try to use"
 				       " its 'constructor' member");
+#endif
 
 			// TODO: all this crap should go into an as_object::getConstructor instead
 			as_value ctor;



From MAILER-DAEMON Sat Apr 07 07:59:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ha9Zy-0006cJ-GN
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 07:59:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ha9Zx-0006Y7-03
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:59:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ha9Zv-0006T2-GX
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:59:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ha9Zv-0006SY-Ch
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:59:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1Ha9WK-0002vw-5V
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 07:55:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Ha9WJ-0004jH-IM
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:55:51 +0000
Received: from tgc by cvs with local (Exim 4.50) id 1Ha9WJ-0004jA-0g
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:55:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Ha9WJ-0004jA-0g@cvs>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Sat, 07 Apr 2007 11:55:51 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog packaging/redhat/gnash.spec ser...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 11:59:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/04/07 11:55:50

Modified files:
	.              : ChangeLog 
	packaging/redhat: gnash.spec 
	server         : video_stream_instance.cpp 
	server/asobj   : NetConnection.cpp NetStream.h 
	                 NetStreamFfmpeg.cpp NetStreamFfmpeg.h 
	                 NetStreamGst.cpp NetStreamGst.h 

Log message:
		* packaging/redhat/gnash.spec: Use --enable-media instead of
		  --enable-sound.
		* server/video_stream_instance.cpp: Delete the image once displayed.
		* server/asobj/NetStream.h: Removed the obsolete getter/setters
		  for onStatus.
		* server/asobj/NetStreamFfmpeg.{h,cpp}: Removed the obsolete 
		  getter/setters for onStatus. Made get_video() threadsafe.
		  Removed \n from log/error messages.
		* server/asobj/NetStreamGst.{cpp,h}: Removed the obsolete 
		  getter/setters for onStatus. Made get_video() threadsafe.
		  Removed \n from log/error messages.
		* server/asobj/NetConnection.cpp: Removed \n from log/error messages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2805&r2=1.2806
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.h?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2805
retrieving revision 1.2806
diff -u -b -r1.2805 -r1.2806
--- ChangeLog	7 Apr 2007 11:32:35 -0000	1.2805
+++ ChangeLog	7 Apr 2007 11:55:50 -0000	1.2806
@@ -1,3 +1,18 @@
+2007-04-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* packaging/redhat/gnash.spec: Use --enable-media instead of
+	  --enable-sound.
+	* server/video_stream_instance.cpp: Delete the image once displayed.
+	* server/asobj/NetStream.h: Removed the obsolete getter/setters
+	  for onStatus.
+	* server/asobj/NetStreamFfmpeg.{h,cpp}: Removed the obsolete 
+	  getter/setters for onStatus. Made get_video() threadsafe.
+	  Removed \n from log/error messages.
+	* server/asobj/NetStreamGst.{cpp,h}: Removed the obsolete 
+	  getter/setters for onStatus. Made get_video() threadsafe.
+	  Removed \n from log/error messages.
+	* server/asobj/NetConnection.cpp: Removed \n from log/error messages.
+
 2007-04-07 Sandro Santilli <strk@keybit.net>
 
 	* server/vm/ASHandlers.cpp (ActionCallMethod): stop warning

Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- packaging/redhat/gnash.spec	29 Mar 2007 23:55:49 -0000	1.15
+++ packaging/redhat/gnash.spec	7 Apr 2007 11:55:50 -0000	1.16
@@ -115,22 +115,22 @@
   CROSS_OPTS="--build=%{_host} --host=$RPM_TARGET --target=$RPM_TARGET"
   RENDERER="--enable-renderer=agg"		# could be opengl
   %ifarch arm
-    SOUND="--disable-sound --disable-plugin --disable-klash"
+    SOUND="--disable-media --disable-plugin --disable-klash"
   %else
-    SOUND="--enable-sound=gst"			# could also be sdl
+    SOUND="--enable-media=gst"			# could also be sdl
   %endif
 # The OLPC is a weird case, it's basically an i386-linux toolchain
 # targeted towards Fedora Core 6. The machine itself is too limited to
 # build RPMs on, so we do it this way.
   %if olpc
     CROSS_OPTS="$CROSS_OPTS --disable-klash --disable-menus"
-    SOUND="--enable-sound=sdl --with-mp3-decoder=mad --disable-static"
+    SOUND="--enable-media=mad --disable-static"
     RENDERER="$RENDERER --with-pixelformat=RGB565"
   %endif
 %else
 # Native RPM build
   CROSS_OPTS="--enable-ghelp --enable-docbook"
-  SOUND="--enable-sound=sdl --with-mp3-decoder=ffmpeg"
+  SOUND="--enable-media=ffmpeg"
   RENDERER=""
 %endif
 

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/video_stream_instance.cpp	23 Mar 2007 00:30:10 -0000	1.17
+++ server/video_stream_instance.cpp	7 Apr 2007 11:55:50 -0000	1.18
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.cpp,v 1.17 2007/03/23 00:30:10 tgc Exp $
+// $Id: video_stream_instance.cpp,v 1.18 2007/04/07 11:55:50 tgc Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -109,6 +109,7 @@
 		if (i)
 		{
 			gnash::render::drawVideoFrame(i, &m, &bounds);
+			delete i;
 		} else {
 			log_warning("An error occured while decoding video frame.");
 		}

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/NetConnection.cpp	30 Mar 2007 13:57:27 -0000	1.35
+++ server/asobj/NetConnection.cpp	7 Apr 2007 11:55:50 -0000	1.36
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.cpp,v 1.35 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetConnection.cpp,v 1.36 2007/04/07 11:55:50 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -108,7 +108,7 @@
 		return false;
 	}
 
-	log_msg("Connection etablished to movie: %s\n", _url.c_str());
+	log_msg("Connection etablished to movie: %s", _url.c_str());
 
 	return true;
 }

Index: server/asobj/NetStream.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/NetStream.h	30 Mar 2007 13:57:27 -0000	1.25
+++ server/asobj/NetStream.h	7 Apr 2007 11:55:50 -0000	1.26
@@ -18,7 +18,7 @@
 //
 //
 
-/*  $Id: NetStream.h,v 1.25 2007/03/30 13:57:27 tgc Exp $ */
+/*  $Id: NetStream.h,v 1.26 2007/04/07 11:55:50 tgc Exp $ */
 
 #ifndef __NETSTREAM_H__
 #define __NETSTREAM_H__
@@ -89,10 +89,6 @@
 
 	virtual bool newFrameReady() { return false; }
 
-	virtual as_function* getStatusHandler() { return NULL; }
-
-	virtual void setStatusHandler(as_function*) { }
-
 	virtual void setEnvironment(as_environment* /*env*/) { };
 };
 

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/NetStreamFfmpeg.cpp	6 Apr 2007 22:16:36 -0000	1.30
+++ server/asobj/NetStreamFfmpeg.cpp	7 Apr 2007 11:55:50 -0000	1.31
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.30 2007/04/06 22:16:36 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.31 2007/04/07 11:55:50 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -561,6 +561,7 @@
 
 			if (clock >= video_clock)
 			{
+				boost::mutex::scoped_lock lock(ns->image_mutex);
 				int videoFrameFormat = gnash::render::videoFrameFormat();
 				if (videoFrameFormat == render::YUV) {
 					static_cast<image::yuv*>(ns->m_imageframe)->update(video->m_data);
@@ -643,7 +644,7 @@
 		}
 		else
 		{
-			log_warning("read_frame: not audio & video stream\n");
+			log_warning("read_frame: not audio & video stream");
 		}
 		return true;
 	}
@@ -838,7 +839,22 @@
 
 image::image_base* NetStreamFfmpeg::get_video()
 {
-	return m_imageframe;
+	boost::mutex::scoped_lock lock(image_mutex);
+
+	if (!m_imageframe) return NULL;
+
+	image::image_base* ret_image;
+	int videoFrameFormat = gnash::render::videoFrameFormat();
+	if (videoFrameFormat == render::YUV) {
+		ret_image = new image::yuv(m_VCodecCtx->width, m_VCodecCtx->height);
+	} else if (videoFrameFormat == render::RGB) {
+		ret_image = new image::rgb(m_VCodecCtx->width, m_VCodecCtx->height);
+	} else {
+		return NULL;
+	}
+
+	ret_image->update(m_imageframe->m_data);
+	return ret_image;
 }
 
 void
@@ -995,19 +1011,6 @@
 	}
 }
 
-as_function* 
-NetStreamFfmpeg::getStatusHandler()
-{
-	return m_statusHandler.get();
-}
-
-void 
-NetStreamFfmpeg::setStatusHandler(as_function* handler)
-{
-	m_statusHandler = handler;
-}
-
-
 } // gnash namespcae
 
 #endif // USE_FFMPEG

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/NetStreamFfmpeg.h	6 Apr 2007 22:16:36 -0000	1.17
+++ server/asobj/NetStreamFfmpeg.h	7 Apr 2007 11:55:50 -0000	1.18
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.17 2007/04/06 22:16:36 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.18 2007/04/07 11:55:50 tgc Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -154,9 +154,8 @@
 	long bytesTotal();
 	void advance();
 	bool newFrameReady();
-	as_function* getStatusHandler();
-	void setStatusHandler(as_function*);
 	void setEnvironment(as_environment* env);
+
 	// Used for ffmpeg data read and seek callbacks
 	static int readPacket(void* opaque, uint8_t* buf, int buf_size);
 	static offset_t seekMedia(void *opaque, offset_t offset, int whence);
@@ -211,6 +210,7 @@
 	boost::thread *m_thread;
 	boost::thread *startThread;
 	boost::mutex decoding_mutex;
+	boost::mutex image_mutex;
 
 	// Are the playing loop running or not
 	volatile bool m_go;

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/NetStreamGst.cpp	6 Apr 2007 19:56:16 -0000	1.21
+++ server/asobj/NetStreamGst.cpp	7 Apr 2007 11:55:50 -0000	1.22
@@ -227,6 +227,8 @@
 
 	NetStreamGst* ns = static_cast<NetStreamGst*>(user_data);
 
+	boost::mutex::scoped_lock lock(ns->image_mutex);
+
 	// If the video size has not yet been detected, detect them
 	if (ns->videowidth == 0 && ns->videoheight == 0) {
 		GstPad* videopad = gst_element_get_pad (ns->colorspace, "src");
@@ -372,7 +374,7 @@
 
 	// Check if the creation of the gstreamer pipeline and audiosink was a succes
 	if (!ns->pipeline) {
-		gnash::log_error("The gstreamer pipeline element could not be created\n");
+		gnash::log_error("The gstreamer pipeline element could not be created");
 		return;
 	}
 
@@ -391,7 +393,7 @@
 		if (!ns->audiosink) ns->audiosink = gst_element_factory_make ("esdsink", NULL);
 
 		if (!ns->audiosink) {
-			gnash::log_error("The gstreamer audiosink element could not be created\n");
+			gnash::log_error("The gstreamer audiosink element could not be created");
 			return;
 		}
 	} else {
@@ -405,7 +407,7 @@
 	ns->volume = gst_element_factory_make ("volume", NULL);
 
 	if (!ns->audioconv || !ns->volume) {
-		gnash::log_error("Gstreamer audio element(s) for movie handling could not be created\n");
+		gnash::log_error("Gstreamer audio element(s) for movie handling could not be created");
 		return;
 	}
 
@@ -605,7 +607,22 @@
 
 image::image_base* NetStreamGst::get_video()
 {
-	return m_imageframe;
+	boost::mutex::scoped_lock lock(image_mutex);
+
+	if (!m_imageframe) return NULL;
+
+	image::image_base* ret_image;
+	int videoFrameFormat = gnash::render::videoFrameFormat();
+	if (videoFrameFormat == render::YUV) {
+		ret_image = new image::yuv(m_VCodecCtx->width, m_VCodecCtx->height);
+	} else if (videoFrameFormat == render::RGB) {
+		ret_image = new image::rgb(m_VCodecCtx->width, m_VCodecCtx->height);
+	} else {
+		return NULL;
+	}
+
+	ret_image->update(m_imageframe->m_data);
+	return ret_image;
 }
 
 void
@@ -756,18 +773,6 @@
 	}
 }
 
-as_function* 
-NetStreamGst::getStatusHandler()
-{
-	return m_statusHandler.get();
-}
-
-void 
-NetStreamGst::setStatusHandler(as_function* handler)
-{
-	m_statusHandler = handler;
-}
-
 // Gstreamer callback function
 int 
 NetStreamGst::readPacket(void* opaque, char* buf, int buf_size){

Index: server/asobj/NetStreamGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/NetStreamGst.h	30 Mar 2007 13:57:27 -0000	1.11
+++ server/asobj/NetStreamGst.h	7 Apr 2007 11:55:50 -0000	1.12
@@ -53,8 +53,6 @@
 	long bytesTotal();
 	void advance();
 	bool newFrameReady();
-	as_function* getStatusHandler();
-	void setStatusHandler(as_function*);
 	void setEnvironment(as_environment* env);
 
 	// Used for gstreamer data read and seek callbacks
@@ -112,6 +110,7 @@
 	image::image_base* m_imageframe;
 
 	boost::thread *startThread;
+	boost::mutex image_mutex;
 	bool m_pause;
 
 	long inputPos;



From MAILER-DAEMON Sat Apr 07 08:12:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Ha9m2-0001hI-8v
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 08:12:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Ha9m0-0001hC-OS
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:12:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Ha9ly-0001h0-S2
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:12:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Ha9ly-0001gx-NL
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:12:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1Ha9iN-0005Wn-G8
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:08:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Ha9iM-0005AK-8h
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:08:18 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1Ha9iM-0005AE-1O
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:08:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Ha9iM-0005AE-1O@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Sat, 07 Apr 2007 12:08:18 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler_ogl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 12:12:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/07 12:08:18

Modified files:
	backend        : render_handler_ogl.cpp 

Log message:
	Accidentally commited this with #define RESAMPLE_METHOD 1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.69&r2=1.70

Patches:
Index: render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- render_handler_ogl.cpp	7 Apr 2007 00:12:01 -0000	1.69
+++ render_handler_ogl.cpp	7 Apr 2007 12:08:17 -0000	1.70
@@ -6,7 +6,7 @@
 // A render_handler that uses SDL & OpenGL
 
 
-/* $Id: render_handler_ogl.cpp,v 1.69 2007/04/07 00:12:01 nihilus Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.70 2007/04/07 12:08:17 nihilus Exp $ */
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -29,7 +29,7 @@
 // 1 = hardware (experimental, should be fast, somewhat buggy)
 // 2 = fast software bilinear (default)
 // 3 = use image::resample(), slow software resampling
-#define RESAMPLE_METHOD 1
+#define RESAMPLE_METHOD 2
 
 
 // bitmap_info_ogl declaration



From MAILER-DAEMON Sat Apr 07 08:29:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaA35-00043p-TY
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 08:29:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaA34-00040C-4K
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:29:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaA33-0003z4-J5
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:29:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaA33-0003yv-CR
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:29:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1Ha9zS-0007sz-2I
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:25:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Ha9zR-0005mO-If
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:25:57 +0000
Received: from tgc by cvs with local (Exim 4.50) id 1Ha9zR-0005mL-DE
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:25:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Ha9zR-0005mL-DE@cvs>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Sat, 07 Apr 2007 12:25:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server video_stream_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 12:29:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/04/07 12:25:57

Modified files:
	server         : video_stream_instance.cpp 

Log message:
	Ops, deleted the wrong "i"

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- video_stream_instance.cpp	7 Apr 2007 11:55:50 -0000	1.18
+++ video_stream_instance.cpp	7 Apr 2007 12:25:57 -0000	1.19
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.cpp,v 1.18 2007/04/07 11:55:50 tgc Exp $
+// $Id: video_stream_instance.cpp,v 1.19 2007/04/07 12:25:57 tgc Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -95,6 +95,7 @@
 			if (i)
 			{
 				gnash::render::drawVideoFrame(i, &m, &bounds);
+				delete i;
 			}
 		}
 
@@ -109,7 +110,6 @@
 		if (i)
 		{
 			gnash::render::drawVideoFrame(i, &m, &bounds);
-			delete i;
 		} else {
 			log_warning("An error occured while decoding video frame.");
 		}



From MAILER-DAEMON Sat Apr 07 08:43:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaAG0-0001Ls-3Y
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 08:43:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaAFy-0001Lk-Pu
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:43:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaAFt-0001LU-VV
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:43:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaAFt-0001LR-QF
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:42:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HaAC6-0001AB-NY
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:39:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaABd-0007cX-ET
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:38:33 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HaABd-0007cU-2d
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:38:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaABd-0007cU-2d@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Sat, 07 Apr 2007 12:38:33 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 12:43:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/07 12:38:32

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStreamFfmpeg.cpp 

Log message:
	Cleanup: modularise some code and use striNg comparison
	rather than char-by-char comparisoN

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2806&r2=1.2807
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2806
retrieving revision 1.2807
diff -u -b -r1.2806 -r1.2807
--- ChangeLog	7 Apr 2007 11:55:50 -0000	1.2806
+++ ChangeLog	7 Apr 2007 12:38:32 -0000	1.2807
@@ -29,7 +29,8 @@
 	* server/NetStreamFfmpeg{.cpp, .h}: Fix a deadlock on non-glibc
 	platforms by waiting for a thread rather than hoping for a
 	certain execution order (which is fundamentally incompatible with
-	threads).
+	threads). Cleanup: modularise some code and use string comparison
+	rather than char-by-char comparison.
 
 2007-04-06 Sandro Santilli <strk@keybit.net>
 

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/asobj/NetStreamFfmpeg.cpp	7 Apr 2007 11:55:50 -0000	1.31
+++ server/asobj/NetStreamFfmpeg.cpp	7 Apr 2007 12:38:32 -0000	1.32
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.31 2007/04/07 11:55:50 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.32 2007/04/07 12:38:32 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -259,6 +259,105 @@
 	return 0;
 }
 
+/// Finds a decoder, allocates a context and initializes it.
+//
+/// @param codec_id the codec ID to find
+/// @return the initialized context, or NULL on failure. The caller is 
+///         responsible for deallocating!
+static AVCodecContext*
+initContext(enum CodecID codec_id)
+{
+
+	AVCodec* codec = avcodec_find_decoder(codec_id);
+	if (!codec) {
+		log_error("libavcodec couldn't find decoder.");
+		return NULL;
+	}
+
+	AVCodecContext * context = avcodec_alloc_context();
+	if (!context) {
+		log_error("libavcodec couldn't allocate context.");
+		return NULL;
+	}
+
+	int rv = avcodec_open(context, codec);
+	if (rv < 0) {
+		avcodec_close(context);
+		log_error("libavcodec failed to initialize codec.");
+		return NULL;
+	}
+
+	return context;
+}
+
+/// Gets video info from the parser and initializes the codec.
+//
+/// @param parser the parser to use to get video information.
+/// @return the initialized context, or NULL on failure. The caller
+///         is responsible for deallocating this pointer.
+static AVCodecContext* 
+initFlvVideo(FLVParser* parser)
+{
+	// Get video info from the parser
+	std::auto_ptr<FLVVideoInfo> videoInfo( parser->getVideoInfo() );
+	if (!videoInfo.get()) {
+		return NULL;
+	}
+
+	enum CodecID codec_id;
+
+	// Find the decoder and init the parser
+	switch(videoInfo->codec) {
+		case VIDEO_CODEC_H263:
+			codec_id = CODEC_ID_FLV1;
+			break;
+#ifdef FFMPEG_VP6
+		case VIDEO_CODEC_VP6:
+			codec_id = CODEC_ID_VP6F;
+			break;
+#endif
+		case VIDEO_CODEC_SCREENVIDEO:
+			codec_id = CODEC_ID_FLASHSV;
+			break;
+		default:
+			log_error("Unsupported video codec");
+			return NULL;
+	}
+
+	return initContext(codec_id);
+}
+
+
+/// Like initFlvVideo, but for audio.
+static AVCodecContext*
+initFlvAudio(FLVParser* parser)
+{
+	// Get audio info from the parser
+	std::auto_ptr<FLVAudioInfo> audioInfo( parser->getAudioInfo() );
+	if (!audioInfo.get()) {
+		return NULL;
+	}
+
+	enum CodecID codec_id;
+
+	switch(audioInfo->codec) {
+		case AUDIO_CODEC_RAW:
+			codec_id = CODEC_ID_PCM_U16LE;
+			break;
+		case AUDIO_CODEC_ADPCM:
+			codec_id = CODEC_ID_ADPCM_SWF;
+			break;
+		case AUDIO_CODEC_MP3:
+			codec_id = CODEC_ID_MP3;
+			break;
+		default:
+			log_error("Unsupported audio codec");
+			return NULL;
+	}
+
+	return initContext(codec_id);
+}
+
 void
 NetStreamFfmpeg::startPlayback(NetStreamFfmpeg* ns)
 {
@@ -277,14 +376,13 @@
 	ns->inputPos = 0;
 
 	// Check if the file is a FLV, in which case we use our own parser
-	uint8_t head[3];
+	char head[4] = {0, 0, 0, 0};
 	if (nc->read(head, 3) < 3) {
 		ns->set_status("NetStream.Buffer.StreamNotFound");
 		return;
 	}
 	nc->seek(0);
-	if (head[0] == 'F' && head[1] == 'L' && head[2] == 'V') {
-		
+	if (std::string(head) == "FLV") {
 		ns->m_isFLV = true;
 		ns->m_parser = new FLVParser();
 		if (!nc->connectParser(ns->m_parser)) {
@@ -298,54 +396,18 @@
 		avcodec_init();
 		avcodec_register_all();
 
-		// Get video info from the parser
-		FLVVideoInfo* videoInfo = ns->m_parser->getVideoInfo();
-		if (videoInfo != NULL) {
-			// Find the decoder and init the parser
-			AVCodec* vcodec;
-			if (videoInfo->codec == VIDEO_CODEC_H263) {
-				vcodec = avcodec_find_decoder(CODEC_ID_FLV1);
-#ifdef FFMPEG_VP6
-			} else if (videoInfo->codec == VIDEO_CODEC_VP6) {
-				vcodec = avcodec_find_decoder(CODEC_ID_VP6F);
-#endif
-			} else if (videoInfo->codec == VIDEO_CODEC_SCREENVIDEO) {
-				vcodec = avcodec_find_decoder(CODEC_ID_FLASHSV);
-			} else {
-				log_error("Unsupported video codec");
-				return;
-			}
-
-			if (vcodec == NULL) {
+		ns->m_VCodecCtx = initFlvVideo(ns->m_parser);
+		if (!ns->m_VCodecCtx) {
+			log_msg("Failed to initialize video codec.");
 				return;
 			}
 
-			ns->m_VCodecCtx = avcodec_alloc_context();
-			avcodec_open(ns->m_VCodecCtx, vcodec);
-		}
-		delete videoInfo;
-
-		// Get audio info from the parser
-		FLVAudioInfo* audioInfo = ns->m_parser->getAudioInfo();
-		if (audioInfo != NULL) {
-
-			AVCodec* acodec;
-			if (audioInfo->codec == AUDIO_CODEC_RAW) {
-				acodec = avcodec_find_decoder(CODEC_ID_PCM_U16LE);
-			} else if (audioInfo->codec == AUDIO_CODEC_ADPCM) {
-				acodec = avcodec_find_decoder(CODEC_ID_ADPCM_SWF);
-			} else if (audioInfo->codec == AUDIO_CODEC_MP3) {
-				acodec = avcodec_find_decoder(CODEC_ID_MP3);
-			} else {
-				log_error("Unsupported audio codec");
+		ns->m_ACodecCtx = initFlvAudio(ns->m_parser);
+		if (!ns->m_ACodecCtx) {
+			log_msg("Failed to initialize audio codec.");
 				return;
 			}
 
-			ns->m_ACodecCtx = avcodec_alloc_context();
-			avcodec_open(ns->m_ACodecCtx, acodec);
-		}
-		delete audioInfo;
-
 		// We just define the indexes here, they're not really used when
 		// the file format is FLV
 		ns->m_video_index = 0;
@@ -360,7 +422,6 @@
 		// Allocate a frame to store the decoded frame in
 		ns->m_Frame = avcodec_alloc_frame();
 
-		// By deleting this lock we allow the av_streamer-thread to start its work
 		return;
 	}
 
@@ -509,8 +570,6 @@
 	}
 
 	ns->m_pause = false;
-	
-	return;
 }
 
 // decoder thread



From MAILER-DAEMON Sat Apr 07 08:53:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaAQR-0005v0-VL
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 08:53:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaAQQ-0005t2-Cg
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:53:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaAQP-0005ro-Gg
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:53:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaAQP-0005rb-CE
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:53:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1HaAMn-0002n3-Ja
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 08:50:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaAMn-00088T-3B
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:50:05 +0000
Received: from tgc by cvs with local (Exim 4.50) id 1HaAMm-00088K-Hi
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 12:50:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaAMm-00088K-Hi@cvs>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Sat, 07 Apr 2007 12:50:04 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 12:53:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/04/07 12:50:04

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStreamFfmpeg.cpp NetStreamGst.cpp 

Log message:
		* server/asobj/NetStream{Ffmpeg,Gst}.cpp: Use the m_imageframe's
		  size to determine the size of the returned frame.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2807&r2=1.2808
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2807
retrieving revision 1.2808
diff -u -b -r1.2807 -r1.2808
--- ChangeLog	7 Apr 2007 12:38:32 -0000	1.2807
+++ ChangeLog	7 Apr 2007 12:50:04 -0000	1.2808
@@ -1,5 +1,10 @@
 2007-04-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
+	* server/asobj/NetStream{Ffmpeg,Gst}.cpp: Use the m_imageframe's
+	  size to determine the size of the returned frame.
+
+2007-04-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
 	* packaging/redhat/gnash.spec: Use --enable-media instead of
 	  --enable-sound.
 	* server/video_stream_instance.cpp: Delete the image once displayed.

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/NetStreamFfmpeg.cpp	7 Apr 2007 12:38:32 -0000	1.32
+++ server/asobj/NetStreamFfmpeg.cpp	7 Apr 2007 12:50:04 -0000	1.33
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.32 2007/04/07 12:38:32 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.33 2007/04/07 12:50:04 tgc Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -905,9 +905,9 @@
 	image::image_base* ret_image;
 	int videoFrameFormat = gnash::render::videoFrameFormat();
 	if (videoFrameFormat == render::YUV) {
-		ret_image = new image::yuv(m_VCodecCtx->width, m_VCodecCtx->height);
+		ret_image = new image::yuv(m_imageframe->m_width, m_imageframe->m_height);
 	} else if (videoFrameFormat == render::RGB) {
-		ret_image = new image::rgb(m_VCodecCtx->width, m_VCodecCtx->height);
+		ret_image = new image::rgb(m_imageframe->m_width, m_imageframe->m_height);
 	} else {
 		return NULL;
 	}

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/NetStreamGst.cpp	7 Apr 2007 11:55:50 -0000	1.22
+++ server/asobj/NetStreamGst.cpp	7 Apr 2007 12:50:04 -0000	1.23
@@ -614,9 +614,9 @@
 	image::image_base* ret_image;
 	int videoFrameFormat = gnash::render::videoFrameFormat();
 	if (videoFrameFormat == render::YUV) {
-		ret_image = new image::yuv(m_VCodecCtx->width, m_VCodecCtx->height);
+		ret_image = new image::yuv(m_imageframe->m_width, m_imageframe->m_height);
 	} else if (videoFrameFormat == render::RGB) {
-		ret_image = new image::rgb(m_VCodecCtx->width, m_VCodecCtx->height);
+		ret_image = new image::rgb(m_imageframe->m_width, m_imageframe->m_height);
 	} else {
 		return NULL;
 	}



From MAILER-DAEMON Sat Apr 07 11:31:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaCsc-0003BA-AV
	for mharc-gnash-commit@gnu.org; Sat, 07 Apr 2007 11:31:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaCsZ-0003Am-Lb
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:31:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaCsY-0003AY-Fv
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:31:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaCsY-0003AV-9Y
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:31:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HaCow-00074K-2i
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 11:27:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaCou-0007kK-Rg
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 15:27:16 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HaCou-0007kH-GQ
	for gnash-commit@gnu.org; Sat, 07 Apr 2007 15:27:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaCou-0007kH-GQ@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 07 Apr 2007 15:27:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xml.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Apr 2007 15:31:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/07 15:27:16

Modified files:
	.              : ChangeLog 
	server/asobj   : xml.cpp xmlnode.cpp xmlnode.h 
	testsuite/actionscript.all: XML.as 

Log message:
	        * server/asobj/xml.cpp (extractNode, parseDoc): properly setup
	          the node parent.
	        * server/asobj/xmlnode.{cpp,h}: keep parent by intrusive_ptr.
	        * testsuite/actionscript.all/XML.as: add tests for
	          nextSibling and previousSibling

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2808&r2=1.2809
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2808
retrieving revision 1.2809
diff -u -b -r1.2808 -r1.2809
--- ChangeLog	7 Apr 2007 12:50:04 -0000	1.2808
+++ ChangeLog	7 Apr 2007 15:27:16 -0000	1.2809
@@ -1,3 +1,11 @@
+2007-04-07 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/xml.cpp (extractNode, parseDoc): properly setup
+	  the node parent.
+	* server/asobj/xmlnode.{cpp,h}: keep parent by intrusive_ptr.
+	* testsuite/actionscript.all/XML.as: add tests for
+	  nextSibling and previousSibling
+
 2007-04-07 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* server/asobj/NetStream{Ffmpeg,Gst}.cpp: Use the m_imageframe's

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/xml.cpp	4 Apr 2007 20:30:45 -0000	1.35
+++ server/asobj/xml.cpp	7 Apr 2007 15:27:16 -0000	1.36
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.35 2007/04/04 20:30:45 bjacques Exp $ */
+/* $Id: xml.cpp,v 1.36 2007/04/07 15:27:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -274,7 +274,7 @@
                 {
                     if (node->content)
                     {
-                        log_msg("extractChildNode from text for %s has contents %s\n", node->name, ptr);
+                        //log_msg("extractChildNode from text for %s has contents '%s'", node->name, ptr);
                         std::string val(reinterpret_cast<const char*>(ptr));
                         element.nodeValueSet(val);
                     }
@@ -289,11 +289,11 @@
     while (childnode)
     {
         child = new XMLNode();
+        child->setParent(&element);
         extractNode(*child, childnode, mem);
         element._children.push_back(child);
         childnode = childnode->next;
     }
-
 }
 
 // Read in an XML document from the specified source
@@ -314,6 +314,7 @@
     if (cur != NULL)
     {
         boost::intrusive_ptr<XMLNode> child = new XMLNode();
+        child->setParent(this);
         extractNode(*child, cur, mem);
         _children.push_back(child);
     }  

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/xmlnode.cpp	4 Apr 2007 15:47:22 -0000	1.26
+++ server/asobj/xmlnode.cpp	7 Apr 2007 15:27:16 -0000	1.27
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.26 2007/04/04 15:47:22 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.27 2007/04/07 15:27:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -129,7 +129,7 @@
 bool
 XMLNode::hasChildNodes()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     if (_children.size()) {
 	return true;
     }
@@ -147,7 +147,7 @@
 boost::intrusive_ptr<XMLNode>
 XMLNode::lastChild()
 {
-	GNASH_REPORT_FUNCTION;
+	//GNASH_REPORT_FUNCTION;
 	if ( _children.empty() )
 	{
 			log_msg("XMLNode %p has no childrens", (void*)this);
@@ -203,7 +203,7 @@
 XMLNode *
 XMLNode::previousSibling()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     if ( ! _parent) return NULL;
  	if (_parent->_children.size() <= 1) return NULL;
@@ -226,10 +226,18 @@
 XMLNode *
 XMLNode::nextSibling()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
-    if ( ! _parent) return NULL;
- 	if (_parent->_children.size() <= 1) return NULL;
+    if ( ! _parent)
+    {
+            //log_msg("Node %p has no parent, returning NULL", this);
+            return NULL;
+    }
+    if (_parent->_children.size() <= 1)
+    {
+            //log_msg("Node %p parent has only this node, returning NULL", this);
+            return NULL;
+    }
 
     XMLNode *previous_node = NULL;
     ChildList::reverse_iterator itx;
@@ -237,7 +245,7 @@
     {
         if (itx->get() == this)
         {
-            // log_msg("Found the next XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
+            //log_msg("Found the next XMLNode child !!!! %s <%p>", (*itx)->nodeName().c_str(), (void*)itx->get());
 		    return previous_node;
 		}
 		previous_node = itx->get();
@@ -618,7 +626,7 @@
 static as_value
 xmlnode_lastchild(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     as_value rv;
     rv.set_null();
@@ -641,7 +649,7 @@
 static as_value
 xmlnode_nextsibling(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     as_value rv;
     rv.set_null();
 
@@ -665,7 +673,7 @@
 static as_value
 xmlnode_previoussibling(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     as_value rv;
     rv.set_null();
 

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/xmlnode.h	4 Apr 2007 15:47:22 -0000	1.10
+++ server/asobj/xmlnode.h	7 Apr 2007 15:27:16 -0000	1.11
@@ -199,7 +199,7 @@
     void appendChild(boost::intrusive_ptr<XMLNode> childNode);
 
     void setParent(XMLNode *node) { _parent = node; };
-    XMLNode *getParent() { return _parent; };
+    XMLNode *getParent() { return _parent.get(); };
 
     /// Insert a node before a node
     //
@@ -219,7 +219,7 @@
 
     void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
 
-    XMLNode		*_parent;
+    boost::intrusive_ptr<XMLNode> _parent;
     ChildList		_children;
     AttribList      _attributes;
 

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- testsuite/actionscript.all/XML.as	4 Apr 2007 15:47:22 -0000	1.24
+++ testsuite/actionscript.all/XML.as	7 Apr 2007 15:27:16 -0000	1.25
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.24 2007/04/04 15:47:22 strk Exp $";
+rcsid="$Id: XML.as,v 1.25 2007/04/07 15:27:16 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -260,6 +260,8 @@
 	{
 		check_equals(nodeName, 'TOPNODE');
 		check_equals(typeof(nodeValue), 'null');
+		check_equals(typeof(nextSibling), 'null');
+		check_equals(typeof(previousSibling), 'null');
 
 		// Check that nodeValue is overridable
 		nodeValue = 4;
@@ -273,6 +275,11 @@
 		{
 			check_equals(nodeName, 'SUBNODE1');
 			check_equals(typeof(nodeValue), 'null');
+
+			check_equals(typeof(nextSibling), 'object');
+			check_equals(nextSibling.nodeName, 'SUBNODE2');
+			check_equals(typeof(previousSibling), 'null');
+
 			check_equals(nodeType, 1); // element
 			check_equals(childNodes.length, 2);
 			with (firstChild)
@@ -280,6 +287,9 @@
 				check_equals(nodeName, 'SUBSUBNODE1');
 				check_equals(typeof(nodeValue), 'null');
 				check_equals(nodeType, 1); // element
+				check_equals(typeof(nextSibling), 'object');
+				check_equals(nextSibling.nodeName, 'SUBSUBNODE2');
+				check_equals(typeof(previousSibling), 'null');
 				check_equals(childNodes.length, 1);
 				with (firstChild)
 				{
@@ -293,6 +303,9 @@
 				check_equals(nodeName, 'SUBSUBNODE2');
 				check_equals(typeof(nodeValue), 'null');
 				check_equals(nodeType, 1); // element
+				check_equals(typeof(nextSibling), 'null');
+				check_equals(typeof(previousSibling), 'object');
+				check_equals(previousSibling.nodeName, 'SUBSUBNODE1');
 				check_equals(childNodes.length, 1);
 				with (firstChild)
 				{
@@ -308,6 +321,11 @@
 			check_equals(nodeName, 'SUBNODE2');
 			check_equals(typeof(nodeValue), 'null');
 			check_equals(nodeType, 1); // element
+
+			check_equals(typeof(nextSibling), 'null');
+			check_equals(typeof(previousSibling), 'object');
+			check_equals(previousSibling.nodeName, 'SUBNODE1');
+
 			check_equals(childNodes.length, 2);
 			with (firstChild)
 			{



From MAILER-DAEMON Sun Apr 08 04:10:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaSUF-00087Q-KF
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 04:10:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaSUE-00082O-1n
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:10:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaSUB-0007vY-Mh
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:10:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaSUB-0007vV-Fg
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:10:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HaSQT-00061O-1Q
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:07:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaSQN-00067u-4J
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 08:06:59 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HaSQM-00067r-RC
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 08:06:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaSQM-00067r-RC@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 08 Apr 2007 08:06:58 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/XML.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 08:10:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/08 08:06:58

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: XML.as 

Log message:
	* testsuite/actionscript.all/XML.as: add tests for XML.attributes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2809&r2=1.2810
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2809
retrieving revision 1.2810
diff -u -b -r1.2809 -r1.2810
--- ChangeLog	7 Apr 2007 15:27:16 -0000	1.2809
+++ ChangeLog	8 Apr 2007 08:06:58 -0000	1.2810
@@ -1,3 +1,7 @@
+2007-04-08 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/XML.as: add tests for XML.attributes
+
 2007-04-07 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/xml.cpp (extractNode, parseDoc): properly setup

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/actionscript.all/XML.as	7 Apr 2007 15:27:16 -0000	1.25
+++ testsuite/actionscript.all/XML.as	8 Apr 2007 08:06:58 -0000	1.26
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.25 2007/04/07 15:27:16 strk Exp $";
+rcsid="$Id: XML.as,v 1.26 2007/04/08 08:06:58 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -40,6 +40,7 @@
 check(! XML.prototype.hasOwnProperty("length") );
 check(! XML.prototype.hasOwnProperty("status"));
 check(! XML.prototype.hasOwnProperty("loaded"));
+check(! XML.prototype.hasOwnProperty("attributes"));
 check(XML.prototype.hasOwnProperty("createElement") );
 check(XML.prototype.hasOwnProperty("addRequestHeader") );
 check(XML.prototype.hasOwnProperty("createTextNode") );
@@ -67,6 +68,7 @@
 check(XMLNode.prototype.hasOwnProperty("removeNode") );
 check(XMLNode.prototype.hasOwnProperty("toString") );
 check(XMLNode.prototype.hasOwnProperty("cloneNode") );
+check(XMLNode.prototype.hasOwnProperty("attributes") );
 check(! XMLNode.prototype.hasOwnProperty("length") );
 check(! XMLNode.prototype.hasOwnProperty("createElement") );
 check(! XMLNode.prototype.hasOwnProperty("addRequestHeader") );
@@ -232,7 +234,8 @@
 // 	fail("XML::load() doesn't work");
 // }
 check(XML);
-var xml_in = "<TOPNODE><SUBNODE1><SUBSUBNODE1>sub sub1 node data 1</SUBSUBNODE1><SUBSUBNODE2>sub sub1 node data 2</SUBSUBNODE2></SUBNODE1><SUBNODE2><SUBSUBNODE1>sub sub2 node data 1</SUBSUBNODE1><SUBSUBNODE2>sub sub2 node data 2</SUBSUBNODE2></SUBNODE2></TOPNODE>";
+// Use escaped " instead of ' so that it matches the return value of toString()
+var xml_in = "<TOPNODE tna1=\"tna1val\" tna2=\"tna2val\" tna3=\"tna3val\"><SUBNODE1 sna1=\"sna1val\" sna2=\"sna2val\"><SUBSUBNODE1 ssna1=\"ssna1val\" ssna2=\"ssna2val\">sub sub1 node data 1</SUBSUBNODE1><SUBSUBNODE2>sub sub1 node data 2</SUBSUBNODE2></SUBNODE1><SUBNODE2><SUBSUBNODE1>sub sub2 node data 1</SUBSUBNODE1><SUBSUBNODE2>sub sub2 node data 2</SUBSUBNODE2></SUBNODE2></TOPNODE>";
 check(XML);
 
 check(XML);
@@ -246,6 +249,7 @@
 	check_equals(this.childNodes.length, 1);
 	check_equals(this.childNodes[0], this.firstChild);
 	check_equals(this.childNodes[0], this.lastChild);
+
 #if OUTPUT_VERSION > 5
 	check(this.childNodes.hasOwnProperty('length'));
 	check(this.childNodes[0] === this.firstChild);
@@ -263,6 +267,10 @@
 		check_equals(typeof(nextSibling), 'null');
 		check_equals(typeof(previousSibling), 'null');
 
+		check_equals(typeof(attributes), 'object');
+		check_equals(attributes.tna1, 'tna1val');
+		check_equals(attributes.tna2, 'tna2val');
+
 		// Check that nodeValue is overridable
 		nodeValue = 4;
 		check_equals(typeof(nodeValue), 'string');
@@ -280,6 +288,10 @@
 			check_equals(nextSibling.nodeName, 'SUBNODE2');
 			check_equals(typeof(previousSibling), 'null');
 
+			check_equals(typeof(attributes), 'object');
+			check_equals(attributes.sna1, 'sna1val');
+			check_equals(attributes.sna2, 'sna2val');
+
 			check_equals(nodeType, 1); // element
 			check_equals(childNodes.length, 2);
 			with (firstChild)
@@ -290,6 +302,9 @@
 				check_equals(typeof(nextSibling), 'object');
 				check_equals(nextSibling.nodeName, 'SUBSUBNODE2');
 				check_equals(typeof(previousSibling), 'null');
+				check_equals(typeof(attributes), 'object');
+				check_equals(attributes.ssna1, 'ssna1val');
+				check_equals(attributes.ssna2, 'ssna2val');
 				check_equals(childNodes.length, 1);
 				with (firstChild)
 				{



From MAILER-DAEMON Sun Apr 08 04:41:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaSxL-00087V-00
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 04:41:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaSxH-0007wI-UE
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:41:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaSxG-0007kv-CX
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:40:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaSxG-0007jt-4o
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:40:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HaStY-0008W8-QH
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:37:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaStX-0007yL-T3
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 08:37:07 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HaStX-0007yI-HV
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 08:37:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaStX-0007yI-HV@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Sun, 08 Apr 2007 08:37:07 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.h server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 08:41:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/08 08:37:07

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.h sprite_instance.cpp 
Added files:
	testsuite/misc-ming.all: get_frame_number_test.c 

Log message:
	new testcase for get_frame_number() and fixs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2810&r2=1.2811
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.227&r2=1.228
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2810
retrieving revision 1.2811
diff -u -b -r1.2810 -r1.2811
--- ChangeLog	8 Apr 2007 08:06:58 -0000	1.2810
+++ ChangeLog	8 Apr 2007 08:37:07 -0000	1.2811
@@ -1,3 +1,11 @@
+2007-04-08 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all:get_frame_number_test.c
+	new testcase for get_frame_number() and goto_frame().
+	*server/sprite_instance.h, sprite_instance.cpp
+	update implementation of get_frame_number() and goto_frame(),
+	fix the above the testcase.
+	
 2007-04-08 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/XML.as: add tests for XML.attributes

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/sprite_instance.h	6 Apr 2007 15:36:05 -0000	1.90
+++ server/sprite_instance.h	8 Apr 2007 08:37:07 -0000	1.91
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.90 2007/04/06 15:36:05 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.91 2007/04/08 08:37:07 zoulunkai Exp $ */
 
 // Stateful live Sprite instance
 
@@ -279,14 +279,11 @@
 
 	/// Parse frame spec and return a 0-based frame number.
 	//
-	/// If frame spec cannot be converted to !NAN number
+	/// If frame spec cannot be converted to !NAN and !Infinity number
 	/// it will be converted to a string and considered a
 	/// frame label (returns false if referring to an
 	/// unknwown label).
 	///
-	/// If frame spec can be converted to a non-zero positive
-	/// integer it will be "clamped" to the valid range.
-	///
 	/// @param frame_spec
 	///	The frame specification.
 	///

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -b -r1.227 -r1.228
--- server/sprite_instance.cpp	6 Apr 2007 16:23:43 -0000	1.227
+++ server/sprite_instance.cpp	8 Apr 2007 08:37:07 -0000	1.228
@@ -1725,11 +1725,11 @@
 
 	as_environment* env = const_cast<as_environment*>(&m_as_environment);
 
-	double num =  frame_spec.to_number(env);
+	as_value str(frame_spec.to_std_string(env));
 
-	// TODO: check if a frame labeled "0" or "-3" or "Infinite"
-	//       takes precedence over the numerical value.
-	if ( isnan(num) )
+	double num =  str.to_number(env);
+
+	if ( isnan(num) || isinf(num))
 	{
 		return m_def->get_labeled_frame(frame_spec.to_string(env), &frameno);
 	}
@@ -1737,7 +1737,10 @@
 	// TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
 	if ( num < 1 ) return false;
 
-	frameno = iclamp(int(num), 1, m_def->get_frame_count())-1;
+	// all frame numbers >= 0 are valid, but a valid frame number may still
+	// reference a non-exist frame(eg. frameno > total_frames).
+	frameno = num - 1;
+
 	return true;
 }
 
@@ -2424,15 +2427,20 @@
 
 	assert(! isUnloaded() );
 
-	//	target_frame_number = iclamp(target_frame_number, 0, m_def->get_frame_count() - 1);
-	// Macromedia Flash ignores goto_frame(bad_frame)
-	if (target_frame_number > m_def->get_frame_count() - 1 ||
-			target_frame_number == m_current_frame)	// to prevent infinitive recursion
-	{
-		//FIXME: Don't set play state to STOP, just return will be more correct. 
-		//  m_current_frame will be incremented in next advance_sprite, so I think 
-		//  there will be no 'infinitive recursion' (Zou)
+	// goto_frame stops by default.
+	// ActionGotoFrame tells the movieClip to go to the target frame 
+	// and stop at that frame. 
 		set_play_state(STOP);
+
+	if(target_frame_number == m_current_frame)
+	{
+		// don't push actions
+		return;
+	}
+	if(target_frame_number > m_def->get_frame_count() - 1)
+	{
+		m_current_frame = m_def->get_frame_count() - 1;
+		// don't push actions
 		return;
 	}
 
@@ -2513,10 +2521,6 @@
 	//  current frame should also be executed(Zou)
 	m_current_frame = target_frame_number;      
 
-	// goto_frame stops by default.
-	// Zou: ActionGotoFrame tells the movieClip to go to the target frame 
-	//  and stop at that frame. 
-	set_play_state(STOP);
 
 	// After entering to advance_sprite() m_current_frame points to frame
 	// that already is executed. 

Index: testsuite/misc-ming.all/get_frame_number_test.c
===================================================================
RCS file: testsuite/misc-ming.all/get_frame_number_test.c
diff -N testsuite/misc-ming.all/get_frame_number_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/get_frame_number_test.c	8 Apr 2007 08:37:07 -0000	1.1
@@ -0,0 +1,135 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Zou Lunkai, zoulunkai@gmail.com
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME  "get_frame_number_test.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  dejagnuclip;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0); 
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  SWFMovie_nextFrame(mo); /* 1st frame */
+
+
+  SWFMovie_labelFrame(mo, "8");
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+  
+  SWFMovie_labelFrame(mo, "8a");
+  SWFMovie_nextFrame(mo); /* 3rd frame */
+  
+  SWFMovie_labelFrame(mo, "aa");
+  SWFMovie_nextFrame(mo); /* 4th frame*/
+  
+  check_equals(mo, "_currentframe", "5");
+  add_actions(mo, " gotoAndStop('8'); ");         // ActionGotoLabel
+  check_equals(mo, "_currentframe", "2");
+  add_actions(mo, " gotoAndStop('xxxxxxxx'); ");  // ActionGotoLabel
+  check_equals(mo, "_currentframe", "2");
+  add_actions(mo, " gotoAndStop('Infinity'); ");  // ActionGotoLabel
+  check_equals(mo, "_currentframe", "2");
+  add_actions(mo, " gotoAndStop(Infinity); ");    // ActionGotoExpression
+  check_equals(mo, "_currentframe", "2");
+  add_actions(mo, " x = 0; "
+                  " gotoAndStop(x); ");         // ActionGotoExpression
+  check_equals(mo, "_currentframe", "2");
+  add_actions(mo, " x = -1; "
+                  " gotoAndStop(x); ");         // ActionGotoExpression
+  check_equals(mo, "_currentframe", "2");             
+  add_actions(mo, " gotoAndStop(6); ");         // ActionGotoFrame
+  SWFMovie_nextFrame(mo); /* 5th frame */
+  
+  add_actions(mo, "function func1() {}"
+                  "func1.prototype.toString = function() { return '8'; };"
+                  "x1 = new func1();"
+                  
+                  "function func2() {}"
+                  "func2.prototype.valueOf = function() { return 8;}; "
+                  "x2 = new func2();"
+                  
+                  "function func3() {}"
+                  "func3.prototype.toString = function() { return '8'; }; "
+                  "func3.prototype.valueOf = function() { return 8;};"
+                  "x3 = new func3();" );
+                  
+                  
+  add_actions(mo, " x = '8'; gotoAndStop(x); ");     // ActionGotoExpression
+  check_equals(mo, "_currentframe", "6");
+  
+  add_actions(mo, " x = '8a'; gotoAndStop(x); ");    // ActionGotoExpression
+  check_equals(mo, "_currentframe", "3");
+  
+  add_actions(mo, " x = 'aa'; gotoAndStop(x); ");    // ActionGotoExpression
+  check_equals(mo, "_currentframe", "4");
+  
+  add_actions(mo, " gotoAndStop(x1); ");             // ActionGotoExpression
+  /* reach the last frame */
+  check_equals(mo, "_currentframe", "6"); 
+  
+  /* reset _currentframe to 1 */
+  add_actions(mo, " gotoAndStop(1); ");  
+  add_actions(mo, " gotoAndStop(x2); ");             // ActionGotoExpression
+  check_equals(mo, "_currentframe", "1"); 
+  
+  add_actions(mo, " gotoAndStop(x3); ");             // ActionGotoExpression
+  /* reach the last frame */
+  check_equals(mo, "_currentframe", "6");
+  
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 6th frame */
+
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+
+
+
+



From MAILER-DAEMON Sun Apr 08 05:00:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaTGd-00081d-5e
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 05:00:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaTGb-0007wz-9N
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 05:00:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaTGa-0007vE-Ey
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 05:00:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaTGa-0007v0-7q
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 05:00:56 -0400
Received: from py-out-1112.google.com ([64.233.166.180])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HaTCs-0004Uz-9S
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 04:57:06 -0400
Received: by py-out-1112.google.com with SMTP id u77so1047795pyb
	for <gnash-commit@gnu.org>; Sun, 08 Apr 2007 01:57:05 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=lFVOD5NRjRwTndoR+5+ZpdSi4P1b8iwWvvR3EdORQiHX7bXD2gx9lr44oLJEngEVgscl/2lL97TrTfdAG+NxgsONcisjRHTbzXn0F4nEoo9IoiPnsXsdoEGNKiBQ80LUz2Ec+YTmWNg/OyzZbocPMGPlIrLySlxwqgv6SZ9x9Fk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=tGsD9p8KgpJBCOl/VHqd57ydwYPfJ54qEO6pRRAXhcgMGPzL40A/nxQ/KIhw6JTc69HhgMhHCMogOeIoeOw3q2vIreaBmuZPvL5QYudtZeRJxGcne7iIFhkH4Qxdn7xDutwCoSk3EgSLQmxDOhhcB6x0OSdqc+UgH7FzsK+0H64=
Received: by 10.114.185.8 with SMTP id i8mr1882324waf.1176022624983;
	Sun, 08 Apr 2007 01:57:04 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sun, 8 Apr 2007 01:57:04 -0700 (PDT)
Message-ID: <ca4b43ff0704080157i78e6ecfbp8c28689e150a7d4@mail.gmail.com>
Date: Sun, 8 Apr 2007 16:57:04 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.h server...
In-Reply-To: <E1HaStX-0007yI-HV@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HaStX-0007yI-HV@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 09:00:57 -0000

-       frameno = iclamp(int(num), 1, m_def->get_frame_count())-1;
+     // all frame numbers >= 0 are valid, but a valid frame number may still
+     // reference a non-exist frame(eg. frameno > total_frames).
+      frameno = num - 1;

think about a hard-coded frame number within ActionGotoFrame tag, of
course it might be a value greater than total frames. And another
reason I didn't clamp it here is that if the specified frame number is
greater than total frames, the expected behavious is jumping to the
last frame but not pushing the actions of the last frame. So it's
slightly different as the ActionGotoFrame(last_frame).



On 4/8/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/08 08:37:07
>
> Modified files:
>        .              : ChangeLog
>        server         : sprite_instance.h sprite_instance.cpp
> Added files:
>        testsuite/misc-ming.all: get_frame_number_test.c
>
> Log message:
>        new testcase for get_frame_number() and fixs
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2810&r2=1.2811
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.90&r2=1.91
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.227&r2=1.228
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&rev=1.1
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2810
> retrieving revision 1.2811
> diff -u -b -r1.2810 -r1.2811
> --- ChangeLog   8 Apr 2007 08:06:58 -0000       1.2810
> +++ ChangeLog   8 Apr 2007 08:37:07 -0000       1.2811
> @@ -1,3 +1,11 @@
> +2007-04-08 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * testsuite/misc-ming.all:get_frame_number_test.c
> +       new testcase for get_frame_number() and goto_frame().
> +       *server/sprite_instance.h, sprite_instance.cpp
> +       update implementation of get_frame_number() and goto_frame(),
> +       fix the above the testcase.
> +
>  2007-04-08 Sandro Santilli <strk@keybit.net>
>
>        * testsuite/actionscript.all/XML.as: add tests for XML.attributes
>
> Index: server/sprite_instance.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
> retrieving revision 1.90
> retrieving revision 1.91
> diff -u -b -r1.90 -r1.91
> --- server/sprite_instance.h    6 Apr 2007 15:36:05 -0000       1.90
> +++ server/sprite_instance.h    8 Apr 2007 08:37:07 -0000       1.91
> @@ -17,7 +17,7 @@
>  //
>  //
>
> -/* $Id: sprite_instance.h,v 1.90 2007/04/06 15:36:05 strk Exp $ */
> +/* $Id: sprite_instance.h,v 1.91 2007/04/08 08:37:07 zoulunkai Exp $ */
>
>  // Stateful live Sprite instance
>
> @@ -279,14 +279,11 @@
>
>        /// Parse frame spec and return a 0-based frame number.
>        //
> -       /// If frame spec cannot be converted to !NAN number
> +       /// If frame spec cannot be converted to !NAN and !Infinity number
>        /// it will be converted to a string and considered a
>        /// frame label (returns false if referring to an
>        /// unknwown label).
>        ///
> -       /// If frame spec can be converted to a non-zero positive
> -       /// integer it will be "clamped" to the valid range.
> -       ///
>        /// @param frame_spec
>        ///     The frame specification.
>        ///
>
> Index: server/sprite_instance.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
> retrieving revision 1.227
> retrieving revision 1.228
> diff -u -b -r1.227 -r1.228
> --- server/sprite_instance.cpp  6 Apr 2007 16:23:43 -0000       1.227
> +++ server/sprite_instance.cpp  8 Apr 2007 08:37:07 -0000       1.228
> @@ -1725,11 +1725,11 @@
>
>        as_environment* env = const_cast<as_environment*>(&m_as_environment);
>
> -       double num =  frame_spec.to_number(env);
> +       as_value str(frame_spec.to_std_string(env));
>
> -       // TODO: check if a frame labeled "0" or "-3" or "Infinite"
> -       //       takes precedence over the numerical value.
> -       if ( isnan(num) )
> +       double num =  str.to_number(env);
> +
> +       if ( isnan(num) || isinf(num))
>        {
>                return m_def->get_labeled_frame(frame_spec.to_string(env), &frameno);
>        }
> @@ -1737,7 +1737,10 @@
>        // TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
>        if ( num < 1 ) return false;
>
> -       frameno = iclamp(int(num), 1, m_def->get_frame_count())-1;
> +       // all frame numbers >= 0 are valid, but a valid frame number may still
> +       // reference a non-exist frame(eg. frameno > total_frames).
> +       frameno = num - 1;
> +
>        return true;
>  }
>
> @@ -2424,15 +2427,20 @@
>
>        assert(! isUnloaded() );
>
> -       //      target_frame_number = iclamp(target_frame_number, 0, m_def->get_frame_count() - 1);
> -       // Macromedia Flash ignores goto_frame(bad_frame)
> -       if (target_frame_number > m_def->get_frame_count() - 1 ||
> -                       target_frame_number == m_current_frame) // to prevent infinitive recursion
> -       {
> -               //FIXME: Don't set play state to STOP, just return will be more correct.
> -               //  m_current_frame will be incremented in next advance_sprite, so I think
> -               //  there will be no 'infinitive recursion' (Zou)
> +       // goto_frame stops by default.
> +       // ActionGotoFrame tells the movieClip to go to the target frame
> +       // and stop at that frame.
>                set_play_state(STOP);
> +
> +       if(target_frame_number == m_current_frame)
> +       {
> +               // don't push actions
> +               return;
> +       }
> +       if(target_frame_number > m_def->get_frame_count() - 1)
> +       {
> +               m_current_frame = m_def->get_frame_count() - 1;
> +               // don't push actions
>                return;
>        }
>
> @@ -2513,10 +2521,6 @@
>        //  current frame should also be executed(Zou)
>        m_current_frame = target_frame_number;
>
> -       // goto_frame stops by default.
> -       // Zou: ActionGotoFrame tells the movieClip to go to the target frame
> -       //  and stop at that frame.
> -       set_play_state(STOP);
>
>        // After entering to advance_sprite() m_current_frame points to frame
>        // that already is executed.
>
> Index: testsuite/misc-ming.all/get_frame_number_test.c
> ===================================================================
> RCS file: testsuite/misc-ming.all/get_frame_number_test.c
> diff -N testsuite/misc-ming.all/get_frame_number_test.c
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ testsuite/misc-ming.all/get_frame_number_test.c     8 Apr 2007 08:37:07 -0000       1.1
> @@ -0,0 +1,135 @@
> +/*
> + *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> + *
> + */
> +
> +/*
> + * Zou Lunkai, zoulunkai@gmail.com
> + */
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <ming.h>
> +
> +#include "ming_utils.h"
> +
> +#define OUTPUT_VERSION 6
> +#define OUTPUT_FILENAME  "get_frame_number_test.swf"
> +
> +
> +int
> +main(int argc, char** argv)
> +{
> +  SWFMovie mo;
> +  SWFMovieClip  dejagnuclip;
> +
> +  const char *srcdir=".";
> +  if ( argc>1 )
> +    srcdir=argv[1];
> +  else
> +  {
> +      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
> +      return 1;
> +  }
> +
> +  Ming_init();
> +  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
> +  SWFMovie_setDimension(mo, 800, 600);
> +  SWFMovie_setRate (mo, 12.0);
> +
> +  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
> +  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
> +  SWFMovie_nextFrame(mo); /* 1st frame */
> +
> +
> +  SWFMovie_labelFrame(mo, "8");
> +  SWFMovie_nextFrame(mo); /* 2nd frame */
> +
> +  SWFMovie_labelFrame(mo, "8a");
> +  SWFMovie_nextFrame(mo); /* 3rd frame */
> +
> +  SWFMovie_labelFrame(mo, "aa");
> +  SWFMovie_nextFrame(mo); /* 4th frame*/
> +
> +  check_equals(mo, "_currentframe", "5");
> +  add_actions(mo, " gotoAndStop('8'); ");         // ActionGotoLabel
> +  check_equals(mo, "_currentframe", "2");
> +  add_actions(mo, " gotoAndStop('xxxxxxxx'); ");  // ActionGotoLabel
> +  check_equals(mo, "_currentframe", "2");
> +  add_actions(mo, " gotoAndStop('Infinity'); ");  // ActionGotoLabel
> +  check_equals(mo, "_currentframe", "2");
> +  add_actions(mo, " gotoAndStop(Infinity); ");    // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "2");
> +  add_actions(mo, " x = 0; "
> +                  " gotoAndStop(x); ");         // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "2");
> +  add_actions(mo, " x = -1; "
> +                  " gotoAndStop(x); ");         // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "2");
> +  add_actions(mo, " gotoAndStop(6); ");         // ActionGotoFrame
> +  SWFMovie_nextFrame(mo); /* 5th frame */
> +
> +  add_actions(mo, "function func1() {}"
> +                  "func1.prototype.toString = function() { return '8'; };"
> +                  "x1 = new func1();"
> +
> +                  "function func2() {}"
> +                  "func2.prototype.valueOf = function() { return 8;}; "
> +                  "x2 = new func2();"
> +
> +                  "function func3() {}"
> +                  "func3.prototype.toString = function() { return '8'; }; "
> +                  "func3.prototype.valueOf = function() { return 8;};"
> +                  "x3 = new func3();" );
> +
> +
> +  add_actions(mo, " x = '8'; gotoAndStop(x); ");     // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "6");
> +
> +  add_actions(mo, " x = '8a'; gotoAndStop(x); ");    // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "3");
> +
> +  add_actions(mo, " x = 'aa'; gotoAndStop(x); ");    // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "4");
> +
> +  add_actions(mo, " gotoAndStop(x1); ");             // ActionGotoExpression
> +  /* reach the last frame */
> +  check_equals(mo, "_currentframe", "6");
> +
> +  /* reset _currentframe to 1 */
> +  add_actions(mo, " gotoAndStop(1); ");
> +  add_actions(mo, " gotoAndStop(x2); ");             // ActionGotoExpression
> +  check_equals(mo, "_currentframe", "1");
> +
> +  add_actions(mo, " gotoAndStop(x3); ");             // ActionGotoExpression
> +  /* reach the last frame */
> +  check_equals(mo, "_currentframe", "6");
> +
> +  add_actions(mo, " _root.totals(); stop(); ");
> +  SWFMovie_nextFrame(mo); /* 6th frame */
> +
> +  //Output movie
> +  puts("Saving " OUTPUT_FILENAME );
> +  SWFMovie_save(mo, OUTPUT_FILENAME);
> +
> +  return 0;
> +}
> +
> +
> +
> +
> +
> +
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Apr 08 06:19:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaUV2-0001yi-Dx
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 06:19:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaUV0-0001o3-Eq
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:19:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaUUy-0001eb-GT
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:19:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaUUy-0001dH-AH
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:19:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HaURG-00076P-8q
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:16:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaURE-0003og-L5
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 10:16:00 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HaURE-0003ob-BB
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 10:16:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaURE-0003ob-BB@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 08 Apr 2007 10:16:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 10:19:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/08 10:16:00

Modified files:
	.              : ChangeLog 

Log message:
	style

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2811&r2=1.2812

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2811
retrieving revision 1.2812
diff -u -b -r1.2811 -r1.2812
--- ChangeLog	8 Apr 2007 08:37:07 -0000	1.2811
+++ ChangeLog	8 Apr 2007 10:16:00 -0000	1.2812
@@ -1,8 +1,8 @@
 2007-04-08 Zou Lunkai <zoulunkai@gmail.com>
 
-	* testsuite/misc-ming.all:get_frame_number_test.c
+	* testsuite/misc-ming.all/get_frame_number_test.c:
 	new testcase for get_frame_number() and goto_frame().
-	*server/sprite_instance.h, sprite_instance.cpp
+	* server/sprite_instance.{cpp,h}
 	update implementation of get_frame_number() and goto_frame(),
 	fix the above the testcase.
 	



From MAILER-DAEMON Sun Apr 08 06:21:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaUWK-0001fo-FZ
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 06:21:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaUWI-0001WI-V6
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:21:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaUWH-0001MM-CZ
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:21:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaUWH-0001Ld-9E
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:21:13 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HaUSY-0007HF-KO
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 06:17:23 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l38AHIM76745;
	Sun, 8 Apr 2007 12:17:18 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Sun, 8 Apr 2007 12:17:18 +0200
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.h server...
Message-ID: <20070408101718.GH35069@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1HaStX-0007yI-HV@cvs>
	<ca4b43ff0704080157i78e6ecfbp8c28689e150a7d4@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704080157i78e6ecfbp8c28689e150a7d4@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 10:21:15 -0000

On Sun, Apr 08, 2007 at 04:57:04PM +0800, zou lunkai wrote:
> -       frameno = iclamp(int(num), 1, m_def->get_frame_count())-1;
> +     // all frame numbers >= 0 are valid, but a valid frame number may 
> still
> +     // reference a non-exist frame(eg. frameno > total_frames).
> +      frameno = num - 1;
> 
> think about a hard-coded frame number within ActionGotoFrame tag, of
> course it might be a value greater than total frames. And another
> reason I didn't clamp it here is that if the specified frame number is
> greater than total frames, the expected behavious is jumping to the
> last frame but not pushing the actions of the last frame. So it's
> slightly different as the ActionGotoFrame(last_frame).

Is this true for all SWF versions and all player versions ?

--strk;



From MAILER-DAEMON Sun Apr 08 09:55:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaXrM-0003q1-K0
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 09:55:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaXrL-0003pw-Ko
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 09:55:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaXrK-0003pk-6b
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 09:55:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaXrJ-0003ph-Vl
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 09:55:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ann@lulu.com>) id 1HaXnb-0001U7-Ag
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 09:51:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaXnT-0005TM-9M
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 13:51:11 +0000
Received: from ann by cvs with local (Exim 4.50) id 1HaXnT-0005TJ-07
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 13:51:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaXnT-0005TJ-07@cvs>
From: Ann Barcomb <ann@lulu.com>
Date: Sun, 08 Apr 2007 13:51:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog devtools/testsuite/c_casts.t
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 13:55:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Ann Barcomb <ann>	07/04/08 13:51:10

Modified files:
	.              : ChangeLog 
Added files:
	devtools/testsuite: c_casts.t 

Log message:
	This test was added at Bastiaan's request.  Note that it is currently
	reporting the wrong line numbers due to a bug in devtools/lib/Gnash/Utils.pm,
	which could also be affecting other devtools tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2812&r2=1.2813
http://cvs.savannah.gnu.org/viewcvs/gnash/devtools/testsuite/c_casts.t?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2812
retrieving revision 1.2813
diff -u -b -r1.2812 -r1.2813
--- ChangeLog	8 Apr 2007 10:16:00 -0000	1.2812
+++ ChangeLog	8 Apr 2007 13:51:10 -0000	1.2813
@@ -1,3 +1,8 @@
+2007-04-08 Ann Barcomb <ann@lulu.com>
+
+	* devtools/testsuite/c_casts.t: added this test at Bastiaan's
+	  request.
+
 2007-04-08 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/get_frame_number_test.c:

Index: devtools/testsuite/c_casts.t
===================================================================
RCS file: devtools/testsuite/c_casts.t
diff -N devtools/testsuite/c_casts.t
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ devtools/testsuite/c_casts.t	8 Apr 2007 13:51:10 -0000	1.1
@@ -0,0 +1,112 @@
+#! perl
+
+use strict;
+use warnings;
+
+use FindBin qw/$Bin/;
+use lib $Bin.'/../lib';
+use Test::More tests => 1;
+use Gnash::Distribution;
+use Gnash::Utils qw/clean/;
+
+my $DIST = Gnash::Distribution->new;
+
+## Jerry Gay explained that this construction was needed because Windows
+## does not get @ARGV the same way as most systems.
+my @files = @ARGV 
+    ? ( $^O eq 'MSwin32' ? <@ARGV> : @ARGV )
+    : $DIST->get_cpp_language_files();
+
+my @var_types = qw/int bool char long double/; 
+my @failures;  
+
+foreach my $path (@files) {
+    open my $fh, '<', $path
+        or die "Cannot open '$path' for reading: $!\n";
+
+    my $prefix = qq<  $path line(s):>;
+    my $message = '';
+
+    ## Read in the entire file, as some of the cleaning spans lines
+    local $/ = undef;
+    my $entire_file = clean(<$fh>);
+    my @lines = split /\n/, $entire_file;    
+
+    ## We need the array index to report the correct line number.
+    LINE: foreach my $i (0..$#lines) {
+        my $string = $lines[$i];
+
+        ## Look for C-style pointer for each builtin data type.  This
+        ## will not check for user-defined types, but it prevents false
+        ## positives such as functions.
+        my $errmark = 0;
+        TYPE: foreach my $type (@var_types) {
+            ## Skip unless a cast of type 'int num = (int*) x;' is found.
+            $errmark = 1, last TYPE if ( $string =~ /=\s*\($type\*?\)\s*\w+/ );
+
+            ## Skip unless a cast of type 'num = int*(x);' is found
+            $errmark = 1, last TYPE if ( $string =~ /=\s*$type\*?\(\w+\)/ );
+        }
+
+        next LINE unless ($errmark); 
+        $message .= " ".($i+1);
+    }
+    push @failures => "$prefix$message\n" if ($message);
+    close $fh;
+}
+
+ok( !scalar(@failures), "C-style casting" )
+    or diag("C-style casting found in ".scalar @failures." files:\n@failures");
+
+=head1 NAME
+
+devtools/testsuite/c_casts.t - checks for C-style casts C++ source and headers
+
+=head1 SYNOPSIS
+
+    # test all files
+    % prove devtools/testsuite/c_casts.t
+
+    # test specific files
+    % perl devtools/testsuite/c_casts.t recently/modified/file
+
+=head1 DESCRIPTION
+
+This test looks for C++ source files which contain C-style casts.  These
+are examples of casting using C-style:
+
+    double x;
+    int num = (int) x
+
+    double x;
+    num = int*(x)
+
+C++ casting style (shown below) provides better diagnoses of usage errors
+and are easier to identify and maintain.
+
+    double x;
+    int num = static_cast<int>(x);
+
+=head1 AUTHORS
+
+Ann Barcomb <ann@lulu.com>, based upon ideas from the Parrot
+L<http://http://dev.perl.org/perl6/> test suite.
+
+=head1 COPYRIGHT
+
+Copyright (C) 2007 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+=cut



From MAILER-DAEMON Sun Apr 08 10:36:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaYUw-0002Li-DA
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 10:36:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaYUv-0002LJ-EU
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 10:36:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaYUu-0002Kz-TX
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 10:36:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaYUu-0002Kt-PS
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 10:36:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ann@lulu.com>) id 1HaYRB-0006C7-SV
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 10:32:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaYR9-0006ma-GZ
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 14:32:11 +0000
Received: from ann by cvs with local (Exim 4.50) id 1HaYR9-0006mR-4U
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 14:32:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaYR9-0006mR-4U@cvs>
From: Ann Barcomb <ann@lulu.com>
Date: Sun, 08 Apr 2007 14:32:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash devtools/lib/Gnash/Utils.pm ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 14:36:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Ann Barcomb <ann>	07/04/08 14:32:10

Modified files:
	devtools/lib/Gnash: Utils.pm 
	.              : ChangeLog 

Log message:
	This commit fixes the bug in Utils.pm which was causing the line numbers
	to be printed incorrectly.  It was happening because when a comment or
	quoted string was being stripped from the code, any newlines in it were
	discarded.  Now it will be replaced with the appropriate number of newlines.
	
	Also I switched to using Regexp::Common instead of rolling my own checks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/devtools/lib/Gnash/Utils.pm?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2813&r2=1.2814

Patches:
Index: devtools/lib/Gnash/Utils.pm
===================================================================
RCS file: /sources/gnash/gnash/devtools/lib/Gnash/Utils.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- devtools/lib/Gnash/Utils.pm	31 Jan 2007 02:54:59 -0000	1.1
+++ devtools/lib/Gnash/Utils.pm	8 Apr 2007 14:32:10 -0000	1.2
@@ -2,6 +2,8 @@
 
 use strict;
 use warnings;
+use Regexp::Common qw/comment delimited/;
+
 use Exporter 'import';
 our @EXPORT_OK = qw/
     clean 
@@ -15,39 +17,45 @@
     return 
       clean_cpp_comment(
         clean_c_comment(
-          clean_single_quoted_string(
-            clean_double_quoted_string(
+          clean_quoted_string(
               $_[0]
             )
           )
-        )
       );
 }
 
 sub clean_cpp_comment {
     my $string = shift;
-    $string =~ s{ // .* }{}gx;
+    while ($string =~ /$RE{comment}{'C++'}{-keep}/) {
+        my $matched = $1;
+        (my $newlines = $matched) =~ s/[^\n]//;
+        $string =~ s/$RE{comment}{'C++'}/$newlines/;
+    }
     return $string;
 }
 
 sub clean_c_comment {
     my $string = shift;
-    $string =~ s{ /\* .*? \*/ }{}gsx;
+    while ($string =~ /$RE{comment}{C}{-keep}/) {
+        my $matched = $1;
+        (my $newlines = $matched) =~ s/[^\n]//;
+        $string =~ s/$RE{comment}{C}/$newlines/;
+    }
     return $string;
 }
 
-sub clean_single_quoted_string {
+sub clean_quoted_string {
     my $string = shift;
-    $string =~ s{ (?: ' (?: \\\\ | \\' | [^'] )* ' ) }{}gsx;
-    return $string;
-}
 
-sub clean_double_quoted_string {
-    my $string = shift;
-    $string =~ s{ (?: " (?: \\\\ | \\" | [^"] )* " ) }{}gsx;
+    while ($string =~ /$RE{delimited}{-delim=>q{"'}}{-keep}/) {
+        my $matched = $1;
+        (my $newlines = $matched) =~ s/[^\n]//;
+        $string =~ s/$RE{delimited}{-delim=>q{"'}}/$newlines/;
+    }
     return $string;
 }
 
+
 1;
 
 =pod
@@ -76,8 +84,8 @@
 
 =item clean($source)
 
-This function calls C<clean_double_quoted_string>, 
-C<clean_single_quoted_string>, C<clean_c_comment>, and C<clean_cpp_comment>
+This function calls C<clean_quoted_string>, 
+C<clean_c_comment>, and C<clean_cpp_comment>
 and returns a string.  It expects to receive the entire contents of a source
 file.
 
@@ -103,9 +111,9 @@
 becomes:
     return 1;
 
-=item clean_single_quoted_string($source)
+=item clean_quoted_string($source)
 
-This routine will remove single quoted strings.  It expects to receive the
+This routine will remove quoted strings.  It expects to receive the
 entire source code and will return the modified code as a string.  For
 instance,
     return 'hello world';
@@ -113,16 +121,6 @@
 becomes
     return ;
 
-=item clean_double_quoted_string($source)
-
-This routine will remove double quoted strings.  It expects to receive the
-entire source code and will return the modified code as a string.  For
-instance,
-    return "hello world";
-
-becomes
-    return ;
-
 =back
 
 =head1 AUTHORS

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2813
retrieving revision 1.2814
diff -u -b -r1.2813 -r1.2814
--- ChangeLog	8 Apr 2007 13:51:10 -0000	1.2813
+++ ChangeLog	8 Apr 2007 14:32:10 -0000	1.2814
@@ -2,6 +2,8 @@
 
 	* devtools/testsuite/c_casts.t: added this test at Bastiaan's
 	  request.
+	* devtools/lib/Gnash/Utils.pm: fix bug which caused wrong line
+	  numbers to be reported.
 
 2007-04-08 Zou Lunkai <zoulunkai@gmail.com>
 



From MAILER-DAEMON Sun Apr 08 11:04:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaYw6-0005qe-UH
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 11:04:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaYw5-0005qZ-W4
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:04:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaYw5-0005qG-4K
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:04:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaYw4-0005qC-Uv
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:04:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HaYsL-0000xt-TD
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:00:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaYsH-0008C1-0p
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 15:00:13 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HaYsG-0008By-Q5
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 15:00:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaYsG-0008By-Q5@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Sun, 08 Apr 2007 15:00:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server textformat.cpp textformat.h asobj/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 15:04:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/08 15:00:12

Modified files:
	server         : textformat.cpp textformat.h 
Removed files:
	server/asobj   : TextFormat.cpp TextFormat.h 

Log message:
	Removed duplicates and added Id-tags to existing. Closing bug #19549

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextFormat.cpp?cvsroot=gnash&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextFormat.h?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- textformat.cpp	4 Apr 2007 20:30:45 -0000	1.22
+++ textformat.cpp	8 Apr 2007 15:00:12 -0000	1.23
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-//
+// $Id: textformat.cpp,v 1.23 2007/04/08 15:00:12 nihilus Exp $
 //
 
 #include "log.h"

Index: textformat.h
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- textformat.h	19 Mar 2007 17:11:14 -0000	1.13
+++ textformat.h	8 Apr 2007 15:00:12 -0000	1.14
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-//
+// $Id: textformat.h,v 1.14 2007/04/08 15:00:12 nihilus Exp $
 //
 
 #ifndef __TEXTFORMAT_H__

Index: asobj/TextFormat.cpp
===================================================================
RCS file: asobj/TextFormat.cpp
diff -N asobj/TextFormat.cpp
--- asobj/TextFormat.cpp	5 Apr 2007 01:28:40 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,108 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-/* $Id: TextFormat.cpp,v 1.1 2007/04/05 01:28:40 nihilus Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "TextFormat.h"
-#include "as_object.h" // for inheritance
-#include "log.h"
-#include "fn_call.h"
-#include "smart_ptr.h" // for boost intrusive_ptr
-#include "builtin_function.h" // need builtin_function
-
-
-as_value textformat_tostring(const fn_call& fn);
-as_value textformat_ctor(const fn_call& fn);
-
-static void
-attachTextFormatInterface(as_object& o)
-{
-	// is this really needed ? shouldn't toString be
-	// derived from Object inheritance ?
-	o.init_member("toString", new builtin_function(textformat_tostring));
-}
-
-static as_object*
-getTextFormatInterface()
-{
-	static boost::intrusive_ptr<as_object> o;
-	if ( ! o )
-	{
-		o = new as_object();
-		attachTextFormatInterface(*o);
-	}
-	return o.get();
-}
-
-class textformat_as_object: public as_object
-{
-
-public:
-
-	textformat_as_object()
-		:
-		as_object(getTextFormatInterface())
-	{}
-
-	// override from as_object ?
-	//const char* get_text_value() const { return "TextFormat"; }
-
-	// override from as_object ?
-	//double get_numeric_value() const { return 0; }
-};
-
-as_value textformat_tostring(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
-    return as_value();
-}
-
-as_value
-textformat_ctor(const fn_call& /* fn */)
-{
-	boost::intrusive_ptr<as_object> obj = new textformat_as_object;
-	
-	return as_value(obj.get()); // will keep alive
-}
-
-// extern (used by Global.cpp)
-void textformat_class_init(as_object& global)
-{
-	// This is going to be the global TextFormat "class"/"function"
-	static boost::intrusive_ptr<builtin_function> cl;
-
-	if ( cl == NULL )
-	{
-		cl=new builtin_function(&textformat_ctor, getTextFormatInterface());
-		// replicate all interface to class, to be able to access
-		// all methods as static functions
-		attachTextFormatInterface(*cl);
-		     
-	}
-
-	// Register _global.TextFormat
-	global.init_member("TextFormat", cl.get());
-
-}
-
-
-} // end of gnash namespace
-

Index: asobj/TextFormat.h
===================================================================
RCS file: asobj/TextFormat.h
diff -N asobj/TextFormat.h
--- asobj/TextFormat.h	5 Apr 2007 01:28:40 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-// 
-//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
-
-/* $Id: TextFormat.h,v 1.1 2007/04/05 01:28:40 nihilus Exp $ */
-
-#ifndef __GNASH_ASOBJ_TEXTFORMAT_H__
-#define __GNASH_ASOBJ_TEXTFORMAT_H__
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-
-#include <memory> // for auto_ptr
-
-namespace gnash {
-
-class as_object;
-
-/// Initialize the global Boolean class
-void textformat_class_init(as_object& global);
-
-/// Return a TextFormat instance (in case the core lib needs it)
-//std::auto_ptr<as_object> init_textformat_instance();
-  
-} // end of gnash namespace
-
-// __GNASH_ASOBJ_BOOLEAN_H__
-#endif
-



From MAILER-DAEMON Sun Apr 08 11:27:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaZIw-0002jn-JV
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 11:27:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaZIu-0002ep-Mc
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:27:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaZIt-0002cr-Mq
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:27:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaZIt-0002cQ-Ev
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:27:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HaZFA-0003zq-7Q
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 11:23:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HaZF2-000060-6E
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 15:23:44 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HaZF2-00005x-01
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 15:23:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HaZF2-00005x-01@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Sun, 08 Apr 2007 15:23:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cp...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 15:27:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/08 15:23:43

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStreamFfmpeg.cpp NetStreamFfmpeg.h 

Log message:
	Only use a single
	thread (rather than two extra threads) for decoding. Plug a
	memory leak (ByteIOCxt.buffer). Modularise some more code

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2814&r2=1.2815
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2814
retrieving revision 1.2815
diff -u -b -r1.2814 -r1.2815
--- ChangeLog	8 Apr 2007 14:32:10 -0000	1.2814
+++ ChangeLog	8 Apr 2007 15:23:43 -0000	1.2815
@@ -1,3 +1,10 @@
+2007-04-08 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* server/asobj/NetStreamFfmpeg{.cpp, .h}: Only use a single
+	thread (rather than two extra threads) for decoding. Plug a
+	memory leak (ByteIOCxt.buffer). Modularise some more code.
+
+
 2007-04-08 Ann Barcomb <ann@lulu.com>
 
 	* devtools/testsuite/c_casts.t: added this test at Bastiaan's

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/NetStreamFfmpeg.cpp	7 Apr 2007 12:50:04 -0000	1.33
+++ server/asobj/NetStreamFfmpeg.cpp	8 Apr 2007 15:23:43 -0000	1.34
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.33 2007/04/07 12:50:04 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.34 2007/04/08 15:23:43 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,7 @@
 #include "NetConnection.h"
 #include "sound_handler.h"
 #include "action.h"
+#include <boost/scoped_array.hpp>
 
 #if defined(_WIN32) || defined(WIN32)
 	#include <Windows.h>	// for sleep()
@@ -58,8 +59,7 @@
 	m_Frame(NULL),
 	m_Resample(NULL),
 
-	m_thread(NULL),
-	startThread(NULL),
+	_decodeThread(NULL),
 
 	m_go(false),
 	m_imageframe(NULL),
@@ -75,12 +75,14 @@
 	m_start_onbuffer(false),
 	m_env(NULL)
 {
+
+	ByteIOCxt.buffer = NULL;
 }
 
 NetStreamFfmpeg::~NetStreamFfmpeg()
 {
 	close();
-	if (m_parser) delete m_parser;
+	delete m_parser;
 }
 
 void NetStreamFfmpeg::setEnvironment(as_environment* env)
@@ -116,12 +118,9 @@
 		// terminate thread
 		m_go = false;
 
-		startThread->join();
-		delete startThread;
-
 		// wait till thread is complete before main continues
-		m_thread->join();
-		delete m_thread;
+		_decodeThread->join();
+		delete _decodeThread;
 
 	}
 
@@ -167,6 +166,8 @@
 		m_qaudio.pop();
 	}
 
+	delete [] ByteIOCxt.buffer;
+
 }
 
 // ffmpeg callback function
@@ -242,19 +243,8 @@
 	m_go = true;
 	m_pause = true;
 
-	if (!m_parser && !m_FormatCtx) {
-		// To avoid blocking while connecting, we use a thread.
-		startThread = new boost::thread(boost::bind(NetStreamFfmpeg::startPlayback, this));
-
-	} else {
-		// We need to restart the audio
-		sound_handler* s = get_sound_handler();
-		if (s) s->attach_aux_streamer(audio_streamer, (void*) this);
-
-	}
-
 	// This starts the decoding thread
-	m_thread = new boost::thread(boost::bind(NetStreamFfmpeg::av_streamer, this)); 
+	_decodeThread = new boost::thread(boost::bind(NetStreamFfmpeg::av_streamer, this)); 
 
 	return 0;
 }
@@ -358,6 +348,31 @@
 	return initContext(codec_id);
 }
 
+
+/// Probe the stream and try to figure out what the format is.
+//
+/// @param ns the netstream to use for reading
+/// @return a pointer to the AVInputFormat structure containing
+///         information about the input format, or NULL.
+static AVInputFormat*
+probeStream(NetStreamFfmpeg* ns)
+{
+	boost::scoped_array<uint8_t> buffer(new uint8_t[2048]);
+
+	// Probe the file to detect the format
+	AVProbeData probe_data;
+	probe_data.filename = "";
+	probe_data.buf = buffer.get();
+	probe_data.buf_size = 2048;
+
+	if (ns->readPacket(ns, probe_data.buf, probe_data.buf_size) < 1){
+ 		log_warning("Gnash could not read from movie url.");
+ 		return NULL;
+	}
+
+	return av_probe_input_format(&probe_data, 1);
+}
+
 void
 NetStreamFfmpeg::startPlayback(NetStreamFfmpeg* ns)
 {
@@ -429,26 +444,15 @@
 	// This registers all available file formats and codecs 
 	// with the library so they will be used automatically when
 	// a file with the corresponding format/codec is opened
-
+	// XXX should we call avcodec_init() first?
 	av_register_all();
 
-	// Open video file
-
-	// Probe the file to detect the format
-	AVProbeData probe_data, *pd = &probe_data;
-	pd->filename = "";
-	pd->buf = new uint8_t[2048];
-	pd->buf_size = 2048;
-
-	if (readPacket(ns, pd->buf, pd->buf_size) < 1){
- 		log_warning("Gnash could not read from movie url: %s", ns->url.c_str());
- 		delete[] pd->buf;
+	AVInputFormat* inputFmt = probeStream(ns);
+	if (!inputFmt) {
+		log_error("Couldn't determine stream input format from URL %s", ns->url.c_str());
  		return;
 	}
 
-	AVInputFormat* inputFmt = av_probe_input_format(pd, 1);
-	delete[] pd->buf;
-
 	// After the format probe, reset to the beginning of the file.
 	nc->seek(0);
 
@@ -575,11 +579,16 @@
 // decoder thread
 void NetStreamFfmpeg::av_streamer(NetStreamFfmpeg* ns)
 {
-	// Wait for startThread to finish.
-	// XXX if this method is to start right after startThread finishes, why is this
-	//     method not called directly by startThread, instead of having its own
-	//     execution thread?
-	ns->startThread->join();
+
+	if (!ns->m_parser && !ns->m_FormatCtx) {
+		startPlayback(ns);
+	} else {
+		// We need to restart the audio
+		sound_handler* s = get_sound_handler();
+		if (s) {
+			s->attach_aux_streamer(audio_streamer, ns);
+		}
+	}
 
 	// This should only happen if close() is called before setup is complete
 	if (!ns->m_go) return;
@@ -784,7 +793,7 @@
 			int got = 0;
 			avcodec_decode_video(m_VCodecCtx, m_Frame, &got, packet.data, packet.size);
 			if (got) {
-				uint8_t *buffer = NULL;
+				boost::scoped_array<uint8_t> buffer;
 
 				int videoFrameFormat = gnash::render::videoFrameFormat();
 				if (m_imageframe == NULL) {
@@ -806,8 +815,8 @@
 				} else if (videoFrameFormat == render::RGB && m_VCodecCtx->pix_fmt != PIX_FMT_RGB24) {
 					AVFrame* frameRGB = avcodec_alloc_frame();
 					unsigned int numBytes = avpicture_get_size(PIX_FMT_RGB24, m_VCodecCtx->width, m_VCodecCtx->height);
-					buffer = new uint8_t[numBytes];
-					avpicture_fill((AVPicture *)frameRGB, buffer, PIX_FMT_RGB24, m_VCodecCtx->width, m_VCodecCtx->height);
+					buffer.reset(new uint8_t[numBytes]);
+					avpicture_fill((AVPicture *)frameRGB, buffer.get(), PIX_FMT_RGB24, m_VCodecCtx->width, m_VCodecCtx->height);
 					img_convert((AVPicture*) frameRGB, PIX_FMT_RGB24, (AVPicture*) m_Frame, m_VCodecCtx->pix_fmt, m_VCodecCtx->width, m_VCodecCtx->height);
 					av_free(m_Frame);
 					m_Frame = frameRGB;
@@ -880,7 +889,6 @@
 						}
 					}
 				}
-				delete [] buffer;
 
 				m_unqueued_data = m_qvideo.push(video) ? NULL : video;
 			}

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/asobj/NetStreamFfmpeg.h	7 Apr 2007 11:55:50 -0000	1.18
+++ server/asobj/NetStreamFfmpeg.h	8 Apr 2007 15:23:43 -0000	1.19
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.18 2007/04/07 11:55:50 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.19 2007/04/08 15:23:43 bjacques Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -207,8 +207,7 @@
 	// Use for resampling audio
 	ReSampleContext *m_Resample;
 
-	boost::thread *m_thread;
-	boost::thread *startThread;
+	boost::thread* _decodeThread;
 	boost::mutex decoding_mutex;
 	boost::mutex image_mutex;
 



From MAILER-DAEMON Sun Apr 08 14:57:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HacZZ-0007yJ-91
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 14:57:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HacZX-0007rx-Fh
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 14:57:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HacZW-0007p9-BV
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 14:57:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HacZW-0007ou-8D
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 14:57:06 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HacVl-0002xg-Kk
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 14:53:14 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l38IrBm84748;
	Sun, 8 Apr 2007 20:53:11 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Sun, 8 Apr 2007 20:53:11 +0200
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/server textformat.cpp textformat.h asobj/...
Message-ID: <20070408185311.GJ35069@keybit.net>
Mail-Followup-To: gnash-commit@gnu.org
References: <E1HaYsG-0008By-Q5@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HaYsG-0008By-Q5@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 18:57:07 -0000

On Sun, Apr 08, 2007 at 03:00:12PM +0000, Markus Gothe wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Markus Gothe <nihilus>	07/04/08 15:00:12
> 
> Modified files:
> 	server         : textformat.cpp textformat.h 
> Removed files:
> 	server/asobj   : TextFormat.cpp TextFormat.h 
> 
> Log message:
> 	Removed duplicates and added Id-tags to existing. Closing bug #19549

We do can move textformat to asobj/TextFormat.{cpp,h} for some more consistency :)

--strk;



From MAILER-DAEMON Sun Apr 08 19:10:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HagWX-0006s2-LU
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 19:10:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HagWV-0006mX-JA
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 19:10:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HagWT-0006ji-E8
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 19:10:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HagWT-0006jf-A3
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 19:10:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HagSh-0005CY-9v
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 19:06:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HagSg-00041a-9Z
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 23:06:18 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HagSf-00041X-TB
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 23:06:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HagSf-00041X-TB@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Sun, 08 Apr 2007 23:06:17 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash configure.ac ChangeLog cygnal/cygnal.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Apr 2007 23:10:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/08 23:06:17

Modified files:
	.              : configure.ac ChangeLog 
	cygnal         : cygnal.cpp 
	macros         : agg.m4 boost.m4 curl.m4 ffmpeg.m4 firefox.m4 
	                 glib.m4 gnashpkgtool.m4 gtk2.m4 gtkglext.m4 
	                 incllist jpeg.m4 kde.m4 libXML.m4 libslist 
	                 ming.m4 mysql.m4 opengl.m4 pango.m4 pthreads.m4 
	                 sdl.m4 x11.m4 
	libbase        : curl_adapter.cpp extension.cpp log.h network.h 
	                 noseek_fd_adapter.cpp rc.cpp ref_counted.h 
	                 sharedlib.cpp 
	testsuite/samples: Makefile.am 

Log message:
		* macros/agg.m4, boost.m4, curl.m4, ffmpeg.m4, firefox.m4,
		glib.m4, gnashpkgtool.m4, gtk2.m4, gtkglext.m4, jpeg.m4, kde.m4,
		libXML.m4, ming.m4, mysql.m4, opengl.m4, pango.m4, pthreads.m4,
		sdl.m4, x11.m4: Use ${shlibext} instead of .so to be more
		portable.
		* macros/ffmpeg.m4: Look for avutil after avformat, as there is a
		dependancy on the order on some systems.
		* macros/x11.m4: Reverse the logic, we *do* want to look for the X11
		librsaries if the X11 headers are found earlier.
		* testsuite/samples/Makefile.am: Add GotoAndPlayTestRunner to CLEANFILES.
		* configure.ac: Improve openbsd host test. Test for Darwin libtool
		vs ar. Reset AR if it's the Darwin libtool. Set FL_MUTEX to 0 if
		lf_flmutext_register isn't found.
		* cygnal/cygnal.cpp: Include libintl.h.
		* libbase/curl_adapter.cpp: Use USE_CURL consistantly instead of
		HAVE_CURL and HAVE_CURL_CURL.
		* libbase/noseek_fd_adapter.cpp: Remove HAVE_STDIN_CURL_H test.
		* libbase/rc.cpp: Include cctype.
		* macros/incllist, libslist: Add Darwin Developer SDK directories.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.287&r2=1.288
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2815&r2=1.2816
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/curl.m4?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/firefox.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/glib.m4?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gnashpkgtool.m4?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtk2.m4?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/jpeg.m4?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ming.m4?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pango.m4?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/sdl.m4?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/rc.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/ref_counted.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/sharedlib.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- configure.ac	6 Apr 2007 07:58:15 -0000	1.287
+++ configure.ac	8 Apr 2007 23:06:16 -0000	1.288
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.287 2007/04/06 07:58:15 jgilmore Exp $
+dnl $Id: configure.ac,v 1.288 2007/04/08 23:06:16 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -33,7 +33,7 @@
   powerpc-apple-darwin*)
     AC_DEFINE([__powerpc64__], [], [this is a 64 bit powerpc])
     ;;
-  i386-*-openbsd*)
+  i[34567]86-*-openbsd*)
     openbsd_os=openbsd
     ;;
   *64-*-openbsd*)
@@ -299,7 +299,7 @@
 )
 
 dnl --------------------------------------------------------
-dnl  ...
+dnl Figure out development tool stuff
 dnl --------------------------------------------------------
 
 AC_PROG_CC
@@ -308,6 +308,34 @@
 AC_PROG_INSTALL
 AM_COMPILER_LIB
 
+dnl Darwin uses libtool instead of ar to produce libraries. We determine which one
+dnl we have here now. For some reason on Darwin, we don't get the
+dnl count from grep via stdin correctly. Writing a temp file does the
+dnl trick, so although it's ugly, that's what we gotta do...
+AC_MSG_CHECKING([Checking which type of library archiver we have])
+rm -f .tmp
+libtool > .tmp 2>&1
+archiver=`grep -c dynamic .tmp 2>&1`
+rm -f .tmp
+if test $archiver -eq 1; then
+  if test "$enable_shared" = no; then
+    AR="libtool -static"
+  else
+    AR="libtool -dynamic"
+    CXXFLAGS="${CXXFLAGS} -dynamic"
+    export MACOSX_DEPLOYMENT_TARGET="10.3"
+  fi
+  AR_FLAGS="-o"
+  darwin=yes
+else
+  AR="ar"
+  AR_FLAGS="cvu"
+  darwin=no
+fi
+AC_MSG_RESULT([${AR}])
+AC_SUBST(AR)
+AC_SUBST(AR_FLAGS)
+
 dnl When cross compiling, limit the search directories cause otherwise
 dnl we may get the host headers or libraries by accident. These values
 dnl are exported, so all the other configure tests in macros/*.m4 use
@@ -739,8 +767,10 @@
 AC_LIBTOOL_DLOPEN
 dnl AC_LIBLTDL_CONVENIENCE
 AC_LIBLTDL_INSTALLABLE
+LTVERSION_VERSION
 AC_PROG_LIBTOOL
-AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has lt_dlmutex_register]))
+AC_CHECK_LIB(ltdl, lt_dlmutex_register, AC_DEFINE(LT_DLMUTEX, 1, [Has lt_dlmutex_register]),
+                                        AC_DEFINE(LT_DLMUTEX, 0, [doesn't have lt_dlmutex_register]) )
 
 DLOPEN="-dlopen"
 DLPREOPEN="-dlpreopen"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2815
retrieving revision 1.2816
diff -u -b -r1.2815 -r1.2816
--- ChangeLog	8 Apr 2007 15:23:43 -0000	1.2815
+++ ChangeLog	8 Apr 2007 23:06:16 -0000	1.2816
@@ -1,10 +1,31 @@
+2007-04-08  Rob Savoye  <rob@bertha.welcomehome.org>
+
+	* macros/agg.m4, boost.m4, curl.m4, ffmpeg.m4, firefox.m4,
+	glib.m4, gnashpkgtool.m4, gtk2.m4, gtkglext.m4, jpeg.m4, kde.m4,
+	libXML.m4, ming.m4, mysql.m4, opengl.m4, pango.m4, pthreads.m4,
+	sdl.m4, x11.m4: Use ${shlibext} instead of .so to be more
+	portable.
+	* macros/ffmpeg.m4: Look for avutil after avformat, as there is a
+	dependancy on the order on some systems.
+	* macros/x11.m4: Reverse the logic, we *do* want to look for the X11
+	librsaries if the X11 headers are found earlier.
+	* testsuite/samples/Makefile.am: Add GotoAndPlayTestRunner to CLEANFILES.
+	* configure.ac: Improve openbsd host test. Test for Darwin libtool
+	vs ar. Reset AR if it's the Darwin libtool. Set FL_MUTEX to 0 if
+	lf_flmutext_register isn't found.
+	* cygnal/cygnal.cpp: Include libintl.h.
+	* libbase/curl_adapter.cpp: Use USE_CURL consistantly instead of
+	HAVE_CURL and HAVE_CURL_CURL.
+	* libbase/noseek_fd_adapter.cpp: Remove HAVE_STDIN_CURL_H test.
+	* libbase/rc.cpp: Include cctype.
+	* macros/incllist, libslist: Add Darwin Developer SDK directories.
+	
 2007-04-08 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/asobj/NetStreamFfmpeg{.cpp, .h}: Only use a single
 	thread (rather than two extra threads) for decoding. Plug a
 	memory leak (ByteIOCxt.buffer). Modularise some more code.
 
-
 2007-04-08 Ann Barcomb <ann@lulu.com>
 
 	* devtools/testsuite/c_casts.t: added this test at Bastiaan's

Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cygnal/cygnal.cpp	6 Apr 2007 07:58:15 -0000	1.7
+++ cygnal/cygnal.cpp	8 Apr 2007 23:06:16 -0000	1.8
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: cygnal.cpp,v 1.7 2007/04/06 07:58:15 jgilmore Exp $ */
+/* $Id: cygnal.cpp,v 1.8 2007/04/08 23:06:16 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -51,6 +51,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <libintl.h>
 
 #ifdef ENABLE_NLS
 #include <locale.h>

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/agg.m4	28 Mar 2007 23:42:19 -0000	1.25
+++ macros/agg.m4	8 Apr 2007 23:06:17 -0000	1.26
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: agg.m4,v 1.25 2007/03/28 23:42:19 rsavoye Exp $
+dnl $Id: agg.m4,v 1.26 2007/04/08 23:06:17 rsavoye Exp $
 
 dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
 dnl but not in AGG 2.3. As we need AGG 2.4, we use this as 
@@ -75,7 +75,7 @@
   AC_ARG_WITH(agg_lib, AC_HELP_STRING([--with-agg-lib], [directory where AGG libraries are]), with_agg_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_agg_lib,[
     if test x"${with_agg_lib}" != x ; then
-      if test -f ${with_agg_lib}/libagg.a -o -f ${with_agg_lib}/libagg.so; then
+      if test -f ${with_agg_lib}/libagg.a -o -f ${with_agg_lib}/libagg.${shlibext}; then
       	ac_cv_path_agg_lib="-L`(cd ${with_agg_lib}; pwd)`"
       else
       	AC_MSG_ERROR([${with_agg_lib} directory doesn't contain AGG libraries.])
@@ -94,7 +94,7 @@
   AC_LANG_PUSH(C++)
   if test x"${ac_cv_path_agg_lib}" = x; then
     for i in $libslist; do
-      if test -f $i/libagg.a -o -f $i/libagg.so; then
+      if test -f $i/libagg.a -o -f $i/libagg.${shlibext}; then
       	if test x"$i" != x"/usr/lib"; then
       	  ac_cv_path_agg_lib="-L$i"
       	  break

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- macros/boost.m4	11 Mar 2007 05:53:20 -0000	1.36
+++ macros/boost.m4	8 Apr 2007 23:06:17 -0000	1.37
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.36 2007/03/11 05:53:20 rsavoye Exp $
+dnl $Id: boost.m4,v 1.37 2007/04/08 23:06:17 rsavoye Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -99,7 +99,7 @@
     AC_MSG_CHECKING([for Boost's thread libraries])
     for i in $libslist; do
       for libname in ${boostnames}; do
-    	  if test -f $i/lib${libname}.a -o -f $i/lib${libname}.so; then
+    	  if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
     	    if test x"$i" != x"/usr/lib"; then
             ac_cv_path_boost_lib="-L$i -l${libname}"
             break
@@ -116,7 +116,7 @@
     AC_MSG_RESULT(${ac_cv_path_boost_lib})
   else
     for k in ${boostnames}; do
-      if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f ${ac_cv_path_boost_lib}/lib${k}.so; then
+      if test -f ${ac_cv_path_boost_lib}/lib${k}.a -o -f ${ac_cv_path_boost_lib}/lib${k}.${shlibext}; then
         if test x"${ac_cv_path_boost_lib}" != x"/usr/lib"; then
 	        ac_cv_path_boost_lib="L${ac_cv_path_boost_lib} -l${k}"
         else
@@ -140,7 +140,7 @@
         break;
       fi
       for libname in ${boostnames}; do
-    	  if test -f $i/lib${libname}.a -o -f $i/lib${libname}.so; then
+    	  if test -f $i/lib${libname}.a -o -f $i/lib${libname}.${shlibext}; then
           boost_date_time=yes
    	      ac_cv_path_boost_lib="${ac_cv_path_boost_lib} -l${libname}"
           break;
@@ -150,8 +150,8 @@
     AC_MSG_RESULT(${ac_cv_path_boost_lib})
   fi
 
+  dnl we don't want any boost libraries in LIBS, we prefer to keep it seperate.
   AC_LANG_POP(C++)  
-  dnl we don't want any boost libraries in LIBS, we prefer to kep it seperate.
   LIBS="$save_LIBS"
 
   BOOST_CFLAGS="$ac_cv_path_boost_incl"
@@ -160,7 +160,7 @@
   BOOST_LIBS="$ac_cv_path_boost_lib" 
   AC_SUBST(BOOST_LIBS)
 
-  AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes])
+dnl  AM_CONDITIONAL(HAVE_BOOST, [test x${boost_date_time} = xyes])
 ])
 
 # Local Variables:

Index: macros/curl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/curl.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/curl.m4	6 Mar 2007 18:06:13 -0000	1.14
+++ macros/curl.m4	8 Apr 2007 23:06:17 -0000	1.15
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: curl.m4,v 1.14 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: curl.m4,v 1.15 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_CURL],
 [
@@ -59,6 +59,10 @@
       done
     fi
 
+    if test x"${ac_cv_path_curl_incl}" = x ; then
+      AC_CHECK_HEADERS(curl/curl.h)
+    fi
+
     if test x"${ac_cv_path_curl_incl}" != x ; then
       AC_MSG_RESULT(yes)
     else
@@ -77,7 +81,7 @@
   AC_ARG_WITH(curl_lib, AC_HELP_STRING([--with-curl-lib], [directory where curl library is]), with_curl_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_curl_lib,[
     if test x"${with_curl_lib}" != x ; then # {
-      if test -f ${with_curl_lib}/libcurl.a -o -f ${with_curl_lib}/libcurl.so; then # {
+      if test -f ${with_curl_lib}/libcurl.a -o -f ${with_curl_lib}/libcurl.${shlibext}; then # {
  ac_cv_path_curl_lib="-L`(cd ${with_curl_lib}; pwd)`"
       else # }{
  AC_MSG_ERROR([${with_curl_lib} directory doesn't contain libcurl.])
@@ -87,13 +91,15 @@
 
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_curl_lib}" = x; then # {
-
-    if test x"${curlconfig}" != "x"; then # {
-      ac_cv_path_curl_lib=`${curlconfig} --libs`
+    if test x"${curlconfig}" != "x" -a x"${darwin}" = xno; then # {
+      dnl curl-config gives us way to many libraries, which create nasty linking
+      dnl dependancy issue, so we strip them off here. The real dependencies are
+      dnl are taken care of by other config tests.
+      ac_cv_path_curl_lib=`${curlconfig} --libs | sed -e 's/lcurl.*/lcurl/'`
     else # }{
       AC_MSG_CHECKING([for libcurl library])
       for i in $libslist; do # {
-        if test -f $i/libcurl.a -o -f $i/libcurl.so; then # {
+        if test -f $i/libcurl.a -o -f $i/libcurl.${shlibext}; then # {
           if test x"$i" != x"/usr/lib"; then # {
             ac_cv_path_curl_lib="-L$i -lcurl"
             AC_MSG_RESULT(${ac_cv_path_curl_lib})
@@ -121,36 +127,6 @@
     CURL_LIBS=""
   fi
 
-  dnl
-  dnl Call AC_CHECK_HEADERS here to
-  dnl get HAVE_* macros automatically defined
-  dnl
-  dnl NOTE: we need additional CFLAGS for things to work
-  dnl       (stuff included by gstreamer header)
-  dnl
-
-  ac_save_CFLAGS="$CFLAGS"
-  ac_save_CPPFLAGS="$CPPFLAGS"
-  CFLAGS="$CFLAGS $CURL_CFLAGS"
-  CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
-  AC_CHECK_HEADERS(curl/curl.h)
-  CFLAGS="$ac_save_CFLAGS"
-  CPPFLAGS="$ac_save_CPPFLAGS"
-
-  dnl
-  dnl Call AC_CHECK_LIB here to
-  dnl make sure curl actually works
-  dnl
-
-  ac_save_LIBS="$LIBS"
-  LIBS="$LIBS $CURL_LIBS"
-  AC_CHECK_LIB(curl, curl_global_init, [curl_lib_ok="yes"],[curl_lib_ok="no"])
-  LIBS="$ac_save_LIBS"
-
-  if test x"${curl_lib_ok}" = xno; then
-     CURL_LIBS=""
-  fi
-
   AM_CONDITIONAL(CURL, [test -n "$CURL_LIBS"])
 
   if test -n "$CURL_LIBS"; then

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- macros/ffmpeg.m4	6 Mar 2007 18:06:13 -0000	1.33
+++ macros/ffmpeg.m4	8 Apr 2007 23:06:17 -0000	1.34
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.33 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.34 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -107,7 +107,7 @@
   AC_ARG_WITH(ffmpeg_lib, AC_HELP_STRING([--with-ffmpeg-lib], [directory where ffmpeg libraries are]), with_ffmpeg_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_ffmpeg_lib, [
     if test x"${with_ffmpeg_lib}" != x ; then
-      if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f ${with_ffmpeg_lib}/libavcodec.so; then
+      if test -f ${with_ffmpeg_lib}/libavcodec.a -o -f ${with_ffmpeg_lib}/libavcodec.${shlibext}; then
 	      ac_cv_path_ffmpeg_lib="-L`(cd ${with_ffmpeg_lib}; pwd)`"
       else
 	      AC_MSG_ERROR([${with_ffmpeg_lib} directory doesn't contain ffmpeg libraries.])
@@ -128,7 +128,7 @@
     AC_MSG_CHECKING([for libavcodec library])
     topdir=""
     for i in $libslist; do
-      if test -f $i/libavcodec.a -o -f $i/libavcodec.so; then
+      if test -f $i/libavcodec.a -o -f $i/libavcodec.${shlibext}; then
         topdir=$i
         AC_MSG_RESULT(${topdir}/libavcodec)
 	      if test x"$i" != x"/usr/lib"; then
@@ -163,7 +163,7 @@
       libdts=""
     fi
     if test x"${libdts}" = x; then
-      if test -f ${topdir}/libdts.a -o -f ${topdir}/libdts.so; then
+      if test -f ${topdir}/libdts.a -o -f ${topdir}/libdts.${shlibext}; then
         ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldts"
         AC_MSG_RESULT(${topdir}/libdts)
       else
@@ -177,28 +177,6 @@
       ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libdts}"      
     fi
 	
-    dnl Look for the AVUTIL library, which is required on some systems.
-    AC_MSG_CHECKING([for libavutil library])
-    if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
-      $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs libavutil`
-    else
-      libavutil=""
-    fi
-    if test x"${libavutil}" = x; then
-      if test -f ${topdir}/libavutil.a -o -f ${topdir}/libavutil.so; then
-        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
-        AC_MSG_RESULT(${topdir}/libavutil)
-      else
-        AC_MSG_RESULT(no)
-        if test x${cross_compiling} = xno; then
-           AC_CHECK_LIB(avutil, av_log, [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"])
-        fi
-      fi
-    else
-      AC_MSG_RESULT(${libavutil})
-      ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavutil}"
-    fi
-	
     dnl Look for the VORBISENC library, which is required on some systems.
     AC_MSG_CHECKING([for libvorbisenc library])
     if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
@@ -207,7 +185,7 @@
       libvorbisenc=""
     fi
     if test x"${libvorbisenc}" = x; then
-      if test -f ${topdir}/libvorbisenc.a -o -f ${topdir}/libvorbisenc.so; then
+      if test -f ${topdir}/libvorbisenc.a -o -f ${topdir}/libvorbisenc.${shlibext}; then
         ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lvorbisenc"
         AC_MSG_RESULT(${topdir}/libvorbisenc)
       else
@@ -229,7 +207,7 @@
       libavformat=""
     fi
     if test x"${libavformat}" = x; then
-      if test -f ${topdir}/libavformat.a -o -f ${topdir}/libavformat.so; then
+      if test -f ${topdir}/libavformat.a -o -f ${topdir}/libavformat.${shlibext}; then
         ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavformat" 
         AC_MSG_RESULT(${topdir}/libavformat)
       else
@@ -243,6 +221,28 @@
       ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavformat}"      
     fi
 
+    dnl Look for the AVUTIL library, which is required on some systems.
+    AC_MSG_CHECKING([for libavutil library])
+    if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
+      $PKG_CONFIG --exists libavutil && libavutil=`$PKG_CONFIG --libs libavutil`
+    else
+      libavutil=""
+    fi
+    if test x"${libavutil}" = x; then
+      if test -f ${topdir}/libavutil.a -o -f ${topdir}/libavutil.${shlibext}; then
+        ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"
+        AC_MSG_RESULT(${topdir}/libavutil)
+      else
+        AC_MSG_RESULT(no)
+        if test x${cross_compiling} = xno; then
+           AC_CHECK_LIB(avutil, av_log, [ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -lavutil"])
+        fi
+      fi
+    else
+      AC_MSG_RESULT(${libavutil})
+      ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} ${libavutil}"
+    fi
+	
      dnl Look for the THEORA library, which is required on some systems.
     AC_MSG_CHECKING([for libtheora library])
     if test x"$PKG_CONFIG" != x -a x${cross_compiling} = xno; then
@@ -251,7 +251,7 @@
       libtheora=""
     fi
     if test x"${libtheora}" = x; then
-      if test -f ${topdir}/libtheora.a -o -f ${topdir}/libtheora.so; then
+      if test -f ${topdir}/libtheora.a -o -f ${topdir}/libtheora.${shlibext}; then
         ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ltheora"
         AC_MSG_RESULT(${topdir}/libtheora)
       else
@@ -273,7 +273,7 @@
       libtdc=""
     fi
     if test x"${libdc}" = x; then
-      if test -f ${topdir}/libdc1394.a -o -f ${topdir}/libdc1394.so; then
+      if test -f ${topdir}/libdc1394.a -o -f ${topdir}/libdc1394.${shlibext}; then
         ac_cv_path_ffmpeg_lib="${ac_cv_path_ffmpeg_lib} -ldc1394"
         AC_MSG_RESULT(${topdir}/libdc1394)
       else

Index: macros/firefox.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/firefox.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22

Index: macros/glib.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/glib.m4,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- macros/glib.m4	21 Jan 2007 22:41:02 -0000	1.25
+++ macros/glib.m4	8 Apr 2007 23:06:17 -0000	1.26
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: glib.m4,v 1.25 2007/01/21 22:41:02 rsavoye Exp $
+dnl $Id: glib.m4,v 1.26 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_GLIB],
 [
@@ -71,7 +71,7 @@
   AC_ARG_WITH(glib_lib, AC_HELP_STRING([--with-glib-lib], [directory where glib library is]), with_glib_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_glib_lib,[
     if test x"${with_glib_lib}" != x ; then
-      if test -f ${with_glib_lib}/libglib-${gnash_glib_version}.a -o -f ${with_glib_lib}/libglib-${gnash_glib_version}.so; then
+      if test -f ${with_glib_lib}/libglib-${gnash_glib_version}.a -o -f ${with_glib_lib}/libglib-${gnash_glib_version}.${shlibext}; then
         ac_cv_path_glib_lib="-L`(cd ${with_glib_lib}; pwd)` -lglib-${gnash_glib_version}"
       else
         AC_MSG_ERROR([${with_glib_lib} directory doesn't contain libglib.])
@@ -88,7 +88,7 @@
   AC_MSG_CHECKING([for glib library])
   if test x"${ac_cv_path_glib_lib}" = x; then
     for i in $libslist; do
-      if test -f $i/libglib-${gnash_glib_version}.a -o -f $i/libglib-${gnash_glib_version}.so; then
+      if test -f $i/libglib-${gnash_glib_version}.a -o -f $i/libglib-${gnash_glib_version}.${shlibext}; then
         if test x"$i" != x"/usr/lib"; then
           ac_cv_path_glib_lib="-L$i -lglib-${gnash_glib_version}"
           break

Index: macros/gnashpkgtool.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gnashpkgtool.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- macros/gnashpkgtool.m4	6 Mar 2007 18:06:13 -0000	1.39
+++ macros/gnashpkgtool.m4	8 Apr 2007 23:06:17 -0000	1.40
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: gnashpkgtool.m4,v 1.39 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: gnashpkgtool.m4,v 1.40 2007/04/08 23:06:17 rsavoye Exp $
 
 dnl Generic macros for finding and setting include-paths and library-path
 dnl for packages. Implements GNASH_PKG_INCLUDES() and GNASH_PKG_LIBS().
@@ -163,7 +163,7 @@
 	AC_CACHE_VAL(ac_cv_path_$1_lib,[
 	if test x"${with_$1_lib}" != x ; then
 		AC_MSG_CHECKING([for lib$1 library in specified directory])
-		if test -f ${with_$1_lib}/lib$name.a -o -f ${with_$1_lib}/lib$name.so; then
+		if test -f ${with_$1_lib}/lib$name.a -o -f ${with_$1_lib}/lib$name.${shlibext}; then
 			tmp=`(cd ${with_$1_lib}; pwd)`
 			ac_cv_path_$1_lib="-L${tmp} -l$name"
 			AC_MSG_RESULT([yes])
@@ -190,8 +190,8 @@
 		ac_save_LIBS=$LIBS
 		LIBS=""
 		for i in $libslist; do
-			if test -f $i/lib$1.a -o -f $i/lib$1.so; then
-				if test -f "$i/lib$1.a" -o -f "$i/lib$1.so"; then
+			if test -f $i/lib$1.a -o -f $i/lib$1.${shlibext}; then
+				if test -f "$i/lib$1.a" -o -f "$i/lib$1.${shlibext}"; then
 					if test x"$i" != x"/usr/lib"; then
 						ac_cv_path_$1_lib="-L$i -l$1 $5"
 						break
@@ -201,7 +201,7 @@
 					fi
 				fi
 			else
-				if test -f "$i/lib$name.a" -o -f "$i/lib$name.so"; then
+				if test -f "$i/lib$name.a" -o -f "$i/lib$name.${shlibext}"; then
 					if test x"$i" != x"/usr/lib"; then
 						ac_cv_path_$1_lib="-L$i -l$name $5"
 						break

Index: macros/gtk2.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtk2.m4,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- macros/gtk2.m4	21 Jan 2007 22:41:02 -0000	1.39
+++ macros/gtk2.m4	8 Apr 2007 23:06:17 -0000	1.40
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: gtk2.m4,v 1.39 2007/01/21 22:41:02 rsavoye Exp $
+dnl $Id: gtk2.m4,v 1.40 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_GTK2],
 [
@@ -63,8 +63,9 @@
   fi
   if test x"${ac_cv_path_gtk2_incl}" = x; then
     AC_CHECK_HEADERS(gtk/gtk.h)
-  else
     AC_MSG_RESULT($ac_cv_path_gtk2_incl)
+  else
+    AC_MSG_WARN([not sure])
   fi
 
   dnl Look for the library
@@ -74,14 +75,14 @@
 
     AC_CACHE_VAL(ac_cv_path_gtk2_lib,[
     if test x"${with_gtk2_lib}" != x ; then
-      if test -f ${with_gtk2_lib}/libgtk-x11-2.0.so; then
+      if test -f ${with_gtk2_lib}/libgtk-x11-2.0.${shlibext}; then
         if test -f ${with_gtk2_lib}/libgdk-x11-2.0; then
         	ac_cv_path_gtk2_lib=-I`(cd ${with_gtk2_lib}; pwd)`
         else
         	AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain libgdk-x11-2.0])
         fi
       else
-      	AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain libgtk-x11-2.0.so])
+      	AC_MSG_ERROR([${with_gtk2_lib} directory doesn't contain libgtk-x11-2.0.${shlibext}])
       fi
     fi
   ])
@@ -97,7 +98,7 @@
   AC_MSG_CHECKING([for libgtk2 library])
   if test x"${ac_cv_path_gtk2_incl}" != x -a x"${ac_cv_path_gtk2_lib}" = x; then
     for i in $libslist; do
-      if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
+      if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.${shlibext}; then
         if test x"$i" != x"/usr/lib"; then
           ac_cv_path_gtk2_lib="-L$i -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -lgmodule-2.0"
           break

Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- macros/gtkglext.m4	9 Jan 2007 00:43:43 -0000	1.33
+++ macros/gtkglext.m4	8 Apr 2007 23:06:17 -0000	1.34
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl: $Id: gtkglext.m4,v 1.33 2007/01/09 00:43:43 rsavoye Exp $
+dnl: $Id: gtkglext.m4,v 1.34 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_GLEXT],
 [
@@ -99,7 +99,7 @@
 AC_ARG_WITH(glext_lib, AC_HELP_STRING([--with-glext-lib], [directory where gtkglext library is]), with_glext_lib=${withval})
 AC_CACHE_VAL(ac_cv_path_glext_lib,[
 if test x"${with_glext_lib}" != x ; then
-	if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a -o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.so; then
+	if test -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.a -o -f ${with_glext_lib}/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
 		ac_cv_path_glext_lib=-L`(cd ${with_glext_lib}; pwd)`
 	else
 		AC_MSG_ERROR([${with_glext_lib} directory doesnt contain libgtkglext-x11-${gnash_glext_version}.[a|so]])
@@ -115,14 +115,14 @@
 if test x"${ac_cv_path_glext_lib}" = x; then
 	AC_CHECK_LIB(gtkglext-x11-${gnash_glext_version}, gtk_gl_init, [ac_cv_path_glext_lib="-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"],[
 	for i in $libslist; do
-		if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f $i/libgtkglext-x11-${gnash_glext_version}.so; then
+		if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f $i/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
 		ac_cv_path_glext_incl_config="-I$i/gtkglext-${gnash_glext_version}/include"
 			if test x"$i" != x"/usr/lib"; then
 				ac_cv_path_glext_lib="-L$i -lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
 				break
 			fi
 		else
-			if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f $i/libgtkglext-x11-${gnash_glext_version}.so; then
+			if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f $i/libgtkglext-x11-${gnash_glext_version}.${shlibext}; then
 				ac_cv_path_glext_lib="-L$i/${gnash_glext_topdir} -lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
 				break
 			fi

Index: macros/incllist
===================================================================
RCS file: /sources/gnash/gnash/macros/incllist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/incllist	2 Mar 2007 14:13:43 -0000	1.3
+++ macros/incllist	8 Apr 2007 23:06:17 -0000	1.4
@@ -1 +1 @@
-${prefix}/${host_alias}/include ${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include /usr/local/include /home/latest/include /opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include .. ../..
+/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/include /Developer/SDKs/MacOSX10.4*.sdk/usr/include ${prefix}/${host_alias}/include ${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include /usr/local/include /home/latest/include /opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include /usr/local/olpc/include .. ../..

Index: macros/jpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/jpeg.m4,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- macros/jpeg.m4	9 Jan 2007 00:43:43 -0000	1.22
+++ macros/jpeg.m4	8 Apr 2007 23:06:17 -0000	1.23
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: jpeg.m4,v 1.22 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: jpeg.m4,v 1.23 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_JPEG],
 [
@@ -72,7 +72,7 @@
     AC_ARG_WITH(jpeg_lib, AC_HELP_STRING([--with-jpeg-lib], [directory where jpeg library is]), with_jpeg_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_jpeg_lib,[
       if test x"${with_jpeg_lib}" != x ; then
-        if test -f ${with_jpeg_lib}/libjpeg.a -o -f ${with_jpeg_lib}/libjpeg.so; then
+        if test -f ${with_jpeg_lib}/libjpeg.a -o -f ${with_jpeg_lib}/libjpeg.${shlibext}; then
 	  ac_cv_path_jpeg_lib=`(cd ${with_jpeg_lib}; pwd)`
         else
 	  AC_MSG_ERROR([${with_jpeg_lib} directory doesn't contain libjpeg.])
@@ -84,7 +84,7 @@
     if test x"${ac_cv_path_jpeg_incl}" = x; then
       AC_MSG_CHECKING([for libjpeg library])
       for i in $libslist; do
-	      if test -f $i/libjpeg.a -o -f $i/libjpeg.so; then
+	      if test -f $i/libjpeg.a -o -f $i/libjpeg.${shlibext}; then
 	        if test x"$i" != x"/usr/lib"; then
 	          ac_cv_path_jpeg_lib="-L$i"
 	          break

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/kde.m4	20 Mar 2007 20:27:29 -0000	1.28
+++ macros/kde.m4	8 Apr 2007 23:06:17 -0000	1.29
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: kde.m4,v 1.28 2007/03/20 20:27:29 martinwguy Exp $
+dnl $Id: kde.m4,v 1.29 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_KDE],
 [
@@ -76,7 +76,7 @@
   AC_ARG_WITH(kde_lib, AC_HELP_STRING([--with-kde-lib], [directory where kde libraries are]), with_kde_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_kde_lib, [
     if test x"${with_kde_lib}" != x ; then
-      if test -f ${with_kde_lib}/libkdeui.a -o -f ${with_kde_lib}/kdeui.so; then
+      if test -f ${with_kde_lib}/libkdeui.a -o -f ${with_kde_lib}/kdeui.${shlibext}; then
 	      ac_cv_path_kde_lib="-L`(cd ${with_kde_lib}; pwd)`"
       else
 	      AC_MSG_ERROR([${with_kde_lib} directory doesn't contain kde libraries.])
@@ -89,7 +89,7 @@
     topdir=""
     libslist="${kde_prefix}/lib ${libslist}"
     for i in $libslist ; do
-      if test -f $i/libkdeui.a -o -f $i/libkdeui.so ; then
+      if test -f $i/libkdeui.a -o -f $i/libkdeui.${shlibext} ; then
         topdir=$i
         AC_MSG_RESULT(${topdir}/libkdeui)
 	      if test x"$i" != x"/usr/lib"; then
@@ -106,7 +106,7 @@
   dnl Look for the kdecore library, which is required
   if test x"${ac_cv_path_kde_lib}" != x; then
     AC_MSG_CHECKING([for kdecore library])
-    if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.so; then
+    if test -f ${topdir}/libkdecore.a -o -f ${topdir}/libkdecore.${shlibext}; then
       ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdecore"
       AC_MSG_RESULT(${topdir}/libkdecore)
     else
@@ -116,7 +116,7 @@
     dnl Look for the kdeprint library, which is required
     AC_MSG_CHECKING([for kdeprint library])
     if test x"${libkdeprint}" = x; then
-      if test -f ${topdir}/libkdeprint.a -o -f ${topdir}/libkdeprint.so; then
+      if test -f ${topdir}/libkdeprint.a -o -f ${topdir}/libkdeprint.${shlibext}; then
         ac_cv_path_kde_lib="${ac_cv_path_kde_lib} -lkdeprint"
         AC_MSG_RESULT(${topdir}/libkdeprint)
       else
@@ -219,7 +219,7 @@
   AC_ARG_WITH(qt_lib, AC_HELP_STRING([--with-qt-lib], [directory where qt libraries are]), with_qt_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_qt_lib, [
     if test x"${with_qt_lib}" != x ; then
-      if test -f ${with_qt_lib}/libqt-mt.q -o -f ${with_qt_lib}/libqt-mt.so; then
+      if test -f ${with_qt_lib}/libqt-mt.q -o -f ${with_qt_lib}/libqt-mt.${shlibext}; then
 	      ac_cv_path_qt_lib="-L`(cd ${with_qt_lib}; pwd)` -lqt-mt"
       else
 	      AC_MSG_ERROR([${with_qt_lib} directory doesn't contain qt libraries.])
@@ -229,7 +229,7 @@
 
   if test x"${ac_cv_path_qt_lib}" = x; then
     AC_MSG_CHECKING([for qt library])
-    if test -f ${gnash_qt_topdir}/lib/libqt-mt.a -o -f ${gnash_qt_topdir}/lib/libqt-mt.so ; then
+    if test -f ${gnash_qt_topdir}/lib/libqt-mt.a -o -f ${gnash_qt_topdir}/lib/libqt-mt.${shlibext} ; then
       ac_cv_path_qt_lib="-L${gnash_qt_topdir}/lib -lqt-mt"
     fi
     if test x"${ac_cv_path_qt_lib}" != x; then

Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/libXML.m4	23 Mar 2007 00:30:10 -0000	1.29
+++ macros/libXML.m4	8 Apr 2007 23:06:17 -0000	1.30
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: libXML.m4,v 1.29 2007/03/23 00:30:10 tgc Exp $
+dnl $Id: libXML.m4,v 1.30 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_LIBXML], [
   has_xml=no
@@ -32,7 +32,7 @@
 
   if test x"${ac_cv_path_libxml_incl}" = x; then
     AC_PATH_PROG(XML2_CONFIG, xml2-config, ,[${pathlist}])
-    if test "x$XML2_CONFIG" != "x" ; then
+    if test "x$XML2_CONFIG" != "x"  -a x"${darwin}" = xno ; then
       if test "x$XML2_CFLAGS" = "x" ; then
         ac_cv_path_libxml_incl=`$XML2_CONFIG --cflags`
       fi
@@ -70,16 +70,15 @@
   AC_ARG_WITH(libxml_lib, AC_HELP_STRING([--with-libxml-lib], [directory where libxml2 library is]), with_libxml_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_libxml_lib, [
     if test x"${with_libxml_lib}" != x ; then
-      if test -f ${with_libxml_libs}/libxml2.a -o -f ${with_libxml_lib}/libxml2.so; then
+      if test -f ${with_libxml_libs}/libxml2.a -o -f ${with_libxml_lib}/libxml2.${shlibext}; then
         ac_cv_path_libxml_lib="-L`(cd ${with_libxml_lib}; pwd)` -lxml2"
       fi
     fi
   ])
-
   AC_MSG_CHECKING([for libxml library])
   if test x"${ac_cv_path_libxml_lib}" = x ; then
     for i in $libslist; do
-      if test -f $i/libxml2.a -o -f $i/libxml2.so; then
+      if test -f $i/libxml2.a -o -f $i/libxml2.${shlibext}; then
         if test x"$i" != x"/usr/lib"; then
           ac_cv_path_libxml_lib="-L$i -lxml2"
           break

Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/libslist	2 Mar 2007 14:13:43 -0000	1.5
+++ macros/libslist	8 Apr 2007 23:06:17 -0000	1.6
@@ -1 +1 @@
-${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..
+/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib /Developer/SDKs/MacOSX10.4*.sdk/usr/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..

Index: macros/ming.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ming.m4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- macros/ming.m4	21 Jan 2007 22:41:03 -0000	1.12
+++ macros/ming.m4	8 Apr 2007 23:06:17 -0000	1.13
@@ -99,7 +99,7 @@
     AC_ARG_WITH(ming_lib, AC_HELP_STRING([--with-ming-lib], [directory where ming library is]), with_ming_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_ming_lib, [
       if test x"${with_ming_lib}" != x ; then
-        if test -f ${with_ming_lib}/libming.a -o -f ${with_ming_lib}/libming.so; then
+        if test -f ${with_ming_lib}/libming.a -o -f ${with_ming_lib}/libming.${shlibext}; then
 	  ac_cv_path_ming_lib=`(cd ${with_ming_lib}; pwd)`
         else
           AC_MSG_ERROR([${with_ming_lib} directory doesn't contain libming.])
@@ -110,7 +110,7 @@
     dnl If the header doesn't exist, there is no point looking for the library.
     if test x"${ac_cv_path_ming_incl}" != x; then
       for i in $libslist; do
-      	if test -f $i/libming.a -o -f $i/libming.so; then
+      	if test -f $i/libming.a -o -f $i/libming.${shlibext}; then
       	  if test x"$i" != x"/usr/lib"; then
       	    ac_cv_path_ming_lib="-L$i -lming"
       	    break

Index: macros/mysql.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mysql.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/mysql.m4	6 Mar 2007 18:06:13 -0000	1.3
+++ macros/mysql.m4	8 Apr 2007 23:06:17 -0000	1.4
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: mysql.m4,v 1.3 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: mysql.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_MYSQL],
 [
@@ -65,7 +65,7 @@
   AC_ARG_WITH(mysql-lib, AC_HELP_STRING([--with-mysql-lib], [directory where mysql libraries are]), with_mysql_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_mysql_lib,[
     if test x"${with_mysql_lib}" != x ; then
-      if test -f ${with_mysql_lib}/libmysqlclient.a -o -f ${with_mysql_lib}/libmysqlclient.so; then
+      if test -f ${with_mysql_lib}/libmysqlclient.a -o -f ${with_mysql_lib}/libmysqlclient.${shlibext}; then
 	ac_cv_path_mysql_lib="-L`(cd ${with_mysql_lib}; pwd)`"
       else
 	AC_MSG_ERROR([${with_mysql_lib} directory doesn't contain mysql libraries.])
@@ -84,7 +84,7 @@
 
     AC_CHECK_LIB(mysqlclient, mysql_init, [ac_cv_path_mysql_lib="-lmysqlclient"], [
       for i in $libslist; do
-	if test -f $i/libmysqlclient.a -o -f $i/libmysqlclient.so; then
+	if test -f $i/libmysqlclient.a -o -f $i/libmysqlclient.${shlibext}; then
           topdir=$i
 	  if test x"$i" != x"/usr/lib"; then
 	    ac_cv_path_mysql_lib="-L$i -lmysqlclient"

Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- macros/opengl.m4	6 Mar 2007 18:06:13 -0000	1.29
+++ macros/opengl.m4	8 Apr 2007 23:06:17 -0000	1.30
@@ -14,16 +14,10 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: opengl.m4,v 1.29 2007/03/06 18:06:13 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.30 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_OPENGL],
 [
-dnl   AC_ARG_ENABLE(opengl, [  --disable-opengl        Disable support for OpenGL],
-dnl   [case "${enableval}" in
-dnl     yes) opengl=no  ;;
-dnl     no)  opengl=yes ;;
-dnl     *)   AC_MSG_ERROR([bad value ${enableval} for disable-opengl option]) ;;
-dnl   esac], opengl=yes)
   opengl=yes
   if test x"$opengl" = x"yes"; then
     dnl Look for the headers.
@@ -35,22 +29,19 @@
       else
         AC_MSG_ERROR([${with_opengl_includes} directory doesn't contain GL/gl.h])
       fi
-    fi])
+      fi
+    ])
 
     dnl If the include path hasn't been specified, go look for it.
     if test x"${ac_cv_path_opengl_includes}" = x; then
-      AC_CHECK_HEADERS(GL/gl.h, [ac_cv_path_opengl_includes=""],[
-      if test x"${ac_cv_path_opengl_includes}" = x; then
         AC_MSG_CHECKING([for OpenGL headers])
-        newincllist="${incllist} /usr/X11R6/include"
-
-        for i in $newincllist; do
+      for i in $incllist; do
           if test -f $i/GL/gl.h; then
             if test x"$i" != x"/usr/include"; then
               ac_cv_path_opengl_includes="-I$i"
               break
             else
-              ac_cv_path_opengl_includes=""
+            ac_cv_path_opengl_includes="default"
               break
             fi
 	    if test -f $i/GL/glu.h; then
@@ -58,28 +49,24 @@
 	    fi
           fi
         done
-      fi])
-    else
-      AC_MSG_RESULT(-I${ac_cv_path_opengl_includes})
-      if test x"${ac_cv_path_opengl_includes}" != x"/usr/include"; then
-        ac_cv_path_opengl_includes="-I${ac_cv_path_opengl_includes}"
-       else
-        ac_cv_path_opengl_includes=""
       fi
+
+    if test x"${ac_cv_path_opengl_includes}" = x; then
+      AC_CHECK_HEADERS([GL/gl.h], [ac_cv_path_opengl_includes=""])
     fi
 
-    if test x"${ac_cv_path_opengl_includes}" != x ; then
+    if test x"${ac_cv_path_opengl_includes}" != x -a x"${ac_cv_path_opengl_includes}" != x"default"; then
       OPENGL_CFLAGS="${ac_cv_path_opengl_includes}"
-      AC_MSG_RESULT(${ac_cv_path_opengl_includes})
     else
       OPENGL_CFLAGS=""
     fi
+    AC_MSG_RESULT(${ac_cv_path_opengl_includes})
 
     dnl Look for the libraries.
     AC_ARG_WITH(opengl_lib, AC_HELP_STRING([--with-opengl-lib], [directory where OpenGL libraries are]), with_opengl_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_opengl_lib,[
     if test x"${with_opengl_lib}" != x ; then
-      if test -f ${with_opengl_lib}/libGL.a -o -f ${with_opengl_lib}/libGL.so; then
+        if test -f ${with_opengl_lib}/libGL.a -o -f ${with_opengl_lib}/libGL.${shlibext}; then
         ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd)` -lGL -lGLU"
       else
         if test -f ${with_opengl_lib}/libopengl32.a -o; then
@@ -91,37 +78,36 @@
     ])
 
     if test x"${ac_cv_path_opengl_lib}" = x; then
-      AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_lib="-lGL -lGLU"],[
-        newliblist="${libslist} /usr/X11R6/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib64 /opt/mesa/lib .. ../.."
-        for i in $newliblist; do
-          if test -f $i/libGLU.a -o -f $i/libGLU.so; then
+      for i in $libslist; do
+        if test -f $i/libGL.${shlibext} -o -f $i/libGL.a; then
             if test x"$i" != x"/usr/lib"; then
-              ac_cv_path_opengl_lib="-L$i -lGL -lGLU"
+            ac_cv_path_opengl_lib="-L$i -lGL"
               break
 	    else
-              ac_cv_path_opengl_lib="-lGL -lGLU"
-	    fi
-          else
-	    if test -f $i/libopengl32.a; then
-	      ac_cv_path_opengl_lib="-L$i -lopengl32 -lglu32"
+            ac_cv_path_opengl_lib="-lGL"
 	      break
-	    else
-	      ac_cv_path_opengl_lib="-lopengl32 -lglu32"
 	    fi
           fi
-          if test -f $i/libGLU.a -o -f $i/libGLU.so; then
-	    AC_MSG_WARN([libGLU not installed!])
-	  fi
-        done])
-    else
-      if test -f ${ac_cv_path_opengl_lib}/libGLU.a -o -f ${ac_cv_path_opengl_lib}/libGLU.so; then
-        if test x"${ac_cv_path_opengl_lib}" != x"/usr/lib"; then
-          ac_cv_path_opengl_lib="-L${ac_cv_path_opengl_lib} -lGL -lGLU"
+      done
+      if test x"${ac_cv_path_opengl_lib}" != x; then
+        if test -f $i/libGLU.${shlibext} -o -f $i/libGLU.a; then
+          ac_cv_path_opengl_lib="${ac_cv_path_opengl_lib} -lGLU"
          else
-          ac_cv_path_opengl_lib="-lGL -lGLU"
+          AC_WARN([No GLU library found!])
         fi
+      else                      dnl nothing found, check for the win32 names
+        for i in $newliblist; do
+          if test -f $i/libopengl32.${shlibext} -o -f $i/libopengl32.a; then
+            ac_cv_path_opengl_lib="-L$i -lopengl32 =lopenglu32"
+            break
       fi
+        done
     fi
+    fi                          dnl end of if ac_cv_path_opengl_lib
+  fi                            dnl end of if $opengl
+
+  if test x"${ac_cv_path_opengl_lib}" = x; then
+    AC_CHECK_LIB([GL], [glBegin], [ac_cv_path_opengl_lib="-lGL -lGLU"])
   fi
 
   if test x"${ac_cv_path_opengl_lib}" != x ; then

Index: macros/pango.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pango.m4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- macros/pango.m4	9 Jan 2007 00:43:43 -0000	1.23
+++ macros/pango.m4	8 Apr 2007 23:06:17 -0000	1.24
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: pango.m4,v 1.23 2007/01/09 00:43:43 rsavoye Exp $
+dnl $Id: pango.m4,v 1.24 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_PANGO],
 [
@@ -80,7 +80,7 @@
   AC_ARG_WITH(pango_lib, AC_HELP_STRING([--with-pango-lib], [directory where pango library is]), with_pango_lib=${withval})
   AC_CACHE_VAL(ac_cv_path_pango_lib,[
     if test x"${with_pango_lib}" != x ; then
-      if test -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.a -o -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.so; then
+      if test -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.a -o -f ${with_pango_lib}/libpangopango-x11-${gnash_pango_version}.${shlibext}; then
 	ac_cv_path_pango_lib=-L`(cd ${with_pango_lib}; pwd)`
       else
 	AC_MSG_ERROR([${with_pango_lib} directory doesn't contain libpangopango.])
@@ -96,7 +96,7 @@
 
   if test x"${ac_cv_path_pango_lib}" = x; then
     for i in $libslist; do
-      if test -f $i/libpango-${gnash_pango_version}.a -o -f $i/libpango-${gnash_pango_version}.so; then
+      if test -f $i/libpango-${gnash_pango_version}.a -o -f $i/libpango-${gnash_pango_version}.${shlibext}; then
         if test x"$i" != x"/usr/lib"; then
 	  ac_cv_path_pango_lib="-L$i -lpango-${gnash_pango_version}"
 	  break

Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- macros/pthreads.m4	28 Mar 2007 23:42:19 -0000	1.27
+++ macros/pthreads.m4	8 Apr 2007 23:06:17 -0000	1.28
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 dnl Copyright (C) 2006 Steven G. Johnson <stevenj@alum.mit.edu>.
-dnl $Id: pthreads.m4,v 1.27 2007/03/28 23:42:19 rsavoye Exp $
+dnl $Id: pthreads.m4,v 1.28 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_PTHREADS],
 [
@@ -175,7 +175,7 @@
 if test x"${PTHREAD_LIBS}" = "x"; then
   AC_MSG_CHECKING([searching for pthread library])
   for i in $libslist; do
-   if test -f $i/libpthread.a -o -f $i/libpthread.so -o -f $i/libpthread.dylib; then
+   if test -f $i/libpthread.a -o -f $i/libpthread.${shlibext} -o -f $i/libpthread.dylib; then
       pthreads=yes
      if test x"$i" != x"/usr/lib"; then
        PTHREAD_LIBS="-L$i -lpthread"

Index: macros/sdl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/sdl.m4,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- macros/sdl.m4	21 Jan 2007 22:41:03 -0000	1.38
+++ macros/sdl.m4	8 Apr 2007 23:06:17 -0000	1.39
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: sdl.m4,v 1.38 2007/01/21 22:41:03 rsavoye Exp $
+dnl $Id: sdl.m4,v 1.39 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_SDL], [
   has_sdl=no
@@ -94,10 +94,10 @@
 dnl  AC_MSG_CHECKING([for sdl library])
   AC_CACHE_VAL(ac_cv_path_sdl_lib, [
     if test x"${with_sdl_lib}" != x ; then
-      if test -f ${with_sdl_lib}/libSDL.a -o -f ${with_sdl_lib}/libSDL.so; then
+      if test -f ${with_sdl_lib}/libSDL.a -o -f ${with_sdl_lib}/libSDL.${shlibext}; then
         ac_cv_path_sdl_lib="-L`(cd ${with_sdl_lib}; pwd)` -lSDL"
       else
-        if test -f ${with_sdl_lib}/libSDL-1.1.a -o -f ${with_sdl_lib}/libSDL-1.1.so; then
+        if test -f ${with_sdl_lib}/libSDL-1.1.a -o -f ${with_sdl_lib}/libSDL-1.1.${shlibext}; then
           ac_cv_path_sdl_lib="-L`(cd ${with_sdl_lib}; pwd)` -lSDL"
         else
           AC_MSG_ERROR([${with_sdl_lib} directory doesn't contain libSDL])
@@ -118,7 +118,7 @@
   
   if test x"${ac_cv_path_sdl_lib}" = x ; then
     for i in $libslist; do
-      if test -f $i/libSDL.a -o -f $i/libSDL.so; then
+      if test -f $i/libSDL.a -o -f $i/libSDL.${shlibext}; then
         if test x"$i" != x"/usr/lib"; then
           ac_cv_path_sdl_lib="-L$i -lSDL"
           dnl AC_MSG_RESULT(${ac_cv_path_sdl_lib})
@@ -130,7 +130,7 @@
           break
         fi
       else
-        if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.so; then
+        if test -f $i/libSDL-1.1.a -o -f $i/libSDL-1.1.${shlibext}; then
           if test x"$i" != x"/usr/lib"; then
             ac_cv_path_sdl_lib="-L$i -lSDL-1.1"
             dnl AC_MSG_RESULT(${ac_cv_path_sdl_lib})

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- macros/x11.m4	26 Jan 2007 19:41:41 -0000	1.3
+++ macros/x11.m4	8 Apr 2007 23:06:17 -0000	1.4
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.3 2007/01/26 19:41:41 rsavoye Exp $
+dnl $Id: x11.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
@@ -61,6 +61,7 @@
 
     AC_MSG_RESULT(${ac_cv_path_x11_incl})
 
+
     if test x"${ac_cv_path_x11_incl}" != x ; then
       X11_CFLAGS="${ac_cv_path_x11_incl}"
       AC_MSG_RESULT(${ac_cv_path_x11_incl})
@@ -72,7 +73,7 @@
     AC_ARG_WITH(x11_lib, AC_HELP_STRING([--with-x11-lib], [directory where x11 library is]), with_x11_lib=${withval})
     AC_CACHE_VAL(ac_cv_path_x11_lib,[
       if test x"${with_x11_lib}" != x ; then
-        if test -f ${with_x11_lib}/libX11.a -o -f ${with_x11_lib}/libX11.so; then
+        if test -f ${with_x11_lib}/libX11.a -o -f ${with_x11_lib}/libX11.${shlibext}; then
 	        ac_cv_path_x11_lib=`(cd ${with_x11_lib}; pwd)`
         else
 	        AC_MSG_ERROR([${with_x11_lib} directory doesn't contain libx11.])
@@ -81,11 +82,11 @@
     ])
 
     dnl If the header doesn't exist, there is no point looking for the library.
-    if test x"${ac_cv_path_x11_incl}" = x; then
+    if test x"${ac_cv_path_x11_incl}" != x; then
       AC_MSG_CHECKING([for X11 library])
       for i in $libslist; do
-	      if test -f $i/libX11.a -o -f $i/libX11.so; then
-          if test -f $i/libXinerama.a -o -f $i/libXinerama.so; then
+	      if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
+          if test -f $i/libXinerama.a -o -f $i/libXinerama.${shlibext}; then
             ac_cv_path_x11_lib="-lXinerama"
           fi
 	        if test x"$i" != x"/usr/lib"; then

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/curl_adapter.cpp	9 Mar 2007 14:38:29 -0000	1.24
+++ libbase/curl_adapter.cpp	8 Apr 2007 23:06:17 -0000	1.25
@@ -16,7 +16,7 @@
 
 // 
 
-/* $Id: curl_adapter.cpp,v 1.24 2007/03/09 14:38:29 tgc Exp $ */
+/* $Id: curl_adapter.cpp,v 1.25 2007/04/08 23:06:17 rsavoye Exp $ */
 
 #if defined(_WIN32) || defined(WIN32)
 #define snprintf _snprintf
@@ -26,10 +26,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_CURL_CURL_H
-# define HAVE_LIBCURL 1
-#endif
-
 #include "curl_adapter.h"
 #include "tu_file.h"
 #include "utility.h"
@@ -47,7 +43,7 @@
 // define this if you want seeks back to be reported (on stderr)
 //#define GNASH_CURL_WARN_SEEKSBACK 1
 
-#ifndef HAVE_LIBCURL
+#ifndef USE_CURL
 
 // Stubs, in case client doesn't want to link to zlib.
 namespace curl_adapter
@@ -60,7 +56,7 @@
 }
 
 
-#else // def HAVE_LIBCURL
+#else // def USE_CURL
 
 
 #include <stdexcept>
@@ -666,7 +662,7 @@
 
 } // namespace curl_adapter
 
-#endif // def HAVE_LIBCURL
+#endif // def USE_CURL
 
 
 // Local Variables:

Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/extension.cpp	10 Jan 2007 00:09:56 -0000	1.7
+++ libbase/extension.cpp	8 Apr 2007 23:06:17 -0000	1.8
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: extension.cpp,v 1.7 2007/01/10 00:09:56 strk Exp $ */
+/* $Id: extension.cpp,v 1.8 2007/04/08 23:06:17 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -36,6 +36,7 @@
 #include <cstring>
 #include <iostream>
 #include <sys/types.h>
+
 #include "log.h"
 #include "sharedlib.h"
 #include "extension.h"

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- libbase/log.h	3 Apr 2007 16:13:07 -0000	1.43
+++ libbase/log.h	8 Apr 2007 23:06:17 -0000	1.44
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.43 2007/04/03 16:13:07 bjacques Exp $ */
+/* $Id: log.h,v 1.44 2007/04/08 23:06:17 rsavoye Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -24,7 +24,7 @@
 #endif
 
 #include "rc.h" // for IF_VERBOSE_* implementation
-#include "tu_config.h"
+//#include "tu_config.h"
 
 #include <fstream>
 #include <sstream>

Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/network.h	3 Apr 2007 16:54:35 -0000	1.14
+++ libbase/network.h	8 Apr 2007 23:06:17 -0000	1.15
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,9 +14,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
 #ifndef __NETWORK_H__
 #define __NETWORK_H__
 

Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/noseek_fd_adapter.cpp	9 Mar 2007 14:38:29 -0000	1.14
+++ libbase/noseek_fd_adapter.cpp	8 Apr 2007 23:06:17 -0000	1.15
@@ -16,7 +16,7 @@
 
 // 
 
-/* $Id: noseek_fd_adapter.cpp,v 1.14 2007/03/09 14:38:29 tgc Exp $ */
+/* $Id: noseek_fd_adapter.cpp,v 1.15 2007/04/08 23:06:17 rsavoye Exp $ */
 
 #if defined(_WIN32) || defined(WIN32)
 #define snprintf _snprintf
@@ -26,10 +26,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_STDIN_CURL_H
-# define HAVE_LIBCURL 1
-#endif
-
 #include "noseek_fd_adapter.h"
 #include "tu_file.h"
 #include "utility.h"

Index: libbase/rc.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/rc.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libbase/rc.cpp	13 Dec 2006 12:00:06 -0000	1.20
+++ libbase/rc.cpp	8 Apr 2007 23:06:17 -0000	1.21
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,26 +14,22 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
 // This is generated by autoconf
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
-#include "StringPredicates.h"
-
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "tu_types.h"
-
+#include <cctype>  // for toupper
 #include <string>
 #include <vector>
 #include <iostream>
 #include <fstream>
 
+#include "tu_types.h"
+#include "StringPredicates.h"
 #include "log.h"
 #include "rc.h"
 

Index: libbase/ref_counted.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/ref_counted.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/ref_counted.h	7 Nov 2006 17:16:18 -0000	1.3
+++ libbase/ref_counted.h	8 Apr 2007 23:06:17 -0000	1.4
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,10 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
-/* $Id: ref_counted.h,v 1.3 2006/11/07 17:16:18 strk Exp $ */
+/* $Id: ref_counted.h,v 1.4 2007/04/08 23:06:17 rsavoye Exp $ */
 
 #ifndef GNASH_REF_COUNTED_H
 #define GNASH_REF_COUNTED_H

Index: libbase/sharedlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/sharedlib.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/sharedlib.cpp	10 Jan 2007 00:09:56 -0000	1.14
+++ libbase/sharedlib.cpp	8 Apr 2007 23:06:17 -0000	1.15
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: sharedlib.cpp,v 1.14 2007/01/10 00:09:56 strk Exp $ */
+/* $Id: sharedlib.cpp,v 1.15 2007/04/08 23:06:17 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -224,7 +224,7 @@
     run  = lt_dlsym (_dlhandle, symbol);
     
     if (run == NULL) {
-        dbglogfile << "Couldn't find symbol: " << symbol << endl;
+        dbglogfile << " Couldn't find symbol: " << symbol << endl;
         return NULL;
     } else {
         dbglogfile << "Found symbol " << symbol << " @ " << (void *)run << endl;
@@ -249,7 +249,7 @@
     Markus: 'Id est NULL.'
     */
     if (run == NULL) {
-        dbglogfile << "Couldn't find symbol: " << symbol << endl;
+        dbglogfile << " Couldn't find symbol: " << symbol << endl;
         return NULL;
     } else {
         dbglogfile << "Found symbol " << symbol << " @ " << (void *)run << endl;

Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/samples/Makefile.am	2 Apr 2007 10:47:36 -0000	1.14
+++ testsuite/samples/Makefile.am	8 Apr 2007 23:06:17 -0000	1.15
@@ -21,9 +21,8 @@
 CLEANFILES =  \
       gnash-dbg.log \
       site.exp.bak \
-      testrun.sum \
-      testrun.log
-
+      testrun.* \
+      GotoAndPlayTestRunner
 
 AM_CPPFLAGS = -I.. \
         -I$(top_srcdir)		\



From MAILER-DAEMON Sun Apr 08 21:01:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaiFy-0001J0-Ci
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 21:01:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaiFx-0001Ht-6U
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:01:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaiFu-0001Hh-SA
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:01:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaiFu-0001He-Lx
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:01:14 -0400
Received: from py-out-1112.google.com ([64.233.166.177])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HaiC8-0008Fd-R5
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 20:57:20 -0400
Received: by py-out-1112.google.com with SMTP id u77so1183009pyb
	for <gnash-commit@gnu.org>; Sun, 08 Apr 2007 17:57:20 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=ZucKNAgLxoZ4qn9w2cpqCs/wYLzdgPHV+QZ0ES0a57+/XbqzDY7nNA9PBWkPiWd5NtHxc/Utqzn1T0s57+eY+lGphi5f8Ynt4Hfw4RPNUSczvk8v7H+aW+lfcbfwQE8uA3VXC+PpHlECIf9WCGIx18uIljEVHLZWz4mtCQIPFkc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=iUERtxHK5p5ksTKcCtQrnb3LCu2KoGzBQ3/fXLlziRl3G+0+r1OGFpBpNkUUWfBiKjMXv8iFPd3lfy10QOFXZmhEVnMq41WKA7f8RCDphmzg69niTvQjFK8L0RlNUNNv6OtC3HXVrKJRYI2cI2UgGyjx7PoSHqVITrJFwvyoiHI=
Received: by 10.114.177.1 with SMTP id z1mr2091718wae.1176080239511;
	Sun, 08 Apr 2007 17:57:19 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sun, 8 Apr 2007 17:57:19 -0700 (PDT)
Message-ID: <ca4b43ff0704081757l62064378xdbedac83d4a7d52f@mail.gmail.com>
Date: Mon, 9 Apr 2007 08:57:19 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "zou lunkai" <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.h server...
In-Reply-To: <20070408101718.GH35069@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HaStX-0007yI-HV@cvs>
	<ca4b43ff0704080157i78e6ecfbp8c28689e150a7d4@mail.gmail.com>
	<20070408101718.GH35069@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 01:01:17 -0000

(1)think about a hard-coded frame number within ActionGotoFrame tag,
of course it might be a value greater than total frames

yes, it's true for version 4,5,6,7,8.(not tested for other version)


(2)And another  reason I didn't clamp it here is that if the specified
frame number is
 greater than total frames, the expected behavious is jumping to the
last frame but not pushing the actions of the last frame.

true again for version 4,5,6,7,8 as tested here.


> >
> > think about a hard-coded frame number within ActionGotoFrame tag, of
> > course it might be a value greater than total frames. And another
> > reason I didn't clamp it here is that if the specified frame number is
> > greater than total frames, the expected behavious is jumping to the
> > last frame but not pushing the actions of the last frame. So it's
> > slightly different as the ActionGotoFrame(last_frame).
>
> Is this true for all SWF versions and all player versions ?
>
> --strk;
>



From MAILER-DAEMON Sun Apr 08 21:45:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Haiwt-0007X7-41
	for mharc-gnash-commit@gnu.org; Sun, 08 Apr 2007 21:45:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Haiws-0007Tx-1z
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:45:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Haiwq-0007RV-HB
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:45:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Haiwq-0007R3-6P
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:45:36 -0400
Received: from nz-out-0506.google.com ([64.233.162.231])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hait3-0004QS-U6
	for gnash-commit@gnu.org; Sun, 08 Apr 2007 21:41:42 -0400
Received: by nz-out-0506.google.com with SMTP id s1so966567nze
	for <gnash-commit@gnu.org>; Sun, 08 Apr 2007 18:41:41 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=ClRs5GkzmEHxoi9lFVwBLm/+hx539kkEnbOt5eZxBmT+Mke0K1OumV3YReyYKBgAB2k8zb4UH9n8n0Nq9/NeOZSpQ2RP7qIIGc5sqpdPRdSBUEk5SuhzhJhtRS9OKIErYabelh5hcAKAs7bzfIQsOk6yjKCY7MZsjxo6moI3ZKk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Vr3kGk3fzS/+N0lwpO7KuFCluMriNioshMbaSTOueme7a6Ktt5NuLaJ8oYqFsTCxr1i7trRABZLwqxqObbPxOu66bkT8bGSawA812VijnJp8gRYJx+qbWQbT/bwpa2vtbDoOo/sGn1WB2lj2bxodAJaHOvh2QBkC6/PwalPRqIo=
Received: by 10.114.182.1 with SMTP id e1mr2119525waf.1176082901004;
	Sun, 08 Apr 2007 18:41:41 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sun, 8 Apr 2007 18:41:40 -0700 (PDT)
Message-ID: <ca4b43ff0704081841u20fe2b01hcb270bd0da833f02@mail.gmail.com>
Date: Mon, 9 Apr 2007 09:41:40 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
In-Reply-To: <E1HZPwq-00085N-0w@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HZPwq-00085N-0w@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 01:45:38 -0000

+     // TODO: are we sure we shouldn't check for frames labeled with negative
+    // numbers ?
this case is already tested in swfdec/test/trace/gotoframe.swf.

eg. x = "-2";
GotoAndStop(x);

x will be converted a NAN when calling "frame_spec.to_number()", then
if there is a frame labeled as "-2", it will be found.


On 4/5/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/04/05 11:16:11
>
> Modified files:
>        .              : ChangeLog
>        server         : sprite_instance.cpp sprite_instance.h
>        server/vm      : ASHandlers.cpp
>        testsuite/swfdec: PASSING
>
> Log message:
>                * server/sprite_instance.{cpp,h} (get_frame_number):
>                  Changed signature to report invalid frame specifications;
>                  simplified and clened implementation of Zou Lunkai.
>                * server/vm/ASHandlers.cpp: updated calls to get_frame_number.
>                * testsuite/swfdec/PASSING: gotoframe.swf now passes.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2789&r2=1.2790
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.222&r2=1.223
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.87&r2=1.88
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.80&r2=1.81
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.13&r2=1.14
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2789
> retrieving revision 1.2790
> diff -u -b -r1.2789 -r1.2790
> --- ChangeLog   5 Apr 2007 08:52:46 -0000       1.2789
> +++ ChangeLog   5 Apr 2007 11:16:11 -0000       1.2790
> @@ -1,5 +1,13 @@
>  2007-04-05 Sandro Santilli <strk@keybit.net>
>
> +       * server/sprite_instance.{cpp,h} (get_frame_number):
> +         Changed signature to report invalid frame specifications;
> +         simplified and clened implementation of Zou Lunkai.
> +       * server/vm/ASHandlers.cpp: updated calls to get_frame_number.
> +       * testsuite/swfdec/PASSING: gotoframe.swf now passes.
> +
> +2007-04-05 Sandro Santilli <strk@keybit.net>
> +
>        * testsuite/misc-ming.all/Makefile.am: enabled run of
>          reverse_execute_PlaceObject2_test2runner and
>          action_execution_order_test6runner.
>
> Index: server/sprite_instance.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
> retrieving revision 1.222
> retrieving revision 1.223
> diff -u -b -r1.222 -r1.223
> --- server/sprite_instance.cpp  4 Apr 2007 20:30:45 -0000       1.222
> +++ server/sprite_instance.cpp  5 Apr 2007 11:16:11 -0000       1.223
> @@ -1706,27 +1706,28 @@
>        testInvariant();
>  }
>
> -size_t
> -sprite_instance::get_frame_number(const as_value& frame_spec) const
> +bool
> +sprite_instance::get_frame_number(const as_value& frame_spec, size_t& frameno) const
>  {
> +       //GNASH_REPORT_FUNCTION;
>        size_t frame_number;
>
> -       // Figure out what frame to call.
> -       if (frame_spec.is_string())
> -       {
> -               if (m_def->get_labeled_frame(frame_spec.to_string(), &frame_number) == false)
> -               {
> -                       // Try converting to integer.
> -                       frame_number = (size_t)frame_spec.to_number();
> -               }
> -       }
> -       else
> +       as_environment* env = const_cast<as_environment*>(&m_as_environment);
> +
> +       double num =  frame_spec.to_number(env);
> +
> +       // TODO: check if a frame labeled "0" or "-3" or "Infinite"
> +       //       takes precedence over the numerical value.
> +       if ( isnan(num) )
>        {
> -               // convert from 1-based to 0-based
> -               frame_number = (size_t) frame_spec.to_number() - 1;
> +               return m_def->get_labeled_frame(frame_spec.to_string(env), &frameno);
>        }
>
> -       return frame_number;
> +       // TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
> +       if ( num < 1 ) return false;
> +
> +       frameno = iclamp(num, 1, m_def->get_frame_count())-1;
> +       return true;
>  }
>
>  /// Execute the actions for the specified frame.
> @@ -1735,13 +1736,12 @@
>  ///
>  void sprite_instance::call_frame_actions(const as_value& frame_spec)
>  {
> -       size_t  frame_number = get_frame_number(frame_spec);
> -
> -       if (frame_number >= m_def->get_frame_count())
> +       size_t frame_number;
> +       if ( ! get_frame_number(frame_spec, frame_number) )
>        {
>                // No dice.
>                IF_VERBOSE_ASCODING_ERRORS(
> -               log_aserror("call_frame('%s') -- unknown frame", frame_spec.to_string());
> +               log_aserror("call_frame('%s') -- invalid frame", frame_spec.to_debug_string().c_str());
>                );
>                return;
>        }
>
> Index: server/sprite_instance.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
> retrieving revision 1.87
> retrieving revision 1.88
> diff -u -b -r1.87 -r1.88
> --- server/sprite_instance.h    3 Apr 2007 13:43:32 -0000       1.87
> +++ server/sprite_instance.h    5 Apr 2007 11:16:11 -0000       1.88
> @@ -17,7 +17,7 @@
>  //
>  //
>
> -/* $Id: sprite_instance.h,v 1.87 2007/04/03 13:43:32 strk Exp $ */
> +/* $Id: sprite_instance.h,v 1.88 2007/04/05 11:16:11 strk Exp $ */
>
>  // Stateful live Sprite instance
>
> @@ -277,11 +277,27 @@
>        ///
>        void    goto_frame(size_t target_frame_number);
>
> -       /// \brief
> -       /// Parse frame spec and return frame number.
> -       /// Frame spec can either be a number of a string (label)
> +       /// Parse frame spec and return a 0-based frame number.
> +       //
> +       /// If frame spec cannot be converted to !NAN number
> +       /// it will be converted to a string and considered a
> +       /// frame label (returns false if referring to an
> +       /// unknwown label).
> +       ///
> +       /// If frame spec can be converted to a non-zero positive
> +       /// integer it will be "clamped" to the valid range.
> +       ///
> +       /// @param frame_spec
> +       ///     The frame specification.
> +       ///
> +       /// @param frameno
> +       ///     The evaluated frame number (0-based)
> +       ///
> +       /// @return
> +       ///     True if the frame_spec could be resolved to a frame number.
> +       ///     False if the frame_spec was invalid.
>        ///
> -       size_t get_frame_number(const as_value& frame_spec) const;
> +       bool get_frame_number(const as_value& frame_spec, size_t& frameno) const;
>
>
>        /// Look up the labeled frame, and jump to it.
>
> Index: server/vm/ASHandlers.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
> retrieving revision 1.80
> retrieving revision 1.81
> diff -u -b -r1.80 -r1.81
> --- server/vm/ASHandlers.cpp    3 Apr 2007 16:33:14 -0000       1.80
> +++ server/vm/ASHandlers.cpp    5 Apr 2007 11:16:11 -0000       1.81
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: ASHandlers.cpp,v 1.80 2007/04/03 16:33:14 strk Exp $ */
> +/* $Id: ASHandlers.cpp,v 1.81 2007/04/05 11:16:11 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -1438,7 +1438,7 @@
>
>        // env.top(0) contains frame specification,
>        // evaluated as for ActionGotoExpression
> -       as_value& framespec = env.top(0);
> +       as_value framespec = env.pop();
>
>        character* target = env.get_target();
>        sprite_instance* target_sprite = target->to_movie();
> @@ -1446,11 +1446,20 @@
>        {
>                log_error("environment target is not a sprite_instance "
>                        "while executing ActionWaitForFrameExpression");
> -               env.drop(1);
>                return;
>        }
>
> -       size_t framenum = target_sprite->get_frame_number(framespec);
> +       size_t framenum;
> +        if ( ! target_sprite->get_frame_number(framespec, framenum) )
> +       {
> +               IF_VERBOSE_ASCODING_ERRORS(
> +               log_aserror("Frame spec found on stack "
> +                       "at ActionWaitForFrame doesn't evaluate "
> +                       "to a valid frame: %s",
> +                       framespec.to_debug_string().c_str());
> +               );
> +               return;
> +       }
>
>  #ifdef REALLY_WAIT_ON_WAIT_FOR_FRAME
>        target_sprite->get_movie_definition()->ensure_frame_loaded(framenum);
> @@ -1465,8 +1474,6 @@
>                thread.skip_actions(skip);
>        }
>
> -       env.drop(1);
> -
>        //dbglogfile << __PRETTY_FUNCTION__ << ": testing" << endl;
>  }
>
> @@ -1999,7 +2006,18 @@
>
>        as_value expression = env.pop();
>
> -       size_t frame_number = target->get_frame_number(expression);
> +       size_t frame_number;
> +       if ( ! target->get_frame_number(expression, frame_number) )
> +       {
> +               IF_VERBOSE_ASCODING_ERRORS(
> +               log_aserror("Frame spec found on stack "
> +                       "at ActionGotoExpression doesn't evaluate "
> +                       "to a valid frame: %s",
> +                       expression.to_debug_string().c_str());
> +               );
> +               return;
> +       }
> +
>        target->goto_frame(frame_number);
>        target->set_play_state(state);
>
>
> Index: testsuite/swfdec/PASSING
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
> retrieving revision 1.13
> retrieving revision 1.14
> diff -u -b -r1.13 -r1.14
> --- testsuite/swfdec/PASSING    29 Mar 2007 08:58:59 -0000      1.13
> +++ testsuite/swfdec/PASSING    5 Apr 2007 11:16:11 -0000       1.14
> @@ -15,6 +15,7 @@
>  goto3.swf
>  goto4.swf
>  goto5.swf
> +gotoframe.swf
>  names.swf
>  array.swf
>  DoInitAction-once.swf
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Mon Apr 09 03:23:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaoDg-0006JA-MH
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 03:23:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaoDe-00069F-VR
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 03:23:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaoDb-0005sB-Qg
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 03:23:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaoDb-0005rW-Ml
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 03:23:15 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hao9k-0007Fb-Kd
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 03:19:18 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l397J5J96086;
	Mon, 9 Apr 2007 09:19:05 +0200 (CEST) (envelope-from strk@keybit.net)
Date: Mon, 9 Apr 2007 09:19:05 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
Message-ID: <20070409071905.GL35069@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1HZPwq-00085N-0w@cvs>
	<ca4b43ff0704081841u20fe2b01hcb270bd0da833f02@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704081841u20fe2b01hcb270bd0da833f02@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 07:23:19 -0000

On Mon, Apr 09, 2007 at 09:41:40AM +0800, zou lunkai wrote:
> +     // TODO: are we sure we shouldn't check for frames labeled with 
> negative
> +    // numbers ?
> this case is already tested in swfdec/test/trace/gotoframe.swf.
> 
> eg. x = "-2";
> GotoAndStop(x);
> 
> x will be converted a NAN when calling "frame_spec.to_number()", then
> if there is a frame labeled as "-2", it will be found.

Really ?? "-2" converts to NaN ? How so ?


--strk;



From MAILER-DAEMON Mon Apr 09 05:08:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaprA-0001Ou-4H
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 05:08:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hapr7-0001Om-MP
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:08:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hapr6-0001Oa-LB
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:08:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hapr6-0001OX-CZ
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:08:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HapnI-0004AA-41
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:04:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HapnG-0002Xy-N9
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 09:04:10 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HapnG-0002Xt-0K
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 09:04:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HapnG-0002Xt-0K@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 09 Apr 2007 09:04:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 09:08:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/09 09:04:09

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/misc-ming.all/Makefile.am: activated
	          get_frame_number test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2816&r2=1.2817
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.89&r2=1.90

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2816
retrieving revision 1.2817
diff -u -b -r1.2816 -r1.2817
--- ChangeLog	8 Apr 2007 23:06:16 -0000	1.2816
+++ ChangeLog	9 Apr 2007 09:04:08 -0000	1.2817
@@ -1,3 +1,8 @@
+2007-04-09 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/Makefile.am: activated
+	  get_frame_number test.
+
 2007-04-08  Rob Savoye  <rob@bertha.welcomehome.org>
 
 	* macros/agg.m4, boost.m4, curl.m4, ffmpeg.m4, firefox.m4,

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- testsuite/misc-ming.all/Makefile.am	6 Apr 2007 09:56:00 -0000	1.89
+++ testsuite/misc-ming.all/Makefile.am	9 Apr 2007 09:04:09 -0000	1.90
@@ -104,6 +104,7 @@
 	eventSoundTest1 \
 	eventSoundTest1-Runner \
 	DrawingApiTestRunner \
+	get_frame_number_test \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -138,6 +139,7 @@
 	reverse_execute_PlaceObject2_test1runner \
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \
+	get_frame_number_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -370,6 +372,20 @@
 	sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
 	chmod 755 $@
 
+get_frame_number_test_SOURCES =	\
+	get_frame_number_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+get_frame_number_test_LDADD = $(MING_LIBS)
+
+get_frame_number_test.swf: get_frame_number_test
+	./get_frame_number_test $(top_srcdir)/testsuite/media
+
+get_frame_number_testrunner: $(srcdir)/../generic-testrunner.sh get_frame_number_test.swf
+	sh $< -r5 $(top_builddir) get_frame_number_test.swf > $@
+	chmod 755 $@
+
 attachMovieTest_SOURCES =	\
 	attachMovieTest.c	\
 	ming_utils.h		\



From MAILER-DAEMON Mon Apr 09 05:28:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaqAR-0005RL-Ms
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 05:28:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaqAP-0005QN-5s
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:28:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaqAO-0005Q4-LD
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:28:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaqAO-0005Pw-87
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:28:04 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Haq6Z-0006v2-F2
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 05:24:08 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l399Nwx97891;
	Mon, 9 Apr 2007 11:23:58 +0200 (CEST) (envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Mon, 9 Apr 2007 11:23:58 +0200
To: Rob Savoye <rob@welcomehome.org>
Subject: Re: [Gnash-commit] gnash configure.ac ChangeLog cygnal/cygnal.cpp ...
Message-ID: <20070409092358.GM35069@keybit.net>
Mail-Followup-To: Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
References: <E1HagSf-00041X-TB@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HagSf-00041X-TB@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 09:28:05 -0000

On Sun, Apr 08, 2007 at 11:06:17PM +0000, Rob Savoye wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Rob Savoye <rsavoye>	07/04/08 23:06:17
> 
> Modified files:
> 	.              : configure.ac ChangeLog 
> 	cygnal         : cygnal.cpp 
> 	macros         : agg.m4 boost.m4 curl.m4 ffmpeg.m4 firefox.m4 
> 	                 glib.m4 gnashpkgtool.m4 gtk2.m4 gtkglext.m4 
> 	                 incllist jpeg.m4 kde.m4 libXML.m4 libslist 
> 	                 ming.m4 mysql.m4 opengl.m4 pango.m4 pthreads.m4 
> 	                 sdl.m4 x11.m4 
> 	libbase        : curl_adapter.cpp extension.cpp log.h network.h 
> 	                 noseek_fd_adapter.cpp rc.cpp ref_counted.h 
> 	                 sharedlib.cpp 
> 	testsuite/samples: Makefile.am 

make[3]: Entering directory `/home/strk/src/gnash/build/head/gtk_agg_gst/testsuite'
...
/bin/sh ../libtool --tag=CXX --mode=link g++  -g -O0 -fno-inline -pthread -march=pentiumpro     -W     -Wall     -Wcast-align     -Wcast-qual     -Wpointer-arith     -Wreturn-type        -o libtestsuite.la   libtestsuite_la-MovieTester.lo libtestsuite_la-sound_handler_test.lo ../backend/libgnashbackend.la ../server/libgnashserver.la ../libbase/libgnashbase.la  -lrt -lX11 -lXi -lm
ar cvu .libs/libtestsuite.a .libs/libtestsuite_la-MovieTester.o .libs/libtestsuite_la-sound_handler_test.o
ar: no operation specified


--strk;



From MAILER-DAEMON Mon Apr 09 06:13:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Haqsd-0001nG-2a
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 06:13:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaqsX-0001mY-PY
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:13:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaqsW-0001m5-Ds
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:13:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaqsV-0001lr-Nd
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:13:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Haqog-000522-M2
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:09:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Haqof-00063P-1w
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 10:09:41 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Haqoe-00063L-P8
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 10:09:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Haqoe-00063L-P8@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 09 Apr 2007 10:09:40 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderFfmpeg...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 10:13:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/09 10:09:40

Modified files:
	.              : ChangeLog 
	libbase        : embedVideoDecoderFfmpeg.cpp 

Log message:
	        * libbase/embedVideoDecoderFfmpeg.cpp: add missing avcodec.h
	          include for definition of CODEC_ID_VP6F.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2817&r2=1.2818
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2817
retrieving revision 1.2818
diff -u -b -r1.2817 -r1.2818
--- ChangeLog	9 Apr 2007 09:04:08 -0000	1.2817
+++ ChangeLog	9 Apr 2007 10:09:40 -0000	1.2818
@@ -1,5 +1,7 @@
 2007-04-09 Sandro Santilli <strk@keybit.net>
 
+	* libbase/embedVideoDecoderFfmpeg.cpp: add missing avcodec.h
+	  include for definition of CODEC_ID_VP6F.
 	* testsuite/misc-ming.all/Makefile.am: activated
 	  get_frame_number test.
 

Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/embedVideoDecoderFfmpeg.cpp	19 Feb 2007 21:45:41 -0000	1.4
+++ libbase/embedVideoDecoderFfmpeg.cpp	9 Apr 2007 10:09:40 -0000	1.5
@@ -14,12 +14,14 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: embedVideoDecoderFfmpeg.cpp,v 1.4 2007/02/19 21:45:41 tgc Exp $
+// $Id: embedVideoDecoderFfmpeg.cpp,v 1.5 2007/04/09 10:09:40 strk Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include "avcodec.h"
+
 #ifdef USE_FFMPEG
 
 #include "embedVideoDecoderFfmpeg.h"



From MAILER-DAEMON Mon Apr 09 06:15:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Haquf-0002Gb-Ec
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 06:15:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Haqud-0002Fp-Cm
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:15:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Haquc-0002FI-6f
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:15:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Haqub-0002Eu-5c
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:15:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Haqqm-0005Sx-Cz
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:11:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Haqqm-0006Ac-0G
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 10:11:52 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Haqql-0006AZ-MR
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 10:11:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Haqql-0006AZ-MR@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 09 Apr 2007 10:11:51 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/embedVideoDecoderFfmpeg...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 10:15:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/09 10:11:51

Modified files:
	.              : ChangeLog 
	libbase        : embedVideoDecoderFfmpeg.cpp 

Log message:
	Reverted last change, the problem is more complex, sorry for confusion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2818&r2=1.2819
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/embedVideoDecoderFfmpeg.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2818
retrieving revision 1.2819
diff -u -b -r1.2818 -r1.2819
--- ChangeLog	9 Apr 2007 10:09:40 -0000	1.2818
+++ ChangeLog	9 Apr 2007 10:11:51 -0000	1.2819
@@ -1,7 +1,5 @@
 2007-04-09 Sandro Santilli <strk@keybit.net>
 
-	* libbase/embedVideoDecoderFfmpeg.cpp: add missing avcodec.h
-	  include for definition of CODEC_ID_VP6F.
 	* testsuite/misc-ming.all/Makefile.am: activated
 	  get_frame_number test.
 

Index: libbase/embedVideoDecoderFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/embedVideoDecoderFfmpeg.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/embedVideoDecoderFfmpeg.cpp	9 Apr 2007 10:09:40 -0000	1.5
+++ libbase/embedVideoDecoderFfmpeg.cpp	9 Apr 2007 10:11:51 -0000	1.6
@@ -14,14 +14,12 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// $Id: embedVideoDecoderFfmpeg.cpp,v 1.5 2007/04/09 10:09:40 strk Exp $
+// $Id: embedVideoDecoderFfmpeg.cpp,v 1.6 2007/04/09 10:11:51 strk Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "avcodec.h"
-
 #ifdef USE_FFMPEG
 
 #include "embedVideoDecoderFfmpeg.h"



From MAILER-DAEMON Mon Apr 09 06:19:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HaqyM-0004H2-D1
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 06:19:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HaqyJ-0004Ee-KP
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:19:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HaqyH-0004DX-U5
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:19:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HaqyH-0004DF-AN
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:19:37 -0400
Received: from nz-out-0506.google.com ([64.233.162.234])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HaquS-00069O-DE
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:15:40 -0400
Received: by nz-out-0506.google.com with SMTP id s1so1023495nze
	for <gnash-commit@gnu.org>; Mon, 09 Apr 2007 03:15:39 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=cY4TJt4/dOX4F/86Ao/qxt6HH2oP/x7OxkIyEYWSgDs3TZj0JqDJitoUbRMt2lFu9zkZBuFTKb38E2l1hO6MiNw5W7xXoOsgrdCnTcwga1JDxFSvZis0vFa2jP1cIOTm4+k9Cf91eaXFlyvy+WvxXkkQs8Ygk7ZwwsD1RYvvHr4=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=fwH2UFzEzdJ0QF7BlFyqyOJK1hugj3Bs4uYpTRIWIY1Vj1YizgrpJv8uVk1qhwmuwyec0cp1v78wXNLkimKhzVilEpgPaSN8LMEbm3CSF6BiN0NbcwzqWAUxdQykA4TkgPIevRDt0PQixL4grZ+xOBgOrwU/5BktD6HZnUyA8vk=
Received: by 10.114.151.13 with SMTP id y13mr856942wad.1176113738811;
	Mon, 09 Apr 2007 03:15:38 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Mon, 9 Apr 2007 03:15:38 -0700 (PDT)
Message-ID: <ca4b43ff0704090315w46a33c00n59de26f247a10728@mail.gmail.com>
Date: Mon, 9 Apr 2007 18:15:38 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: strk@keybit.net, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
In-Reply-To: <20070409071905.GL35069@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HZPwq-00085N-0w@cvs>
	<ca4b43ff0704081841u20fe2b01hcb270bd0da833f02@mail.gmail.com>
	<20070409071905.GL35069@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 10:19:40 -0000

On 4/9/07, Sandro Santilli <strk@keybit.net> wrote:
> On Mon, Apr 09, 2007 at 09:41:40AM +0800, zou lunkai wrote:
> > +     // TODO: are we sure we shouldn't check for frames labeled with
> > negative
> > +    // numbers ?
> > this case is already tested in swfdec/test/trace/gotoframe.swf.
> >
> > eg. x = "-2";
> > GotoAndStop(x);
> >
> > x will be converted a NAN when calling "frame_spec.to_number()", then
> > if there is a frame labeled as "-2", it will be found.
>
> Really ?? "-2" converts to NaN ? How so ?
>

sorry, this was  my mistake.

x = "-2";
GotoAndStop(x) == GotoAndStop(-2) == DoNothing(don't stop the current
frame, and don't push any actions)


bool
sprite_instance::get_frame_number(const as_value& frame_spec, size_t&
frameno) const
{
	//GNASH_REPORT_FUNCTION;

	as_environment* env = const_cast<as_environment*>(&m_as_environment);

            //becuase the "toString()" is expected to be invoked...
	as_value str(frame_spec.to_std_string(env));

             //alway convert the std_string to a number first. If this
conversion succeeded,
            //then we try to fetch the number-th frame. We do this
even the result number
            //is not a valid frame index.
	double num =  str.to_number(env);

	if ( isnan(num) || isinf(num))
	{
	return m_def->get_labeled_frame(frame_spec.to_string(env), &frameno);
	}

	// TODO: are we sure we shouldn't check for frames labeled with negative
            //numbers ?
            // I think so, we are not going to look for a number-labeled frame.
	if ( num < 1 ) return false;

	// all frame numbers >= 0 are valid, but a valid frame number may still
	// reference a non-exist frame(eg. frameno > total_frames).
	frameno = num - 1;

	return true;
}


although currently implementation seems work, I don't like its signature.
Is this one better:

errorCode
sprite_instance::get_frame_number(const as_value& frame_spec, size_t&
frameno) const

errorCode might be just a "int"  type.



From MAILER-DAEMON Mon Apr 09 06:49:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HarRd-0001cx-Di
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 06:49:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HarRc-0001cs-Ew
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:49:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HarRa-0001cV-Vr
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:49:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HarRa-0001cH-Te
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:49:54 -0400
Received: from nz-out-0506.google.com ([64.233.162.227])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HarNm-0001Uc-2t
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 06:45:58 -0400
Received: by nz-out-0506.google.com with SMTP id s1so1026643nze
	for <gnash-commit@gnu.org>; Mon, 09 Apr 2007 03:45:57 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=gI3+F1NLx+At2O7ULSyW9uHB+rwI1NkCfhv+/kQq9ut7ruTLdqGL66aWUOlMfREKZKOSNj2rU91zkJhRhoWpq15LBhaf52doyQMWtDrc5dWiikyZa2PSvHF8H7QZjCLayo3BqA8ezy3hwG7otRVgpLjWC696uRhcIQMfglioVbM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=NHwpWH3CwndV3Jr+xGFGuW1RJ+dIc8vq02CioV2gK69LfGwgsm4rCQvV6kiXf+hhrfg4CD5w0HqgbwXtBu/TrQD9I3kpX5ChB0PVYc8XJ1hOU0nasMl981rHxpVNVOOwkVDz5l2abAt7Q08YaX1ILT+QgiWrManLYJ3iLrs8Tpg=
Received: by 10.114.211.1 with SMTP id j1mr2265608wag.1176115557237;
	Mon, 09 Apr 2007 03:45:57 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Mon, 9 Apr 2007 03:45:57 -0700 (PDT)
Message-ID: <ca4b43ff0704090345q53903abam6483f284575f7414@mail.gmail.com>
Date: Mon, 9 Apr 2007 18:45:57 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: strk@keybit.net, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
In-Reply-To: <ca4b43ff0704090315w46a33c00n59de26f247a10728@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HZPwq-00085N-0w@cvs>
	<ca4b43ff0704081841u20fe2b01hcb270bd0da833f02@mail.gmail.com>
	<20070409071905.GL35069@keybit.net>
	<ca4b43ff0704090315w46a33c00n59de26f247a10728@mail.gmail.com>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Apr 2007 10:49:56 -0000

explanation of current implementation:

bool
sprite_instance::get_frame_number(const as_value& frame_spec, size_t&
frameno) const
{
       //GNASH_REPORT_FUNCTION;

       as_environment* env = const_cast<as_environment*>(&m_as_environment);

        //becuase the "toString()" is expected to be invoked...
       as_value str(frame_spec.to_std_string(env));

       //alway convert the std_string to a number first. If this
conversion succeeded,
       //then we try to fetch the number-th frame. We do this even the
result number
       //is not a valid frame index.
       double num =  str.to_number(env);

       if ( isnan(num) || isinf(num))
       {
            return m_def->get_labeled_frame(frame_spec.to_string(env),
&frameno);
       }

       // TODO: are we sure we shouldn't check for frames labeled with negative
       //numbers ?
       // I think so, we are not going to look for a number-labeled frame.

       if ( num < 1 ) return false;

       // all frame numbers >= 0 are valid, but a valid frame number may still
       // reference a non-exist frame(eg. frameno > total_frames).
       frameno = num - 1;

       return true;
}


the drawback of the current implementation is that even if
get_frame_number() returns "true", we still need to check the
"frameno" here and there, as it might be still not in the valid
range.(eg, frameno > total_frames).  And it's also not good to clamp
the "frameno" to [0, total_frames-1] inside this function...



From MAILER-DAEMON Mon Apr 09 23:16:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hb6q2-0001hx-F2
	for mharc-gnash-commit@gnu.org; Mon, 09 Apr 2007 23:16:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hb6q0-0001dX-2Q
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 23:16:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hb6pz-0001ce-LC
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 23:16:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hb6pz-0001cR-Ip
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 23:16:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hb6m6-0006jO-1Z
	for gnash-commit@gnu.org; Mon, 09 Apr 2007 23:12:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hb6m5-0001bm-1K
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 03:12:05 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hb6m4-0001bj-LX
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 03:12:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hb6m4-0001bj-LX@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 10 Apr 2007 03:12:04 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 03:16:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/10 03:12:04

Modified files:
	.              : ChangeLog 
	server/parser  : shape_character_def.cpp 

Log message:
	fix a regression of reading fill styles

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2819&r2=1.2820
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2819
retrieving revision 1.2820
diff -u -b -r1.2819 -r1.2820
--- ChangeLog	9 Apr 2007 10:11:51 -0000	1.2819
+++ ChangeLog	10 Apr 2007 03:12:04 -0000	1.2820
@@ -1,3 +1,8 @@
+2007-04-10 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/parser/shape_character_def.cpp:
+	  fix reading fill_styles, actually it was a regression.
+	  
 2007-04-09 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/Makefile.am: activated

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/shape_character_def.cpp	19 Feb 2007 11:08:22 -0000	1.13
+++ server/parser/shape_character_def.cpp	10 Apr 2007 03:12:04 -0000	1.14
@@ -6,7 +6,7 @@
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
 
-/* $Id: shape_character_def.cpp,v 1.13 2007/02/19 11:08:22 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.14 2007/04/10 03:12:04 zoulunkai Exp $ */
 
 #include "shape_character_def.h"
 
@@ -57,7 +57,7 @@
 {
 
 	// Get the count.
-	uint8_t fill_style_count = in->read_u8();
+	uint16_t fill_style_count = in->read_u8();
 	if (tag_type > 2)
 	{
 		if (fill_style_count == 0xFF)
@@ -72,7 +72,7 @@
 
 	// Read the styles. 
 	styles.reserve(styles.size()+fill_style_count);
-	for (uint8_t i = 0; i < fill_style_count; ++i)
+	for (uint16_t i = 0; i < fill_style_count; ++i)
 	{
 		// TODO: add a fill_style constructor directly
 		//       reading from stream



From MAILER-DAEMON Tue Apr 10 04:42:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbBvs-00016M-K4
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 04:42:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbBvo-00012e-SG
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 04:42:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbBvl-0000xu-0S
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 04:42:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbBvk-0000wq-1q
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 04:42:24 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HbBrn-0007zf-1h
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 04:38:20 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3A8bwc18901;
	Tue, 10 Apr 2007 10:37:58 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Tue, 10 Apr 2007 10:37:58 +0200
From: strk <strk@keybit.net>
To: Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash configure.ac ChangeLog cygnal/cygnal.cpp ...
Message-ID: <20070410083758.GA18757@keybit.net>
Mail-Followup-To: Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
References: <E1HagSf-00041X-TB@cvs> <20070409092358.GM35069@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070409092358.GM35069@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 08:42:29 -0000

On Mon, Apr 09, 2007 at 11:23:58AM +0200, strk wrote:
> On Sun, Apr 08, 2007 at 11:06:17PM +0000, Rob Savoye wrote:
> > CVSROOT:	/sources/gnash
> > Module name:	gnash
> > Changes by:	Rob Savoye <rsavoye>	07/04/08 23:06:17
> > 
> > Modified files:
> > 	.              : configure.ac 

...

> make[3]: Entering directory `/home/strk/src/gnash/build/head/gtk_agg_gst/testsuite'
> ...
> /bin/sh ../libtool --tag=CXX --mode=link g++  -g -O0 -fno-inline -pthread -march=pentiumpro     -W     -Wall     -Wcast-align     -Wcast-qual     -Wpointer-arith     -Wreturn-type        -o libtestsuite.la   libtestsuite_la-MovieTester.lo libtestsuite_la-sound_handler_test.lo ../backend/libgnashbackend.la ../server/libgnashserver.la ../libbase/libgnashbase.la  -lrt -lX11 -lXi -lm
> ar cvu .libs/libtestsuite.a .libs/libtestsuite_la-MovieTester.o .libs/libtestsuite_la-sound_handler_test.o
> ar: no operation specified

Commenting out the libtool archiver check block fixes the problem here on Ubuntu.
The suspicius part is the manual setting of AR and AR FLAGS

dnl BOGUS dnl   AR="ar"
dnl BOGUS dnl   AR_FLAGS="cvu"
dnl BOGUS dnl   darwin=no


--strk;



From MAILER-DAEMON Tue Apr 10 05:18:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbCV7-0006by-0O
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 05:18:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbCV4-0006bl-Vt
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 05:18:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbCV3-0006aR-Eg
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 05:18:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbCV3-0006Zu-8d
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 05:18:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbCR7-0003kG-Ui
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 05:14:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbCR6-0002RX-RU
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 09:14:48 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbCR6-0002RU-HU
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 09:14:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbCR6-0002RU-HU@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 09:14:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog macros/ffmpeg.m4
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 09:18:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 09:14:48

Modified files:
	.              : ChangeLog 
	macros         : ffmpeg.m4 

Log message:
	        * macros/ffmpeg.m4: fix --with-ffmpeg-incl to look for
	          avcodec.h under the 'ffmpeg' subdir (this is assumed
	          to exist in Gnash source code).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2820&r2=1.2821
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2820
retrieving revision 1.2821
diff -u -b -r1.2820 -r1.2821
--- ChangeLog	10 Apr 2007 03:12:04 -0000	1.2820
+++ ChangeLog	10 Apr 2007 09:14:47 -0000	1.2821
@@ -1,3 +1,9 @@
+2007-04-10 Sandro Santilli <strk@keybit.net>
+
+	* macros/ffmpeg.m4: fix --with-ffmpeg-incl to look for
+	  avcodec.h under the 'ffmpeg' subdir (this is assumed
+	  to exist in Gnash source code).
+
 2007-04-10 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/parser/shape_character_def.cpp:

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- macros/ffmpeg.m4	8 Apr 2007 23:06:17 -0000	1.34
+++ macros/ffmpeg.m4	10 Apr 2007 09:14:48 -0000	1.35
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: ffmpeg.m4,v 1.34 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: ffmpeg.m4,v 1.35 2007/04/10 09:14:48 strk Exp $
 
 AC_DEFUN([GNASH_PATH_FFMPEG],
 [
@@ -22,10 +22,10 @@
   AC_ARG_WITH(ffmpeg_incl, AC_HELP_STRING([--with-ffmpeg-incl], [directory where ffmpeg headers are]), with_ffmpeg_incl=${withval})
   AC_CACHE_VAL(ac_cv_path_ffmpeg_incl,[
     if test x"${with_ffmpeg_incl}" != x ; then
-      if test -f ${with_ffmpeg_incl}/avcodec.h ; then
+      if test -f ${with_ffmpeg_incl}/ffmpeg/avcodec.h ; then
         ac_cv_path_ffmpeg_incl="-I`(cd ${with_ffmpeg_incl}; pwd)`"
       else
-        AC_MSG_ERROR([${with_ffmpeg_incl} directory doesn't contain any headers])
+        AC_MSG_ERROR([${with_ffmpeg_incl} directory doesn't contain the ffmpeg/avcodec.h header])
       fi
     fi
   ])



From MAILER-DAEMON Tue Apr 10 06:50:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbDvg-0005vT-Tg
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 06:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbDvf-0005vE-Cu
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 06:50:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbDvd-0005uG-FT
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 06:50:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbDvc-0005uB-Uk
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 06:50:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbDrg-0000U2-S6
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 06:46:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbDrg-0007m8-2n
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:46:20 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbDrf-0007m4-Qc
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:46:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbDrf-0007m4-Qc@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 10:46:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xmlnode.cpp server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 10:50:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 10:46:19

Modified files:
	.              : ChangeLog 
	server/asobj   : xmlnode.cpp xmlnode.h 
	testsuite/actionscript.all: XML.as 

Log message:
	        * server/asobj/xmlnode.{h,cpp}: fix appendChild to properly
	          move the node; implement insertBefore and removeNode; fix
	          cloneNode to respect not copy childs if not deep; implement
	          parentNode gettersetter.
	        * testsuite/actionscript.all/XML.as: add tests for insertBefore,
	          appendNode, cloneNode, removeNode and parentNode.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2821&r2=1.2822
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2821
retrieving revision 1.2822
diff -u -b -r1.2821 -r1.2822
--- ChangeLog	10 Apr 2007 09:14:47 -0000	1.2821
+++ ChangeLog	10 Apr 2007 10:46:19 -0000	1.2822
@@ -1,5 +1,11 @@
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/xmlnode.{h,cpp}: fix appendChild to properly
+	  move the node; implement insertBefore and removeNode; fix
+	  cloneNode to respect not copy childs if not deep; implement
+	  parentNode gettersetter.
+	* testsuite/actionscript.all/XML.as: add tests for insertBefore,
+	  appendNode, cloneNode, removeNode and parentNode.
 	* macros/ffmpeg.m4: fix --with-ffmpeg-incl to look for
 	  avcodec.h under the 'ffmpeg' subdir (this is assumed
 	  to exist in Gnash source code).

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/xmlnode.cpp	7 Apr 2007 15:27:16 -0000	1.27
+++ server/asobj/xmlnode.cpp	10 Apr 2007 10:46:19 -0000	1.28
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.27 2007/04/07 15:27:16 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.28 2007/04/10 10:46:19 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -63,6 +63,7 @@
 static as_value xmlnode_nextsibling(const fn_call& fn);
 static as_value xmlnode_previoussibling(const fn_call& fn);
 static as_value xmlnode_childNodes(const fn_call& fn);
+static as_value xmlnode_parentNode(const fn_call& fn);
 as_object* getXMLNodeInterface();
 
 static LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
@@ -97,16 +98,13 @@
 XMLNode::XMLNode(const XMLNode& tpl, bool deep)
     :
     as_object(getXMLNodeInterface()),
-    _parent(tpl._parent),
+    _parent(0), // _parent is never implicitly copied
     _name(tpl._name),
     _value(tpl._value),
     _type(tpl._type)
 {
-    if ( ! deep )
-    {
-            _children = tpl._children;
-    }
-    else // deep copy
+    // only clone childs if in deep mode
+    if ( deep ) 
     {
         const ChildList& from=tpl._children;
         for (ChildList::const_iterator it=from.begin(), itEnd=from.end();
@@ -160,10 +158,13 @@
 void
 XMLNode::appendChild(boost::intrusive_ptr<XMLNode> node)
 {
-    if (node)
-	{
+    assert (node);
+
+    boost::intrusive_ptr<XMLNode> oldparent = node->getParent();
 		node->setParent(this);
 		_children.push_back(node);
+    if ( oldparent ) {
+        oldparent->_children.remove(node);
     }
 
 //    log_msg("%s: partially unimplemented\n", __PRETTY_FUNCTION__);
@@ -180,24 +181,45 @@
     return newnode;
 }
 
-/// \brief insert a node before a node
-///
-/// Method; inserts a new child node into the XML object's child
-/// list, before the beforeNode node. If the beforeNode parameter is
-/// undefined or null, the node is added using the appendChild()
-/// method. If beforeNode is not a child of my_xml, the insertion
-/// fails.
 void
-XMLNode::insertBefore(XMLNode * /* newnode */, XMLNode * /* node */)
+XMLNode::insertBefore(boost::intrusive_ptr<XMLNode> newnode, boost::intrusive_ptr<XMLNode> pos)
 {
+    // find iterator for positional parameter
     log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+
+    ChildList::iterator it = find(_children.begin(), _children.end(), pos);
+    if ( it == _children.end() )
+    {
+        IF_VERBOSE_ASCODING_ERRORS(
+        log_aserror("XMLNode.insertBefore(): positional parameter is not a child of this node");
+        );
+        return;
+    }
+
+    _children.insert(it, newnode);
+    boost::intrusive_ptr<XMLNode> oldparent = newnode->getParent();
+    newnode->setParent(this);
+    if ( oldparent )
+    {
+        oldparent->_children.remove(newnode);
+    }
 }
+
 /// \brief removes the specified XML object from its parent. Also
 /// deletes all descendants of the node.
 void
 XMLNode::removeNode()
 {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    assert(get_ref_count() > 1);
+    boost::intrusive_ptr<XMLNode> oldparent = getParent();
+    if ( oldparent )
+    {
+        oldparent->_children.remove(this);
+    }
+    _children.clear();
+    _attributes.clear();
+    _parent = NULL;
+    assert(get_ref_count() > 0);
 }
 
 XMLNode *
@@ -377,7 +399,8 @@
     gettersetter = new builtin_function(&xmlnode_previoussibling, NULL);
     o.init_property("previousSibling", *gettersetter, *gettersetter);
 
-    o.init_member("parentNode",  as_value().set_null());
+    gettersetter = new builtin_function(&xmlnode_parentNode, NULL);
+    o.init_property("parentNode",  *gettersetter, *gettersetter);
 
 }
 
@@ -460,6 +483,40 @@
     GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     
+	if ( fn.nargs < 2 )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+        std::stringstream ss; fn.dump_args(ss);
+		log_aserror("XMLNode.insertBefore(%s) needs at least two argument", ss.str().c_str());
+		);
+		return as_value();
+	}
+
+	boost::intrusive_ptr<XMLNode> newnode = boost::dynamic_pointer_cast<XMLNode>(fn.arg(0).to_object());
+	if ( ! newnode )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+        std::stringstream ss; fn.dump_args(ss);
+		log_aserror("First argument to XMLNode.insertBefore(%s) is not an XMLNode",
+                ss.str().c_str());
+		);
+		return as_value();
+	}
+
+	boost::intrusive_ptr<XMLNode> pos = boost::dynamic_pointer_cast<XMLNode>(fn.arg(1).to_object());
+	if ( ! pos )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+        std::stringstream ss; fn.dump_args(ss);
+		log_aserror("Second argument to XMLNode.insertBefore(%s) is not an XMLNode",
+                ss.str().c_str());
+		);
+		return as_value();
+	}
+
+    ptr->insertBefore(newnode, pos);
+    return as_value();
+    
 //    return as_value(ptr->obj.getAllocated());
 //    ptr->obj.insertBefore();
     log_msg("%s:unimplemented \n", __PRETTY_FUNCTION__);
@@ -472,7 +529,6 @@
     GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     
-//    return as_value(ptr->obj.getAllocated());
     ptr->removeNode();
     return as_value();
 }
@@ -693,6 +749,30 @@
     return rv;
 }
 
+// Both a getter and a (do-nothing) setter for parentNode
+static as_value
+xmlnode_parentNode(const fn_call& fn)
+{
+    //GNASH_REPORT_FUNCTION;
+    as_value rv;
+    rv.set_null();
+
+    if ( fn.nargs != 0 )
+    {
+        IF_VERBOSE_ASCODING_ERRORS(
+        log_aserror("Tried to set read-only property XMLNode.parentNode");
+        );
+        return rv;
+    }
+
+    boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
+    XMLNode *node = ptr->getParent();
+    if (node) {
+	rv = node;
+    }
+    return rv;
+}
+
 // Both a getter and a (do-nothing) setter for childNodes
 static as_value
 xmlnode_childNodes(const fn_call& fn)

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/xmlnode.h	7 Apr 2007 15:27:16 -0000	1.11
+++ server/asobj/xmlnode.h	10 Apr 2007 10:46:19 -0000	1.12
@@ -28,9 +28,6 @@
 #include "tu_config.h"
 
 //#define DEBUG_MEMORY_ALLOCATION 1
-#include <vector>
-#include <string>
-#include <sstream>
 
 #include "action.h"
 #include "impl.h"
@@ -45,6 +42,11 @@
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
 
+#include <list>
+#include <vector>
+#include <string>
+#include <sstream>
+
 namespace gnash {  
  
 /// XMLNode  ActionScript class
@@ -135,7 +137,8 @@
     boost::intrusive_ptr<XMLNode> firstChild();
     boost::intrusive_ptr<XMLNode> lastChild();
     
-    typedef std::vector< boost::intrusive_ptr<XMLNode> > ChildList;
+    // Use a list for quick erasing
+    typedef std::list< boost::intrusive_ptr<XMLNode> > ChildList;
 
     typedef std::vector< XMLAttr > AttribList;
 
@@ -143,13 +146,6 @@
 
     AttribList& attributes() { return _attributes; }
     
-    boost::intrusive_ptr<XMLNode> operator [] (int x)
-    {
-        log_msg("%s: get element %d", __PRETTY_FUNCTION__, x);
-        
-        return _children[x];
-    }
-    
     XMLNode& operator = (XMLNode &node) {
         gnash::log_msg("%s: \n", __PRETTY_FUNCTION__);
         if (this == &node) return *this;
@@ -208,18 +204,35 @@
     /// undefined or null, the node is added using the appendChild()
     /// method. If beforeNode is not a child of my_xml, the insertion
     /// fails.
-    void insertBefore(XMLNode *newnode, XMLNode *node);
+    ///
+    /// @param newnoe
+    ///     The node to insert, moving from its current tree
+    ///
+    /// @param beforeWhich
+    ///     The node before which to insert the new one.
+    ///     Must be a child of this XMLNode or the operation will fail.
+    ///
+    void insertBefore(boost::intrusive_ptr<XMLNode> newnode, boost::intrusive_ptr<XMLNode> pos);
 
     /// Removes the specified XML object from its parent.
     //
     /// Also deletes all descendants of the node.
+    /// Make sure to keep an intrusive_ptr against
+    /// this instance during operation or the ref-counting
+    /// management might destroy it.
+    ///
     void removeNode();
 
     void toString(std::ostream& str) const;
 
     void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
 
+    // We might turn this back to a dumb pointer, as long
+    // as we'll make sure in the XMLNode destructor and
+    // any child cleaning interface to set child parent
+    // to NULL
     boost::intrusive_ptr<XMLNode> _parent;
+
     ChildList		_children;
     AttribList      _attributes;
 

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/actionscript.all/XML.as	8 Apr 2007 08:06:58 -0000	1.26
+++ testsuite/actionscript.all/XML.as	10 Apr 2007 10:46:19 -0000	1.27
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.26 2007/04/08 08:06:58 strk Exp $";
+rcsid="$Id: XML.as,v 1.27 2007/04/10 10:46:19 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -69,6 +69,7 @@
 check(XMLNode.prototype.hasOwnProperty("toString") );
 check(XMLNode.prototype.hasOwnProperty("cloneNode") );
 check(XMLNode.prototype.hasOwnProperty("attributes") );
+check(XMLNode.prototype.hasOwnProperty("parentNode") );
 check(! XMLNode.prototype.hasOwnProperty("length") );
 check(! XMLNode.prototype.hasOwnProperty("createElement") );
 check(! XMLNode.prototype.hasOwnProperty("addRequestHeader") );
@@ -91,7 +92,12 @@
 check(! XMLNode.hasOwnProperty("cloneNode") );
 #endif
 
+check(XML.prototype instanceof XMLNode);
+
 var tmp = new XML();
+check(tmp instanceof XML);
+check(tmp instanceof XMLNode);
+
 check_equals(typeof(tmp.length), 'undefined');
 check(! tmp.hasOwnProperty("length"));
 
@@ -242,9 +248,20 @@
 tmp.checkParsed = function ()
 {
 	note("tmp.checkParsed called");
+
+	// Since we didn't *load* the XML, but we
+	// just *parsed* it, expect getBytesLoaded 
+	// and getBytesTotal to return undefined
+	check_equals(this.getBytesLoaded(), undefined);
+	check_equals(this.getBytesTotal(), undefined);
+
 	check(this.hasChildNodes());
+	check_equals(typeof(this.nodeName), 'null');
+	check_equals(typeof(this.nodeValue), 'null');
 	check(this.childNodes instanceof Array);
 	check_equals(this.firstChild, this.lastChild);
+	check(this.firstChild instanceof XMLNode);
+	check_equals(typeof(this.length), 'undefined');
 	check_equals(typeof(this.childNodes.length), 'number');
 	check_equals(this.childNodes.length, 1);
 	check_equals(this.childNodes[0], this.firstChild);
@@ -383,38 +400,98 @@
 tmp.checkParsed(); // onLoad won't be called
 //note("Parsed XML: "+tmp.toString());
 check_equals(tmp.toString(), xml_in);
-check(XML.prototype instanceof XMLNode);
-check(tmp instanceof XML);
-check(tmp instanceof XMLNode);
-check(tmp.firstChild instanceof XMLNode);
-check_equals(typeof(tmp.nodeName), 'null');
-check_equals(typeof(tmp.nodeValue), 'null');
-check_equals(typeof(tmp.length), 'undefined');
-check_equals(tmp.firstChild.nodeName, "TOPNODE");
-check_equals(typeof(tmp.firstChild.length), 'undefined');
 
-if (tmp.hasChildNodes() == true) {
-    pass("XML::hasChildNodes() works");
-} else {
-    fail("XML::hasChildNodes() doesn't work");
-}
-// note(tmp.getBytesLoaded());
-// note(tmp.getBytesTotal());
+//------------------------------------------------
+// Test XML editing
+//------------------------------------------------
+xml1 = new XML("<X1T><X1C1></X1C1><X1C2></X1C2></X1T>");
+xml2 = new XML("<X2T><X2C1></X2C1><X2C2></X2C2></X2T>");
+check_equals(xml1.childNodes.length, 1);
+check_equals(xml1.firstChild.childNodes.length, 2);
+check_equals(xml2.childNodes.length, 1);
+check_equals(xml2.firstChild.childNodes.length, 2);
+
+// Now move X1C1 to X2T
+movingchild = xml2.firstChild.lastChild;
+
+check_equals(movingchild.parentNode, xml2.firstChild);
+check(movingchild.parentNode != xml1.firstChild);
+xml1.firstChild.appendChild(movingchild);
+check_equals(movingchild.parentNode, xml1.firstChild);
+check(movingchild.parentNode != xml2.firstChild);
+
+check_equals(xml1.firstChild.childNodes.length, 3);
+check_equals(xml1.firstChild.childNodes[0].nodeName, "X1C1");
+check_equals(xml1.firstChild.childNodes[1].nodeName, "X1C2");
+check_equals(xml1.firstChild.childNodes[2].nodeName, "X2C2");
+
+check_equals(xml2.firstChild.childNodes.length, 1); // firstChild has been moved
+check_equals(xml2.firstChild.childNodes[0].nodeName, "X2C1");
+
+// Now insert X2C1 from xml2 before X1C2 in xml1
+xml1.firstChild.insertBefore(
+	xml2.firstChild.lastChild, // what to insert
+	xml1.firstChild.childNodes[1] // before what to insert it
+);
+check_equals(xml1.firstChild.childNodes.length, 4);
+check_equals(xml1.firstChild.childNodes[0].nodeName, "X1C1");
+check_equals(xml1.firstChild.childNodes[1].nodeName, "X2C1");
+check_equals(xml1.firstChild.childNodes[2].nodeName, "X1C2");
+check_equals(xml1.firstChild.childNodes[3].nodeName, "X2C2");
+
+// XMLNode.removeNode
+check_equals(xml2.firstChild.childNodes.length, 0); // lastChild has been moved
+xml2.firstChild.removeNode();
+check_equals(xml2.childNodes.length, 0); // it's only child has been dropped
+
+x1c1_node = xml1.firstChild.childNodes[0];
+x2c1_node = xml1.firstChild.childNodes[1];
+check_equals(x1c1_node.nodeName, "X1C1");
+check_equals(x1c1_node.nextSibling, x2c1_node);
+check_equals(x2c1_node.nodeName, "X2C1");
+check_equals(x2c1_node.previousSibling, x1c1_node);
+xml1.firstChild.removeNode(); // removeNode removes all childrens !!
+check_equals(xml1.childNodes.length, 0);
+// so these become orphaned (no parent)
+check_equals(x1c1_node.nodeName, "X1C1");
+check_equals(x1c1_node.nextSibling(), null);
+check_equals(x2c1_node.nodeName, "X2C1");
+check_equals(x2c1_node.previousSibling(), null);
+
+xml1.appendChild(x1c1_node);
+xml1.appendChild(x2c1_node);
+check_equals(x1c1_node.nextSibling, x2c1_node);
+check_equals(x2c1_node.previousSibling, x1c1_node);
+
+check_equals(xml1.childNodes.length, 2);
+x1c1_node.appendChild(x2c1_node);
+check_equals(xml1.childNodes.length, 1);
+check_equals(xml1.firstChild.lastChild.nodeName, 'X2C1');
+
+src_node = xml1.firstChild;
+cln_node = src_node.cloneNode(); // ! deep
+deepcln_node = src_node.cloneNode(true); // deep
+
+check_equals(src_node.childNodes.length, 1);
+check_equals(cln_node.childNodes.length, 0); // non-deep clone doesn't clone childs !
+check_equals(deepcln_node.childNodes.length, 1);
+
+check_equals(src_node.firstChild.nodeName, 'X2C1');
+check_equals(deepcln_node.firstChild.nodeName, 'X2C1');
+src_node.firstChild.nodeName = 'X2C1_modified';
+check_equals(src_node.firstChild.nodeName, 'X2C1_modified');
+check_equals(deepcln_node.firstChild.nodeName, 'X2C1');
+
+check_equals(deepcln_node.parentNode, null);
+deepcln_node.parentNode = src_node;
+check_equals(deepcln_node.parentNode, null);
+
+
+
+//------------------------------------------------
+// Other tests..
+//------------------------------------------------
 
-// Since we didn't *load* the XML, but we
-// just *parsed* it, expect getBytesLoaded 
-// and getBytesTotal to return undefined
-check_equals(tmp.getBytesLoaded(), undefined);
-check_equals(tmp.getBytesTotal(), undefined);
-
-if (tmp.getBytesLoaded() == tmp.getBytesTotal()) {
-    pass("bytes count are the same");
-} else {
-    fail("bytes counts are not the same");
-}
-
-
-check(XML);
 myXML = new XML();
 check(myXML != undefined);
 check(myXML.createElement);



From MAILER-DAEMON Tue Apr 10 08:21:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbFLI-0006eB-5d
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 08:21:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbFLG-0006dz-8K
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 08:20:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbFLE-0006de-Cv
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 08:20:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbFLE-0006dZ-AK
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 08:20:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbFHI-0007ZZ-3z
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 08:16:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbFHG-0005EI-GG
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 12:16:50 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbFHG-0005EE-4O
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 12:16:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbFHG-0005EE-4O@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 12:16:50 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/stream.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 12:20:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 12:16:49

Modified files:
	.              : ChangeLog 
	server         : stream.cpp 

Log message:
	        * server/stream.cpp (open_tag): print tag offsets as start
	          of the tag (including header). This is to match offsets
	          as printed by Ming's listswf for comparision purposes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2822&r2=1.2823
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2822
retrieving revision 1.2823
diff -u -b -r1.2822 -r1.2823
--- ChangeLog	10 Apr 2007 10:46:19 -0000	1.2822
+++ ChangeLog	10 Apr 2007 12:16:49 -0000	1.2823
@@ -1,5 +1,8 @@
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* server/stream.cpp (open_tag): print tag offsets as start
+	  of the tag (including header). This is to match offsets
+	  as printed by Ming's listswf for comparision purposes.
 	* server/asobj/xmlnode.{h,cpp}: fix appendChild to properly
 	  move the node; implement insertBefore and removeNode; fix
 	  cloneNode to respect not copy childs if not deep; implement

Index: server/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/stream.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/stream.cpp	22 Mar 2007 17:14:37 -0000	1.16
+++ server/stream.cpp	10 Apr 2007 12:16:49 -0000	1.17
@@ -259,6 +259,10 @@
 	SWF::tag_type stream::open_tag()
 	{
 		align();
+
+		// for debugging
+		unsigned long offset=get_position();
+
 		int	tag_header = read_u16();
 		int	tag_type = tag_header >> 6;
 		int	tag_length = tag_header & 0x3F;
@@ -270,7 +274,7 @@
 
 		IF_VERBOSE_PARSE (
 			log_parse("SWF[%lu]: tag type = %d, tag length = %d",
-			get_position(), tag_type, tag_length);
+			offset, tag_type, tag_length);
 		);
 			
 		// Remember where the end of the tag is, so we can



From MAILER-DAEMON Tue Apr 10 10:21:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbHDq-0005dl-Vd
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 10:21:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbHDo-0005d1-M4
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:21:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbHDm-0005c6-IS
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:21:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbHDm-0005c1-AE
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:21:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbH9p-0007jD-GB
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:17:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbH9n-0005PF-JE
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:17:15 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbH9n-0005PB-A3
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:17:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbH9n-0005PB-A3@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 14:17:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp testsuite/actio...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 14:21:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 14:17:15

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp 
	testsuite/actionscript.all: getvariable.as 

Log message:
	        * testsuite/actionscript.all/getvariable.as: add test for
	          literal 'invalid:Number' variable name.
	        * libbase/log.cpp: stop adding CR to debugging output !!

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2823&r2=1.2824
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2823
retrieving revision 1.2824
diff -u -b -r1.2823 -r1.2824
--- ChangeLog	10 Apr 2007 12:16:49 -0000	1.2823
+++ ChangeLog	10 Apr 2007 14:17:14 -0000	1.2824
@@ -1,5 +1,8 @@
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/getvariable.as: add test for
+	  literal 'invalid:Number' variable name.
+	* libbase/log.cpp: stop adding CR to debugging output !!
 	* server/stream.cpp (open_tag): print tag offsets as start
 	  of the tag (including header). This is to match offsets
 	  as printed by Ming's listswf for comparision purposes.

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- libbase/log.cpp	21 Feb 2007 20:22:58 -0000	1.44
+++ libbase/log.cpp	10 Apr 2007 14:17:15 -0000	1.45
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.cpp,v 1.44 2007/02/21 20:22:58 strk Exp $ */
+/* $Id: log.cpp,v 1.45 2007/04/10 14:17:15 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -740,11 +740,11 @@
     scoped_lock lock(io_mutex);
     if (_trace) {
 	if (_verbose) {
-	    cout << "\r" << endl;
+	    cout << endl;
 	}
     } else {
 	if (_verbose) {
-	    cout << "\r" << endl;
+	    cout << endl;
 	}
     }
     

Index: testsuite/actionscript.all/getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/actionscript.all/getvariable.as	28 Feb 2007 23:05:58 -0000	1.7
+++ testsuite/actionscript.all/getvariable.as	10 Apr 2007 14:17:15 -0000	1.8
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.7 2007/02/28 23:05:58 strk Exp $";
+rcsid="$Id: getvariable.as,v 1.8 2007/04/10 14:17:15 strk Exp $";
 
 #include "check.as"
 
@@ -297,6 +297,22 @@
 check_equals(checkpoint, 7);
 
 //-----------------------------------------------------------------------
+// Check 'invalid:Number'
+//-----------------------------------------------------------------------
+
+asm {
+	push 'invalid:Number'
+	push '8'
+	setvariable
+        push 'checkpoint'
+	push 'invalid:Number'
+	getvariable
+        setvariable
+};
+check_equals(typeof(checkpoint), 'undefined');
+check_equals(typeof(invalid), 'undefined');
+
+//-----------------------------------------------------------------------
 // TODO: try use of 'with' stack
 //-----------------------------------------------------------------------
 



From MAILER-DAEMON Tue Apr 10 10:45:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbHaz-0004ge-L7
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 10:45:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbHax-0004dl-Rb
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:45:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbHax-0004cq-4K
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:45:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbHax-0004cg-1V
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:45:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbHX0-0002Vf-3p
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 10:41:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbHWz-00080M-AP
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:41:13 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbHWz-00080I-47
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:41:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbHWz-00080I-47@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 14:41:13 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/parser/Makefile.am ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 14:45:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 14:41:12

Modified files:
	server/parser  : Makefile.am 
	.              : ChangeLog 

Log message:
	        * server/parser/Makefile.am: add FFMPEG_CFLAGS to AM_CPPFLAGS
	          if using FFMPEG sound.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2824&r2=1.2825

Patches:
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/Makefile.am	28 Mar 2007 23:42:20 -0000	1.26
+++ server/parser/Makefile.am	10 Apr 2007 14:41:12 -0000	1.27
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.26 2007/03/28 23:42:20 rsavoye Exp $
+# $Id: Makefile.am,v 1.27 2007/04/10 14:41:12 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -85,6 +85,10 @@
 AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
 endif
 
+if USE_FFMPEG_ENGINE
+AM_CPPFLAGS += $(FFMPEG_CFLAGS)
+endif
+
 # Rebuild with GCC 4.x Mudflap support
 mudflap:
 	@echo "Rebuilding with GCC Mudflap support"

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2824
retrieving revision 1.2825
diff -u -b -r1.2824 -r1.2825
--- ChangeLog	10 Apr 2007 14:17:14 -0000	1.2824
+++ ChangeLog	10 Apr 2007 14:41:12 -0000	1.2825
@@ -1,5 +1,8 @@
+
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/Makefile.am: add FFMPEG_CFLAGS to AM_CPPFLAGS
+	  if using FFMPEG sound.
 	* testsuite/actionscript.all/getvariable.as: add test for
 	  literal 'invalid:Number' variable name.
 	* libbase/log.cpp: stop adding CR to debugging output !!



From MAILER-DAEMON Tue Apr 10 11:52:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbIeK-0007jU-1k
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 11:52:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbIeH-0007em-QS
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 11:52:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbIeF-0007XI-I2
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 11:52:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbIeF-0007Wo-Bj
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 11:52:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbIaH-0004xe-IQ
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 11:48:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbIaG-0005CY-5l
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 15:48:40 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbIaF-0005CV-QA
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 15:48:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbIaF-0005CV-QA@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 15:48:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog configure.ac server/sprite_inst...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 15:52:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 15:48:39

Modified files:
	.              : ChangeLog configure.ac 
	server         : sprite_instance.cpp sprite_instance.h 
	server/parser  : movie_def_impl.cpp movie_def_impl.h 
	                 movie_definition.h sprite_definition.cpp 
	                 sprite_definition.h 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/parser/: movie_definition.h, movie_def_impl.{cpp,h},
	          sprite_definition.{cpp,h}: stop using TU legacy hashes
	          and strings: use std::string instead of C strings, use
	          references instead of pointers in a few places.
	        * server/sprite_instance.{cpp,h}: use std::string instead
	          of C strings for frame labels, update other uses of changed
	          interfaces of parser.
	        * server/swf/tag_loaders.cpp: update uses of changed interfaces
	          of parser.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2825&r2=1.2826
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.288&r2=1.289
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.228&r2=1.229
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.85&r2=1.86

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2825
retrieving revision 1.2826
diff -u -b -r1.2825 -r1.2826
--- ChangeLog	10 Apr 2007 14:41:12 -0000	1.2825
+++ ChangeLog	10 Apr 2007 15:48:39 -0000	1.2826
@@ -1,3 +1,14 @@
+2007-04-10 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/: movie_definition.h, movie_def_impl.{cpp,h},
+	  sprite_definition.{cpp,h}: stop using TU legacy hashes
+	  and strings: use std::string instead of C strings, use
+	  references instead of pointers in a few places.
+	* server/sprite_instance.{cpp,h}: use std::string instead
+	  of C strings for frame labels, update other uses of changed
+	  interfaces of parser.
+	* server/swf/tag_loaders.cpp: update uses of changed interfaces
+	  of parser.
 
 2007-04-10 Sandro Santilli <strk@keybit.net>
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -b -r1.288 -r1.289
--- configure.ac	8 Apr 2007 23:06:16 -0000	1.288
+++ configure.ac	10 Apr 2007 15:48:39 -0000	1.289
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.288 2007/04/08 23:06:16 rsavoye Exp $
+dnl $Id: configure.ac,v 1.289 2007/04/10 15:48:39 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -312,29 +312,29 @@
 dnl we have here now. For some reason on Darwin, we don't get the
 dnl count from grep via stdin correctly. Writing a temp file does the
 dnl trick, so although it's ugly, that's what we gotta do...
-AC_MSG_CHECKING([Checking which type of library archiver we have])
-rm -f .tmp
-libtool > .tmp 2>&1
-archiver=`grep -c dynamic .tmp 2>&1`
-rm -f .tmp
-if test $archiver -eq 1; then
-  if test "$enable_shared" = no; then
-    AR="libtool -static"
-  else
-    AR="libtool -dynamic"
-    CXXFLAGS="${CXXFLAGS} -dynamic"
-    export MACOSX_DEPLOYMENT_TARGET="10.3"
-  fi
-  AR_FLAGS="-o"
-  darwin=yes
-else
-  AR="ar"
-  AR_FLAGS="cvu"
-  darwin=no
-fi
-AC_MSG_RESULT([${AR}])
-AC_SUBST(AR)
-AC_SUBST(AR_FLAGS)
+dnl BOGUS dnl AC_MSG_CHECKING([Checking which type of library archiver we have])
+dnl BOGUS dnl rm -f .tmp
+dnl BOGUS dnl libtool > .tmp 2>&1
+dnl BOGUS dnl archiver=`grep -c dynamic .tmp 2>&1`
+dnl BOGUS dnl rm -f .tmp
+dnl BOGUS dnl if test $archiver -eq 1; then
+dnl BOGUS dnl   if test "$enable_shared" = no; then
+dnl BOGUS dnl     AR="libtool -static"
+dnl BOGUS dnl   else
+dnl BOGUS dnl     AR="libtool -dynamic"
+dnl BOGUS dnl     CXXFLAGS="${CXXFLAGS} -dynamic"
+dnl BOGUS dnl     export MACOSX_DEPLOYMENT_TARGET="10.3"
+dnl BOGUS dnl   fi
+dnl BOGUS dnl   AR_FLAGS="-o"
+dnl BOGUS dnl   darwin=yes
+dnl BOGUS dnl else
+dnl BOGUS dnl   AR="ar"
+dnl BOGUS dnl   AR_FLAGS="cvu"
+dnl BOGUS dnl   darwin=no
+dnl BOGUS dnl fi
+dnl BOGUS dnl AC_MSG_RESULT([${AR}])
+dnl BOGUS dnl AC_SUBST(AR)
+dnl BOGUS dnl AC_SUBST(AR_FLAGS)
 
 dnl When cross compiling, limit the search directories cause otherwise
 dnl we may get the host headers or libraries by accident. These values

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -b -r1.228 -r1.229
--- server/sprite_instance.cpp	8 Apr 2007 08:37:07 -0000	1.228
+++ server/sprite_instance.cpp	10 Apr 2007 15:48:39 -0000	1.229
@@ -1731,7 +1731,7 @@
 
 	if ( isnan(num) || isinf(num))
 	{
-		return m_def->get_labeled_frame(frame_spec.to_string(env), &frameno);
+		return m_def->get_labeled_frame(frame_spec.to_std_string(env), frameno);
 	}
 
 	// TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
@@ -1739,7 +1739,7 @@
 
 	// all frame numbers >= 0 are valid, but a valid frame number may still
 	// reference a non-exist frame(eg. frameno > total_frames).
-	frameno = num - 1;
+	frameno = size_t(num) - 1;
 
 	return true;
 }
@@ -2541,22 +2541,20 @@
 
 }
 
-bool sprite_instance::goto_labeled_frame(const char* label)
+bool sprite_instance::goto_labeled_frame(const std::string& label)
 {
 	size_t target_frame;
-	if (m_def->get_labeled_frame(label, &target_frame))
+	if (m_def->get_labeled_frame(label, target_frame))
 	{
 		goto_frame(target_frame);
 		return true;
 	}
-	else
-	{
+
 		IF_VERBOSE_MALFORMED_SWF(
 		log_swferror("sprite_instance::goto_labeled_frame('%s') "
-			"unknown label", label);
+			"unknown label", label.c_str());
 		);
 		return false;
-	}
 }
 
 void sprite_instance::display()

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/sprite_instance.h	8 Apr 2007 08:37:07 -0000	1.91
+++ server/sprite_instance.h	10 Apr 2007 15:48:39 -0000	1.92
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.91 2007/04/08 08:37:07 zoulunkai Exp $ */
+/* $Id: sprite_instance.h,v 1.92 2007/04/10 15:48:39 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -298,7 +298,7 @@
 
 
 	/// Look up the labeled frame, and jump to it.
-	bool goto_labeled_frame(const char* label);
+	bool goto_labeled_frame(const std::string& label);
 
 		
 	/// Display (render?) this Sprite/MovieClip, unless invisible

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/parser/movie_def_impl.cpp	3 Apr 2007 16:13:07 -0000	1.62
+++ server/parser/movie_def_impl.cpp	10 Apr 2007 15:48:39 -0000	1.63
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 200, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -267,23 +267,23 @@
     return false;
 }
 
-void movie_def_impl::visit_imported_movies(import_visitor* visitor)
+void movie_def_impl::visit_imported_movies(import_visitor& visitor)
 {
-    stringi_hash<bool>	visited;	// ugh!
+    // don't call the visitor twice for a single URL
+    std::set<std::string> visited;
 
     for (size_t i = 0, n = m_imports.size(); i < n; i++)
         {
             const import_info&	inf = m_imports[i];
-            if (visited.find(inf.m_source_url) == visited.end())
+        if (visited.insert(inf.m_source_url).second)
                 {
                     // Call back the visitor.
-                    visitor->visit(inf.m_source_url.c_str());
-                    visited[inf.m_source_url] = true;
+            visitor.visit(inf.m_source_url);
                 }
         }
 }
 
-void movie_def_impl::resolve_import(const char* source_url, movie_definition* source_movie)
+void movie_def_impl::resolve_import(const std::string& source_url, movie_definition* source_movie)
 {
 
     // Iterate in reverse, since we remove stuff along the way.
@@ -298,8 +298,8 @@
 
                     if (res == NULL)
                         {
-                            log_error("import error: resource '%s' is not exported from movie '%s'\n",
-                                      inf.m_symbol.c_str(), source_url);
+                            log_error("import error: resource '%s' is not exported from movie '%s'",
+                                      inf.m_symbol.c_str(), source_url.c_str());
                         }
                     else if (font* f = res->cast_to_font())
                         {
@@ -315,8 +315,8 @@
                         }
                     else
                         {
-                            log_error("import error: resource '%s' from movie '%s' has unknown type\n",
-                                      inf.m_symbol.c_str(), source_url);
+                            log_error("import error: resource '%s' from movie '%s' has unknown type",
+                                      inf.m_symbol.c_str(), source_url.c_str());
                         }
 
                     if (imported)
@@ -344,7 +344,7 @@
     // make sure character_id is resolved
     if (in_import_table(character_id))
         {
-            log_error("get_character_def(): character_id %d is still waiting to be imported\n",
+            log_error("get_character_def(): character_id %d is still waiting to be imported",
                       character_id);
         }
 #endif // not NDEBUG
@@ -357,7 +357,7 @@
 void movie_def_impl::add_font(int font_id, font* f)
 {
     assert(f);
-    m_fonts.add(font_id, f);
+    m_fonts.insert(make_pair(font_id, boost::intrusive_ptr<font>(f)));
 }
 
 font* movie_def_impl::get_font(int font_id)
@@ -366,23 +366,23 @@
     // make sure font_id is resolved
     if (in_import_table(font_id))
         {
-            log_error("get_font(): font_id %d is still waiting to be imported\n",
+            log_error("get_font(): font_id %d is still waiting to be imported",
                       font_id);
         }
 #endif // not NDEBUG
 
-    boost::intrusive_ptr<font>	f;
-    m_fonts.get(font_id, &f);
-    assert(f == NULL || f->get_ref_count() > 1);
+    FontMap::iterator it = m_fonts.find(font_id);
+    if ( it == m_fonts.end() ) return NULL;
+    boost::intrusive_ptr<font> f = it->second;
+    assert(f->get_ref_count() > 1);
     return f.get();
 }
 
 bitmap_character_def* movie_def_impl::get_bitmap_character_def(int character_id)
 {
-    boost::intrusive_ptr<bitmap_character_def>	ch;
-    m_bitmap_characters.get(character_id, &ch);
-    assert(ch == NULL || ch->get_ref_count() > 1);
-    return ch.get();
+    BitmapMap::iterator it = m_bitmap_characters.find(character_id);
+    if ( it == m_bitmap_characters.end() ) return NULL;
+    else return it->second.get(); 
 }
 
 void
@@ -391,7 +391,8 @@
 {
     assert(ch);
     //log_msg("Add bitmap character %d", character_id);
-    m_bitmap_characters.add(character_id, ch);
+    //m_bitmap_characters.add(character_id, ch);
+    m_bitmap_characters.insert(make_pair(character_id, boost::intrusive_ptr<bitmap_character_def>(ch)));
 
 	// we can *NOT* generate bitmap_info until
 	// a renderer is present
@@ -400,9 +401,12 @@
 
 sound_sample* movie_def_impl::get_sound_sample(int character_id)
 {
-    boost::intrusive_ptr<sound_sample>	ch;
-    m_sound_samples.get(character_id, &ch);
-    assert(ch == NULL || ch->get_ref_count() > 1);
+    SoundSampleMap::iterator it = m_sound_samples.find(character_id);
+    if ( it == m_sound_samples.end() ) return NULL;
+
+    boost::intrusive_ptr<sound_sample> ch = it->second;
+    assert(ch->get_ref_count() > 1);
+
     return ch.get();
 }
 
@@ -410,7 +414,8 @@
 {
     assert(sam);
 	log_msg("Add sound sample %d", character_id);
-    m_sound_samples.add(character_id, sam);
+    m_sound_samples.insert(make_pair(character_id,
+            boost::intrusive_ptr<sound_sample>(sam)));
 }
 
 // Read header and assign url
@@ -582,9 +587,8 @@
 
     std::vector<int>	font_ids;
 
-    for (hash<int, boost::intrusive_ptr<font> >::iterator it = m_fonts.begin();
-         it != m_fonts.end();
-         ++it)
+    for (FontMap::iterator it = m_fonts.begin(), itEnd=m_fonts.end();
+         it != itEnd; ++it)
         {
             font*	f = it->second.get();
             if (f->get_owning_movie() == this)
@@ -977,7 +981,7 @@
 }
 
 void
-movie_def_impl::export_resource(const tu_string& symbol, resource* res)
+movie_def_impl::export_resource(const std::string& symbol, resource* res)
 {
 	// FIXME: m_exports access should be protected by a mutex
 
@@ -987,7 +991,7 @@
 
 
 boost::intrusive_ptr<resource>
-movie_def_impl::get_exported_resource(const tu_string& symbol)
+movie_def_impl::get_exported_resource(const std::string& symbol)
 {
 	boost::intrusive_ptr<resource> res;
 
@@ -1021,10 +1025,8 @@
 	for (;;)
 	{
 		// FIXME: make m_exports access thread-safe
-		if ( m_exports.get(symbol, &res) )
-		{
-			return res;
-		}
+        ExportMap::iterator it = m_exports.find(symbol);
+        if ( it != m_exports.end() ) return it->second;
 
 		size_t new_loading_frame = get_loading_frame();
 
@@ -1081,17 +1083,20 @@
 }
 
 void
-movie_def_impl::add_frame_name(const char* name)
+movie_def_impl::add_frame_name(const std::string& n)
 {
 	//log_msg("labelframe: frame %d, name %s", _frames_loaded, name);
 	assert(_frames_loaded < m_frame_count);
+    m_named_frames[n] = _frames_loaded;
+}
 
-    tu_string	n = name;
-
-		if (m_named_frames.get(n, NULL) == false)	// frame should not already have a name (?)
-		{
-	    m_named_frames.add(n, _frames_loaded);	// stores 0-based frame #
-		}
+bool
+movie_def_impl::get_labeled_frame(const std::string& label, size_t& frame_number)
+{
+    NamedFrameMap::iterator it = m_named_frames.find(label);
+    if ( it == m_named_frames.end() ) return false;
+    frame_number = it->second;
+    return true;
 }
 
 

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/parser/movie_def_impl.h	4 Apr 2007 20:30:45 -0000	1.35
+++ server/parser/movie_def_impl.h	10 Apr 2007 15:48:39 -0000	1.36
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -64,9 +64,9 @@
 private:
     friend class movie_def_impl;
 
-    tu_string	m_source_url;
+    std::string	m_source_url;
     int	        m_character_id;
-    tu_string	m_symbol;
+    std::string	m_symbol;
 
     import_info()
 	:
@@ -74,7 +74,7 @@
 	{
 	}
 
-    import_info(const char* source, int id, const char* symbol)
+    import_info(const std::string& source, int id, const std::string& symbol)
 	:
 	m_source_url(source),
 	m_character_id(id),
@@ -134,7 +134,6 @@
 	/// It contains pairs of 'int' and 'boost::intrusive_ptr<character_def>'
 	///
 	typedef std::map< int, boost::intrusive_ptr<character_def> > container;
-	//typedef hash< int, boost::intrusive_ptr<character_def> >container;
 
 	typedef container::iterator iterator;
 
@@ -184,14 +183,18 @@
 private:
 	/// Characters Dictionary
 	CharacterDictionary	_dictionary;
-	//hash<int, boost::intrusive_ptr<character_def> >		m_characters;
 
 	/// Tags loader table
 	SWF::TagLoadersTable& _tag_loaders;
 
-	hash<int, boost::intrusive_ptr<font> >	 		m_fonts;
-	hash<int, boost::intrusive_ptr<bitmap_character_def> >	m_bitmap_characters;
-	hash<int, boost::intrusive_ptr<sound_sample> >		m_sound_samples;
+	typedef std::map<int, boost::intrusive_ptr<font> > FontMap;
+	FontMap m_fonts;
+
+	typedef std::map<int, boost::intrusive_ptr<bitmap_character_def> > BitmapMap;
+	BitmapMap m_bitmap_characters;
+
+	typedef std::map<int, boost::intrusive_ptr<sound_sample> > SoundSampleMap;
+	SoundSampleMap m_sound_samples;
 
 	/// A list of movie control events for each frame.
 	std::vector<PlayList> m_playlist;
@@ -200,9 +203,11 @@
 	std::vector<PlayList> m_init_action_list;
 
 	/// 0-based frame #'s
-	stringi_hash<size_t> m_named_frames;
+	typedef std::map<std::string, size_t> NamedFrameMap;
+	NamedFrameMap m_named_frames;
 
-	stringi_hash<boost::intrusive_ptr<resource> > m_exports;
+	typedef std::map<std::string, boost::intrusive_ptr<resource> > ExportMap;
+	ExportMap m_exports;
 
 	/// Items we import.
 	std::vector<import_info> m_imports;
@@ -379,7 +384,7 @@
 	}
 
 	// See docs in movie_definition.h
-	virtual void export_resource(const tu_string& symbol,
+	virtual void export_resource(const std::string& symbol,
 			resource* res);
 
 	/// Get the named exported resource, if we expose it.
@@ -387,13 +392,12 @@
 	/// @return NULL if the label doesn't correspond to an exported
 	///         resource, or if a timeout occurs while scanning the movie.
 	///
-	virtual boost::intrusive_ptr<resource> get_exported_resource(const tu_string& symbol);
+	virtual boost::intrusive_ptr<resource> get_exported_resource(const std::string& symbol);
 
 	// see docs in movie_definition.h
-	virtual void add_import(const char* source_url, int id, const char* symbol)
+	virtual void add_import(const std::string& source_url, int id, const std::string& symbol)
 	{
 	    assert(in_import_table(id) == false);
-
 	    m_imports.push_back(import_info(source_url, id, symbol));
 	}
 
@@ -401,12 +405,13 @@
 	/// character_id is listed in the import table.
 	bool in_import_table(int character_id);
 
+	/// \brief
 	/// Calls back the visitor for each movie that we
 	/// import symbols from.
-	virtual void visit_imported_movies(import_visitor* visitor);
+	virtual void visit_imported_movies(import_visitor& visitor);
 
-	// see docs in movie_definition.h
-	virtual void resolve_import(const char* source_url,
+	// See docs in movie_definition.h
+	virtual void resolve_import(const std::string& source_url,
 		movie_definition* source_movie);
 
 	void add_character(int character_id, character_def* c);
@@ -419,10 +424,8 @@
 	character_def*	get_character_def(int character_id);
 
 	// See dox in movie_definition
-	bool get_labeled_frame(const char* label, size_t* frame_number)
-	{
-		return m_named_frames.get(label, frame_number);
-	}
+	//
+	bool get_labeled_frame(const std::string& label, size_t& frame_number);
 
 	void	add_font(int font_id, font* f);
 
@@ -465,7 +468,7 @@
 	}
 
 	// See dox in movie_definition.h
-	void add_frame_name(const char* name);
+	void add_frame_name(const std::string& name);
 
 	/// Set an input object for later loading DefineBits
 	/// images (JPEG images without the table info).

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/movie_definition.h	5 Mar 2007 10:36:13 -0000	1.19
+++ server/parser/movie_definition.h	10 Apr 2007 15:48:39 -0000	1.20
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -161,15 +161,16 @@
 	/// Call visit_imported_movies() to retrieve a list of
 	/// names of movies imported into this movie.
 	//
-	/// visitor->visit() will be called back with the name
+	/// visitor.visit() will be called back with the name
 	/// of each imported movie.
+	///
 	class import_visitor
 	{
 	public:
 	    virtual ~import_visitor() {}
-	    virtual void	visit(const char* imported_movie_filename) = 0;
+	    virtual void visit(const std::string& imported_movie_filename) = 0;
 	};
-	virtual void visit_imported_movies(import_visitor* /*visitor*/) {}
+	virtual void visit_imported_movies(import_visitor& /*visitor*/) {}
 	
 	/// Call this to resolve an import of the given movie.
 	//
@@ -180,7 +181,7 @@
 	///
 	/// @see add_import
 	///
-	virtual void resolve_import(const char* /*name*/,
+	virtual void resolve_import(const std::string& /*name*/,
 			movie_definition* /*def*/) {}
 	
 	//
@@ -249,7 +250,7 @@
 	/// @return NULL if the label doesn't correspond to an exported
 	///         resource. This is the default behaviour.
 	///
-	virtual boost::intrusive_ptr<resource>	get_exported_resource(const tu_string& /*symbol*/)
+	virtual boost::intrusive_ptr<resource>	get_exported_resource(const std::string& /*symbol*/)
 	{
 		return NULL;
 	}
@@ -286,7 +287,7 @@
 	///
 	/// @return true if a frame with that label was found, false otherwise
 	///
-	virtual bool get_labeled_frame(const char* /*label*/, size_t* /*frame_number*/)
+	virtual bool get_labeled_frame(const std::string& /*label*/, size_t& /*frame_number*/)
 	{
 		return false;
 	}
@@ -347,10 +348,12 @@
 	/// Labels the frame currently being loaded with the given name. 
 	//
 	/// A copy of the name string is made and kept in this object.
+    /// In case of multiple frames with the same name, the last added
+    /// will be the one referenced by that name.
 	///
 	/// The default implementation is a no-op.
 	///
-	virtual void add_frame_name(const char* /*name*/)
+	virtual void add_frame_name(const std::string& /*name*/)
 	{
 	}
 
@@ -453,15 +456,16 @@
 		return -1;
 	}
 
-	/// \brief
-	/// Mark the given resource as "exported" with the given
-	/// linkage name.
+	/// Mark the given resource as "exported" with the given linkage name.
 	//
+    /// Note that any previously exported resource with the same linkage 
+    /// name will become unreachable (export override).
+    ///
 	/// @see get_exported_resource
 	///
 	/// The default implementation is a no-op
 	///
-	virtual void export_resource(const tu_string& /*symbol*/,
+	virtual void export_resource(const std::string& /*symbol*/,
 			resource* /*res*/)
 	{
 	}
@@ -481,8 +485,8 @@
 	///
 	/// The default implementation is a no-op.
 	///
-	virtual void add_import(const char* /*source_url*/,
-			int /*id*/, const char* /*symbol_name*/)
+	virtual void add_import(const std::string& /*source_url*/,
+			int /*id*/, const std::string& /*symbol_name*/)
 	{
 	}
 

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/sprite_definition.cpp	26 Feb 2007 22:08:06 -0000	1.10
+++ server/parser/sprite_definition.cpp	10 Apr 2007 15:48:39 -0000	1.11
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -157,23 +157,20 @@
 
 /*virtual*/
 void
-sprite_definition::add_frame_name(const char* name)
+sprite_definition::add_frame_name(const std::string& name)
 {
 	//log_msg("labelframe: frame %d, name %s", m_loading_frame, name);
-	assert((int)m_loading_frame >= 0 && m_loading_frame < m_frame_count);
-
-	tu_string n = name;
-	size_t currently_assigned = 0;
-	if (m_named_frames.get(n, &currently_assigned) == true)
-	{
-		log_error("add_frame_name(" SIZET_FMT ", '%s') -- frame name "
-			"already assigned to frame " SIZET_FMT "; overriding\n",
-			m_loading_frame,
-			name, currently_assigned);
-	}
+	assert(m_loading_frame < m_frame_count);
+    m_named_frames[name] = m_loading_frame;
+}
 
-	// stores 0-based frame #
-	m_named_frames[n] = m_loading_frame;
+bool
+sprite_definition::get_labeled_frame(const std::string& label, size_t& frame_number)
+{
+    NamedFrameMap::iterator it = m_named_frames.find(label);
+    if ( it == m_named_frames.end() ) return false;
+    frame_number = it->second;
+    return true;
 }
 
 sprite_definition::sprite_definition(movie_definition* m, stream* in)

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/sprite_definition.h	26 Feb 2007 22:20:24 -0000	1.15
+++ server/parser/sprite_definition.h	10 Apr 2007 15:48:39 -0000	1.16
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -98,7 +98,8 @@
 	std::vector<PlayList> m_playlist;
 
 	// stores 0-based frame #'s
-	stringi_hash<size_t> m_named_frames;
+	typedef std::map<std::string, size_t> NamedFrameMap;
+	NamedFrameMap m_named_frames;
 
 	size_t m_frame_count;
 
@@ -212,16 +213,16 @@
 
 	
 	/// Overridden just for complaining  about malformed SWF
-	virtual void export_resource(const tu_string& /*symbol*/,
+	virtual void export_resource(const std::string& /*symbol*/,
 			resource* /*res*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_warning("can't export from sprite! Malformed SWF?");
+		log_swferror("Can't export from sprite!");
 		);
 	}
 
 	/// Delegate call to associated root movie
-	virtual boost::intrusive_ptr<resource> get_exported_resource(const tu_string& sym)
+	virtual boost::intrusive_ptr<resource> get_exported_resource(const std::string& sym)
 	{
 		return m_movie_def->get_exported_resource(sym);
 	}
@@ -281,13 +282,10 @@
 	}
 
 	// See dox in movie_definition.h
-	virtual void	add_frame_name(const char* name);
+	virtual void	add_frame_name(const std::string& name);
 
 	// See dox in movie_definition
-	bool	get_labeled_frame(const char* label, size_t* frame_number)
-	{
-	    return m_named_frames.get(label, frame_number);
-	}
+	bool get_labeled_frame(const std::string& label, size_t& frame_number);
 
 	/// frame_number is 0-based
 	const PlayList& get_playlist(size_t frame_number)

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/swf/tag_loaders.cpp	6 Apr 2007 11:43:44 -0000	1.85
+++ server/swf/tag_loaders.cpp	10 Apr 2007 15:48:39 -0000	1.86
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.85 2007/04/06 11:43:44 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.86 2007/04/10 15:48:39 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1396,16 +1396,16 @@
 	    if (font* f = m->get_font(id))
 		{
 		    // Expose this font for export.
-		    m->export_resource(tu_string(symbol_name), f);
+		    m->export_resource(symbol_name, f);
 		}
 	    else if (character_def* ch = m->get_character_def(id))
 		{
 		    // Expose this movie/button/whatever for export.
-		    m->export_resource(tu_string(symbol_name), ch);
+		    m->export_resource(symbol_name, ch);
 		}
 	    else if (sound_sample* ch = m->get_sound_sample(id))
 		{
-		    m->export_resource(tu_string(symbol_name), ch);
+		    m->export_resource(symbol_name, ch);
 		}
 	    else
 		{



From MAILER-DAEMON Tue Apr 10 12:22:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbJ6c-0000pE-0N
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 12:22:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbJ6b-0000p9-62
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 12:22:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbJ6a-0000ow-2o
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 12:22:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbJ6Z-0000ot-WC
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 12:22:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbJ2c-0001oR-DY
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 12:17:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbJ2Z-0007G4-A1
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 16:17:55 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbJ2Z-0007Fz-1U
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 16:17:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbJ2Z-0007Fz-1U@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 16:17:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/movie_instance.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 16:22:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 16:17:54

Modified files:
	.              : ChangeLog 
	server         : movie_instance.cpp 
	server/parser  : movie_def_impl.cpp 

Log message:
	        * server/parser/movie_def_impl.cpp (read_all_swf): at
	          end of parsing, check consistency of number of frames
	          advertised in header and number of frames read from the
	          stream. Update total frame count if needed and properly
	          wake up any frame reached condition waiters.
	        * server/movie_instance.cpp (advance) check return from
	          ensure_frame_loaded.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2826&r2=1.2827
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_instance.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.63&r2=1.64

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2826
retrieving revision 1.2827
diff -u -b -r1.2826 -r1.2827
--- ChangeLog	10 Apr 2007 15:48:39 -0000	1.2826
+++ ChangeLog	10 Apr 2007 16:17:54 -0000	1.2827
@@ -1,5 +1,15 @@
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/movie_def_impl.cpp (read_all_swf): at
+	  end of parsing, check consistency of number of frames 
+	  advertised in header and number of frames read from the
+	  stream. Update total frame count if needed and properly
+	  wake up any frame reached condition waiters.
+	* server/movie_instance.cpp (advance) check return from
+	  ensure_frame_loaded.
+
+2007-04-10 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/: movie_definition.h, movie_def_impl.{cpp,h},
 	  sprite_definition.{cpp,h}: stop using TU legacy hashes
 	  and strings: use std::string instead of C strings, use

Index: server/movie_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_instance.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/movie_instance.cpp	15 Feb 2007 11:14:52 -0000	1.8
+++ server/movie_instance.cpp	10 Apr 2007 16:17:54 -0000	1.9
@@ -65,8 +65,11 @@
 	// We do this inside advance_root to make sure
 	// it's only for a root sprite (not a sprite defined
 	// by DefineSprite!)
-	_def->ensure_frame_loaded(min(get_current_frame()+2,
-		get_frame_count()));
+	size_t nextframe = min(get_current_frame()+2, get_frame_count());
+	if ( !_def->ensure_frame_loaded(nextframe) )
+	{
+		log_error("Frame " SIZET_FMT " never loaded", nextframe);
+	}
 
 	if (m_on_event_load_called == false)
 	{

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/parser/movie_def_impl.cpp	10 Apr 2007 15:48:39 -0000	1.63
+++ server/parser/movie_def_impl.cpp	10 Apr 2007 16:17:54 -0000	1.64
@@ -559,7 +559,7 @@
 movie_def_impl::ensure_frame_loaded(size_t framenum)
 {
 #ifndef LOAD_MOVIES_IN_A_SEPARATE_THREAD 
-	assert ( framenum <= _frames_loaded );
+	return ( framenum <= _frames_loaded );
 #endif
 
 	boost::mutex::scoped_lock lock(_frames_loaded_mutex);
@@ -574,7 +574,7 @@
 
         //log_msg("Condition reached (_frames_loaded=%u)", _frames_loaded);
 
-	return true;
+	return ( framenum <= _frames_loaded );
 }
 
 
@@ -934,6 +934,18 @@
 		);
 	}
 
+	if ( m_frame_count > _frames_loaded )
+	{
+		IF_VERBOSE_MALFORMED_SWF(
+		log_swferror(SIZET_FMT " frames advertised in header, but only " SIZET_FMT " SHOWFRAME tags "
+			"found in stream. Updating total frames count", m_frame_count, _frames_loaded);
+		);
+		boost::mutex::scoped_lock lock(_frames_loaded_mutex);
+		m_frame_count = _frames_loaded;
+		// Notify any thread waiting on frame reached condition
+		_frame_reached_condition.notify_all();
+	}
+
 }
 
 size_t



From MAILER-DAEMON Tue Apr 10 13:16:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbJxW-0001WW-Jj
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 13:16:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbJxV-0001PN-5n
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:16:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbJxU-0001Jy-El
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:16:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbJxT-0001IH-TY
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:16:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbJtW-00036U-9i
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:12:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbJtU-0003yN-ET
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:12:36 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbJtU-0003yJ-AG
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:12:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbJtU-0003yJ-AG@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 17:12:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server as_environment.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 17:16:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 17:12:36

Modified files:
	server         : as_environment.cpp 

Log message:
	minor cleanup

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.64&r2=1.65

Patches:
Index: as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- as_environment.cpp	5 Apr 2007 14:59:11 -0000	1.64
+++ as_environment.cpp	10 Apr 2007 17:12:36 -0000	1.65
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.64 2007/04/05 14:59:11 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.65 2007/04/10 17:12:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -436,7 +436,7 @@
 	}
 	else if ( val.is_string() )
 	{
-		return find_target(std::string(val.to_string()));
+		return find_target(val.to_std_string());
 	}
 	else
 	{



From MAILER-DAEMON Tue Apr 10 13:45:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbKPi-0001vx-0D
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 13:45:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbKPg-0001se-61
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:45:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbKPf-0001sS-2p
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:45:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbKPe-0001sP-U0
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:45:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbKLh-00085I-4U
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 13:41:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbKLf-0007hi-DK
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:41:43 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbKLf-0007hd-0C
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:41:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbKLf-0007hd-0C@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 17:41:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 17:45:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 17:41:42

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

Log message:
	        * server/as_environment.{cpp,h}: add the concept
	          of a default target to support setTarget() calls
	          (null target spec meaning will to reset the target
	           to its original value).
	        * server/vm/ASHandlers.cpp (CommonSetTarget):
	          When target specification is an empty string
	          reset the target to its original value.
	          Use find_target rather then find_object to avoid
	          variables and character names clashes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2827&r2=1.2828
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.84&r2=1.85

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2827
retrieving revision 1.2828
diff -u -b -r1.2827 -r1.2828
--- ChangeLog	10 Apr 2007 16:17:54 -0000	1.2827
+++ ChangeLog	10 Apr 2007 17:41:42 -0000	1.2828
@@ -1,5 +1,17 @@
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.{cpp,h}: add the concept
+	  of a default target to support setTarget() calls
+	  (null target spec meaning will to reset the target
+	   to its original value).
+	* server/vm/ASHandlers.cpp (CommonSetTarget):
+	  When target specification is an empty string
+	  reset the target to its original value.
+	  Use find_target rather then find_object to avoid
+	  variables and character names clashes.
+
+2007-04-10 Sandro Santilli <strk@keybit.net>
+
 	* server/parser/movie_def_impl.cpp (read_all_swf): at
 	  end of parsing, check consistency of number of frames 
 	  advertised in header and number of frames read from the

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/as_environment.cpp	10 Apr 2007 17:12:36 -0000	1.65
+++ server/as_environment.cpp	10 Apr 2007 17:41:42 -0000	1.66
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.65 2007/04/10 17:12:36 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.66 2007/04/10 17:41:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1036,6 +1036,14 @@
 	_localFrames.push_back(CallFrame(func));
 }
 
+void
+as_environment::set_target(character* target)
+{
+	assert(target);
+	if ( ! m_target ) _original_target = target;
+	m_target = target;
+}
+
 } // end of gnash namespace
 
 

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/as_environment.h	28 Mar 2007 16:24:39 -0000	1.43
+++ server/as_environment.h	10 Apr 2007 17:41:42 -0000	1.44
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_environment.h,v 1.43 2007/03/28 16:24:39 strk Exp $ */
+/* $Id: as_environment.h,v 1.44 2007/04/10 17:41:42 strk Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -74,7 +74,10 @@
 	}
 
 	character* get_target() { return m_target; }
-	void set_target(character* target) { m_target = target; }
+	void set_target(character* target);
+
+	// Reset target to its original value
+	void reset_target() { m_target = _original_target; }
 
 	/// @{ Stack access/manipulation
 
@@ -486,6 +489,9 @@
 	/// Movie target. 
 	character* m_target;
 
+	/// Movie target. 
+	character* _original_target;
+
 	/// Given a variable name, set its value (no support for path)
 	void set_variable_raw(const std::string& path, const as_value& val,
 		const ScopeStack& with_stack);

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- server/vm/ASHandlers.cpp	7 Apr 2007 11:32:35 -0000	1.84
+++ server/vm/ASHandlers.cpp	10 Apr 2007 17:41:42 -0000	1.85
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.84 2007/04/07 11:32:35 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.85 2007/04/10 17:41:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1885,15 +1885,14 @@
 {
 	character *new_target;
     
-	// if the string is blank, we set target to the root movie
-	// TODO - double check this is correct?
-	if ( target_name.empty() ) {
-		new_target = env.find_target(string("/"));
-	} else {
-		as_value target_val = env.get_variable(target_name);
-		new_target = target_val.to_sprite();
+	// if the string is blank, we reset the target to its original value
+	if ( target_name.empty() )
+	{
+		env.reset_target();
+		return;
 	}
 
+	new_target = env.find_target(target_name);
 	if (new_target == NULL)
 	{
 		IF_VERBOSE_ASCODING_ERRORS (



From MAILER-DAEMON Tue Apr 10 14:10:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbKnq-00082A-0B
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 14:10:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbKnn-0007zk-Sb
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:10:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbKnm-0007xZ-9W
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:10:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbKnm-0007xV-7o
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:10:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbKjo-00032h-9V
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:06:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbKjl-000125-L8
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:06:37 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbKjl-000121-D4
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:06:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbKjl-000121-D4@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 18:06:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 18:10:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 18:06:37

Modified files:
	.              : ChangeLog 
	libbase        : log.h 

Log message:
	        * libbase/log.h: allow switching off any VERBOSITY overhead
	          by using -DVERBOSE_WHAT=0.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2828&r2=1.2829
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2828
retrieving revision 1.2829
diff -u -b -r1.2828 -r1.2829
--- ChangeLog	10 Apr 2007 17:41:42 -0000	1.2828
+++ ChangeLog	10 Apr 2007 18:06:36 -0000	1.2829
@@ -1,5 +1,7 @@
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
+	* libbase/log.h: allow switching off any VERBOSITY overhead
+	  by using -DVERBOSE_WHAT=0.
 	* server/as_environment.{cpp,h}: add the concept
 	  of a default target to support setTarget() calls
 	  (null target spec meaning will to reset the target

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- libbase/log.h	8 Apr 2007 23:06:17 -0000	1.44
+++ libbase/log.h	10 Apr 2007 18:06:37 -0000	1.45
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.44 2007/04/08 23:06:17 rsavoye Exp $ */
+/* $Id: log.h,v 1.45 2007/04/10 18:06:37 strk Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -187,39 +187,47 @@
 DSOEXPORT void log_aserror(const char* fmt, ...);
 #endif
 
-// Undefine this to completely remove parse debugging at compile-time
+// Define to 0 to completely remove parse debugging at compile-time
+#ifndef VERBOSE_PARSE
 #define VERBOSE_PARSE 1
+#endif
 
-// Undefine this to completely remove action debugging at compile-time
+// Define to 0 to completely remove action debugging at compile-time
+#ifndef VERBOSE_ACTION
 #define VERBOSE_ACTION 1
+#endif
 
-// Undefine this to remove ActionScript errors verbosity at compile-time
+// Define to 0 to remove ActionScript errors verbosity at compile-time
+#ifndef VERBOSE_ASCODING_ERRORS
 #define VERBOSE_ASCODING_ERRORS  1
+#endif
 
-// Undefine this to remove invalid SWF verbosity at compile-time
+// Define to 0 this to remove invalid SWF verbosity at compile-time
+#ifndef VERBOSE_MALFORMED_SWF
 #define VERBOSE_MALFORMED_SWF 1
+#endif
 
 
-#ifdef VERBOSE_PARSE
+#if VERBOSE_PARSE
 #define IF_VERBOSE_PARSE(x) do { if ( LogFile::getDefaultInstance().getParserDump() ) { x; } } while (0);
 #else
 #define IF_VERBOSE_PARSE(x)
 #endif
 
-#ifdef VERBOSE_ACTION
+#if VERBOSE_ACTION
 #define IF_VERBOSE_ACTION(x) do { if ( LogFile::getDefaultInstance().getActionDump() ) { x; } } while (0);
 #else
 #define IF_VERBOSE_ACTION(x)
 #endif
 
-#ifdef VERBOSE_ASCODING_ERRORS
+#if VERBOSE_ASCODING_ERRORS
 // TODO: check if it's worth to check verbosity level too...
 #define IF_VERBOSE_ASCODING_ERRORS(x) { if ( RcInitFile::getDefaultInstance().showASCodingErrors() ) { x; } } while (0);
 #else
 #define IF_VERBOSE_ASCODING_ERRORS(x)
 #endif
 
-#ifdef VERBOSE_MALFORMED_SWF
+#if VERBOSE_MALFORMED_SWF
 // TODO: check if it's worth to check verbosity level too... 
 #define IF_VERBOSE_MALFORMED_SWF(x) { if ( RcInitFile::getDefaultInstance().showMalformedSWFErrors() ) { x; } } while (0);
 #else



From MAILER-DAEMON Tue Apr 10 14:22:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbKza-0008JE-J6
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 14:22:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbKzZ-0008Iy-5t
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:22:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbKzX-0008IV-3S
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:22:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbKzW-0008IS-Ut
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:22:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HbKvY-00053T-PK
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 14:18:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbKvW-0001tK-NI
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:18:46 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HbKvW-0001tH-GY
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:18:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbKvW-0001tH-GY@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Tue, 10 Apr 2007 18:18:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash configure.ac ChangeLog backend/render_han...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 18:22:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/10 18:18:46

Modified files:
	.              : configure.ac ChangeLog 
	backend        : render_handler_ogl.cpp 
	cygnal         : netstats.cpp 
	gui            : Makefile.am 
	server         : StreamProvider.cpp StreamProvider.h 
	                 StringPredicates.h 
	server/parser  : Makefile.am 
	server/vm      : Makefile.am 
	server/asobj   : Makefile.am 
	utilities      : Makefile.am 
	macros         : incllist libslist opengl.m4 x11.m4 

Log message:
		* configure.ac: Test the host to see if we're on a Darwin machine.
		* backend/render_handler_ogl.cpp: Build with the native Darwin
		port of OpenGL.
		* cygnal/netstats.cpp: Include date.hpp.
		* gui/Makefile.am: Add FFMPEG_LIBS for cross compiling.
		* macros/incllist, incllist: Don't search for Darwin specific
		paths, we're correctly using the -framework flag to GCC now.
		* macros/opengl.m4: For Darwin, use the OpenGL and AGL frameworks
		instead of include or linker paths.
		* macros/x11.m4: Find all the right include paths. Look for
		libXplugin too, which is Darwin specific, and in a weird place.
		* server/StreamProvider.cpp: Remove bogus USE_CURL setting.
		* server/StreamProvider.h: Include config.h.
		* server/asobj/Makefile.am: Use FFMPEG_CFLAGS too.
		* server/parser/Makefile.am: Use FFMPEG_CFLAGS too.
		* server/vm/Makefile.am:  Use FFMPEG_CFLAGS too.
		* utilities/Makefile.am: Add FFMPEG_LIBS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.289&r2=1.290
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2829&r2=1.2830
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/netstats.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StringPredicates.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -b -r1.289 -r1.290
--- configure.ac	10 Apr 2007 15:48:39 -0000	1.289
+++ configure.ac	10 Apr 2007 18:18:45 -0000	1.290
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.289 2007/04/10 15:48:39 strk Exp $
+dnl $Id: configure.ac,v 1.290 2007/04/10 18:18:45 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -33,6 +33,9 @@
   powerpc-apple-darwin*)
     AC_DEFINE([__powerpc64__], [], [this is a 64 bit powerpc])
     ;;
+  i[34567]86-apple-darwin*)
+    darwin=yes
+    ;;
   i[34567]86-*-openbsd*)
     openbsd_os=openbsd
     ;;
@@ -312,29 +315,24 @@
 dnl we have here now. For some reason on Darwin, we don't get the
 dnl count from grep via stdin correctly. Writing a temp file does the
 dnl trick, so although it's ugly, that's what we gotta do...
-dnl BOGUS dnl AC_MSG_CHECKING([Checking which type of library archiver we have])
-dnl BOGUS dnl rm -f .tmp
-dnl BOGUS dnl libtool > .tmp 2>&1
-dnl BOGUS dnl archiver=`grep -c dynamic .tmp 2>&1`
-dnl BOGUS dnl rm -f .tmp
-dnl BOGUS dnl if test $archiver -eq 1; then
-dnl BOGUS dnl   if test "$enable_shared" = no; then
-dnl BOGUS dnl     AR="libtool -static"
-dnl BOGUS dnl   else
-dnl BOGUS dnl     AR="libtool -dynamic"
-dnl BOGUS dnl     CXXFLAGS="${CXXFLAGS} -dynamic"
-dnl BOGUS dnl     export MACOSX_DEPLOYMENT_TARGET="10.3"
-dnl BOGUS dnl   fi
-dnl BOGUS dnl   AR_FLAGS="-o"
-dnl BOGUS dnl   darwin=yes
-dnl BOGUS dnl else
-dnl BOGUS dnl   AR="ar"
-dnl BOGUS dnl   AR_FLAGS="cvu"
-dnl BOGUS dnl   darwin=no
-dnl BOGUS dnl fi
-dnl BOGUS dnl AC_MSG_RESULT([${AR}])
-dnl BOGUS dnl AC_SUBST(AR)
-dnl BOGUS dnl AC_SUBST(AR_FLAGS)
+AC_MSG_CHECKING([Checking which type of library archiver we have])
+rm -f .tmp
+libtool > .tmp 2>&1
+archiver=`grep -c dynamic .tmp 2>&1`
+rm -f .tmp
+if test $archiver -eq 1; then
+dnl   if test "$enable_shared" = no; then
+dnl     AR="libtool -static"
+dnl   else
+dnl     AR="libtool -dynamic"
+dnl     CXXFLAGS="${CXXFLAGS} -dynamic"
+   export MACOSX_DEPLOYMENT_TARGET="10.3"
+dnl   fi
+dnl   AR_FLAGS="-o"
+   darwin=yes
+else
+   darwin=no
+fi
 
 dnl When cross compiling, limit the search directories cause otherwise
 dnl we may get the host headers or libraries by accident. These values

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2829
retrieving revision 1.2830
diff -u -b -r1.2829 -r1.2830
--- ChangeLog	10 Apr 2007 18:06:36 -0000	1.2829
+++ ChangeLog	10 Apr 2007 18:18:45 -0000	1.2830
@@ -1,3 +1,23 @@
+2007-04-10  Rob Savoye  <rob@bertha.welcomehome.org>
+
+	* configure.ac: Test the host to see if we're on a Darwin machine.
+	* backend/render_handler_ogl.cpp: Build with the native Darwin
+	port of OpenGL.
+	* cygnal/netstats.cpp: Include date.hpp.
+	* gui/Makefile.am: Add FFMPEG_LIBS for cross compiling.
+	* macros/incllist, incllist: Don't search for Darwin specific
+	paths, we're correctly using the -framework flag to GCC now.
+	* macros/opengl.m4: For Darwin, use the OpenGL and AGL frameworks
+	instead of include or linker paths.
+	* macros/x11.m4: Find all the right include paths. Look for
+	libXplugin too, which is Darwin specific, and in a weird place.
+	* server/StreamProvider.cpp: Remove bogus USE_CURL setting.
+	* server/StreamProvider.h: Include config.h.
+	* server/asobj/Makefile.am: Use FFMPEG_CFLAGS too.
+	* server/parser/Makefile.am: Use FFMPEG_CFLAGS too.
+	* server/vm/Makefile.am:  Use FFMPEG_CFLAGS too.
+	* utilities/Makefile.am: Add FFMPEG_LIBS.
+	
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
 	* libbase/log.h: allow switching off any VERBOSITY overhead

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- backend/render_handler_ogl.cpp	7 Apr 2007 12:08:17 -0000	1.70
+++ backend/render_handler_ogl.cpp	10 Apr 2007 18:18:45 -0000	1.71
@@ -5,8 +5,14 @@
 
 // A render_handler that uses SDL & OpenGL
 
+/* $Id: render_handler_ogl.cpp,v 1.71 2007/04/10 18:18:45 rsavoye Exp $ */
 
-/* $Id: render_handler_ogl.cpp,v 1.70 2007/04/07 12:08:17 nihilus Exp $ */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <cstring>
+#include <cmath>
 
 //#include "gnash.h"
 #include "render_handler.h"
@@ -14,15 +20,35 @@
 #include "types.h"
 #include "image.h"
 #include "utility.h"
-#include "tu_opengl_includes.h"
-
-#include <cstring>
-#include <cmath>
 
 #if defined(_WIN32) || defined(WIN32)
-	#include <Windows.h>
+#  include <Windows.h>
 #endif
 
+#ifdef NOT_SGI_GL
+#include <AGL/agl.h>
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#else
+# include <GL/gl.h>
+# include <GL/glx.h>
+# include <GL/glu.h>
+# ifndef APIENTRY
+#  define APIENTRY
+# endif
+#endif
+
+#if !defined(WIN32) || defined(GUI_GTK)
+# define GL_GLEXT_PROTOTYPES
+# include <GL/gl.h>
+# include <GL/glx.h>
+# include <GL/glu.h>
+# ifndef APIENTRY
+#  define APIENTRY
+# endif
+#endif // no WIN32 or OSX
+
 using namespace gnash;
 
 // choose the resampling method:

Index: cygnal/netstats.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/netstats.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cygnal/netstats.cpp	3 Jan 2007 01:52:06 -0000	1.2
+++ cygnal/netstats.cpp	10 Apr 2007 18:18:45 -0000	1.3
@@ -15,16 +15,18 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: netstats.cpp,v 1.2 2007/01/03 01:52:06 nihilus Exp $ */
+/* $Id: netstats.cpp,v 1.3 2007/04/10 18:18:45 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+#include <boost/date_time/date.hpp>
 #include "netstats.h"
 #include "log.h"
 
 using namespace gnash;
+using namespace boost::posix_time;
 
 namespace cygnal {
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- gui/Makefile.am	6 Apr 2007 07:58:15 -0000	1.63
+++ gui/Makefile.am	10 Apr 2007 18:18:45 -0000	1.64
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.63 2007/04/06 07:58:15 jgilmore Exp $
+# $Id: Makefile.am,v 1.64 2007/04/10 18:18:45 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -63,6 +63,7 @@
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
 AM_LDFLAGS =  \
 	$(LIBLTDL) \
+	$(FFMPEG_LIBS) \
 	$(CURL_LIBS) \
 	$(LIBXML_LIBS) \
 	$(BOOST_LIBS) \
@@ -123,7 +124,7 @@
 if USE_GUI_GTK
   AM_LDFLAGS += $(CAIRO_LIBS)
   GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS) $(GTK_AGG_SRCS) 
-  AM_LDFLAGS += $(GTK_LIBS) 
+  AM_LDFLAGS += $(GTK_LIBS) $(X11_LIBS)
   AM_CPPFLAGS += $(GTK_CFLAGS)
 else
  GTK_SRCS = 
@@ -218,6 +219,7 @@
 	$(top_builddir)/backend/libgnashbackend.la \
 	$(top_builddir)/server/libgnashserver.la \
 	$(top_builddir)/server/vm/libgnashvm.la \
+	$(top_builddir)/server/parser/libgnashparser.la \
 	$(top_builddir)/server/asobj/libgnashasobjs.la \
 	$(top_builddir)/server/parser/libgnashparser.la \
 	$(top_builddir)/libgeometry/libgnashgeo.la \

Index: server/StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/StreamProvider.cpp	24 Mar 2007 14:36:47 -0000	1.15
+++ server/StreamProvider.cpp	10 Apr 2007 18:18:45 -0000	1.16
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006. 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,18 +14,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-//
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-//#ifdef HAVE_CURL_CURL_H
-//#define USE_CURL 1
-//#endif
-
 #include "StreamProvider.h"
 #include "URL.h"
 #include "tu_file.h"

Index: server/StreamProvider.h
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/StreamProvider.h	23 Feb 2007 11:26:54 -0000	1.3
+++ server/StreamProvider.h	10 Apr 2007 18:18:45 -0000	1.4
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,14 +14,14 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
 #ifndef _GNASH_STREAMPROVIDER_H
 #define _GNASH_STREAMPROVIDER_H
 
-#include <string>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
+#include <string>
 
 // Forward declarations
 class tu_file;

Index: server/StringPredicates.h
===================================================================
RCS file: /sources/gnash/gnash/server/StringPredicates.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/StringPredicates.h	27 Nov 2006 22:21:39 -0000	1.4
+++ server/StringPredicates.h	10 Apr 2007 18:18:45 -0000	1.5
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -13,11 +13,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
 //
 
-/* $Id: StringPredicates.h,v 1.4 2006/11/27 22:21:39 nihilus Exp $ */
+/* $Id: StringPredicates.h,v 1.5 2007/04/10 18:18:45 rsavoye Exp $ */
 
 #ifndef GNASH_STRINGPREDICATES_H
 #define GNASH_STRINGPREDICATES_H
@@ -86,3 +84,8 @@
 } // namespace gnash
 
 #endif // GNASH_STRINGPREDICATES_H
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/parser/Makefile.am	10 Apr 2007 14:41:12 -0000	1.27
+++ server/parser/Makefile.am	10 Apr 2007 18:18:45 -0000	1.28
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.27 2007/04/10 14:41:12 strk Exp $
+# $Id: Makefile.am,v 1.28 2007/04/10 18:18:45 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -38,6 +38,7 @@
         -I$(top_srcdir)	\
 	$(LIBXML_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(FFMPEG_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(DMALLOC_CFLAGS) \

Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/vm/Makefile.am	27 Mar 2007 14:52:05 -0000	1.8
+++ server/vm/Makefile.am	10 Apr 2007 18:18:45 -0000	1.9
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.8 2007/03/27 14:52:05 strk Exp $
+# $Id: Makefile.am,v 1.9 2007/04/10 18:18:45 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -32,6 +32,7 @@
         -I$(top_srcdir)/libamf \
         -I$(top_srcdir)	\
 	$(GLIB_CFLAGS) \
+	$(FFMPEG_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(PTHREAD_CFLAGS) \
 	$(DMALLOC_CFLAGS) \

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/asobj/Makefile.am	28 Mar 2007 23:42:20 -0000	1.33
+++ server/asobj/Makefile.am	10 Apr 2007 18:18:46 -0000	1.34
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.33 2007/03/28 23:42:20 rsavoye Exp $
+# $Id: Makefile.am,v 1.34 2007/04/10 18:18:46 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -35,6 +35,7 @@
 	$(PTHREAD_CFLAGS) \
 	$(DMALLOC_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(FFMPEG_CFLAGS) \
 	$(GSTREAMER_CFLAGS) \
 	$(BOOST_CFLAGS) \
 	$(LIBXML_CFLAGS) \

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- utilities/Makefile.am	6 Apr 2007 07:58:16 -0000	1.51
+++ utilities/Makefile.am	10 Apr 2007 18:18:46 -0000	1.52
@@ -28,6 +28,8 @@
 	$(top_builddir)/server/asobj/libgnashasobjs.la \
 	$(top_builddir)/server/vm/libgnashvm.la \
 	$(top_builddir)/server/parser/libgnashparser.la \
+	$(top_builddir)/server/parser/libgnashparser.la \
+	$(top_builddir)/server/asobj/libgnashasobjs.la \
 	$(top_builddir)/libbase/libgnashbase.la \
 	$(top_builddir)/libamf/libgnashamf.la
 
@@ -38,6 +40,7 @@
 	$(LIBLTDL) \
         $(MYSQL_LIBS) \
 	$(LIBXML_LIBS) \
+	$(FFMPEG_LIBS) \
 	$(CURL_LIBS) \
 	$(BOOST_LIBS) \
 	$(PTHREAD_LIBS) \

Index: macros/incllist
===================================================================
RCS file: /sources/gnash/gnash/macros/incllist,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/incllist	8 Apr 2007 23:06:17 -0000	1.4
+++ macros/incllist	10 Apr 2007 18:18:46 -0000	1.5
@@ -1 +1 @@
-/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/include /Developer/SDKs/MacOSX10.4*.sdk/usr/include ${prefix}/${host_alias}/include ${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include /usr/local/include /home/latest/include /opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include /usr/local/olpc/include .. ../..
+${prefix}/${host_alias}/include ${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include /usr/local/include /home/latest/include /opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include /usr/local/olpc/include .. ../..

Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/libslist	8 Apr 2007 23:06:17 -0000	1.6
+++ macros/libslist	10 Apr 2007 18:18:46 -0000	1.7
@@ -1 +1 @@
-/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib /Developer/SDKs/MacOSX10.4*.sdk/usr/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..
+${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..

Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- macros/opengl.m4	8 Apr 2007 23:06:17 -0000	1.30
+++ macros/opengl.m4	10 Apr 2007 18:18:46 -0000	1.31
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: opengl.m4,v 1.30 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: opengl.m4,v 1.31 2007/04/10 18:18:46 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_OPENGL],
 [
@@ -33,10 +33,19 @@
     ])
 
     dnl If the include path hasn't been specified, go look for it.
+    if test x"${darwin}" = xyes; then
+      ac_cv_path_opengl_includes="-framework Carbon -framework ApplicationServices -framework OpenGL -framework AGL -I/System/Library/Frameworks/OpenGL.framework/Headers"
+    else
+      notsgigl=no
     if test x"${ac_cv_path_opengl_includes}" = x; then
       AC_MSG_CHECKING([for OpenGL headers])
-      for i in $incllist; do
-        if test -f $i/GL/gl.h; then
+        newlist="/System/Library/Frameworks/OpenGL.framework/Headers ${incllist}"
+        for i in $newlist; do
+          if test -f $i/GL/gl.h -o -f $i/OpenGL.h; then
+            if test -f $i/OpenGL.h; then
+              notsgigl=yes
+              AC_DEFINE(NOT_SGI_GL, [1], [Is not based on the SGI GL])
+            fi
           if test x"$i" != x"/usr/include"; then
             ac_cv_path_opengl_includes="-I$i"
             break
@@ -50,6 +59,7 @@
         fi
       done
     fi
+    fi
 
     if test x"${ac_cv_path_opengl_includes}" = x; then
       AC_CHECK_HEADERS([GL/gl.h], [ac_cv_path_opengl_includes=""])
@@ -77,8 +87,12 @@
       fi
     ])
 
+    if test x"${darwin}" = xyes; then
+      ac_cv_path_opengl_lib="framework Carbon -framework ApplicationServices -framework OpenGL -framework AGL"
+    else
     if test x"${ac_cv_path_opengl_lib}" = x; then
-      for i in $libslist; do
+        newlist="/System/Library/Frameworks/OpenGL.framework/Libraries ${libslist}"
+        for i in $newlist; do
         if test -f $i/libGL.${shlibext} -o -f $i/libGL.a; then
           if test x"$i" != x"/usr/lib"; then
             ac_cv_path_opengl_lib="-L$i -lGL"
@@ -104,6 +118,7 @@
         done
       fi
     fi                          dnl end of if ac_cv_path_opengl_lib
+    fi                          dnl end of if darwin
   fi                            dnl end of if $opengl
 
   if test x"${ac_cv_path_opengl_lib}" = x; then

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/x11.m4	8 Apr 2007 23:06:17 -0000	1.4
+++ macros/x11.m4	10 Apr 2007 18:18:46 -0000	1.5
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: x11.m4,v 1.5 2007/04/10 18:18:46 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
@@ -42,7 +42,8 @@
     dnl If the path hasn't been specified, go look for it.
     if test x"${ac_cv_path_x11_incl}" = x; then
       AC_MSG_CHECKING([for X11 headers])
-      for i in $incllist; do
+      newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/include ${incllist}"
+      for i in $newlist; do
       	if test -f $i/X11/X.h; then
       	  if test x"$i" != x"/usr/include"; then
       	    ac_cv_path_x11_incl="-I$i"
@@ -84,23 +85,29 @@
     dnl If the header doesn't exist, there is no point looking for the library.
     if test x"${ac_cv_path_x11_incl}" != x; then
       AC_MSG_CHECKING([for X11 library])
-      for i in $libslist; do
+      newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/lib /Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
+      for i in $newlist; do
 	      if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
+	        ac_cv_path_x11_lib="-L$i -lX11"
           if test -f $i/libXinerama.a -o -f $i/libXinerama.${shlibext}; then
-            ac_cv_path_x11_lib="-lXinerama"
+            ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXinerama"
           fi
-	        if test x"$i" != x"/usr/lib"; then
-	          ac_cv_path_x11_lib="-L$i -lX11 ${ac_cv_path_x11_lib}"
-	          break
-          else
-	          ac_cv_path_x11_lib="-lX11 ${ac_cv_path_x11_lib}"
-	          break
+          if test -f $i/libXext.a -o -f $i/libXext.${shlibext}; then
+            ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXext"
 	        fi
           AC_MSG_RESULT(yes)
+          break
         fi
       done
     fi
 
+   for i in $newlist; do
+     if test -f $i/libXplugin.a -o -f $i/libXplugin.${shlibext}; then
+       ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -L$i -lXplugin"
+       break
+     fi
+    done
+
     if test x"${ac_cv_path_x11_lib}" = x; then
       AC_CHECK_LIB(X11, x11_mem_init, [ac_cv_path_x11_lib=""])
       AC_MSG_RESULT(${ac_cv_path_x11_lib})



From MAILER-DAEMON Tue Apr 10 16:28:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbMxD-00046B-On
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 16:28:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbMxC-00042a-DR
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 16:28:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbMxB-00040O-EN
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 16:28:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbMxB-0003zj-6U
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 16:28:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbMtC-0004kT-EK
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 16:24:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbMt5-0002oy-Qi
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 20:24:23 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbMt5-0002ov-HN
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 20:24:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbMt5-0002ov-HN@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Tue, 10 Apr 2007 20:24:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xmlsocket.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 20:28:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/10 20:24:23

Modified files:
	.              : ChangeLog 
	server/asobj   : xmlsocket.cpp NetStreamFfmpeg.cpp 
	                 NetStreamFfmpeg.h 
	libbase        : image.cpp 

Log message:
	        * server/asobj/NetStreamFfmpeg.{cpp,h}: Don't call delete on a
	        new[]-allocated pointer. Don't try to copy a byte-aligned
	        data buffer into a "flat" one, and vice versa. Add a helper
	        class called AudioResampler, which will do audio resampling
	        if necessary.
	        * server/xmlsocket.cpp: Use SIZET_FMT.
	        * libbase/image.cpp: Document update().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2830&r2=1.2831
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2830
retrieving revision 1.2831
diff -u -b -r1.2830 -r1.2831
--- ChangeLog	10 Apr 2007 18:18:45 -0000	1.2830
+++ ChangeLog	10 Apr 2007 20:24:22 -0000	1.2831
@@ -1,3 +1,13 @@
+2007-04-10 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* server/asobj/NetStreamFfmpeg.{cpp,h}: Don't call delete on a
+	new[]-allocated pointer. Don't try to copy a byte-aligned
+	data buffer into a "flat" one, and vice versa. Add a helper
+	class called AudioResampler, which will do audio resampling
+	if necessary.
+	* server/xmlsocket.cpp: Use SIZET_FMT.
+	* libbase/image.cpp: Document update().
+
 2007-04-10  Rob Savoye  <rob@bertha.welcomehome.org>
 
 	* configure.ac: Test the host to see if we're on a Darwin machine.

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/xmlsocket.cpp	5 Apr 2007 07:31:28 -0000	1.23
+++ server/asobj/xmlsocket.cpp	10 Apr 2007 20:24:23 -0000	1.24
@@ -659,10 +659,10 @@
     std::vector<std::string > msgs;
     if (obj.anydata(msgs))
     {
-        log_msg("Got %u messages: ", msgs.size());
+        log_msg("Got " SIZET_FMT " messages: ", msgs.size());
         for (size_t i=0; i<msgs.size(); ++i)
         {
-            log_msg(" Message %u: %s ", i, msgs[i].c_str());
+            log_msg(" Message " SIZET_FMT " : %s ", i, msgs[i].c_str());
         }
 
         boost::intrusive_ptr<as_function> onDataHandler = getEventHandler("onData");

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/asobj/NetStreamFfmpeg.cpp	8 Apr 2007 15:23:43 -0000	1.34
+++ server/asobj/NetStreamFfmpeg.cpp	10 Apr 2007 20:24:23 -0000	1.35
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.34 2007/04/08 15:23:43 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.35 2007/04/10 20:24:23 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -42,7 +42,7 @@
 
 // Used to free data in the AVPackets we create our self
 static void avpacket_destruct(AVPacket* av) {
-	delete av->data;
+	delete [] av->data;
 }
 
 
@@ -57,7 +57,6 @@
 	m_ACodecCtx(NULL),
 	m_FormatCtx(NULL),
 	m_Frame(NULL),
-	m_Resample(NULL),
 
 	_decodeThread(NULL),
 
@@ -148,10 +147,6 @@
 		m_FormatCtx = NULL;
 	}
 
-	if (m_Resample) {
-		audio_resample_close (m_Resample);
-	}
-
 	if (m_imageframe) delete m_imageframe;
 
 	while (m_qvideo.size() > 0)
@@ -576,6 +571,30 @@
 	ns->m_pause = false;
 }
 
+
+/// Copy RGB data from a source raw_videodata_t to a destination image::rgb.
+/// @param dst the destination image::rgb, which must already be initialized
+///            with a buffer of size of at least src.m_size.
+/// @param src the source raw_videodata_t to copy data from. The m_size member
+///            of this structure must be initialized.
+/// @param width the width, in bytes, of a row of video data.
+static void
+rgbcopy(image::rgb* dst, raw_videodata_t* src, int width)
+{
+	assert(src->m_size <= dst->m_width * dst->m_height * 3);
+
+	uint8_t* dstptr = dst->m_data;
+
+	uint8_t* srcptr = src->m_data;
+	uint8_t* srcend = src->m_data + src->m_size;
+
+	while (srcptr < srcend) {
+		memcpy(dstptr, srcptr, width);
+		dstptr += dst->m_pitch;
+		srcptr += width;
+	}
+}
+
 // decoder thread
 void NetStreamFfmpeg::av_streamer(NetStreamFfmpeg* ns)
 {
@@ -632,9 +651,12 @@
 				boost::mutex::scoped_lock lock(ns->image_mutex);
 				int videoFrameFormat = gnash::render::videoFrameFormat();
 				if (videoFrameFormat == render::YUV) {
+					// XXX m_imageframe might be a byte aligned buffer, while video is not!
 					static_cast<image::yuv*>(ns->m_imageframe)->update(video->m_data);
 				} else if (videoFrameFormat == render::RGB) {
-					ns->m_imageframe->update(video->m_data);
+
+					image::rgb* imgframe = static_cast<image::rgb*>(ns->m_imageframe);
+					rgbcopy(imgframe, video, ns->m_VCodecCtx->width * 3);
 				}
 				ns->m_qvideo.pop();
 				delete video;
@@ -755,9 +777,11 @@
 		if (packet.stream_index == m_audio_index && get_sound_handler())
 		{
 			int frame_size;
-			uint8_t* ptr = new uint8_t[(AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2];
+			unsigned int bufsize = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
+
+			uint8_t* ptr = new uint8_t[bufsize];
 #ifdef FFMPEG_AUDIO2
-			frame_size = (AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2;
+			frame_size = bufsize;
 			if (avcodec_decode_audio2(m_ACodecCtx, (int16_t*) ptr, &frame_size, packet.data, packet.size) >= 0)
 #else
 			if (avcodec_decode_audio(m_ACodecCtx, (int16_t*) ptr, &frame_size, packet.data, packet.size) >= 0)
@@ -767,24 +791,27 @@
 				bool stereo = m_ACodecCtx->channels > 1 ? true : false;
 				int samples = stereo ? frame_size >> 2 : frame_size >> 1;
 
-				// Resampeling using ffmpegs (libavcodecs) resampler
-				if (!m_Resample) {
-					// arguments: (output channels, input channels, output rate, input rate)
-					m_Resample = audio_resample_init (2, m_ACodecCtx->channels, 44100, m_ACodecCtx->sample_rate);
-				}
-				// The size of this is a guess, we don't know yet... Lets hope it's big enough
-				int16_t* output_data = new int16_t[frame_size * 2];
-				samples = audio_resample (m_Resample, output_data, (int16_t*)ptr, samples);
+				if (_resampler.init(m_ACodecCtx)){
+					// Resampling is needed.
+					
+					uint8_t* output = new uint8_t[bufsize];
+					
+					samples = _resampler.resample(reinterpret_cast<int16_t*>(ptr), 
+									 reinterpret_cast<int16_t*>(output), 
+									 samples);
+					delete [] ptr;
+					ptr = reinterpret_cast<uint8_t*>(output);
+				}
 
 				raw_videodata_t* raw = new raw_videodata_t;
-				raw->m_data = (uint8_t*) output_data;
+				
+				raw->m_data = ptr;
 				raw->m_ptr = raw->m_data;
 				raw->m_size = samples * 2 * 2; // 2 for stereo and 2 for samplesize = 2 bytes
 				raw->m_stream_index = m_audio_index;
 
 				m_unqueued_data = m_qaudio.push(raw) ? NULL : raw;
 			}
-			delete[] ptr;
 		}
 		else
 		if (packet.stream_index == m_video_index)
@@ -881,13 +908,21 @@
 					}
 					video->m_size = copied;
 				} else if (videoFrameFormat == render::RGB) {
-					for(int line = 0; line < m_VCodecCtx->height; line++)
-					{
-						for(int byte = 0; byte < (m_VCodecCtx->width*3); byte++)
-						{
-							video->m_data[byte + (line*m_VCodecCtx->width*3)] = (unsigned char) *(m_Frame->data[0]+(line*m_Frame->linesize[0])+byte);
-						}
+
+					uint8_t* srcptr = m_Frame->data[0];
+					uint8_t* srcend = m_Frame->data[0] + m_Frame->linesize[0] * m_VCodecCtx->height;
+					uint8_t* dstptr = video->m_data;
+					unsigned int srcwidth = m_VCodecCtx->width * 3;
+
+					video->m_size = 0;
+
+					while (srcptr < srcend) {
+						memcpy(dstptr, srcptr, srcwidth);
+						srcptr += m_Frame->linesize[0];
+						dstptr += srcwidth;
+						video->m_size += srcwidth;
 					}
+
 				}
 
 				m_unqueued_data = m_qvideo.push(video) ? NULL : video;

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/NetStreamFfmpeg.h	8 Apr 2007 15:23:43 -0000	1.19
+++ server/asobj/NetStreamFfmpeg.h	10 Apr 2007 20:24:23 -0000	1.20
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.19 2007/04/08 15:23:43 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.20 2007/04/10 20:24:23 bjacques Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -138,6 +138,38 @@
 		std::queue < T > m_queue;
 };
 
+
+class AudioResampler
+{
+public:
+	AudioResampler() : _context(NULL) {}
+	~AudioResampler()
+	{ 
+		if(_context) {
+			audio_resample_close (_context);
+		}
+	}
+	
+	bool init(AVCodecContext* ctx)
+	{
+		if (!_context && (ctx->sample_rate != 44100 && ctx->channels != 2)) {
+			_context = audio_resample_init(2,  ctx->channels,
+				44100, ctx->sample_rate);
+			return true;
+		}
+		return false;
+	}
+	
+	int resample(int16_t* input, int16_t* output, int samples)
+	{
+		return audio_resample (_context, output, input, samples);
+	}
+	
+
+private:
+	ReSampleContext* _context;
+};
+
 class NetStreamFfmpeg: public NetStream {
 public:
 	NetStreamFfmpeg();
@@ -205,7 +237,7 @@
 	AVFrame* m_Frame;
 
 	// Use for resampling audio
-	ReSampleContext *m_Resample;
+	AudioResampler _resampler;
 
 	boost::thread* _decodeThread;
 	boost::mutex decoding_mutex;

Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libbase/image.cpp	5 Dec 2006 14:26:09 -0000	1.17
+++ libbase/image.cpp	10 Apr 2007 20:24:23 -0000	1.18
@@ -29,6 +29,13 @@
 	{
 	}
 
+	/// Copy image data from a buffer.
+	//
+	/// Note that this buffer MUST have the same m_pitch, or unexpected things
+	/// will happen. In general, it is only safe to copy from another image_base
+	/// (or derivative thereof) or unexpected things will happen. 
+	///
+	/// @param data buffer to copy data from.
 	void image_base::update(uint8_t* data)
 	{
 		memcpy(m_data, data, m_pitch * m_height);



From MAILER-DAEMON Tue Apr 10 17:13:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbNec-0003DE-F0
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 17:13:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbNeb-0003AX-FL
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:13:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbNeZ-00036K-5a
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:13:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbNeY-000366-Vd
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:13:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbNaZ-0007Ws-3C
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:09:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbNaH-00073v-AU
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:09:01 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbNaG-00073j-St
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:09:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbNaG-00073j-St@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 21:09:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 21:13:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 21:09:00

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	        * server/swf/tag_loaders.cpp (readPlaceObject2): reduce
	          calls to IF_VERBOSE_PARSE.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2831&r2=1.2832
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2831
retrieving revision 1.2832
diff -u -b -r1.2831 -r1.2832
--- ChangeLog	10 Apr 2007 20:24:22 -0000	1.2831
+++ ChangeLog	10 Apr 2007 21:09:00 -0000	1.2832
@@ -1,3 +1,8 @@
+2007-04-10 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/tag_loaders.cpp (readPlaceObject2): reduce
+	  calls to IF_VERBOSE_PARSE.
+
 2007-04-10 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/asobj/NetStreamFfmpeg.{cpp,h}: Don't call delete on a

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/swf/tag_loaders.cpp	10 Apr 2007 15:48:39 -0000	1.86
+++ server/swf/tag_loaders.cpp	10 Apr 2007 21:09:00 -0000	1.87
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.86 2007/04/10 15:48:39 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.87 2007/04/10 21:09:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1002,62 +1002,25 @@
 
 		m_depth = in->read_u16()+character::staticDepthOffset;
 
-		IF_VERBOSE_PARSE
-		(
-                    log_parse("  depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
-		);
-
-		if (has_char)
-		{
-			m_character_id = in->read_u16();
-			IF_VERBOSE_PARSE (
-				log_parse("  char id = %d", m_character_id);
-			);
-		}
+		if (has_char) m_character_id = in->read_u16();
 
 		if (has_matrix)
 		{
 			m_has_matrix = true;
 			m_matrix.read(in);
-			IF_VERBOSE_PARSE (
-				log_parse("  mat:");
-				m_matrix.print();
-			);
 		}
 
 		if (has_cxform)
 		{
 			m_has_cxform = true;
 			m_color_transform.read_rgba(in);
-			IF_VERBOSE_PARSE (
-				log_parse("  cxform:");
-				m_color_transform.print();
-			);
 		}
 				
-		if (has_ratio)
-		{
-			m_ratio = (float)in->read_u16() / (float)65535;
-			IF_VERBOSE_PARSE (
-				log_parse("  ratio: %f", m_ratio);
-			);
-		}
+		if (has_ratio) m_ratio = (float)in->read_u16() / (float)65535;
 				
-		if (has_name)
-		{
-			m_name = in->read_string();
-			IF_VERBOSE_PARSE (
-				log_parse("  name = %s", m_name ? m_name : "<null>");
-			);
-		}
+		if (has_name) m_name = in->read_string();
 
-		if (has_clip_bracket)
-		{
-			m_clip_depth = in->read_u16()+character::staticDepthOffset; 
-			IF_VERBOSE_PARSE (
-				log_parse("  clip_depth = %d (%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
-			);
-		}
+		if (has_clip_bracket) m_clip_depth = in->read_u16()+character::staticDepthOffset; 
 
 		if (has_actions)
 		{
@@ -1081,6 +1044,27 @@
 			m_place_type = PLACE;
 		}
                                 
+		IF_VERBOSE_PARSE (
+			log_parse("  PLACEOBJECT2: depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
+			if ( has_char ) log_parse("  char id = %d", m_character_id);
+			if ( has_matrix ) 
+			{
+				log_parse("  mat:");
+				m_matrix.print();
+			}
+			if ( has_cxform )
+			{
+				log_parse("  cxform:");
+				m_color_transform.print();
+			}
+			if ( has_ratio ) log_parse("  ratio: %f", m_ratio);
+			if ( has_name ) log_parse("  name = %s", m_name ? m_name : "<null>");
+			if ( has_clip_bracket ) log_parse("  clip_depth = %d (%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
+			log_parse(" m_place_type: %d", m_place_type);
+		);
+				
+
+                                
 		//log_msg("place object at depth %i", m_depth);
 	}
 



From MAILER-DAEMON Tue Apr 10 17:15:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbNgD-0006IG-Kl
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 17:15:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbNgB-0006DU-T8
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:15:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbNgB-00069v-0T
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:15:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbNgA-00069N-O1
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:15:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HbNcB-0000J5-Iv
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:10:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbNc9-0007By-3B
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:10:57 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HbNc8-0007Bv-QV
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:10:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbNc8-0007Bv-QV@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Tue, 10 Apr 2007 21:10:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog cygnal/http.cpp cygnal/stream.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 21:15:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/10 21:10:56

Modified files:
	.              : ChangeLog 
	cygnal         : http.cpp stream.cpp 

Log message:
	Added 'return true'-stubs, closes bug #19561.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2832&r2=1.2833
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/stream.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2832
retrieving revision 1.2833
diff -u -b -r1.2832 -r1.2833
--- ChangeLog	10 Apr 2007 21:09:00 -0000	1.2832
+++ ChangeLog	10 Apr 2007 21:10:56 -0000	1.2833
@@ -1,3 +1,8 @@
+2007-04-10 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* cygnal/http.cpp cygnal/stream.cpp: Added 'return true'-stubs, closes
+	  bug #19561.
+
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/tag_loaders.cpp (readPlaceObject2): reduce

Index: cygnal/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- cygnal/http.cpp	3 Jan 2007 01:52:06 -0000	1.5
+++ cygnal/http.cpp	10 Apr 2007 21:10:56 -0000	1.6
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: http.cpp,v 1.5 2007/01/03 01:52:06 nihilus Exp $ */
+/* $Id: http.cpp,v 1.6 2007/04/10 21:10:56 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -131,6 +131,7 @@
     } else {
         dbglogfile << "Couldn't send GET Reply" << endl;
     }    
+    return true; // Default to true
 }
 
 // bool

Index: cygnal/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/stream.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cygnal/stream.cpp	11 Mar 2007 17:51:09 -0000	1.2
+++ cygnal/stream.cpp	10 Apr 2007 21:10:56 -0000	1.3
@@ -281,6 +281,7 @@
     GNASH_REPORT_FUNCTION;
 
     _state = PREVIEW;
+    return true; // Default to true    
 }
 
 // Stream a series of thumbnails
@@ -289,6 +290,7 @@
     GNASH_REPORT_FUNCTION;
     
     _state = THUMBNAIL;
+    return true; // Default to true
 }
 
 // Pause the stream
@@ -297,6 +299,7 @@
     GNASH_REPORT_FUNCTION;
     
     _state = PAUSE;
+    return true; // Default to true
 }
 
 // Seek within the stream
@@ -305,6 +308,7 @@
     GNASH_REPORT_FUNCTION;
     
     _state = SEEK;
+    return true; // Default to true    
 }
 
 // Upload a stream into a sandbox
@@ -313,6 +317,7 @@
     GNASH_REPORT_FUNCTION;
     
     _state = UPLOAD;
+    return true; // Default to true
 }
 
 // Stream a single "real-time" source.
@@ -320,6 +325,7 @@
     GNASH_REPORT_FUNCTION;
     
     _state = MULTICAST;
+    return true; // Default to true    
 }
 
 } // end of cygnal namespace



From MAILER-DAEMON Tue Apr 10 17:35:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbNzb-0004uu-G7
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 17:35:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbNzZ-0004rR-EX
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:35:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbNzY-0004qC-RS
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:35:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbNzY-0004pz-IE
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:35:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <tomasgroth@yahoo.dk>) id 1HbNvZ-0006ov-K2
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:31:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbNvY-0000Aq-UC
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:31:01 +0000
Received: from tgc by cvs with local (Exim 4.50) id 1HbNvY-0000Ag-Ls
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:31:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbNvY-0000Ag-Ls@cvs>
From: Tomas Groth <tomasgroth@yahoo.dk>
Date: Tue, 10 Apr 2007 21:31:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 21:35:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Tomas Groth <tgc>	07/04/10 21:31:00

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStreamFfmpeg.h 

Log message:
		* server/asobj/NetStreamFfmpeg.h: Fixed a bug in the 
		  AudioResampler, which made it only resample the first time.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2833&r2=1.2834
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2833
retrieving revision 1.2834
diff -u -b -r1.2833 -r1.2834
--- ChangeLog	10 Apr 2007 21:10:56 -0000	1.2833
+++ ChangeLog	10 Apr 2007 21:31:00 -0000	1.2834
@@ -1,3 +1,8 @@
+2007-04-10 Tomas Groth Christensen <tomasgroth@yahoo.dk>
+
+	* server/asobj/NetStreamFfmpeg.h: Fixed a bug in the 
+	  AudioResampler, which made it only resample the first time.
+
 2007-04-10 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* cygnal/http.cpp cygnal/stream.cpp: Added 'return true'-stubs, closes

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/NetStreamFfmpeg.h	10 Apr 2007 20:24:23 -0000	1.20
+++ server/asobj/NetStreamFfmpeg.h	10 Apr 2007 21:31:00 -0000	1.21
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.20 2007/04/10 20:24:23 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.21 2007/04/10 21:31:00 tgc Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -152,9 +152,11 @@
 	
 	bool init(AVCodecContext* ctx)
 	{
-		if (!_context && (ctx->sample_rate != 44100 && ctx->channels != 2)) {
+		if (ctx->sample_rate != 44100 && ctx->channels != 2) {
+			if (!_context) {
 			_context = audio_resample_init(2,  ctx->channels,
 				44100, ctx->sample_rate);
+ 			}
 			return true;
 		}
 		return false;



From MAILER-DAEMON Tue Apr 10 17:48:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbOCR-0007B1-P5
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 17:48:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbOCP-0007Af-TU
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:48:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbOCN-0007AQ-SA
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:48:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbOCN-0007AM-M3
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:48:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbO8O-0003hR-Iq
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 17:44:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbO8N-0002H4-Bp
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:44:15 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbO8M-0002Gz-VK
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 21:44:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbO8M-0002Gz-VK@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 10 Apr 2007 21:44:14 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 21:48:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/10 21:44:14

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp sprite_instance.h 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/sprite_instance.{cpp,h}: add duplicateMovieClip method
	          for use by MovieClip.duplicateMovieClip and ActionDuplicateClip.
	        * server/vm/ASHandlers.cpp (ActionDuplicateClip): use the new
	          sprite_instance::duplicateMovieClip method fixing a bogus assumption
	          about the parent to duplicate into.
	        * testsuite/actionscript.all/MovieClip.as: add small test for
	          ActionDuplicateClip.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2834&r2=1.2835
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.229&r2=1.230
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.47&r2=1.48

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2834
retrieving revision 1.2835
diff -u -b -r1.2834 -r1.2835
--- ChangeLog	10 Apr 2007 21:31:00 -0000	1.2834
+++ ChangeLog	10 Apr 2007 21:44:14 -0000	1.2835
@@ -1,3 +1,13 @@
+2007-04-10 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.{cpp,h}: add duplicateMovieClip method
+	  for use by MovieClip.duplicateMovieClip and ActionDuplicateClip.
+	* server/vm/ASHandlers.cpp (ActionDuplicateClip): use the new
+	  sprite_instance::duplicateMovieClip method fixing a bogus assumption
+	  about the parent to duplicate into.
+	* testsuite/actionscript.all/MovieClip.as: add small test for
+	  ActionDuplicateClip.
+
 2007-04-10 Tomas Groth Christensen <tomasgroth@yahoo.dk>
 
 	* server/asobj/NetStreamFfmpeg.h: Fixed a bug in the 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -b -r1.229 -r1.230
--- server/sprite_instance.cpp	10 Apr 2007 15:48:39 -0000	1.229
+++ server/sprite_instance.cpp	10 Apr 2007 21:44:14 -0000	1.230
@@ -396,59 +396,28 @@
 	if (fn.nargs < 2)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("duplicateMovieClip needs 2 or 3 args\n");
+		log_aserror("MovieClip.duplicateMovieClip() needs 2 or 3 args");
 	    	);
 		return as_value();
 	}
 
-	// strk question: Would a call to 
-	//   sprite->get_movie_defition()->create_instance()
-	//   and an add_display_object taking a character_instance
-	//   instead of a character *id* be more appropriate ?
-	//   (sounds more general)
+	std::string newname = fn.arg(0).to_std_string(&(fn.env()));
+	int depth = int(fn.arg(1).to_number());
 
-	// Copy event handlers from sprite
-	// We should not copy 'm_action_buffer' since the 'm_method' already contains it
-	std::vector<swf_event*>	event_handlers;
-	const std::map<event_id, as_value>& sprite_events = sprite->get_event_handlers();
-	typedef std::map<event_id, as_value>::const_iterator event_iterator;
-	for (event_iterator it = sprite_events.begin(),
-		itEnd = sprite_events.end();
-		it != itEnd; ++it )
-	{
-		swf_event* e = new swf_event; // FIXME: who will delete this ?
-		e->m_event = it->first;
-		e->m_method = it->second;
-		event_handlers.push_back(e);
-	}
-
-	character* parent = sprite->get_parent();
-	sprite_instance* parent_sprite = parent ? parent->to_movie() : NULL;
-	character* ch = NULL;
-	if (parent_sprite)
-	{
-		ch = parent_sprite->add_display_object(
-			sprite->get_id(),
-			fn.arg(0).to_string(),
-			event_handlers,
-			int(fn.arg(1).to_number()),
-			true, // replace if depth is occupied (to drop)
-			sprite->get_cxform(),
-			sprite->get_matrix(),
-			sprite->get_ratio(),
-			sprite->get_clip_depth());
-
-		ch->setDynamic();
+	boost::intrusive_ptr<sprite_instance> ch;
 
 		// Copy members from initObject
-		if (fn.nargs == 3 && ch)
+	if (fn.nargs == 3)
 		{
 			boost::intrusive_ptr<as_object> initObject = fn.arg(2).to_object();
-			if ( initObject ) ch->copyProperties(*initObject);
+		ch = sprite->duplicateMovieClip(newname, depth, initObject.get());
 		}
-
+	else
+	{
+		ch = sprite->duplicateMovieClip(newname, depth);
 	}
-	return as_value(ch);
+
+	return as_value(ch.get());
 }
 
 static as_value sprite_goto_and_play(const fn_call& fn)
@@ -1866,6 +1835,58 @@
 	return txt_char;
 }
 
+boost::intrusive_ptr<sprite_instance> 
+sprite_instance::duplicateMovieClip(const std::string& newname, int depth,
+		as_object* initObject)
+{
+	character* parent_ch = get_parent();
+	if ( ! parent_ch )
+	{
+		log_error("Can't clone root the movie");
+		return NULL;
+	}
+	sprite_instance* parent = parent_ch->to_movie();
+	if ( ! parent )
+	{
+		log_error("%s parent is not a sprite, can't clone", getTarget().c_str());
+		return NULL;
+	}
+
+	boost::intrusive_ptr<sprite_instance> newsprite = new sprite_instance(m_def.get(),
+			m_root, parent, get_id());
+	newsprite->set_name(newname.c_str());
+
+	newsprite->setDynamic();
+
+	if ( initObject ) newsprite->copyProperties(*initObject);
+	//else newsprite->copyProperties(*this);
+
+
+	// Copy event handlers from sprite
+	// We should not copy 'm_action_buffer' since the 'm_method' already contains it
+	const std::map<event_id, as_value>& sprite_events = get_event_handlers();
+	typedef std::map<event_id, as_value>::const_iterator event_iterator;
+	for (event_iterator it = sprite_events.begin(),
+		itEnd = sprite_events.end();
+		it != itEnd; ++it )
+	{
+		swf_event* e = new swf_event; // FIXME: who will delete this ?
+		e->m_event = it->first;
+		e->m_method = it->second;
+		e->attach_to(newsprite.get());
+	}
+
+	parent->m_display_list.place_character(
+		newsprite.get(),
+		depth,
+		get_cxform(),
+		get_matrix(),
+		get_ratio(),
+		get_clip_depth());
+	
+	return newsprite;
+}
+
 void sprite_instance::clone_display_object(const std::string& name,
 	const std::string& newname, int depth)
 {
@@ -1889,6 +1910,11 @@
 	    // @@ TODO need to duplicate ch's event handlers, and presumably other members?
 	    // Probably should make a character::clone() function to handle this.
 	}
+    else
+    {
+	    log_error("clone_display_object(%s, %s, %d): could not find a character named %s to clone",
+			    name.c_str(), newname.c_str(), depth, name.c_str());
+    }
 }
 
 void sprite_instance::remove_display_object(const tu_string& name_tu)
@@ -2719,7 +2745,7 @@
 		int clip_depth)
 {
 	assert(m_def != NULL);
-	// log_msg("%s: character %s, id is %d", __FUNCTION__, name, character_id); // FIXME: debugging crap
+	//log_msg("%s: character %s, id is %d, depth is %d", __FUNCTION__, name, character_id, depth); // FIXME: debugging crap
 
 	character_def*	cdef = m_def->get_character_def(character_id);
 	if (cdef == NULL)

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/sprite_instance.h	10 Apr 2007 15:48:39 -0000	1.92
+++ server/sprite_instance.h	10 Apr 2007 21:44:14 -0000	1.93
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.92 2007/04/10 15:48:39 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.93 2007/04/10 21:44:14 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -530,10 +530,22 @@
 	// delegates to movie_root 
 	virtual void stop_drag();
 
-	/// Duplicate the object with the specified name
-	/// and add it with a new name  at a new depth.
-	void clone_display_object(const std::string& name,
-		const std::string& newname, int depth);
+	/// Duplicate this sprite in its timeline
+	//
+	/// Add the new character at a the given depth to this sprite
+	/// parent displaylist.
+	///
+	/// NOTE: the call will fail for the root movie (no parent).
+	/// NOTE2: any character at the given target depth will be
+	///        replaced by the new character
+	/// NOTE3: event handlers will also be copied
+	///
+	/// @param init_object
+	///	If not null, will be used to copy properties over.
+	///
+	boost::intrusive_ptr<sprite_instance> duplicateMovieClip(
+		const std::string& newname,
+		int newdepth, as_object* init_object=NULL);
 
 	/// Remove the object with the specified name.
 	//
@@ -737,6 +749,11 @@
 
 private:
 
+	/// Duplicate the object with the specified name
+	/// and add it with a new name  at a new depth.
+	void clone_display_object(const std::string& name,
+		const std::string& newname, int depth);
+
 	/// Reset the DisplayList for proper loop-back or goto_frame
 	//
 	/// The DisplayList is cleared by all but dynamic characters

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/vm/ASHandlers.cpp	10 Apr 2007 17:41:42 -0000	1.85
+++ server/vm/ASHandlers.cpp	10 Apr 2007 21:44:14 -0000	1.86
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.85 2007/04/10 17:41:42 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.86 2007/04/10 21:44:14 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1141,23 +1141,36 @@
 void
 SWFHandlers::ActionDuplicateClip(ActionExec& thread)
 {
-//    GNASH_REPORT_FUNCTION;
+	GNASH_REPORT_FUNCTION;
 	as_environment& env = thread.env;
 
 	thread.ensureStack(3); 
 
-	sprite_instance* si = env.get_target()->to_movie();
-	if ( ! si )
+	int depth = int(env.top(0).to_number(&env))+character::staticDepthOffset;
+	std::string newname = env.top(1).to_std_string(&env);
+	std::string path = env.top(2).to_std_string(&env);
+
+	character* ch = env.find_target(path);
+	if ( ! ch )
 	{
-		log_error("environment target is not a sprite_instance while executing ActionDuplicateClip");
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Path given to duplicateMovieClip(%s) doesn't point to a character",
+			path.c_str());
+		);
+		return;
 	}
-	else
+
+	boost::intrusive_ptr<sprite_instance> sprite = ch->to_movie();
+	if ( ! sprite )
 	{
-		si->clone_display_object(
-			env.top(2).to_std_string(),
-			env.top(1).to_std_string(),
-			(int) env.top(0).to_number(&env));
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Path given to duplicateMovieClip(%s) is not a sprite",
+			path.c_str());
+		);
+		return;
 	}
+
+	sprite->duplicateMovieClip(newname, depth);
 	env.drop(3);
 }
 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- testsuite/actionscript.all/MovieClip.as	6 Apr 2007 15:53:24 -0000	1.47
+++ testsuite/actionscript.all/MovieClip.as	10 Apr 2007 21:44:14 -0000	1.48
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.47 2007/04/06 15:53:24 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.48 2007/04/10 21:44:14 strk Exp $";
 
 #include "check.as"
 
@@ -310,6 +310,24 @@
 #endif // OUTPUT_VERSION >= 6
 
 //----------------------------------------------
+// Test duplicateMovieClip
+//----------------------------------------------
+#if OUTPUT_VERSION >= 6
+_root.createEmptyMovieClip("original", 61);
+_root.original.createEmptyMovieClip("child1", 1);
+_root.original._x = 100;
+check_equals(typeof(_root.original), 'movieclip');
+check_equals(typeof(_root.original.child1), 'movieclip');
+check_equals(_root.original._x, 100);
+
+duplicateMovieClip(_root.original, "copy1", 63);
+check_equals(typeof(_root.copy1), 'movieclip');
+check_equals(typeof(_root.copy1.child1), 'undefined');
+check_equals(_root.copy1.getDepth(), 63);
+check_equals(_root.copy1._x, 100);
+#endif // OUTPUT_VERSION >= 6
+
+//----------------------------------------------
 // Test timeline variables
 //----------------------------------------------
 



From MAILER-DAEMON Tue Apr 10 18:59:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbPJC-00060n-Nm
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 18:59:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbPJB-0005w3-Q4
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:59:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbPJB-0005tK-AG
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:59:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbPJB-0005sx-6O
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:59:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbPFB-000209-NY
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 18:55:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbPFB-0002ow-4a
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 22:55:21 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbPFA-0002of-SA
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 22:55:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbPFA-0002of-SA@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Tue, 10 Apr 2007 22:55:20 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/image.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 22:59:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/10 22:55:20

Modified files:
	.              : ChangeLog 
	libbase        : image.h 

Log message:
	Define a virtual destructor for the image_base 
	class so deriving classes will have their destructors called 
	when we decide to delete them. Fixes a _big_ memory leak.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2835&r2=1.2836
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2835
retrieving revision 1.2836
diff -u -b -r1.2835 -r1.2836
--- ChangeLog	10 Apr 2007 21:44:14 -0000	1.2835
+++ ChangeLog	10 Apr 2007 22:55:20 -0000	1.2836
@@ -32,6 +32,9 @@
 	if necessary.
 	* server/xmlsocket.cpp: Use SIZET_FMT.
 	* libbase/image.cpp: Document update().
+	* libbase/image.h: Define a virtual destructor for the image_base
+	class so deriving classes will have their destructors called
+	when we decide to delete them. Fixes a _big_ memory leak.
 
 2007-04-10  Rob Savoye  <rob@bertha.welcomehome.org>
 

Index: libbase/image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/image.h	5 Dec 2006 14:26:09 -0000	1.11
+++ libbase/image.h	10 Apr 2007 22:55:20 -0000	1.12
@@ -42,6 +42,7 @@
 
 		image_base(uint8_t* data, int width, int height, int pitch, id_image type);
 		void update(uint8_t* data);
+		virtual ~image_base() {}
 	};
 
 	/// 24-bit RGB image.  Packed data, red byte first (RGBRGB...)
@@ -86,7 +87,7 @@
 	enum {Y, U, V, T, NB_TEXS};
 
 	yuv(int w, int h);
-	~yuv();
+	~yuv() {}
 	void update(uint8_t* data);
 	unsigned int video_nlpo2(unsigned int x) const;
 	int size() const;



From MAILER-DAEMON Tue Apr 10 19:15:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbPYr-0006OY-7O
	for mharc-gnash-commit@gnu.org; Tue, 10 Apr 2007 19:15:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbPYq-0006OT-6M
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 19:15:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbPYp-0006OH-On
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 19:15:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbPYp-0006OE-KE
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 19:15:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbPUq-0004JZ-2b
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 19:11:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbPUp-0004RE-MJ
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 23:11:31 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbPUp-0004RB-HH
	for gnash-commit@gnu.org; Tue, 10 Apr 2007 23:11:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbPUp-0004RB-HH@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Tue, 10 Apr 2007 23:11:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/LoadThread.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Apr 2007 23:15:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/10 23:11:31

Modified files:
	.              : ChangeLog 
	libbase        : LoadThread.cpp 

Log message:
	Handle the case where the cache is filled up and we have yet more data
	to load. Patch by tgc.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2836&r2=1.2837
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/LoadThread.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2836
retrieving revision 1.2837
diff -u -b -r1.2836 -r1.2837
--- ChangeLog	10 Apr 2007 22:55:20 -0000	1.2836
+++ ChangeLog	10 Apr 2007 23:11:30 -0000	1.2837
@@ -12,6 +12,8 @@
 
 	* server/asobj/NetStreamFfmpeg.h: Fixed a bug in the 
 	  AudioResampler, which made it only resample the first time.
+	* libbase/LoadThread.cpp: Handle the case where the cache is
+	filled and we have yet more data to load.
 
 2007-04-10 Markus Gothe <nietzsche@lysator.liu.se>
 

Index: libbase/LoadThread.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/LoadThread.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/LoadThread.cpp	3 Apr 2007 16:45:02 -0000	1.5
+++ libbase/LoadThread.cpp	10 Apr 2007 23:11:31 -0000	1.6
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: LoadThread.cpp,v 1.5 2007/04/03 16:45:02 strk Exp $
+// $Id: LoadThread.cpp,v 1.6 2007/04/10 23:11:31 bjacques Exp $
 
 #include "LoadThread.h"
 
@@ -245,14 +245,34 @@
 
 	if (_loadPosition != _actualPosition) _stream->set_position(_loadPosition);
 
-	int ret = _stream->read_bytes(_cache+_cachedData, _chunkSize);
+	int ret;
+	if (_cachedData + _chunkSize > _cacheSize) {
+		ret = _stream->read_bytes(_cache + _cachedData, _cacheSize - _cachedData);
 
+		_cachedData += ret;
+		if (ret != _cacheSize - _cachedData) {
+			_completed = true;
+		} else {
+			_stream->set_position(_loadPosition + _chunkSize);
+			long pos = _stream->get_position();
+			if (pos != _loadPosition + _chunkSize) {
+				_completed = true;
+			}
+			ret += pos - (_loadPosition + _chunkSize);
+		}
+		
+	} else {
+		ret = _stream->read_bytes(_cache + _cachedData, _chunkSize);
 	if (ret != _chunkSize) {
 		_completed = true;
 	}
 	_cachedData += ret;
+
+	}
+
 	_loadPosition = _loadPosition + ret;
 	_actualPosition = _loadPosition;
+
 }
 
 void LoadThread::download()



From MAILER-DAEMON Wed Apr 11 01:08:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbV4Q-0006GD-Hv
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 01:08:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbV4P-0006Fv-Ja
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:08:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbV4O-0006Fh-VH
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:08:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbV4O-0006FX-Pi
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:08:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HbV0M-0002GU-9Y
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:04:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbV0B-00076U-Fd
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 05:04:15 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HbV0B-00076N-6O
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 05:04:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbV0B-00076N-6O@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 11 Apr 2007 05:04:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 05:08:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/11 05:04:15

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp 

Log message:
	don't trim of the last / in parse_path()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2837&r2=1.2838
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2837
retrieving revision 1.2838
diff -u -b -r1.2837 -r1.2838
--- ChangeLog	10 Apr 2007 23:11:30 -0000	1.2837
+++ ChangeLog	11 Apr 2007 05:04:14 -0000	1.2838
@@ -1,3 +1,8 @@
+2007-04-11 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/as_environment.cpp:
+	  don't trim of the last "/" in parse_path(), fix parsing path in format "/:x".
+	  
 2007-04-10 Sandro Santilli <strk@keybit.net>
 
 	* server/sprite_instance.{cpp,h}: add duplicateMovieClip method

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/as_environment.cpp	10 Apr 2007 17:41:42 -0000	1.66
+++ server/as_environment.cpp	11 Apr 2007 05:04:14 -0000	1.67
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.66 2007/04/10 17:41:42 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.67 2007/04/11 05:04:14 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -399,14 +399,6 @@
     // Var.
     var = &var_path[colon_index + 1];
     
-    // Path.
-    if (colon_index > 0) {
-	if (var_path[colon_index - 1] == '/') {
-	    // Trim off the extraneous trailing slash.
-	    colon_index--;
-	}
-    }
-
     // @@ could be better. 
     path = var_path;
     path.resize(colon_index);



From MAILER-DAEMON Wed Apr 11 01:46:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbVfL-00014g-Rt
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 01:46:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbVfK-00014J-UX
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:46:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbVfJ-00013X-Uq
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:46:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbVfJ-00013C-RX
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:46:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HbVbH-0000y8-BR
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 01:42:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbVb8-0002So-Ez
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 05:42:26 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HbVb7-0002Sj-VE
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 05:42:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbVb7-0002Sj-VE@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 11 Apr 2007 05:42:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/getv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 05:46:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/11 05:42:25

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: getvariable.as 

Log message:
	add tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2838&r2=1.2839
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2838
retrieving revision 1.2839
diff -u -b -r1.2838 -r1.2839
--- ChangeLog	11 Apr 2007 05:04:14 -0000	1.2838
+++ ChangeLog	11 Apr 2007 05:42:25 -0000	1.2839
@@ -2,6 +2,8 @@
 
 	* server/as_environment.cpp:
 	  don't trim of the last "/" in parse_path(), fix parsing path in format "/:x".
+	* testsuite/actionscript.all/getvariable.as:
+	  add tests
 	  
 2007-04-10 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/actionscript.all/getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/actionscript.all/getvariable.as	10 Apr 2007 14:17:15 -0000	1.8
+++ testsuite/actionscript.all/getvariable.as	11 Apr 2007 05:42:25 -0000	1.9
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.8 2007/04/10 14:17:15 strk Exp $";
+rcsid="$Id: getvariable.as,v 1.9 2007/04/11 05:42:25 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -312,6 +312,25 @@
 check_equals(typeof(checkpoint), 'undefined');
 check_equals(typeof(invalid), 'undefined');
 
+
+//-----------------------------------------------------------------------
+// Check 'path and var'
+//-----------------------------------------------------------------------
+func = function () 
+{ 
+	var xx = 1;
+	asm {	
+		push '/:xx'
+		push '2'
+		setvariable
+	};
+	check_equals(xx, 1);
+	check_equals(_root.xx, 2);
+};
+
+func();
+
+
 //-----------------------------------------------------------------------
 // TODO: try use of 'with' stack
 //-----------------------------------------------------------------------



From MAILER-DAEMON Wed Apr 11 02:32:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbWNB-000082-Ah
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 02:32:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbWN8-0008U4-K3
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 02:32:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbWN6-0008Rt-4Y
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 02:32:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbWN5-0008RT-TE
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 02:31:59 -0400
Received: from an-out-0708.google.com ([209.85.132.245])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HbWJ2-0007Tb-Iv
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 02:27:49 -0400
Received: by an-out-0708.google.com with SMTP id b8so84269ana
	for <gnash-commit@gnu.org>; Tue, 10 Apr 2007 23:27:40 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=KJsOdUhN+F6eHcdFJE84XspGH/jdJeUx5XGf+1v/NoTc1K5uy56ZI3gZO8vCN3LPXWqB1HhXOE0SwldercwoUOefr68Cewv0KAHZO8SRA2Qjtko1BT6lXY5Gjpvlry2VnQZSnKnXaR3VuFzJxVkX68NDvMyuteRHFHtOjVsyT/8=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Eq3y1ZZ+r75erp6JMh9HHjXjFTYnGv2v5skeTg2b787SnokKaJSVJdB+iwe9En2tLGDjbPvUeg+byCkrx0gLAEkxIhhr5zuHoDshcVRn/eGupwRyLQaibV4PeKdZ30OkGB6+/Vv53SOcTUynFJWNCsST1YmPCyPll51l7xRjW4U=
Received: by 10.114.36.1 with SMTP id j1mr132088waj.1176272860114;
	Tue, 10 Apr 2007 23:27:40 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Tue, 10 Apr 2007 23:27:39 -0700 (PDT)
Message-ID: <ca4b43ff0704102327he384e4es4a37153160709e1d@mail.gmail.com>
Date: Wed, 11 Apr 2007 14:27:39 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_environment.cpp
In-Reply-To: <E1HbV0B-00076N-6O@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HbV0B-00076N-6O@cvs>
X-detected-kernel: Linux 2.6 (newer, 2)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 06:32:03 -0000

Don't trim off the trailing slash, just return the raw path.
find_target() knows how to deal with the trailing slash.  And the
"trailing slash" is very important when it is representing "_root".  I
have added tests for this special case(BTW, it's not specail at all in
real swf movies).

On 4/11/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/11 05:04:15
>
> Modified files:
>        .              : ChangeLog
>        server         : as_environment.cpp
>
> Log message:
>        don't trim of the last / in parse_path()
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2837&r2=1.2838
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.66&r2=1.67
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2837
> retrieving revision 1.2838
> diff -u -b -r1.2837 -r1.2838
> --- ChangeLog   10 Apr 2007 23:11:30 -0000      1.2837
> +++ ChangeLog   11 Apr 2007 05:04:14 -0000      1.2838
> @@ -1,3 +1,8 @@
> +2007-04-11 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * server/as_environment.cpp:
> +         don't trim of the last "/" in parse_path(), fix parsing path in format "/:x".
> +
>  2007-04-10 Sandro Santilli <strk@keybit.net>
>
>        * server/sprite_instance.{cpp,h}: add duplicateMovieClip method
>
> Index: server/as_environment.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
> retrieving revision 1.66
> retrieving revision 1.67
> diff -u -b -r1.66 -r1.67
> --- server/as_environment.cpp   10 Apr 2007 17:41:42 -0000      1.66
> +++ server/as_environment.cpp   11 Apr 2007 05:04:14 -0000      1.67
> @@ -16,7 +16,7 @@
>
>  //
>
> -/* $Id: as_environment.cpp,v 1.66 2007/04/10 17:41:42 strk Exp $ */
> +/* $Id: as_environment.cpp,v 1.67 2007/04/11 05:04:14 zoulunkai Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -399,14 +399,6 @@
>     // Var.
>     var = &var_path[colon_index + 1];
>
> -    // Path.
> -    if (colon_index > 0) {
> -       if (var_path[colon_index - 1] == '/') {
> -           // Trim off the extraneous trailing slash.
> -           colon_index--;
> -       }
> -    }
> -
>     // @@ could be better.
>     path = var_path;
>     path.resize(colon_index);
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Wed Apr 11 03:36:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbXNC-0001y4-Dz
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 03:36:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbXNA-0001vS-Pc
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 03:36:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbXNA-0001uY-2g
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 03:36:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbXN9-0001uO-Vz
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 03:36:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HbXJ7-0007nE-N7
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 03:31:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbXJ3-0003wK-V0
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 07:31:54 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HbXJ3-0003wG-MG
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 07:31:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbXJ3-0003wG-MG@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 11 Apr 2007 07:31:53 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all getvariable.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 07:36:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/11 07:31:53

Modified files:
	testsuite/actionscript.all: getvariable.as 

Log message:
	update tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- getvariable.as	11 Apr 2007 05:42:25 -0000	1.9
+++ getvariable.as	11 Apr 2007 07:31:53 -0000	1.10
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.9 2007/04/11 05:42:25 zoulunkai Exp $";
+rcsid="$Id: getvariable.as,v 1.10 2007/04/11 07:31:53 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -316,7 +316,7 @@
 //-----------------------------------------------------------------------
 // Check 'path and var'
 //-----------------------------------------------------------------------
-func = function () 
+function func_obj() 
 { 
 	var xx = 1;
 	asm {	
@@ -328,6 +328,7 @@
 	check_equals(_root.xx, 2);
 };
 
+func = new func_obj();
 func();
 
 



From MAILER-DAEMON Wed Apr 11 04:07:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbXrp-0001Tg-Ce
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 04:07:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbXrn-0001T5-Ko
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:07:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbXrm-0001SZ-Lp
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:07:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbXrm-0001SV-8J
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:07:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbXnj-0003fX-8h
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:03:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbXng-0007OF-Up
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:03:33 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbXng-0007OB-HI
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:03:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbXng-0007OB-HI@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 08:03:32 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/display...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 08:07:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 08:03:32

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	        * testsuite/misc-ming.all/displaylist_depths_test.c:
	          Add tests for duplicateMovieClip, _width and cloning
	          static event handlers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2839&r2=1.2840
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2839
retrieving revision 1.2840
diff -u -b -r1.2839 -r1.2840
--- ChangeLog	11 Apr 2007 05:42:25 -0000	1.2839
+++ ChangeLog	11 Apr 2007 08:03:32 -0000	1.2840
@@ -1,3 +1,9 @@
+2007-04-11 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/displaylist_depths_test.c:
+	  Add tests for duplicateMovieClip, _width and cloning
+	  static event handlers.
+
 2007-04-11 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/as_environment.cpp:

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/displaylist_depths_test.c	6 Apr 2007 16:47:07 -0000	1.3
+++ testsuite/misc-ming.all/displaylist_depths_test.c	11 Apr 2007 08:03:32 -0000	1.4
@@ -49,13 +49,29 @@
 			" lineTo(%d, %d);"
 			" lineTo(%d, %d);"
 			" endFill();"
+			"}"
+			"%s.createEmptyMovieClip('child', 1);"
+			"with (%s.child) {"
+			" lineStyle(3, 0x000000, 100);"	
+			" moveTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
 			"}",
 			name, depth, name,
 			x, y,
 			x, y+height,
 			x+width, y+height,
 			x+width, y,
-			x, y);
+			x, y,
+			name, name,
+			x+5, y+5,
+			x+5, y+height-5,
+			x+width-5, y+height-5,
+			x+width-5, y+5,
+			x+5, y+5
+			);
 
 	SWFMovie_add(mo, (SWFBlock)ac);
 }
@@ -64,18 +80,30 @@
 add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
 {
 	SWFShape sh;
-	SWFMovieClip mc;
+	SWFMovieClip mc, mc2;
 	SWFDisplayItem it;
 
-	sh = make_fill_square (x, y, width, height, 255, 0, 0, 255, 0, 0);
+	sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 255, 0, 0);
 	mc = newSWFMovieClip();
 	SWFMovieClip_add(mc, (SWFBlock)sh);
+
+	sh = make_square (-(width/2)+5, -(height/2)+5, width-10, height-10, 0, 0, 0);
+	mc2 = newSWFMovieClip(); // child
+	SWFMovieClip_add(mc2, (SWFBlock)sh);
+	SWFMovieClip_nextFrame(mc2);
+
+	it = SWFMovieClip_add(mc, (SWFBlock)mc2);
+	SWFDisplayItem_setName(it, "child");
 	SWFMovieClip_nextFrame(mc);
+
 	it = SWFMovie_add(mo, (SWFBlock)mc);
 	SWFDisplayItem_setDepth(it, depth); 
+	SWFDisplayItem_moveTo(it, x, y); 
+	//SWFDisplayItem_moveTo(it, -(width/2), -(height/2)); 
 	SWFDisplayItem_setName(it, name);
+	SWFDisplayItem_addAction(it, newSWFAction("this._rotation+=2;"), SWFACTION_ENTERFRAME);
 
-	SWFMovie_add(mo, (SWFBlock)mc);
+	//SWFMovie_add(mo, (SWFBlock)mc);
 }
 
 
@@ -84,6 +112,7 @@
 {
 	SWFMovie mo;
 	SWFMovieClip dejagnuclip;
+	int i;
 
 	const char *srcdir=".";
 	if ( argc>1 ) 
@@ -159,7 +188,96 @@
 	check_equals(mo, "typeof(staticmc0)", "'movieclip'");
 	check_equals(mo, "staticmc0.getDepth()", "-16384"); // converted at negative depth !
 
-	SWFMovie_nextFrame(mo); 
+	for (i=0; i<10; ++i) SWFMovie_nextFrame(mo); 
+
+	// Duplicate all sprites
+	add_actions(mo,
+		"duplicateMovieClip(staticmc, 'staticmc_dup', 2000); staticmc_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc, 'dynamicmc_dup', -2001); dynamicmc_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc_2000, 'dynamicmc_2000_dup', 2002); dynamicmc_2000_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc_30000, 'dynamicmc_30000_dup', 2003); dynamicmc_30000_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc0, 'dynamicmc0_dup', -2004); dynamicmc0_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc1048575, 'dynamicmc1048575_dup', -2005); dynamicmc1048575_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc1048576, 'dynamicmc1048576_dup', 2006); dynamicmc1048576_dup._x += 300;"
+		"duplicateMovieClip(dynamicmc2130690045, 'dynamicmc2130690045_dup', 2007); dynamicmc2130690045_dup._x += 300;"
+		// This is just to test that the next placement on depth 2008 will override it
+		"duplicateMovieClip(staticmc0, 'staticmc0_dup_fake', -2008);"
+		"duplicateMovieClip(staticmc0, 'staticmc0_dup', -2008); staticmc0_dup._x += 300;");
+
+	// Check that all depths have been duplicated 
+	check_equals(mo, "typeof(staticmc_dup)", "'movieclip'");
+	check_equals(mo, "staticmc_dup.getDepth()", "2000"); 
+	check_equals(mo, "typeof(dynamicmc_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc_dup.getDepth()", "-2001");
+	check_equals(mo, "typeof(dynamicmc_2000_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc_2000_dup.getDepth()", "2002");
+	check_equals(mo, "typeof(dynamicmc_30000_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc_30000_dup.getDepth()", "2003");
+	check_equals(mo, "typeof(dynamicmc0_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc0_dup.getDepth()", "-2004");
+	check_equals(mo, "typeof(dynamicmc1048575_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc1048575_dup.getDepth()", "-2005");
+	check_equals(mo, "typeof(dynamicmc1048576_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc1048576_dup.getDepth()", "2006");
+	check_equals(mo, "typeof(dynamicmc2130690045_dup)", "'movieclip'");
+	check_equals(mo, "dynamicmc2130690045_dup.getDepth()", "2007");
+	check_equals(mo, "typeof(staticmc0_dup_fake)", "'undefined'");
+	check_equals(mo, "typeof(staticmc0_dup)", "'movieclip'");
+	check_equals(mo, "staticmc0_dup.getDepth()", "-2008"); 
+
+	// Check that duplicated stuff got also drawing api duplication
+	// And (but only for the static case) child duplication
+
+	check_equals(mo, "staticmc_dup._width", "staticmc._width"); 
+	xcheck_equals(mo, "parseInt(staticmc_dup._width/10)", "7"); 
+	check_equals(mo, "typeof(staticmc.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(staticmc_dup.child)", "'movieclip'"); 
+
+	// Note that dynamicmc_dup is at negative depth
+	check_equals(mo, "dynamicmc_dup._width", "dynamicmc._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc_dup._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc_dup.child)", "'undefined'"); 
+
+	check_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc_2000_dup._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc_2000.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc_2000_dup.child)", "'undefined'"); 
+
+	check_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc_30000_dup._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc_30000.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc_30000_dup.child)", "'undefined'"); 
+
+	// Note that dynamicmc0_dup is at negative depth
+	check_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc0_dup._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc0.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc0_dup.child)", "'undefined'"); 
+
+	// Note that dynamicmc1048575_dup is at negative depth
+	check_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc1048575_dup._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc1048575.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc1048575_dup.child)", "'undefined'"); 
+
+	check_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc1048576._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc1048576.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc1048576_dup.child)", "'undefined'"); 
+
+	check_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width"); 
+	xcheck_equals(mo, "parseInt(dynamicmc2130690045._width/10)", "6"); 
+	check_equals(mo, "typeof(dynamicmc2130690045.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(dynamicmc2130690045_dup.child)", "'undefined'"); 
+
+	// Note that staticmc0_dup is at negative depth
+	check_equals(mo, "staticmc0_dup._width", "staticmc0._width"); 
+	xcheck_equals(mo, "parseInt(staticmc0._width/10)", "7"); 
+	check_equals(mo, "typeof(staticmc0.child)", "'movieclip'"); 
+	check_equals(mo, "typeof(staticmc0_dup.child)", "'movieclip'"); 
+
+	for (i=0; i<10; ++i) SWFMovie_nextFrame(mo); 
 
 	// Try removing all characters
 	add_actions(mo, "removeMovieClip(staticmc);"
@@ -171,6 +289,15 @@
 			"removeMovieClip(dynamicmc1048576);"
 			"removeMovieClip(dynamicmc2130690045);"
 			"removeMovieClip(staticmc0);"
+			"removeMovieClip(staticmc_dup);"
+			"removeMovieClip(dynamicmc_dup);"
+			"removeMovieClip(dynamicmc_2000_dup);"
+			"removeMovieClip(dynamicmc_30000_dup);"
+			"removeMovieClip(dynamicmc0_dup);"
+			"removeMovieClip(dynamicmc1048575_dup);"
+			"removeMovieClip(dynamicmc1048576_dup);"
+			"removeMovieClip(dynamicmc2130690045_dup);"
+			"removeMovieClip(staticmc0_dup);"
 			);
 
 	// Check what gets removed and what not
@@ -184,6 +311,17 @@
 	check_equals(mo, "typeof(dynamicmc2130690045)", "'movieclip'"); // clip in "reserved" zone not removed
 	check_equals(mo, "typeof(staticmc0)", "'movieclip'");
 
+	// These are duplicated clips
+	check_equals(mo, "typeof(staticmc_dup)", "'undefined'");
+	check_equals(mo, "typeof(dynamicmc_dup)", "'movieclip'");
+	check_equals(mo, "typeof(dynamicmc_2000_dup)", "'undefined'"); 
+	check_equals(mo, "typeof(dynamicmc_30000_dup)", "'undefined'"); 
+	check_equals(mo, "typeof(dynamicmc0_dup)", "'movieclip'");
+	check_equals(mo, "typeof(dynamicmc1048575_dup)", "'movieclip'");
+	check_equals(mo, "typeof(dynamicmc1048576_dup)", "'undefined'"); 
+	check_equals(mo, "typeof(dynamicmc2130690045_dup)", "'undefined'"); 
+	check_equals(mo, "typeof(staticmc0_dup)", "'movieclip'");
+
 	SWFMovie_nextFrame(mo);
 
 	// Move all non-removed chars to the "dynamic" depth range



From MAILER-DAEMON Wed Apr 11 04:12:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbXwb-0004yE-W7
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 04:12:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbXwZ-0004w7-Vr
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:12:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbXwZ-0004vr-8E
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:12:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbXwZ-0004vn-2p
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:12:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbXsW-00047e-58
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:08:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbXsR-0007n5-Ky
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:08:27 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbXsR-0007n1-Ac
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:08:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbXsR-0007n1-Ac@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 08:08:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash testsuite/actionscript.all/MovieClip.as C...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 08:12:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 08:08:27

Modified files:
	testsuite/actionscript.all: MovieClip.as 
	.              : ChangeLog 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: add tests
	          showing that user-defined event handlers must be handled
	          differently then placeobject-defined ones. At least
	          for the sake of duplicating movieclips.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2840&r2=1.2841

Patches:
Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- testsuite/actionscript.all/MovieClip.as	10 Apr 2007 21:44:14 -0000	1.48
+++ testsuite/actionscript.all/MovieClip.as	11 Apr 2007 08:08:26 -0000	1.49
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.48 2007/04/10 21:44:14 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.49 2007/04/11 08:08:26 strk Exp $";
 
 #include "check.as"
 
@@ -316,13 +316,19 @@
 _root.createEmptyMovieClip("original", 61);
 _root.original.createEmptyMovieClip("child1", 1);
 _root.original._x = 100;
+_root.original.onEnterFrame = function() { };
+_root.original.onRollOver = function() { };
 check_equals(typeof(_root.original), 'movieclip');
 check_equals(typeof(_root.original.child1), 'movieclip');
 check_equals(_root.original._x, 100);
+check_equals(typeof(_root.original.onEnterFrame), 'function');
+check_equals(typeof(_root.original.onRollOver), 'function');
 
 duplicateMovieClip(_root.original, "copy1", 63);
 check_equals(typeof(_root.copy1), 'movieclip');
 check_equals(typeof(_root.copy1.child1), 'undefined');
+check_equals(typeof(_root.copy1.onEnterFrame), 'undefined');
+xcheck_equals(typeof(_root.copy1.onRollOver), 'undefined');
 check_equals(_root.copy1.getDepth(), 63);
 check_equals(_root.copy1._x, 100);
 #endif // OUTPUT_VERSION >= 6

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2840
retrieving revision 1.2841
diff -u -b -r1.2840 -r1.2841
--- ChangeLog	11 Apr 2007 08:03:32 -0000	1.2840
+++ ChangeLog	11 Apr 2007 08:08:27 -0000	1.2841
@@ -1,5 +1,9 @@
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/MovieClip.as: add tests
+	  showing that user-defined event handlers must be handled
+	  differently then placeobject-defined ones. At least
+	  for the sake of duplicating movieclips.
 	* testsuite/misc-ming.all/displaylist_depths_test.c:
 	  Add tests for duplicateMovieClip, _width and cloning
 	  static event handlers.



From MAILER-DAEMON Wed Apr 11 04:43:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbYQl-0003sW-Dh
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 04:43:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbYQk-0003s6-5w
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:43:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbYQi-0003ru-VO
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:43:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbYQi-0003rd-MP
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:43:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbYMf-0007sq-KF
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:39:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbYMU-0002m6-Tn
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:39:31 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbYMU-0002lz-LG
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:39:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbYMU-0002lz-LG@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 08:39:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 08:43:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 08:39:30

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	add MovieClip.duplicateMovieClip test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2841&r2=1.2842
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.49&r2=1.50

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2841
retrieving revision 1.2842
diff -u -b -r1.2841 -r1.2842
--- ChangeLog	11 Apr 2007 08:08:27 -0000	1.2841
+++ ChangeLog	11 Apr 2007 08:39:29 -0000	1.2842
@@ -3,7 +3,8 @@
 	* testsuite/actionscript.all/MovieClip.as: add tests
 	  showing that user-defined event handlers must be handled
 	  differently then placeobject-defined ones. At least
-	  for the sake of duplicating movieclips.
+	  for the sake of duplicating movieclips; add
+	  MovieClip.duplicateMovieClip test.
 	* testsuite/misc-ming.all/displaylist_depths_test.c:
 	  Add tests for duplicateMovieClip, _width and cloning
 	  static event handlers.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- testsuite/actionscript.all/MovieClip.as	11 Apr 2007 08:08:26 -0000	1.49
+++ testsuite/actionscript.all/MovieClip.as	11 Apr 2007 08:39:30 -0000	1.50
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.49 2007/04/11 08:08:26 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.50 2007/04/11 08:39:30 strk Exp $";
 
 #include "check.as"
 
@@ -331,6 +331,17 @@
 xcheck_equals(typeof(_root.copy1.onRollOver), 'undefined');
 check_equals(_root.copy1.getDepth(), 63);
 check_equals(_root.copy1._x, 100);
+
+#if OUTPUT_VERSION == 6
+// SWF7 and higher removed duplicateMovieClip method of MovieClip class
+_root.original.duplicateMovieClip("copy2", 64);
+check_equals(typeof(_root.copy2), 'movieclip');
+check_equals(typeof(_root.copy2.child1), 'undefined');
+check_equals(typeof(_root.copy2.onEnterFrame), 'undefined');
+xcheck_equals(typeof(_root.copy2.onRollOver), 'undefined');
+check_equals(_root.copy2.getDepth(), 64);
+check_equals(_root.copy2._x, 100);
+#endif // OUTPUT_VERSION = 6
 #endif // OUTPUT_VERSION >= 6
 
 //----------------------------------------------



From MAILER-DAEMON Wed Apr 11 04:54:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbYaj-0002ym-GQ
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 04:54:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbYaf-0002xA-QD
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:54:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbYad-0002wn-8g
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:54:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbYad-0002wk-28
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:54:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbYWa-00016j-5B
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:49:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbYWT-0003aN-3b
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:49:49 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbYWS-0003aK-Tc
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:49:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbYWS-0003aK-Tc@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 08:49:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ming_ut...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 08:54:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 08:49:48

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: ming_utils.h 

Log message:
	        * testsuite/misc-ming.all/ming_utils.h: define newSWFAction
	          to compileSWFActionCode when using older Ming versions.
	          Now we can use them interxchangeably (the newer newSWFAction
	          has to be preferred though).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2842&r2=1.2843
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ming_utils.h?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2842
retrieving revision 1.2843
diff -u -b -r1.2842 -r1.2843
--- ChangeLog	11 Apr 2007 08:39:29 -0000	1.2842
+++ ChangeLog	11 Apr 2007 08:49:47 -0000	1.2843
@@ -1,5 +1,9 @@
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/ming_utils.h: define newSWFAction
+	  to compileSWFActionCode when using older Ming versions.
+	  Now we can use them interxchangeably (the newer newSWFAction
+	  has to be preferred though).
 	* testsuite/actionscript.all/MovieClip.as: add tests
 	  showing that user-defined event handlers must be handled
 	  differently then placeobject-defined ones. At least

Index: testsuite/misc-ming.all/ming_utils.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ming_utils.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/misc-ming.all/ming_utils.h	2 Apr 2007 10:38:34 -0000	1.17
+++ testsuite/misc-ming.all/ming_utils.h	11 Apr 2007 08:49:48 -0000	1.18
@@ -37,6 +37,8 @@
  */
 #if MING_VERSION_CODE >= 00040004
 # define compileSWFActionCode newSWFAction
+#else
+# define newSWFAction compileSWFActionCode
 #endif
 
 /* Missing define to allow using older Ming releases */



From MAILER-DAEMON Wed Apr 11 04:59:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbYfg-0002H7-Bk
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 04:59:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbYfe-0002D1-4Z
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:59:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbYfd-00029z-9n
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:59:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbYfc-00027I-Fk
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:59:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbYba-00021Q-4X
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 04:55:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbYba-0003zJ-0x
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:55:06 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbYbZ-0003zC-K1
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 08:55:05 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbYbZ-0003zC-K1@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 08:55:05 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/sprit...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 08:59:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 08:55:05

Modified files:
	.              : ChangeLog 
	server         : character.h sprite_instance.cpp 

Log message:
	        * server/character.h: add protected set_event_handlers(), turn
	          get_event_handelrs into a protected member.
	        * server/sprite_instance.cpp (duplicateMovieClip): simplified copying
	          of event handlers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2843&r2=1.2844
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.230&r2=1.231

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2843
retrieving revision 1.2844
diff -u -b -r1.2843 -r1.2844
--- ChangeLog	11 Apr 2007 08:49:47 -0000	1.2843
+++ ChangeLog	11 Apr 2007 08:55:05 -0000	1.2844
@@ -1,5 +1,12 @@
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
+	* server/character.h: add protected set_event_handlers(), turn
+	  get_event_handelrs into a protected member.
+	* server/sprite_instance.cpp (duplicateMovieClip): simplified copying
+	  of event handlers.
+
+2007-04-11 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/ming_utils.h: define newSWFAction
 	  to compileSWFActionCode when using older Ming versions.
 	  Now we can use them interxchangeably (the newer newSWFAction

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- server/character.h	6 Apr 2007 11:43:44 -0000	1.62
+++ server/character.h	11 Apr 2007 08:55:05 -0000	1.63
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.62 2007/04/06 11:43:44 strk Exp $ */
+/* $Id: character.h,v 1.63 2007/04/11 08:55:05 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -86,6 +86,16 @@
 
 protected:
 
+	const Events& get_event_handlers() const
+	{
+	    return _event_handlers;
+	}
+	
+	void set_event_handlers(const Events& copyfrom) 
+	{
+		_event_handlers = copyfrom;
+	}
+
 	/// Used to assign a name to unnamed instances
 	static std::string getNextUnnamedInstanceName();
 
@@ -537,12 +547,6 @@
 	///
 	virtual void get_mouse_state(int& x, int& y, int& buttons);
 	
-	// TODO : make protected
-	const std::map<event_id, as_value>& get_event_handlers() const
-	{
-	    return _event_handlers;
-	}
-
 	/// These have been moved down from movie.h to remove that file
 	/// from the inheritance chain. It is probably still a misdesign
 	/// to require these functions for all characters.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -b -r1.230 -r1.231
--- server/sprite_instance.cpp	10 Apr 2007 21:44:14 -0000	1.230
+++ server/sprite_instance.cpp	11 Apr 2007 08:55:05 -0000	1.231
@@ -1861,20 +1861,9 @@
 	if ( initObject ) newsprite->copyProperties(*initObject);
 	//else newsprite->copyProperties(*this);
 
-
 	// Copy event handlers from sprite
 	// We should not copy 'm_action_buffer' since the 'm_method' already contains it
-	const std::map<event_id, as_value>& sprite_events = get_event_handlers();
-	typedef std::map<event_id, as_value>::const_iterator event_iterator;
-	for (event_iterator it = sprite_events.begin(),
-		itEnd = sprite_events.end();
-		it != itEnd; ++it )
-	{
-		swf_event* e = new swf_event; // FIXME: who will delete this ?
-		e->m_event = it->first;
-		e->m_method = it->second;
-		e->attach_to(newsprite.get());
-	}
+	newsprite->set_event_handlers(get_event_handlers());
 
 	parent->m_display_list.place_character(
 		newsprite.get(),



From MAILER-DAEMON Wed Apr 11 09:08:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbcYO-0008HD-MY
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 09:08:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbcYM-0008FF-Hf
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 09:08:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbcYI-0008Di-Sp
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 09:08:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbcYI-0008Da-K0
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 09:07:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbcUE-0007Fi-TL
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 09:03:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbcUE-0001H1-F8
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:03:46 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbcUE-0001Gv-4i
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:03:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbcUE-0001Gv-4i@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Wed, 11 Apr 2007 13:03:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/FLVParser.cpp server/as...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 13:08:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/11 13:03:46

Modified files:
	.              : ChangeLog 
	libbase        : FLVParser.cpp 
	server/asobj   : NetStreamFfmpeg.cpp 

Log message:
	* libbase/FLVParser.cpp: Append 8 "zero" bytes to the end of the frame
	buffer to prevent decoders from going past the end of our frame buffer.
	This adds NULL-termination, which is also expected by FFMPEG.
	* server/asobj/NetStreamFfmpeg.cpp: Initialize certain members to safe
	defaults so they will not be read in their uninitialised states.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2844&r2=1.2845
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2844
retrieving revision 1.2845
diff -u -b -r1.2844 -r1.2845
--- ChangeLog	11 Apr 2007 08:55:05 -0000	1.2844
+++ ChangeLog	11 Apr 2007 13:03:45 -0000	1.2845
@@ -1,3 +1,11 @@
+2007-04-11 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* libbase/FLVParser.cpp: Append 8 "zero" bytes to the end of the frame
+	buffer to prevent decoders from going past the end of our frame buffer.
+	This adds NULL-termination, which is also expected by FFMPEG.
+	* server/asobj/NetStreamFfmpeg.cpp: Initialize certain members to safe
+	defaults so they will not be read in their uninitialised states.
+
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
 	* server/character.h: add protected set_event_handlers(), turn

Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/FLVParser.cpp	30 Mar 2007 13:57:26 -0000	1.3
+++ libbase/FLVParser.cpp	11 Apr 2007 13:03:45 -0000	1.4
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.cpp,v 1.3 2007/03/30 13:57:26 tgc Exp $
+// $Id: FLVParser.cpp,v 1.4 2007/04/11 13:03:45 bjacques Exp $
 
 #include "FLVParser.h"
 #include "amf.h"
@@ -109,6 +109,8 @@
 	}
 
 	// Find the next frame in the file a return it
+#define PADDING_BYTES 8
+
 	if (useAudio) {
 		_lastAudioFrame++;
 
@@ -117,8 +119,10 @@
 		frame->timestamp = _audioFrames[_lastAudioFrame]->timestamp;
 
 		_lt->seek(_audioFrames[_lastAudioFrame]->dataPosition);
-		frame->data = new uint8_t[_audioFrames[_lastAudioFrame]->dataSize];
-		_lt->read(frame->data, _audioFrames[_lastAudioFrame]->dataSize);
+		frame->data = new uint8_t[frame->dataSize + PADDING_BYTES];
+		size_t bytesread = _lt->read(frame->data, frame->dataSize);
+		memset(frame->data + bytesread, 0, PADDING_BYTES);
+
 		frame->tag = 8;
 		return frame;
 	
@@ -130,12 +134,16 @@
 		frame->timestamp = _videoFrames[_lastVideoFrame]->timestamp;
 
 		_lt->seek(_videoFrames[_lastVideoFrame]->dataPosition);
-		frame->data = new uint8_t[_videoFrames[_lastVideoFrame]->dataSize];
-		_lt->read(frame->data, _videoFrames[_lastVideoFrame]->dataSize);
+		frame->data = new uint8_t[frame->dataSize + PADDING_BYTES];
+		size_t bytesread  = _lt->read(frame->data, frame->dataSize);
+		memset(frame->data + bytesread, 0, PADDING_BYTES);
+
 		frame->tag = 9;
 		return frame;
 	}
 
+#undef PADDING_BYTES
+
 }
 
 FLVFrame* FLVParser::nextAudioFrame()

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/NetStreamFfmpeg.cpp	10 Apr 2007 20:24:23 -0000	1.35
+++ server/asobj/NetStreamFfmpeg.cpp	11 Apr 2007 13:03:45 -0000	1.36
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.35 2007/04/10 20:24:23 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.36 2007/04/11 13:03:45 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -581,7 +581,7 @@
 static void
 rgbcopy(image::rgb* dst, raw_videodata_t* src, int width)
 {
-	assert(src->m_size <= dst->m_width * dst->m_height * 3);
+	assert(src->m_size <= static_cast<uint32_t>(dst->m_width * dst->m_height * 3));
 
 	uint8_t* dstptr = dst->m_data;
 
@@ -766,7 +766,8 @@
 		packet.destruct = avpacket_destruct;
 		packet.size = frame->dataSize;
 		packet.data = frame->data;
-		packet.pts = static_cast<int64_t>(frame->timestamp);
+		// FIXME: is this the right value for packet.dts?
+		packet.pts = packet.dts = static_cast<int64_t>(frame->timestamp);
 		rc = 0;
 	} else {
 		rc = av_read_frame(m_FormatCtx, &packet);
@@ -859,6 +860,7 @@
 
 				video->m_ptr = video->m_data;
 				video->m_stream_index = m_video_index;
+				video->m_pts = 0;
 
 				// set presentation timestamp
 				if (packet.dts != static_cast<signed long>(AV_NOPTS_VALUE))



From MAILER-DAEMON Wed Apr 11 10:09:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbdVm-0005rL-8h
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 10:09:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbdVl-0005mw-22
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:09:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbdVk-0005lz-H6
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:09:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbdVk-0005lj-9C
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:09:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ann@lulu.com>) id 1HbdRg-0007Xw-38
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:05:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbdRX-0007M5-MJ
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 14:05:03 +0000
Received: from ann by cvs with local (Exim 4.50) id 1HbdRX-0007M2-Hg
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 14:05:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbdRX-0007M2-Hg@cvs>
From: Ann Barcomb <ann@lulu.com>
Date: Wed, 11 Apr 2007 14:05:03 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash testsuite/actionscript.all/gen-index-wiki...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 14:09:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Ann Barcomb <ann>	07/04/11 14:04:59

Modified files:
	testsuite/actionscript.all: gen-index-wiki.sh 
	doc/C          : sources.xml 
	.              : ChangeLog 

Log message:
	Changed all references of 'gnash.lulu.com' to 'www.gnashdev.org'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/gen-index-wiki.sh?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/sources.xml?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2845&r2=1.2846

Patches:
Index: testsuite/actionscript.all/gen-index-wiki.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/gen-index-wiki.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/actionscript.all/gen-index-wiki.sh	30 Nov 2006 00:13:28 -0000	1.2
+++ testsuite/actionscript.all/gen-index-wiki.sh	11 Apr 2007 14:04:58 -0000	1.3
@@ -11,10 +11,10 @@
 	echo "Source: http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/${testname}.as?root=gnash"
 	echo 
 	echo "Targets: "
-	echo "[http://gnash.lulu.com/testcases/v5/${testname}-v5.swf SWF5] "
-	echo "[http://gnash.lulu.com/testcases/v6/${testname}-v6.swf SWF6] "
-	echo "[http://gnash.lulu.com/testcases/v7/${testname}-v7.swf SWF7] "
-	echo "[http://gnash.lulu.com/testcases/v8/${testname}-v8.swf SWF8]"
+	echo "[http://www.gnashdev.org/testcases/v5/${testname}-v5.swf SWF5] "
+	echo "[http://www.gnashdev.org/testcases/v6/${testname}-v6.swf SWF6] "
+	echo "[http://www.gnashdev.org/testcases/v7/${testname}-v7.swf SWF7] "
+	echo "[http://www.gnashdev.org/testcases/v8/${testname}-v8.swf SWF8]"
 	echo 
 	} 
 done; 

Index: doc/C/sources.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/sources.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- doc/C/sources.xml	29 Mar 2007 22:09:44 -0000	1.33
+++ doc/C/sources.xml	11 Apr 2007 14:04:58 -0000	1.34
@@ -64,8 +64,8 @@
 	If you only have access to the internet via a web proxy,
 	you will find daily snapshots of the latest CVS tree in
 	<ulink type="http"
-	       url="http://gnash.lulu.com/dev_snapshots/">
-		    http://gnash.lulu.com/dev_snapshots
+	       url="http://www.gnashdev.org/dev_snapshots/">
+		    http://www.gnashdev.org/dev_snapshots
 	</ulink> 
       </para>
     </sect3>

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2845
retrieving revision 1.2846
diff -u -b -r1.2845 -r1.2846
--- ChangeLog	11 Apr 2007 13:03:45 -0000	1.2845
+++ ChangeLog	11 Apr 2007 14:04:59 -0000	1.2846
@@ -1,3 +1,8 @@
+2007-04-11 Ann Barcomb <ann@lulu.com>
+
+	* testsuite/actionscript.all/gen-index-wiki.sh doc/C/sources.xml:
+	  Changed all references of 'gnash.lulu.com' to 'www.gnashdev.org'.
+
 2007-04-11 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* libbase/FLVParser.cpp: Append 8 "zero" bytes to the end of the frame



From MAILER-DAEMON Wed Apr 11 10:24:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbdkb-0001tF-21
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 10:24:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbdkZ-0001ol-Jg
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:24:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbdkW-0001kP-Dc
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:24:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbdkW-0001kE-A7
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:24:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbdgR-0001Dm-2o
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:20:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbdgM-00008c-6e
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 14:20:22 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbdgL-00008Y-Of
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 14:20:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbdgL-00008Y-Of@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 14:20:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/Makefile.am server/butto...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 14:24:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 14:20:21

Modified files:
	.              : ChangeLog 
	server         : Makefile.am button_character_instance.cpp 
	                 character.cpp character.h dlist.cpp dlist.h 
	                 event_id.h execute_tag.h gnash.h impl.h 
	                 movie_root.cpp movie_root.h sprite_instance.cpp 
	                 sprite_instance.h swf_event.h types.cpp 
	server/parser  : button_character_def.h shape_character_def.h 
	server/swf     : tag_loaders.cpp 
	server/vm      : ExecutableCode.h action.cpp 
	testsuite/actionscript.all: MovieClip.as dejagnu_so_init.as 
	testsuite/misc-ming.all: action_execution_order_extend_test.c 
	                         displaylist_depths_test.c 
Added files:
	server         : cxform.cpp cxform.h 
	server/swf     : PlaceObject2Tag.cpp PlaceObject2Tag.h 

Log message:
	        * server/: Makefile.am, gnash.h, types.cpp, cxform.{cpp,h},
	          swf/PlaceObject2Tag.{cpp,h}, swf/tag_loaders.cpp:
	          Extract PlaceObject2Tag from tag_loaders
	          and cxform from gnash.h and types.cpp.
	        * server/character.{cpp,h}: add getUserDefinedEventHandler
	          function, change static event handlers function to allow
	          for multiple handlers for the same event.
	        * server/vm/ExecutableCode.h: add EventCode class.
	        * server/swf_event.h: drop the 'function' member, provide better
	          members protection.
	        * testsuite/actionscript.all/MovieClip.as: add tests for
	          user defined events not being proper properties.
	        * testsuite/actionscript.all/dejagnu_so_init.as: delete the
	          user-defined onEnterFrame when finished with it.
	        * server/execute_tag.h: add missing include.
	        * server/event_id.h: add setKeyCode method, for better protection.
	        * server/button_character_instance.cpp (on_button_event): look for
	          user-defined event handlers.
	        * server/dlist.{cpp,h}, server/impl.h,
	          server/parser/shape_character_def.h,
	          server/parser/button_character_def.h:
	          Update after addition of new files
	        * testsuite/misc-ming.all/action_execution_order_extend_test.c:
	          Two unexpected successes, one unexpected failures (due to scrabling
	          of event handling).
	        * server/movie_root.{cpp,h}: add pushAction(ExecutableCode).
	        * server/sprite_instance.{cpp,h}: stop using gettersetter for event
	          handlers
	        * testsuite/misc-ming.all/displaylist_depths_test.c: test that
	          event handlers need to be duplicated too.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2846&r2=1.2847
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/event_id.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/execute_tag.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.h?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.231&r2=1.232
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_event.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ExecutableCode.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/dejagnu_so_init.as?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_extend_test.c?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2846
retrieving revision 1.2847
diff -u -b -r1.2846 -r1.2847
--- ChangeLog	11 Apr 2007 14:04:59 -0000	1.2846
+++ ChangeLog	11 Apr 2007 14:20:20 -0000	1.2847
@@ -1,3 +1,36 @@
+2007-04-11 Sandro Santilli <strk@keybit.net>
+
+	* server/: Makefile.am, gnash.h, types.cpp, cxform.{cpp,h},
+	  swf/PlaceObject2Tag.{cpp,h}, swf/tag_loaders.cpp:
+	  Extract PlaceObject2Tag from tag_loaders
+	  and cxform from gnash.h and types.cpp.
+	* server/character.{cpp,h}: add getUserDefinedEventHandler
+	  function, change static event handlers function to allow
+	  for multiple handlers for the same event.
+	* server/vm/ExecutableCode.h: add EventCode class.
+	* server/swf_event.h: drop the 'function' member, provide better
+	  members protection.
+	* testsuite/actionscript.all/MovieClip.as: add tests for
+	  user defined events not being proper properties.
+	* testsuite/actionscript.all/dejagnu_so_init.as: delete the
+	  user-defined onEnterFrame when finished with it.
+	* server/execute_tag.h: add missing include.
+	* server/event_id.h: add setKeyCode method, for better protection.
+	* server/button_character_instance.cpp (on_button_event): look for
+	  user-defined event handlers.
+	* server/dlist.{cpp,h}, server/impl.h,
+	  server/parser/shape_character_def.h,
+	  server/parser/button_character_def.h:
+	  Update after addition of new files
+	* testsuite/misc-ming.all/action_execution_order_extend_test.c:
+	  Two unexpected successes, one unexpected failures (due to scrabling
+	  of event handling).
+	* server/movie_root.{cpp,h}: add pushAction(ExecutableCode).
+	* server/sprite_instance.{cpp,h}: stop using gettersetter for event
+	  handlers
+	* testsuite/misc-ming.all/displaylist_depths_test.c: test that
+	  event handlers need to be duplicated too.
+
 2007-04-11 Ann Barcomb <ann@lulu.com>
 
 	* testsuite/actionscript.all/gen-index-wiki.sh doc/C/sources.xml:

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/Makefile.am	28 Mar 2007 23:42:19 -0000	1.108
+++ server/Makefile.am	11 Apr 2007 14:20:20 -0000	1.109
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.108 2007/03/28 23:42:19 rsavoye Exp $
+# $Id: Makefile.am,v 1.109 2007/04/11 14:20:20 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -57,6 +57,7 @@
 	as_object.cpp \
 	as_value.cpp \
 	character.cpp \
+	cxform.cpp \
 	DynamicShape.cpp	\
 	edit_text_character.cpp \
 	generic_character.cpp \
@@ -69,6 +70,7 @@
 	swf/TagLoadersTable.cpp	\
 	swf/tag_loaders.cpp \
 	swf/DefineFontAlignZonesTag.cpp \
+	swf/PlaceObject2Tag.cpp \
 	swf_function.cpp \
 	video_stream_instance.cpp \
 	StreamProvider.cpp \
@@ -110,6 +112,7 @@
 	builtin_function.h \
 	button_character_instance.h \
 	character.h \
+	cxform.h \
 	debugger.h \
 	DynamicShape.h	\
 	dlist.h	\
@@ -140,6 +143,7 @@
 	swf/TagLoadersTable.h \
 	swf/tag_loaders.h \
 	swf/DefineFontAlignZonesTag.h \
+	swf/PlaceObject2Tag.h \
 	swf_event.h \
 	swf_function.h \
 	tesselate.h \

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/button_character_instance.cpp	2 Apr 2007 17:22:29 -0000	1.39
+++ server/button_character_instance.cpp	11 Apr 2007 14:20:20 -0000	1.40
@@ -22,6 +22,7 @@
 #include "builtin_function.h"
 #include "fn_call.h" // for shared ActionScript getter-setters
 #include "GnashException.h" // for shared ActionScript getter-setters
+#include "ExecutableCode.h"
 
 /** \page buttons Buttons and mouse behaviour
 
@@ -204,6 +205,7 @@
 	gettersetter = new builtin_function(&character::parent_getset, NULL);
 	o.init_property("_parent", *gettersetter, *gettersetter);
 
+#if 0
 	gettersetter = new builtin_function(&character::onrollover_getset, NULL);
 	o.init_property("onRollOver", *gettersetter, *gettersetter);
 
@@ -221,6 +223,7 @@
 
 	gettersetter = new builtin_function(&character::onload_getset, NULL);
 	o.init_property("onLoad", *gettersetter, *gettersetter);
+#endif
 
 	//--
 
@@ -303,7 +306,6 @@
 bool
 button_character_instance::on_event(const event_id& id)
 {
-
 #if 0
 	if (id.m_id != event_id::KEY_PRESS)
 	{
@@ -613,10 +615,10 @@
 	}
 
 	// check for built-in event handler.
-	as_value method = get_event_handler(event);
-	if ( ! method.is_undefined() )
+	std::auto_ptr<ExecutableCode> code ( get_event_handler(event) );
+	if ( code.get() )
 	{
-		call_method0(method, &(get_environment()), this);
+		code->execute();
 	}
 	else
 	{
@@ -625,7 +627,11 @@
 
 
 	// Call conventional attached method.
-	// @@ TODO
+	boost::intrusive_ptr<as_function> method = getUserDefinedEventHandler(event.get_function_name());
+	if ( method )
+	{
+		call_method0(as_value(method.get()), &(get_environment()), this);
+	}
 }
 
 void 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/character.cpp	6 Apr 2007 19:56:16 -0000	1.29
+++ server/character.cpp	11 Apr 2007 14:20:20 -0000	1.30
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.29 2007/04/06 19:56:16 strk Exp $ */
+/* $Id: character.cpp,v 1.30 2007/04/11 14:20:20 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -30,6 +30,7 @@
 #include "VM.h" // for do_mouse_drag (to be moved in movie_root)
 #include "fn_call.h" // for shared ActionScript getter-setters
 #include "GnashException.h" // for shared ActionScript getter-setters (ensure_character)
+#include "ExecutableCode.h"
 
 #include <boost/algorithm/string/case_conv.hpp>
 
@@ -236,160 +237,6 @@
 //---------------------------------------------------------------------
 
 as_value
-character::onrollover_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::ROLL_OVER);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::ROLL_OVER, fn.arg(0));
-	}
-	return rv;
-
-}
-
-as_value
-character::onrollout_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::ROLL_OUT);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::ROLL_OUT, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onpress_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::PRESS);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::PRESS, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onrelease_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::RELEASE);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::RELEASE, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onreleaseoutside_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::RELEASE_OUTSIDE);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::RELEASE_OUTSIDE, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onmouseup_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::MOUSE_UP);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::MOUSE_UP, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onmousedown_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::MOUSE_DOWN);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::MOUSE_DOWN, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onmousemove_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::MOUSE_MOVE);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::MOUSE_MOVE, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
-character::onload_getset(const fn_call& fn)
-{
-	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
-
-	as_value rv;
-	if ( fn.nargs == 0 ) // getter
-	{
-		rv = ptr->get_event_handler(event_id::LOAD);
-	}
-	else // setter
-	{
-		ptr->set_event_handler(event_id::LOAD, fn.arg(0));
-	}
-	return rv;
-}
-
-as_value
 character::x_getset(const fn_call& fn)
 {
 	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
@@ -718,16 +565,31 @@
 }
 
 void
-character::set_event_handler(const event_id& id, const as_value& method)
+character::set_event_handlers(const Events& copyfrom)
 {
-	_event_handlers[id] = method;
+	for (Events::const_iterator it=copyfrom.begin(), itE=copyfrom.end();
+			it != itE; ++it)
+	{
+		const event_id& ev = it->first;
+		const BufferList& bufs = it->second;
+		for (size_t i=0; i<bufs.size(); ++i)
+		{
+			const action_buffer* buf = bufs[i];
+			assert(buf);
+			add_event_handler(ev, *buf);
+		}	
+	}
+}
+
+void
+character::add_event_handler(const event_id& id, const action_buffer& code)
+{
+	_event_handlers[id].push_back(&code);
 
 	//log_msg("Setting handler for event %s", id.get_function_name().c_str());
 
 	// Set the character as a listener iff the
 	// kind of event is a KEY or MOUSE one 
-	if ( method.is_function() )
-	{
 		switch (id.m_id)
 		{
 			case event_id::KEY_PRESS:
@@ -742,12 +604,31 @@
 			default:
 				break;
 		}
-	}
+
 	// todo: drop the character as a listener
 	//       if it gets no valid handlers for
 	//       mouse or keypress events.
 }
 
+std::auto_ptr<ExecutableCode>
+character::get_event_handler(const event_id& id) const
+{
+	std::auto_ptr<ExecutableCode> handler;
+
+	Events::const_iterator it = _event_handlers.find(id);
+	if ( it == _event_handlers.end() ) return handler;
+
+	assert(get_ref_count() > 0);
+	boost::intrusive_ptr<character> this_ptr = const_cast<character*>(this);
+
+	handler.reset( new EventCode(this_ptr, it->second) );
+	return handler;
+}
+
+character::~character()
+{
+}
+
 void
 character::unload()
 {
@@ -760,18 +641,14 @@
 void
 character::queueEventHandler(const event_id& id)
 {
-	//testInvariant();
-
 	bool called=false;
 
 	movie_root& root = VM::get().getRoot();
 
-	// First, check for built-in event handler.
-	boost::intrusive_ptr<as_function> method = get_event_handler(id).to_as_function();
-	   
-	if (method)
+	std::auto_ptr<ExecutableCode> code ( get_event_handler(id) );
+	if ( code.get() )
 	{
-		root.pushAction(method, boost::intrusive_ptr<character>(this));
+		root.pushAction(code);
 		called=true;
 	}
 
@@ -780,35 +657,40 @@
 	// ActionScript and SWF defined events
 	// (for example: onClipLoad vs. onLoad)
 	//
-	if (called) return;
+	//if (called) return;
 
 	// Check for member function.
-	// In ActionScript 2.0, event method names are CASE SENSITIVE.
-	// In ActionScript 1.0, event method names are CASE INSENSITIVE.
-	// TODO: move to get_function_name directly ?
-	std::string method_name = id.get_function_name();
-	if ( _vm.getSWFVersion() < 7 )
-	{
-		boost::to_lower(method_name, _vm.getLocale());
-	}
-
-	if (method_name.length() > 0)
-	{
-		as_value method_val;
-		if ( get_member(method_name, &method_val) )
-		{
-			method = method_val.to_as_function();
+	boost::intrusive_ptr<as_function> method = getUserDefinedEventHandler(id.get_function_name());
 			if ( method )
 			{
 				root.pushAction(method, boost::intrusive_ptr<character>(this));
 			}
+
+}
+
+boost::intrusive_ptr<as_function>
+character::getUserDefinedEventHandler(const std::string& name) const
+{
+	std::string method_name = name;
+	if ( _vm.getSWFVersion() < 7 )
+	{
+		boost::to_lower(method_name, _vm.getLocale());
 		}
-	}
 
-	//testInvariant();
+	as_value tmp;
+
+	boost::intrusive_ptr<as_function> func;
 
+	// const cast is needed due to getter/setter members possibly
+	// modifying this object even when only get !
+	if ( const_cast<character*>(this)->get_member(method_name, &tmp) )
+	{
+		func = tmp.to_as_function();
+	}
+	return func;
 }
 
+
 } // namespace gnash
 
 // local variables:

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/character.h	11 Apr 2007 08:55:05 -0000	1.63
+++ server/character.h	11 Apr 2007 14:20:20 -0000	1.64
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.63 2007/04/11 08:55:05 strk Exp $ */
+/* $Id: character.h,v 1.64 2007/04/11 14:20:20 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -35,6 +35,7 @@
 #include "as_object.h" // for inheritance
 #include "rect.h" // for composition (invalidated bounds)
 #include "matrix.h" // for composition
+#include "cxform.h" // for composition
 #include "log.h"
 #include "snappingrange.h"
 
@@ -48,6 +49,7 @@
 namespace gnash {
 	class sprite_instance;
 	class movie_instance;
+	class ExecutableCode;
 }
 
 namespace gnash {
@@ -62,7 +64,9 @@
 
 public:
 
-	typedef std::map<event_id, as_value> Events;
+	// action_buffer is externally owned
+	typedef std::vector<const action_buffer*> BufferList;
+	typedef std::map<event_id, BufferList> Events;
 
 private:
 
@@ -91,10 +95,20 @@
 	    return _event_handlers;
 	}
 	
-	void set_event_handlers(const Events& copyfrom) 
-	{
-		_event_handlers = copyfrom;
-	}
+	/// Return a user defined event handler, if any
+	//
+	/// @param name
+	/// 	Function name to fetch. It will be converted to 
+	///	lowercase if current VM has been initialized against
+	///	an SWF version inferior to 7.
+	///
+	/// @return
+	///	A function if a member with the given name exists and
+	///	casts to an as_function. A NULL pointer otherwise.
+	///
+	boost::intrusive_ptr<as_function> getUserDefinedEventHandler(const std::string& name) const;
+	
+	void set_event_handlers(const Events& copyfrom);
 
 	/// Used to assign a name to unnamed instances
 	static std::string getNextUnnamedInstanceName();
@@ -157,6 +171,7 @@
 
 public:  // TODO: make protected
 
+#if 0
 	static as_value onrollover_getset(const fn_call& fn);
 
 	static as_value onrollout_getset(const fn_call& fn);
@@ -174,6 +189,7 @@
 	static as_value onmousedown_getset(const fn_call& fn);
 
 	static as_value onmousemove_getset(const fn_call& fn);
+#endif
 
 	static as_value x_getset(const fn_call& fn);
 
@@ -213,6 +229,8 @@
     ///
     static const int staticDepthOffset = -16384;
 
+    ~character();
+
     character(character* parent, int id)
 	:
 	m_id(id),
@@ -323,7 +341,7 @@
 	/// Maps from our local space into normal color space.
 	virtual cxform	get_world_cxform() const;
 
-	/// Get a built-in function handler for the given event
+	/// Get the built-in function handlers code for the given event
 	//
 	/// NOTE: this function is only for getting statically-defined
 	///       event handlers, which are the ones attached to a character
@@ -331,13 +349,7 @@
 	///       to properly fetch any user-defined event handler, which 
 	///       are the ones attached to a character with ActionScript code.
 	///
-	as_value get_event_handler(const event_id& id) const
-	{
-		std::map<event_id, as_value>::const_iterator it = \
-			_event_handlers.find(id);
-		if ( it == _event_handlers.end() ) return as_value();
-		return it->second;
-	}
+	std::auto_ptr<ExecutableCode> get_event_handler(const event_id& id) const;
 
 	/// Set a built-in function handler for the given event
 	//
@@ -351,10 +363,14 @@
 	///       are the ones attached to a character with ActionScript code.
 	///
 	/// @param id
+	///	The event triggering the handler.
 	///
-	/// @param method
+	/// @param code
+	///	An action buffer to execute when given event is triggered.
+	///	The buffer is externally owned (not copied), make sure it
+	///	is kept alive for the whole lifetime of this character.
 	///
-	void set_event_handler(const event_id& id, const as_value& method);
+	void add_event_handler(const event_id& id, const action_buffer& code);
 
 	/// \brief
 	/// Call this when a character get equipped

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/dlist.cpp	6 Apr 2007 11:43:44 -0000	1.57
+++ server/dlist.cpp	11 Apr 2007 14:20:20 -0000	1.58
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/dlist.h	6 Apr 2007 11:43:44 -0000	1.32
+++ server/dlist.h	11 Apr 2007 14:20:20 -0000	1.33
@@ -33,6 +33,10 @@
 #include <iosfwd>
 
 namespace gnash {
+	class cxform;
+}
+
+namespace gnash {
 
 /// A DisplayItem is simply a character object 
 typedef boost::intrusive_ptr<character> DisplayItem;

Index: server/event_id.h
===================================================================
RCS file: /sources/gnash/gnash/server/event_id.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/event_id.h	8 Feb 2007 16:23:28 -0000	1.4
+++ server/event_id.h	11 Apr 2007 14:20:20 -0000	1.5
@@ -108,6 +108,11 @@
 			|| (m_key_code != key::INVALID && (m_id == KEY_PRESS)));
 	}
 
+	void setKeyCode(unsigned char key)
+	{
+		m_key_code = key;
+	}
+
 	bool	operator==(const event_id& id) const { return m_id == id.m_id && m_key_code == id.m_key_code; }
 
 	bool operator< (const event_id& id) const

Index: server/execute_tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/execute_tag.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/execute_tag.h	21 Feb 2007 08:22:04 -0000	1.9
+++ server/execute_tag.h	11 Apr 2007 14:20:20 -0000	1.10
@@ -25,6 +25,8 @@
 #include "config.h"
 #endif
 
+#include "tu_types.h" // for uint32 typedef
+
 #include <cstdarg>
 #include <cassert>
 

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/gnash.h	6 Apr 2007 07:58:16 -0000	1.90
+++ server/gnash.h	11 Apr 2007 14:20:20 -0000	1.91
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.90 2007/04/06 07:58:16 jgilmore Exp $ */
+/* $Id: gnash.h,v 1.91 2007/04/11 14:20:20 strk Exp $ */
 
 /// \mainpage
 ///
@@ -435,52 +435,6 @@
 };
 
 
-/// Color transform type, used by render handler
-class DSOEXPORT cxform
-{
-public:
-    /// [RGBA][multiply, add]
-    float	m_[4][2];
-    
-    /// Initialize to the identity color transform (no transform)
-    cxform();
-    
-    /// Concatenate c's transform onto ours. 
-    //
-    /// When transforming colors, c's transform is applied
-    /// first, then ours.
-    ///
-    void concatenate(const cxform& c);
-    
-    /// Apply our transform to the given color; return the result.
-    rgba transform(const rgba in) const;
-    
-    /// Faster transform() method for loops (avoids creation of rgba object)
-    void transform(uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) const;    
-    
-    /// Read RGB from the SWF input stream.
-    void read_rgb(stream* in);
-    
-    /// Read RGBA from the SWF input stream.
-    void read_rgba(stream* in);
-    
-    /// Force component values to be in range.
-    void clamp();
-    
-    /// Debug log.
-    void print() const;
-    
-    /// Returns true when the cxform equals identity (no transform)
-    bool is_identity() const;
-    
-    /// Returns true when the cxform leads to alpha == 0
-    bool is_invisible() const;
-    
-    /// The identity color transform (no transform)
-    static cxform	identity;
-};
-
-
 //
 // texture and render callback handler.
 //

Index: server/impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/impl.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/impl.h	27 Feb 2007 09:10:20 -0000	1.42
+++ server/impl.h	11 Apr 2007 14:20:20 -0000	1.43
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: impl.h,v 1.42 2007/02/27 09:10:20 strk Exp $ */
+/* $Id: impl.h,v 1.43 2007/04/11 14:20:20 strk Exp $ */
 
 #ifndef GNASH_IMPL_H
 #define GNASH_IMPL_H
@@ -30,6 +30,7 @@
 #include "tu_config.h"
 
 #include "gnash.h"
+#include "cxform.h" // for composition of display_info
 #include "types.h"
 #include "container.h"
 #include "utility.h"

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/movie_root.cpp	4 Apr 2007 20:30:45 -0000	1.55
+++ server/movie_root.cpp	11 Apr 2007 14:20:20 -0000	1.56
@@ -825,6 +825,12 @@
 }
 
 void
+movie_root::pushAction(std::auto_ptr<ExecutableCode> code)
+{
+	_actionQueue.push_back(code->clone());
+}
+
+void
 movie_root::pushAction(const action_buffer& buf, boost::intrusive_ptr<character> target)
 {
 #ifdef GNASH_DEBUG

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/movie_root.h	3 Apr 2007 16:32:05 -0000	1.46
+++ server/movie_root.h	11 Apr 2007 14:20:20 -0000	1.47
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.46 2007/04/03 16:32:05 strk Exp $ */
+/* $Id: movie_root.h,v 1.47 2007/04/11 14:20:20 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -415,6 +415,9 @@
 	}
 
 	/// Push an executable code to the ActionQueue
+	void pushAction(std::auto_ptr<ExecutableCode> code);
+
+	/// Push an executable code to the ActionQueue
 	void pushAction(const action_buffer& buf, boost::intrusive_ptr<character> target);
 
 	/// Push a function code to the ActionQueue

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -b -r1.231 -r1.232
--- server/sprite_instance.cpp	11 Apr 2007 08:55:05 -0000	1.231
+++ server/sprite_instance.cpp	11 Apr 2007 14:20:20 -0000	1.232
@@ -51,6 +51,7 @@
 #include "StreamProvider.h"
 #include "URLAccessManager.h" // for loadVariables
 #include "LoadVariablesThread.h" 
+#include "ExecutableCode.h"
 
 #include <vector>
 #include <string>
@@ -1352,6 +1353,7 @@
 	gettersetter = new builtin_function(&sprite_soundbuftime_getset, NULL);
 	o.init_property("_soundbuftime", *gettersetter, *gettersetter);
 
+#if 0
 	gettersetter = new builtin_function(&character::onrollover_getset, NULL);
 	o.init_property("onRollOver", *gettersetter, *gettersetter);
 
@@ -1369,6 +1371,7 @@
 
 	gettersetter = new builtin_function(&character::onmousemove_getset, NULL);
 	o.init_property("onMouseMove", *gettersetter, *gettersetter);
+#endif
 
 }
 
@@ -1943,12 +1946,11 @@
 			
 	// First, check for built-in event handler.
 	{
-		as_value	method = get_event_handler(id);
-                   
-		if (!method.is_undefined())
+		std::auto_ptr<ExecutableCode> code ( get_event_handler(id) );
+		if ( code.get() )
 		{
 			// Dispatch.
-			call_method0(method, &m_as_environment, this);
+			code->execute();
 
 			called = true;
 			// Fall through and call the function also, if it's defined!
@@ -1967,25 +1969,15 @@
 
 	// Check for member function.
 	{
-		// In ActionScript 2.0, event method names are CASE SENSITIVE.
-		// In ActionScript 1.0, event method names are CASE INSENSITIVE.
-		// TODO: move to get_function_name directly ?
-		std::string method_name = id.get_function_name();
-		if ( _vm.getSWFVersion() < 7 )
-		{
-			boost::to_lower(method_name, _vm.getLocale());
-		}
+		boost::intrusive_ptr<as_function> method = 
+			getUserDefinedEventHandler(id.get_function_name());
 
-		if (method_name.length() > 0)
-		{
-			as_value	method;
-			if (get_member(method_name, &method) && ! method.is_undefined() )
+		if ( method )
 			{
-				call_method0(method, &m_as_environment, this);
+			call_method0(as_value(method.get()), &m_as_environment, this);
 				called = true;
 			}
 		}
-	}
 
 	testInvariant();
 
@@ -2013,6 +2005,11 @@
 	log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_string());
 #endif
 
+	if ( val.is_function() )
+	{
+		checkForKeyPressOrMouseEvent(name);
+	}
+
 	// Try textfield variables
 	//
 	// FIXME: Turn textfield variables into Getter/Setters (Properties)
@@ -2706,7 +2703,9 @@
 	// Attach event handlers (if any).
 	for (size_t i = 0, n = event_handlers.size(); i < n; i++)
 	{
-		event_handlers[i]->attach_to(ch.get());
+		swf_event* ev = event_handlers[i];
+		ch->add_event_handler(ev->event(), ev->action());
+		//event_handlers[i]->attach_to(*ch);
 	}
 
 	m_display_list.place_character(
@@ -2891,8 +2890,6 @@
 bool
 sprite_instance::can_handle_mouse_event() const
 {
-	as_value dummy;
-
 	// Event handlers that qualify as mouse event handlers.
 	static const event_id EH[] =
 	{
@@ -2903,45 +2900,20 @@
 		event_id(event_id::ROLL_OUT),
 		event_id(event_id::DRAG_OVER),
 		event_id(event_id::DRAG_OUT),
-		// MOUSE_{DOWN,UP,MOVE} are handled
-		// differently, in that they are called
-		// reguardles of mouse position
-		// See has_mouse_event
-		//event_id(event_id::MOUSE_DOWN),
-		//event_id(event_id::MOUSE_UP)
-		//event_id(event_id::MOUSE_MOVE)
 	};
 
-	int swfversion =  _vm.getSWFVersion();
 	for (unsigned int i = 0; i < ARRAYSIZE(EH); i++)
 	{
 		const event_id &event = EH[i];
 
 		// Check event handlers
-		dummy = get_event_handler(event.id());
-		if (!dummy.is_undefined())
+		if ( get_event_handler(event.id()).get() )
 		{
 			return true;
 		}
 
 		// Check user-defined event handlers
-		// TODO: check if it's possible to actually
-		//       have an hard-coded handler and a user-defined
-		//       one. If this is not the case we should add
-		//       gettersetter memebers for all these handlers.
-		//
-		std::string fname = event.get_function_name();
-		if ( swfversion < 7 )
-		{
-			// TODO: have event.get_function_name()
-			//       return an SWF-contextual string  instead!
-			boost::to_lower(fname, _vm.getLocale());
-		}
-
-		// The const_cast is needed because get_member, due to
-		// possible "getter" methods executing stuff, is a non-const
-		// function. We take the "risk" here...
-		if (const_cast<sprite_instance*>(this)->get_member(fname, &dummy))
+		if ( getUserDefinedEventHandler(event.get_function_name()) )
 		{
 			return true;
 		}
@@ -3301,28 +3273,6 @@
 	_target_dot.clear();
 }
 
-/* private static */
-bool
-sprite_instance::sameEvents(const Events& eventsMap, const SWFEventsVector& eventsVect)
-{
-	size_t n = eventsVect.size();
-	if (eventsMap.size() != n) return false;
-
-	for (size_t i = 0; i < n; i++)
-	{
-		Events::const_iterator it = eventsMap.find(eventsVect[i]->m_event);
-
-		if ( it == eventsMap.end() ) return false;
-
-		as_value result = it->second;
-		// compare actionscipt in event
-		if (eventsVect[i]->m_method != result) return false;
-	}
-
-	return true;
-	
-}
-
 bool
 sprite_instance::loadMovie(const URL& url)
 {
@@ -3498,4 +3448,32 @@
 
 }
 
+void
+sprite_instance::checkForKeyPressOrMouseEvent(const std::string& name)
+{
+	// short-cut
+	if ( name.size() < 9 ) return;
+
+	// TODO: don't use strcmp/strcasecmp, we're a C++ application after all !
+
+	typedef int (*cmp_t) (const char*, const char*);
+	cmp_t cmp = strcmp;
+	if ( _vm.getSWFVersion() < 7 ) cmp = strcasecmp;
+
+	const char* ptr = name.c_str();
+
+	if ( ! cmp(ptr, "onkeypress") )
+	{
+		has_keypress_event();
+	}
+	else if ( ! cmp(ptr, "onMouseDown")
+		|| ! cmp(ptr, "onMouseUp") 
+		|| ! cmp(ptr, "onMouseMove") )
+	{
+		has_mouse_event();
+	}
+
+}
+
+
 } // namespace gnash

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/sprite_instance.h	10 Apr 2007 21:44:14 -0000	1.93
+++ server/sprite_instance.h	11 Apr 2007 14:20:20 -0000	1.94
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.93 2007/04/10 21:44:14 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.94 2007/04/11 14:20:20 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -749,6 +749,17 @@
 
 private:
 
+	/// \brief
+	/// Call has_keypress_event() or has_mouse_event()
+	/// if the given string correspond to an event handler
+	/// for which registering as a listener of Mouse or Key is needed
+	//
+	///
+	/// @param name
+	///	Member name. 
+	///
+	void checkForKeyPressOrMouseEvent(const std::string& name);
+
 	/// Duplicate the object with the specified name
 	/// and add it with a new name  at a new depth.
 	void clone_display_object(const std::string& name,
@@ -878,15 +889,6 @@
 	/// Build the _target member recursive on parent
 	std::string computeTargetPath() const;
 
-	/// Compare two events sets 
-	//
-	/// @return 
-	///	true if the two sets contain the same values, false otherwise.
-	///	Note that in the eventsMap, only the value is compared, and
-	///	the key is discarded.
-	///
-	static bool sameEvents(const Events& eventsMap, const SWFEventsVector& eventsVect);
-
 	/// The DisplayList resulting by execution of tags in first frame.
 	//
 	/// It will be used to reinitialized actual DisplayList on restart.

Index: server/swf_event.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_event.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/swf_event.h	7 Feb 2007 00:59:59 -0000	1.4
+++ server/swf_event.h	11 Apr 2007 14:20:20 -0000	1.5
@@ -23,7 +23,7 @@
 
 #include "as_value.h" // for composition
 #include "action_buffer.h" // for composition
-#include "action.h" // for event_id
+#include "event_id.h" // for composition
 
 #include <cassert>
 
@@ -34,28 +34,43 @@
 //
 
 /// For embedding event handlers in place_object_2
+//
+/// TODO: move under parser dir !
+///
 class swf_event
 {
 public:
-    // NOTE: DO NOT USE THESE AS VALUE TYPES IN AN
-    // std::vector<>!  They cannot be moved!  The private
-    // operator=(const swf_event&) should help guard
-    // against that.
 
-    event_id	m_event;
-    action_buffer	m_action_buffer;
-    as_value	m_method;
+	swf_event(const event_id& ev, std::auto_ptr<action_buffer> buf)
+		:
+		m_event(ev),
+		m_action_buffer(buf)
+	{
+	}
 
     swf_event()
 	{
 	}
 
-    void	attach_to(character* ch) const
+	const action_buffer& action()
+	{
+		return *m_action_buffer;
+	}
+
+	event_id& event()
 	{
-	    ch->set_event_handler(m_event, m_method);
+		return m_event;
 	}
 
 private:
+
+    // NOTE: DO NOT USE THESE AS VALUE TYPES IN AN
+    // std::vector<>!  They cannot be moved!  The private
+    // operator=(const swf_event&) should help guard
+    // against that.
+
+    event_id	m_event;
+    std::auto_ptr<action_buffer> m_action_buffer;
     // DON'T USE THESE
     swf_event(const swf_event& /*s*/) { assert(0); }
     void	operator=(const swf_event& /*s*/) { assert(0); }

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/types.cpp	1 Mar 2007 11:06:32 -0000	1.20
+++ server/types.cpp	11 Apr 2007 14:20:20 -0000	1.21
@@ -38,160 +38,6 @@
 
 
 	//
-	// cxform
-	//
-
-
-	cxform	cxform::identity;
-
-
-	cxform::cxform()
-	// Initialize to identity transform.
-	{
-		m_[0][0] = 1;
-		m_[1][0] = 1;
-		m_[2][0] = 1;
-		m_[3][0] = 1;
-		m_[0][1] = 0;
-		m_[1][1] = 0;
-		m_[2][1] = 0;
-		m_[3][1] = 0;
-	}
-
-	void	cxform::concatenate(const cxform& c)
-	// Concatenate c's transform onto ours.  When
-	// transforming colors, c's transform is applied
-	// first, then ours.
-	{
-		m_[0][1] += m_[0][0] * c.m_[0][1];
-		m_[1][1] += m_[1][0] * c.m_[1][1];
-		m_[2][1] += m_[2][0] * c.m_[2][1];
-		m_[3][1] += m_[3][0] * c.m_[3][1];
-
-		m_[0][0] *= c.m_[0][0];
-		m_[1][0] *= c.m_[1][0];
-		m_[2][0] *= c.m_[2][0];
-		m_[3][0] *= c.m_[3][0];
-	}
-
-	
-	rgba	cxform::transform(const rgba in) const
-	// Apply our transform to the given color; return the result.
-	{
-		rgba	result(in.m_r, in.m_g, in.m_b, in.m_a);
-		
-		transform(result.m_r, result.m_g, result.m_b, result.m_a);
-
-		return result;
-	}
-
-  void	cxform::transform(uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) const
-  // Faster transform() method for loops (avoids creation of rgba object)
-  {
-		r = (uint8_t) fclamp(r * m_[0][0] + m_[0][1], 0, 255);
-		g = (uint8_t) fclamp(g * m_[1][0] + m_[1][1], 0, 255);
-		b = (uint8_t) fclamp(b * m_[2][0] + m_[2][1], 0, 255);
-		a = (uint8_t) fclamp(a * m_[3][0] + m_[3][1], 0, 255);
-  }
-
-	void	cxform::read_rgb(stream* in)
-	{
-		in->align();
-
-		int	has_add = in->read_uint(1);
-		int	has_mult = in->read_uint(1);
-		int	nbits = in->read_uint(4);
-
-		if (has_mult) {
-			m_[0][0] = in->read_sint(nbits) / 255.0f;
-			m_[1][0] = in->read_sint(nbits) / 255.0f;
-			m_[2][0] = in->read_sint(nbits) / 255.0f;
-			m_[3][0] = 1;
-		}
-		else {
-			for (int i = 0; i < 4; i++) { m_[i][0] = 1; }
-		}
-		if (has_add) {
-			m_[0][1] = (float) in->read_sint(nbits);
-			m_[1][1] = (float) in->read_sint(nbits);
-			m_[2][1] = (float) in->read_sint(nbits);
-			m_[3][1] = 1;
-		}
-		else {
-			for (int i = 0; i < 4; i++) { m_[i][1] = 0; }
-		}
-	}
-
-	void	cxform::read_rgba(stream* in)
-	{
-		in->align();
-
-		int	has_add = in->read_uint(1);
-		int	has_mult = in->read_uint(1);
-		int	nbits = in->read_uint(4);
-
-		if (has_mult) {
-			m_[0][0] = in->read_sint(nbits) / 256.0f;
-			m_[1][0] = in->read_sint(nbits) / 256.0f;
-			m_[2][0] = in->read_sint(nbits) / 256.0f;
-			m_[3][0] = in->read_sint(nbits) / 256.0f;
-		}
-		else {
-			for (int i = 0; i < 4; i++) { m_[i][0] = 1; }
-		}
-		if (has_add) {
-			m_[0][1] = (float) in->read_sint(nbits);
-			m_[1][1] = (float) in->read_sint(nbits);
-			m_[2][1] = (float) in->read_sint(nbits);
-			m_[3][1] = (float) in->read_sint(nbits);
-		}
-		else {
-			for (int i = 0; i < 4; i++) { m_[i][1] = 0; }
-		}
-	}
-
-        /// Force component values to be in legal range.
-        void cxform::clamp()
-	{
-		m_[0][0] = fclamp(m_[0][0], 0, 1);
-		m_[1][0] = fclamp(m_[1][0], 0, 1);
-		m_[2][0] = fclamp(m_[2][0], 0, 1);
-		m_[3][0] = fclamp(m_[3][0], 0, 1);
-		
-		m_[0][1] = fclamp(m_[0][1], -255.0f, 255.0f);
-		m_[1][1] = fclamp(m_[1][1], -255.0f, 255.0f);
-		m_[2][1] = fclamp(m_[2][1], -255.0f, 255.0f);
-		m_[3][1] = fclamp(m_[3][1], -255.0f, 255.0f);
-	}
-
-	void	cxform::print() const
-	// Debug log.
-	{
-		log_parse("    *         +");
-		log_parse("| %4.4f %4.4f|", m_[0][0], m_[0][1]);
-		log_parse("| %4.4f %4.4f|", m_[1][0], m_[1][1]);
-		log_parse("| %4.4f %4.4f|", m_[2][0], m_[2][1]);
-		log_parse("| %4.4f %4.4f|", m_[3][0], m_[3][1]);
-	}
-	
-	bool	cxform::is_identity() const
-	// Returns true when the cxform equals identity (no transform)
-	{	   
-	  for (int a=0; a<4; a++)
-	   for (int b=0; b<2; b++)
-	    if (m_[a][b] != identity.m_[a][b])
-	     return false;
-	  
-	  return true;
-  }
-
-	bool	cxform::is_invisible() const
-	// Returns true when the cxform leads to alpha == 0
-	{
-		return (255.0 * m_[3][0] + m_[3][1]) <= 0.0;	
-  }
-
-	//
 	// rgba
 	//
 

Index: server/parser/button_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/button_character_def.h	27 Feb 2007 09:10:20 -0000	1.11
+++ server/parser/button_character_def.h	11 Apr 2007 14:20:20 -0000	1.12
@@ -14,7 +14,7 @@
 #include "sound_definition.h"
 #include "rect.h" // for get_bound
 #include "matrix.h" // for composition
-#include "gnash.h" // for class cxform :(
+#include "cxform.h" // for composition
 
 #ifndef UNUSED
 #define UNUSED(x) ((x) = (x))
@@ -23,6 +23,7 @@
 // Forward declarations
 namespace gnash {
 	class sprite_instance;
+	class action_buffer;
 }
 
 namespace gnash {

Index: server/parser/shape_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/shape_character_def.h	19 Feb 2007 11:08:23 -0000	1.10
+++ server/parser/shape_character_def.h	11 Apr 2007 14:20:20 -0000	1.11
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape_character_def.h,v 1.10 2007/02/19 11:08:23 strk Exp $ */
+/* $Id: shape_character_def.h,v 1.11 2007/04/11 14:20:20 strk Exp $ */
 
 #ifndef GNASH_SHAPE_CHARACTER_DEF_H
 #define GNASH_SHAPE_CHARACTER_DEF_H
@@ -18,6 +18,11 @@
 
 
 namespace gnash {
+	class cxform;
+	class matrix;
+}
+
+namespace gnash {
 
 	/// \brief
 	/// Represents the outline of one or more shapes, along with

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/swf/tag_loaders.cpp	10 Apr 2007 21:09:00 -0000	1.87
+++ server/swf/tag_loaders.cpp	11 Apr 2007 14:20:21 -0000	1.88
@@ -14,14 +14,12 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: tag_loaders.cpp,v 1.87 2007/04/10 21:09:00 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.88 2007/04/11 14:20:21 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include <zlib.h>
-
 #include "tu_file.h"
 #include "utility.h"
 #include "action.h"
@@ -54,6 +52,9 @@
 #include "GnashException.h"
 #include "video_stream_def.h"
 #include "sound_definition.h"
+#include "PlaceObject2Tag.h"
+
+#include <zlib.h>
 
 namespace gnash {
 
@@ -766,430 +767,6 @@
 	}
 }
 
-/// SWF Tag PlaceObject (4) or PlaceObject2 (9) 
-class place_object_2 : public execute_tag
-{
-public:
-    int	m_tag_type;
-    char*	m_name;
-    float	m_ratio;
-    cxform	m_color_transform;
-    matrix	m_matrix;
-    bool	m_has_matrix;
-    bool	m_has_cxform;
-    int		m_depth;
-    uint16_t	m_character_id;
-    int 	m_clip_depth;
-    enum place_type {
-	PLACE,
-	MOVE,
-	REPLACE
-    } m_place_type;
-    std::vector<swf_event*>	m_event_handlers;
-
-
-    place_object_2()
-	:
-	m_tag_type(0),
-	m_name(NULL),
-	m_ratio(0),
-	m_has_matrix(false),
-	m_has_cxform(false),
-	m_depth(0),
-	m_character_id(0),
-	m_clip_depth(0),
-	m_place_type(PLACE)
-	{
-	}
-
-	~place_object_2()
-	{
-	    delete [] m_name;
-	    m_name = NULL;
-
-	    for (int i = 0, n = m_event_handlers.size(); i < n; i++)
-		{
-		    delete m_event_handlers[i];
-		}
-	    m_event_handlers.resize(0);
-	}
-
-	// read SWF::PLACEOBJECT 
-	void readPlaceObject(stream* in)
-	{
-		// Original place_object tag; very simple.
-		m_character_id = in->read_u16();
-		m_depth = in->read_u16()+character::staticDepthOffset;
-		m_matrix.read(in);
-
-		IF_VERBOSE_PARSE
-		(
-			log_parse("  char_id = %d", m_character_id);
-			log_parse("  depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
-			m_matrix.print();
-		);
-
-		if (in->get_position() < in->get_tag_end_position())
-		{
-			m_color_transform.read_rgb(in);
-
-			IF_VERBOSE_PARSE
-			(
-				log_parse("  cxform:");
-				m_color_transform.print();
-			);
-
-		}
-	}
-
-	// read placeObject2 actions
-	void readPlaceActions(stream* in, int movie_version)
-	{
-
-		uint16_t reserved = in->read_u16();
-		assert(reserved == 0);	// must be 0
-
-		// The logical 'or' of all the following handlers.
-		// I don't think we care about this...
-		uint32_t all_flags = (movie_version >= 6) ?
-			in->read_u32() : in->read_u16();
-		UNUSED(all_flags);
-
-		IF_VERBOSE_PARSE (
-			log_parse("  actions: flags = 0x%X", all_flags);
-		);
-
-		// Read swf_events.
-		for (;;)
-		{
-			// Read event.
-			in->align();
-
-			uint32_t flags = (movie_version >= 6) ? in->read_u32() : in->read_u16();
-
-			if (flags == 0)
-			{
-				// Done with events.
-				break;
-			}
-
-			uint32_t event_length = in->read_u32();
-			if ( in->get_tag_end_position()-in->get_position() <  event_length )
-			{
-				IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("swf_event::read(), "
-					"even_length = %u, but only %lu bytes left "
-					"to the end of current tag."
-					" Breaking for safety.",
-					event_length, in->get_tag_end_position()-in->get_position());
-				);
-				break;
-			}
-
-			uint8 ch = key::INVALID;
-
-			if (flags & (1 << 17))	// has keypress event
-			{
-				ch = in->read_u8();
-				event_length--;
-			}
-
-			// Read the actions for event(s)
-			action_buffer action;
-			action.read(in);
-
-			size_t readlen = action.size();
-			if (readlen > event_length)
-			{
-				IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("swf_event::read(), "
-					"event_length = %d, "
-					"but read " SIZET_FMT
-					". Breaking for safety.",
-					event_length, readlen);
-				);
-				// or should we just continue here ?
-				break;
-			}
-			else if ( readlen < event_length )
-			{
-				IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("swf_event::read(), "
-					"event_length = %d, "
-					"but read " SIZET_FMT 
-					". Skipping excessive bytes.",
-					event_length, readlen);
-				);
-				in->skip_bytes(event_length - readlen);
-			}
-
-			// 13 bits reserved, 19 bits used
-			static const event_id s_code_bits[19] =
-			{
-				event_id::LOAD,
-				event_id::ENTER_FRAME,
-				event_id::UNLOAD,
-				event_id::MOUSE_MOVE,
-				event_id::MOUSE_DOWN,
-				event_id::MOUSE_UP,
-				event_id::KEY_DOWN,
-				event_id::KEY_UP,
-
-				event_id::DATA,
-				event_id::INITIALIZE,
-				event_id::PRESS,
-				event_id::RELEASE,
-				event_id::RELEASE_OUTSIDE,
-				event_id::ROLL_OVER,
-				event_id::ROLL_OUT,
-				event_id::DRAG_OVER,
-
-				event_id::DRAG_OUT,
-				event_id(event_id::KEY_PRESS, key::CONTROL),
-				event_id::CONSTRUCT
-			};
-
-			// Let's see if the event flag we received is for an event that we know of
-			if ((pow(2.0, int( sizeof(s_code_bits) / sizeof(s_code_bits[0]) )) - 1) < flags)
-			{
-				IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x", flags);
-				);
-			}
-
-			for (int i = 0, mask = 1; i < int(sizeof(s_code_bits)/sizeof(s_code_bits[0])); i++, mask <<= 1)
-			{
-				if (flags & mask)
-				{
-					swf_event*	ev = new swf_event;
-					ev->m_event = s_code_bits[i];
-					ev->m_action_buffer = action;
-//					log_action("---- actions for event %s", ev->m_event.get_function_name().c_str());
-
-					// hack
-					if (i == 17)	// has keypress event ?
-					{
-						ev->m_event.m_key_code = ch;
-					}
-
-					// Create a function to execute the actions.
-					std::vector<with_stack_entry>	empty_with_stack;
-					swf_function*	func = new swf_function(&ev->m_action_buffer, NULL, 0, empty_with_stack);
-					func->set_length(ev->m_action_buffer.get_length());
-
-					ev->m_method.set_as_function(func);
-
-					m_event_handlers.push_back(ev);
-				}
-			}
-		}
-	}
-
-
-	// read SWF::PLACEOBJECT2
-	void readPlaceObject2(stream* in, int movie_version)
-	{
-		in->align();
-
-		bool	has_actions = in->read_uint(1) ? true : false;
-		bool	has_clip_bracket = in->read_uint(1) ? true : false;
-		bool	has_name = in->read_uint(1) ? true : false;
-		bool	has_ratio = in->read_uint(1) ? true : false;
-		bool	has_cxform = in->read_uint(1) ? true : false;
-		bool	has_matrix = in->read_uint(1) ? true : false;
-		bool	has_char = in->read_uint(1) ? true : false;
-		bool	flag_move = in->read_uint(1) ? true : false;
-
-		m_depth = in->read_u16()+character::staticDepthOffset;
-
-		if (has_char) m_character_id = in->read_u16();
-
-		if (has_matrix)
-		{
-			m_has_matrix = true;
-			m_matrix.read(in);
-		}
-
-		if (has_cxform)
-		{
-			m_has_cxform = true;
-			m_color_transform.read_rgba(in);
-		}
-				
-		if (has_ratio) m_ratio = (float)in->read_u16() / (float)65535;
-
-		if (has_name) m_name = in->read_string();
-
-		if (has_clip_bracket) m_clip_depth = in->read_u16()+character::staticDepthOffset; 
-
-		if (has_actions)
-		{
-			readPlaceActions(in, movie_version);
-		}
-
-
-		if (has_char == true && flag_move == true)
-		{
-			// Remove whatever's at m_depth, and put m_character there.
-			m_place_type = REPLACE;
-		}
-		else if (has_char == false && flag_move == true)
-		{
-			// Moves the object at m_depth to the new location.
-			m_place_type = MOVE;
-		}
-		else if (has_char == true && flag_move == false)
-		{
-			// Put m_character at m_depth.
-			m_place_type = PLACE;
-		}
-
-		IF_VERBOSE_PARSE (
-			log_parse("  PLACEOBJECT2: depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
-			if ( has_char ) log_parse("  char id = %d", m_character_id);
-			if ( has_matrix ) 
-			{
-				log_parse("  mat:");
-				m_matrix.print();
-			}
-			if ( has_cxform )
-			{
-				log_parse("  cxform:");
-				m_color_transform.print();
-			}
-			if ( has_ratio ) log_parse("  ratio: %f", m_ratio);
-			if ( has_name ) log_parse("  name = %s", m_name ? m_name : "<null>");
-			if ( has_clip_bracket ) log_parse("  clip_depth = %d (%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
-			log_parse(" m_place_type: %d", m_place_type);
-		);
-				
-
-                                
-		//log_msg("place object at depth %i", m_depth);
-	}
-
-	// read SWF::PLACEOBJECT or SWF::PLACEOBJECT2
-	void read(stream* in, tag_type tag, int movie_version)
-	{
-
-		m_tag_type = tag;
-
-		if (tag == SWF::PLACEOBJECT)
-		{
-			readPlaceObject(in);
-		}
-		else
-		{
-			readPlaceObject2(in, movie_version);
-		}
-	}
-
-		
-	/// Place/move/whatever our object in the given movie.
-	void execute(sprite_instance* m)
-	{
-	    switch (m_place_type) {
-	      case PLACE:
-		  m->add_display_object(
-		      m_character_id,
-		      m_name,
-		      m_event_handlers,
-		      m_depth,
-		      m->is_reverse_execution(),	// place_object doesn't do replacement when not in reverse execution
-		      m_color_transform,
-		      m_matrix,
-		      m_ratio,
-		      m_clip_depth);
-		  break;
-		  
-	      case MOVE:
-		  m->move_display_object(
-		      m_depth,
-		      m_has_cxform,
-		      m_color_transform,
-		      m_has_matrix,
-		      m_matrix,
-		      m_ratio,
-		      m_clip_depth);
-		  break;
-		  
-	      case REPLACE:
-		  m->replace_display_object(
-		      m_character_id,
-		      m_name,
-		      m_depth,
-		      m_has_cxform,
-		      m_color_transform,
-		      m_has_matrix,
-		      m_matrix,
-		      m_ratio,
-		      m_clip_depth);
-		  break;
-	    }
-	}
-    
-	/// Proxy for execute(sprite_instance*)
-	void execute_state(sprite_instance* m)
-	{
-	    execute(m);
-	}
-    
-	void execute_state_reverse(sprite_instance* m, int frame)
-	{
-	    switch (m_place_type) {
-	      case PLACE:
-		  // reverse of add is remove
-		  m->remove_display_object(m_depth, m_tag_type == 4 ? m_character_id : -1);
-		  break;
-		  
-	      case MOVE:
-		  // reverse of move is move
-		  m->move_display_object(
-		      m_depth,
-		      m_has_cxform,
-		      m_color_transform,
-		      m_has_matrix,
-		      m_matrix,
-		      m_ratio,
-		      m_clip_depth);
-		  break;
-		  
-	      case REPLACE:
-	      {
-		  // reverse of replace is to re-add the previous object.
-		  execute_tag*	last_add = m->find_previous_replace_or_add_tag(frame, m_depth, -1);
-		  if (last_add) {
-		      last_add->execute_state(m);
-		  } else {
-		      log_error("reverse REPLACE can't find previous replace or add tag(%d, %d)",
-				frame, m_depth);
-		      
-		  }
-		  break;
-	      }
-	    }
-	}
-    
-	virtual uint32	get_depth_id_of_replace_or_add_tag() const
-	{
-		uint32 depthid = 0;
-		if (m_place_type == PLACE || m_place_type == REPLACE)
-		{
-			int id = -1;
-			if (m_tag_type == SWF::PLACEOBJECT)
-			{
-			    // Old-style PlaceObject; the corresponding Remove
-			    // is specific to the character_id.
-			    id = m_character_id;
-			}
-			depthid = ((m_depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
-		}
-		return depthid;
-	}
-};
-
-
-	
 void
 place_object_2_loader(stream* in, tag_type tag, movie_definition* m)
 {
@@ -1200,7 +777,8 @@
     log_parse("  place_object_2");
     		);
 
-    place_object_2*	ch = new place_object_2;
+    // TODO: who owns and is going to remove this tag ?
+    PlaceObject2Tag* ch = new PlaceObject2Tag(*m);
     ch->read(in, tag, m->get_version());
 
     m->add_execute_tag(ch);

Index: server/vm/ExecutableCode.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ExecutableCode.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/vm/ExecutableCode.h	2 Apr 2007 17:22:29 -0000	1.3
+++ server/vm/ExecutableCode.h	11 Apr 2007 14:20:21 -0000	1.4
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ExecutableCode.h,v 1.3 2007/04/02 17:22:29 strk Exp $ */
+/* $Id: ExecutableCode.h,v 1.4 2007/04/11 14:20:21 strk Exp $ */
 
 #ifndef GNASH_EXECUTABLECODE_H
 #define GNASH_EXECUTABLECODE_H
@@ -42,6 +42,8 @@
 
 	virtual void execute()=0;
 
+	virtual ExecutableCode* clone() const=0;
+
 	virtual ~ExecutableCode() {}
 };
 
@@ -56,6 +58,11 @@
 		target(nTarget)
 	{}
 
+	ExecutableCode* clone() const
+	{
+		return new GlobalCode(*this);
+	}
+
 	virtual void execute()
 	{
 		if ( ! target->isUnloaded() )
@@ -76,6 +83,66 @@
 	boost::intrusive_ptr<character> target;
 };
 
+/// Event code 
+class EventCode: public ExecutableCode {
+
+public:
+
+	typedef vector<const action_buffer*> BufferList;
+
+	EventCode(boost::intrusive_ptr<character> nTarget)
+		:
+		_target(nTarget)
+	{}
+
+	EventCode(boost::intrusive_ptr<character> nTarget, const BufferList& buffers)
+		:
+		_target(nTarget),
+		_buffers(buffers)
+	{}
+
+
+	ExecutableCode* clone() const
+	{
+		return new EventCode(*this);
+	}
+
+	/// Add an action buffer to this event handler
+	//
+	/// @param buffer
+	///	An action buffer to execute. Externally owned
+	///	and not copied, so make sure it's kept
+	///	alive for the whole EventCode lifetime.
+	///
+	void addAction(const action_buffer& buffer)
+	{
+		_buffers.push_back(&buffer);
+	}
+
+	virtual void execute()
+	{
+		// We do want to call the onUnload event handler !!
+		//if ( _target->isUnloaded() )
+		//{
+			//log_msg("Sprite %s unloaded, won't execute global code in it", target->getTargetPath().c_str());
+		//	return;
+		//}
+		for (BufferList::iterator it=_buffers.begin(), itEnd=_buffers.end();
+				it != itEnd; ++it)
+		{
+			ActionExec exec(*(*it), _target->get_environment());
+			exec();
+		}
+	}
+
+private:
+
+	boost::intrusive_ptr<character> _target;
+
+	BufferList _buffers;
+
+};
+
 /// Function code
 class FunctionCode: public ExecutableCode {
 
@@ -87,9 +154,13 @@
 		target(nTarget)
 	{}
 
+	ExecutableCode* clone() const
+	{
+		return new FunctionCode(*this);
+	}
+
 	virtual void execute()
 	{
-		//log_msg("Execution of FunctionCode unimplemented yet");
 		as_environment env; env.set_target(target.get());
 		func->call(fn_call(target.get(), &env, 0, 0));
 	}

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/vm/action.cpp	22 Mar 2007 11:38:57 -0000	1.11
+++ server/vm/action.cpp	11 Apr 2007 14:20:21 -0000	1.12
@@ -485,10 +485,10 @@
 		"onPress",		 // PRESS
 		"onRelease",		 // RELEASE
 		"onRelease_Outside",	 // RELEASE_OUTSIDE
-		"onRoll_Over",		 // ROLL_OVER
-		"onRoll_Out",		 // ROLL_OUT
-		"onDrag_Over",		 // DRAG_OVER
-		"onDrag_Out",		 // DRAG_OUT
+		"onRollOver",		 // ROLL_OVER
+		"onRollOut",		 // ROLL_OUT
+		"onDragOver",		 // DRAG_OVER
+		"onDragOut",		 // DRAG_OUT
 		"onKeyPress",		 // KEY_PRESS
 		"onInitialize",		 // INITIALIZE
 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- testsuite/actionscript.all/MovieClip.as	11 Apr 2007 08:39:30 -0000	1.50
+++ testsuite/actionscript.all/MovieClip.as	11 Apr 2007 14:20:21 -0000	1.51
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.50 2007/04/11 08:39:30 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.51 2007/04/11 14:20:21 strk Exp $";
 
 #include "check.as"
 
@@ -165,6 +165,26 @@
 check_equals(mc.onRollOver, undefined);
 check_equals(mc.onSetFocus, undefined);
 check_equals(mc.onUnload, undefined);
+#if OUTPUT_VERSION >=6
+check(! mc.hasOwnProperty('onData'));
+check(! mc.hasOwnProperty('onDragOut'));
+check(! mc.hasOwnProperty('onDragOver'));
+check(! mc.hasOwnProperty('onEnterFrame')); 
+check(! mc.hasOwnProperty('onKeyDown'));
+check(! mc.hasOwnProperty('onKeyUp'));
+check(! mc.hasOwnProperty('onKillFocus'));
+check(! mc.hasOwnProperty('onLoad'));
+check(! mc.hasOwnProperty('onMouseDown'));
+check(! mc.hasOwnProperty('onMouseMove'));
+check(! mc.hasOwnProperty('onMouseUp'));
+check(! mc.hasOwnProperty('onPress'));
+check(! mc.hasOwnProperty('onRelease'));
+check(! mc.hasOwnProperty('onReleaseOutside'));
+check(! mc.hasOwnProperty('onRollOut'));
+check(! mc.hasOwnProperty('onRollOver'));
+check(! mc.hasOwnProperty('onSetFocus'));
+check(! mc.hasOwnProperty('onUnload'));
+#endif
 
 // Check property existance
 
@@ -328,7 +348,7 @@
 check_equals(typeof(_root.copy1), 'movieclip');
 check_equals(typeof(_root.copy1.child1), 'undefined');
 check_equals(typeof(_root.copy1.onEnterFrame), 'undefined');
-xcheck_equals(typeof(_root.copy1.onRollOver), 'undefined');
+check_equals(typeof(_root.copy1.onRollOver), 'undefined');
 check_equals(_root.copy1.getDepth(), 63);
 check_equals(_root.copy1._x, 100);
 
@@ -338,7 +358,7 @@
 check_equals(typeof(_root.copy2), 'movieclip');
 check_equals(typeof(_root.copy2.child1), 'undefined');
 check_equals(typeof(_root.copy2.onEnterFrame), 'undefined');
-xcheck_equals(typeof(_root.copy2.onRollOver), 'undefined');
+check_equals(typeof(_root.copy2.onRollOver), 'undefined');
 check_equals(_root.copy2.getDepth(), 64);
 check_equals(_root.copy2._x, 100);
 #endif // OUTPUT_VERSION = 6

Index: testsuite/actionscript.all/dejagnu_so_init.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/dejagnu_so_init.as,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/actionscript.all/dejagnu_so_init.as	9 Feb 2007 14:47:15 -0000	1.12
+++ testsuite/actionscript.all/dejagnu_so_init.as	11 Apr 2007 14:20:21 -0000	1.13
@@ -41,6 +41,7 @@
 		clearInterval(_dejagnu_checker_interval);
 #ifdef USE_FRAMELOOP
 		onEnterFrame = undefined;
+		delete onEnterFrame;
 #endif
 
 		// setup some dejagnu wrappers

Index: testsuite/misc-ming.all/action_execution_order_extend_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_extend_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-ming.all/action_execution_order_extend_test.c	21 Mar 2007 09:33:19 -0000	1.6
+++ testsuite/misc-ming.all/action_execution_order_extend_test.c	11 Apr 2007 14:20:21 -0000	1.7
@@ -95,7 +95,7 @@
   /* Woo, the PlaceObject tag hasn't defined an 'onLoad' function.
 		 maybe just pushed something to the action list???
 	*/
-  xcheck_equals(mo, "typeOf(_root.mc_red.onLoad)", "'undefined'");
+  check_equals(mo, "typeOf(_root.mc_red.onLoad)", "'undefined'");
   add_actions(mo, " note('as in frame2 of root'); var x1 = \"as_in_root\"; ");
   add_actions(mo, " _root.mc_red.onLoad = function () \
                    { \
@@ -157,8 +157,8 @@
   SWFMovie_nextFrame(mo); /* 4th frame */
   
   /* mc_red onload is only called IFF onClipEvent(load) is also defined! */
-  check_equals(mo, "_root.y1", "'mc_red onLoad called'");
-  xcheck_equals(mo, "_root.y1bis", "'mc_red onClipLoad called'");
+  xcheck_equals(mo, "_root.y1", "'mc_red onLoad called'");
+  check_equals(mo, "_root.y1bis", "'mc_red onClipLoad called'");
   /* actions in main timeline is executed *after* mc_red.onEnterFrame */
   check_equals(mo, "_root.y2", "'as_in_root'");
   /* actions in main timeline is executed *before* mc_red.onUnload in

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/displaylist_depths_test.c	11 Apr 2007 08:03:32 -0000	1.4
+++ testsuite/misc-ming.all/displaylist_depths_test.c	11 Apr 2007 14:20:21 -0000	1.5
@@ -102,6 +102,7 @@
 	//SWFDisplayItem_moveTo(it, -(width/2), -(height/2)); 
 	SWFDisplayItem_setName(it, name);
 	SWFDisplayItem_addAction(it, newSWFAction("this._rotation+=2;"), SWFACTION_ENTERFRAME);
+	SWFDisplayItem_addAction(it, newSWFAction("this._y+=5;"), SWFACTION_ENTERFRAME);
 
 	//SWFMovie_add(mo, (SWFBlock)mc);
 }

Index: server/cxform.cpp
===================================================================
RCS file: server/cxform.cpp
diff -N server/cxform.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/cxform.cpp	11 Apr 2007 14:20:20 -0000	1.1
@@ -0,0 +1,191 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// 
+// $Id: cxform.cpp,v 1.1 2007/04/11 14:20:20 strk Exp $ 
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "cxform.h"
+#include "types.h" // for rgba type :(
+#include "stream.h" // for reading from SWF
+#include "log.h"
+
+using namespace std;
+
+namespace gnash {
+
+cxform	cxform::identity;
+
+cxform::cxform()
+// Initialize to identity transform.
+{
+	m_[0][0] = 1;
+	m_[1][0] = 1;
+	m_[2][0] = 1;
+	m_[3][0] = 1;
+	m_[0][1] = 0;
+	m_[1][1] = 0;
+	m_[2][1] = 0;
+	m_[3][1] = 0;
+}
+
+void	cxform::concatenate(const cxform& c)
+// Concatenate c's transform onto ours.  When
+// transforming colors, c's transform is applied
+// first, then ours.
+{
+	m_[0][1] += m_[0][0] * c.m_[0][1];
+	m_[1][1] += m_[1][0] * c.m_[1][1];
+	m_[2][1] += m_[2][0] * c.m_[2][1];
+	m_[3][1] += m_[3][0] * c.m_[3][1];
+
+	m_[0][0] *= c.m_[0][0];
+	m_[1][0] *= c.m_[1][0];
+	m_[2][0] *= c.m_[2][0];
+	m_[3][0] *= c.m_[3][0];
+}
+
+
+rgba	cxform::transform(const rgba& in) const
+// Apply our transform to the given color; return the result.
+{
+	rgba	result(in.m_r, in.m_g, in.m_b, in.m_a);
+	
+	transform(result.m_r, result.m_g, result.m_b, result.m_a);
+
+	return result;
+}
+
+void	cxform::transform(uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) const
+// Faster transform() method for loops (avoids creation of rgba object)
+{
+	r = (uint8_t) fclamp(r * m_[0][0] + m_[0][1], 0, 255);
+	g = (uint8_t) fclamp(g * m_[1][0] + m_[1][1], 0, 255);
+	b = (uint8_t) fclamp(b * m_[2][0] + m_[2][1], 0, 255);
+	a = (uint8_t) fclamp(a * m_[3][0] + m_[3][1], 0, 255);
+}
+
+void	cxform::read_rgb(stream* in)
+{
+	in->align();
+
+	int	has_add = in->read_uint(1);
+	int	has_mult = in->read_uint(1);
+	int	nbits = in->read_uint(4);
+
+	if (has_mult) {
+		m_[0][0] = in->read_sint(nbits) / 255.0f;
+		m_[1][0] = in->read_sint(nbits) / 255.0f;
+		m_[2][0] = in->read_sint(nbits) / 255.0f;
+		m_[3][0] = 1;
+	}
+	else {
+		for (int i = 0; i < 4; i++) { m_[i][0] = 1; }
+	}
+	if (has_add) {
+		m_[0][1] = (float) in->read_sint(nbits);
+		m_[1][1] = (float) in->read_sint(nbits);
+		m_[2][1] = (float) in->read_sint(nbits);
+		m_[3][1] = 1;
+	}
+	else {
+		for (int i = 0; i < 4; i++) { m_[i][1] = 0; }
+	}
+}
+
+void	cxform::read_rgba(stream* in)
+{
+	in->align();
+
+	int	has_add = in->read_uint(1);
+	int	has_mult = in->read_uint(1);
+	int	nbits = in->read_uint(4);
+
+	if (has_mult) {
+		m_[0][0] = in->read_sint(nbits) / 256.0f;
+		m_[1][0] = in->read_sint(nbits) / 256.0f;
+		m_[2][0] = in->read_sint(nbits) / 256.0f;
+		m_[3][0] = in->read_sint(nbits) / 256.0f;
+	}
+	else {
+		for (int i = 0; i < 4; i++) { m_[i][0] = 1; }
+	}
+	if (has_add) {
+		m_[0][1] = (float) in->read_sint(nbits);
+		m_[1][1] = (float) in->read_sint(nbits);
+		m_[2][1] = (float) in->read_sint(nbits);
+		m_[3][1] = (float) in->read_sint(nbits);
+	}
+	else {
+		for (int i = 0; i < 4; i++) { m_[i][1] = 0; }
+	}
+}
+
+/// Force component values to be in legal range.
+void cxform::clamp()
+{
+	m_[0][0] = fclamp(m_[0][0], 0, 1);
+	m_[1][0] = fclamp(m_[1][0], 0, 1);
+	m_[2][0] = fclamp(m_[2][0], 0, 1);
+	m_[3][0] = fclamp(m_[3][0], 0, 1);
+	
+	m_[0][1] = fclamp(m_[0][1], -255.0f, 255.0f);
+	m_[1][1] = fclamp(m_[1][1], -255.0f, 255.0f);
+	m_[2][1] = fclamp(m_[2][1], -255.0f, 255.0f);
+	m_[3][1] = fclamp(m_[3][1], -255.0f, 255.0f);
+}
+
+void	cxform::print() const
+// Debug log.
+{
+	log_parse("    *         +");
+	log_parse("| %4.4f %4.4f|", m_[0][0], m_[0][1]);
+	log_parse("| %4.4f %4.4f|", m_[1][0], m_[1][1]);
+	log_parse("| %4.4f %4.4f|", m_[2][0], m_[2][1]);
+	log_parse("| %4.4f %4.4f|", m_[3][0], m_[3][1]);
+}
+
+bool	cxform::is_identity() const
+// Returns true when the cxform equals identity (no transform)
+{	   
+  for (int a=0; a<4; a++)
+   for (int b=0; b<2; b++)
+    if (m_[a][b] != identity.m_[a][b])
+     return false;
+  
+  return true;
+}
+
+bool	cxform::is_invisible() const
+// Returns true when the cxform leads to alpha == 0
+{
+	return (255.0 * m_[3][0] + m_[3][1]) <= 0.0;	
+}
+
+
+}	// end namespace gnash
+
+
+// Local Variables:
+// mode: C++
+// c-basic-offset: 8 
+// tab-width: 8
+// indent-tabs-mode: t
+// End:

Index: server/cxform.h
===================================================================
RCS file: server/cxform.h
diff -N server/cxform.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/cxform.h	11 Apr 2007 14:20:20 -0000	1.1
@@ -0,0 +1,91 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifndef GNASHCXFORM_H
+#define GNASHCXFORM_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tu_config.h" // for DSOEXPORT
+
+#include <iosfwd>
+
+namespace gnash {
+	class rgba;
+	class stream;
+}
+
+namespace gnash {
+
+/// Color transform type, used by render handler
+class DSOEXPORT cxform
+{
+public:
+    /// [RGBA][multiply, add]
+    float	m_[4][2];
+    
+    /// Initialize to the identity color transform (no transform)
+    cxform();
+    
+    /// Concatenate c's transform onto ours. 
+    //
+    /// When transforming colors, c's transform is applied
+    /// first, then ours.
+    ///
+    void concatenate(const cxform& c);
+    
+    /// Apply our transform to the given color; return the result.
+    rgba transform(const rgba& in) const;
+    
+    /// Faster transform() method for loops (avoids creation of rgba object)
+    void transform(uint8_t& r, uint8_t& g, uint8_t& b, uint8_t& a) const;    
+    
+    /// Read RGB from the SWF input stream.
+    void read_rgb(stream* in);
+    
+    /// Read RGBA from the SWF input stream.
+    void read_rgba(stream* in);
+    
+    /// Force component values to be in range.
+    void clamp();
+    
+    /// Debug log.
+    void print() const;
+    
+    /// Returns true when the cxform equals identity (no transform)
+    bool is_identity() const;
+    
+    /// Returns true when the cxform leads to alpha == 0
+    bool is_invisible() const;
+    
+    /// The identity color transform (no transform)
+    static cxform	identity;
+};
+
+
+
+
+}	// namespace gnash
+
+#endif // GNASHCXFORM_H
+
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: server/swf/PlaceObject2Tag.cpp
diff -N server/swf/PlaceObject2Tag.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/swf/PlaceObject2Tag.cpp	11 Apr 2007 14:20:21 -0000	1.1
@@ -0,0 +1,413 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+/* $Id: PlaceObject2Tag.cpp,v 1.1 2007/04/11 14:20:21 strk Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "PlaceObject2Tag.h"
+#include "character.h"
+#include "sprite_instance.h"
+#include "swf_event.h"
+#include "log.h"
+#include "stream.h"
+
+namespace gnash {
+namespace SWF {
+namespace tag_loaders {
+
+void
+PlaceObject2Tag::readPlaceObject(stream* in)
+{
+	// Original place_object tag; very simple.
+	m_character_id = in->read_u16();
+	m_depth = in->read_u16()+character::staticDepthOffset;
+	m_matrix.read(in);
+
+	IF_VERBOSE_PARSE
+	(
+		log_parse("  char_id = %d", m_character_id);
+		log_parse("  depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
+		m_matrix.print();
+	);
+
+	if (in->get_position() < in->get_tag_end_position())
+	{
+		m_color_transform.read_rgb(in);
+
+		IF_VERBOSE_PARSE
+		(
+			log_parse("  cxform:");
+			m_color_transform.print();
+		);
+
+	}
+}
+
+// read placeObject2 actions
+void
+PlaceObject2Tag::readPlaceActions(stream* in, int movie_version)
+{
+
+	uint16_t reserved = in->read_u16();
+	assert(reserved == 0);	// must be 0
+
+	// The logical 'or' of all the following handlers.
+	// I don't think we care about this...
+	uint32_t all_flags = (movie_version >= 6) ?
+		in->read_u32() : in->read_u16();
+	UNUSED(all_flags);
+
+	IF_VERBOSE_PARSE (
+		log_parse("  actions: flags = 0x%X", all_flags);
+	);
+
+	// Read swf_events.
+	for (;;)
+	{
+		// Read event.
+		in->align();
+
+		uint32_t flags = (movie_version >= 6) ? in->read_u32() : in->read_u16();
+
+		if (flags == 0)
+		{
+			// Done with events.
+			break;
+		}
+
+		uint32_t event_length = in->read_u32();
+		if ( in->get_tag_end_position()-in->get_position() <  event_length )
+		{
+			IF_VERBOSE_MALFORMED_SWF(
+			log_swferror("swf_event::read(), "
+				"even_length = %u, but only %lu bytes left "
+				"to the end of current tag."
+				" Breaking for safety.",
+				event_length, in->get_tag_end_position()-in->get_position());
+			);
+			break;
+		}
+
+		uint8 ch = key::INVALID;
+
+		if (flags & (1 << 17))	// has keypress event
+		{
+			ch = in->read_u8();
+			event_length--;
+		}
+
+		// Read the actions for event(s)
+		std::auto_ptr<action_buffer> action(new action_buffer);
+		action->read(in);
+
+		size_t readlen = action->size();
+		if (readlen > event_length)
+		{
+			IF_VERBOSE_MALFORMED_SWF(
+			log_swferror("swf_event::read(), "
+				"event_length = %d, "
+				"but read " SIZET_FMT
+				". Breaking for safety.",
+				event_length, readlen);
+			);
+			// or should we just continue here ?
+			break;
+		}
+		else if ( readlen < event_length )
+		{
+			IF_VERBOSE_MALFORMED_SWF(
+			log_swferror("swf_event::read(), "
+				"event_length = %d, "
+				"but read " SIZET_FMT 
+				". Skipping excessive bytes.",
+				event_length, readlen);
+			);
+			in->skip_bytes(event_length - readlen);
+		}
+
+		// 13 bits reserved, 19 bits used
+		static const event_id s_code_bits[19] =
+		{
+			event_id::LOAD,
+			event_id::ENTER_FRAME,
+			event_id::UNLOAD,
+			event_id::MOUSE_MOVE,
+			event_id::MOUSE_DOWN,
+			event_id::MOUSE_UP,
+			event_id::KEY_DOWN,
+			event_id::KEY_UP,
+
+			event_id::DATA,
+			event_id::INITIALIZE,
+			event_id::PRESS,
+			event_id::RELEASE,
+			event_id::RELEASE_OUTSIDE,
+			event_id::ROLL_OVER,
+			event_id::ROLL_OUT,
+			event_id::DRAG_OVER,
+
+			event_id::DRAG_OUT,
+			event_id(event_id::KEY_PRESS, key::CONTROL),
+			event_id::CONSTRUCT
+		};
+
+		// Let's see if the event flag we received is for an event that we know of
+		if ((pow(2.0, int( sizeof(s_code_bits) / sizeof(s_code_bits[0]) )) - 1) < flags)
+		{
+			IF_VERBOSE_MALFORMED_SWF(
+			log_swferror("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x", flags);
+			);
+		}
+
+		for (int i = 0, mask = 1; i < int(sizeof(s_code_bits)/sizeof(s_code_bits[0])); i++, mask <<= 1)
+		{
+			if (flags & mask)
+			{
+				std::auto_ptr<swf_event> ev ( new swf_event(s_code_bits[i], action) );
+				//log_action("---- actions for event %s", ev->event().get_function_name().c_str());
+
+				// hack
+				if (i == 17)	// has keypress event ?
+				{
+					ev->event().setKeyCode(ch);
+				}
+
+				m_event_handlers.push_back(ev.release());
+			}
+		}
+	}
+}
+
+// read SWF::PLACEOBJECT2
+void
+PlaceObject2Tag::readPlaceObject2(stream* in, int movie_version)
+{
+	in->align();
+
+	bool	has_actions = in->read_uint(1) ? true : false;
+	bool	has_clip_bracket = in->read_uint(1) ? true : false;
+	bool	has_name = in->read_uint(1) ? true : false;
+	bool	has_ratio = in->read_uint(1) ? true : false;
+	bool	has_cxform = in->read_uint(1) ? true : false;
+	bool	has_matrix = in->read_uint(1) ? true : false;
+	bool	has_char = in->read_uint(1) ? true : false;
+	bool	flag_move = in->read_uint(1) ? true : false;
+
+	m_depth = in->read_u16()+character::staticDepthOffset;
+
+	if (has_char) m_character_id = in->read_u16();
+
+	if (has_matrix)
+	{
+		m_has_matrix = true;
+		m_matrix.read(in);
+	}
+
+	if (has_cxform)
+	{
+		m_has_cxform = true;
+		m_color_transform.read_rgba(in);
+	}
+			
+	if (has_ratio) m_ratio = (float)in->read_u16() / (float)65535;
+
+	if (has_name) m_name = in->read_string();
+
+	if (has_clip_bracket) m_clip_depth = in->read_u16()+character::staticDepthOffset; 
+
+	if (has_actions)
+	{
+		readPlaceActions(in, movie_version);
+	}
+
+
+	if (has_char == true && flag_move == true)
+	{
+		// Remove whatever's at m_depth, and put m_character there.
+		m_place_type = REPLACE;
+	}
+	else if (has_char == false && flag_move == true)
+	{
+		// Moves the object at m_depth to the new location.
+		m_place_type = MOVE;
+	}
+	else if (has_char == true && flag_move == false)
+	{
+		// Put m_character at m_depth.
+		m_place_type = PLACE;
+	}
+
+	IF_VERBOSE_PARSE (
+		log_parse("  PLACEOBJECT2: depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
+		if ( has_char ) log_parse("  char id = %d", m_character_id);
+		if ( has_matrix ) 
+		{
+			log_parse("  mat:");
+			m_matrix.print();
+		}
+		if ( has_cxform )
+		{
+			log_parse("  cxform:");
+			m_color_transform.print();
+		}
+		if ( has_ratio ) log_parse("  ratio: %f", m_ratio);
+		if ( has_name ) log_parse("  name = %s", m_name ? m_name : "<null>");
+		if ( has_clip_bracket ) log_parse("  clip_depth = %d (%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
+		log_parse(" m_place_type: %d", m_place_type);
+	);
+			
+
+			
+	//log_msg("place object at depth %i", m_depth);
+}
+
+void
+PlaceObject2Tag::read(stream* in, tag_type tag, int movie_version)
+{
+
+	m_tag_type = tag;
+
+	if (tag == SWF::PLACEOBJECT)
+	{
+		readPlaceObject(in);
+	}
+	else
+	{
+		readPlaceObject2(in, movie_version);
+	}
+}
+
+/// Place/move/whatever our object in the given movie.
+void
+PlaceObject2Tag::execute(sprite_instance* m)
+{
+    switch (m_place_type) {
+
+      case PLACE:
+          m->add_display_object(
+	      m_character_id,
+	      m_name,
+	      m_event_handlers,
+	      m_depth,
+	      m->is_reverse_execution(),	// place_object doesn't do replacement when not in reverse execution
+	      m_color_transform,
+	      m_matrix,
+	      m_ratio,
+	      m_clip_depth);
+	  break;
+	  
+      case MOVE:
+	  m->move_display_object(
+	      m_depth,
+	      m_has_cxform,
+	      m_color_transform,
+	      m_has_matrix,
+	      m_matrix,
+	      m_ratio,
+	      m_clip_depth);
+	  break;
+	  
+      case REPLACE:
+	  m->replace_display_object(
+	      m_character_id,
+	      m_name,
+	      m_depth,
+	      m_has_cxform,
+	      m_color_transform,
+	      m_has_matrix,
+	      m_matrix,
+	      m_ratio,
+	      m_clip_depth);
+	  break;
+    }
+}
+
+PlaceObject2Tag::~PlaceObject2Tag()
+{
+	delete [] m_name;
+	m_name = NULL;
+	for(size_t i=0; i<m_event_handlers.size(); ++i)
+	{
+		delete m_event_handlers[i];
+	}
+}
+
+void
+PlaceObject2Tag::execute_state_reverse(sprite_instance* m, int frame)
+{
+    switch (m_place_type) {
+      case PLACE:
+	  // reverse of add is remove
+	  m->remove_display_object(m_depth, m_tag_type == 4 ? m_character_id : -1);
+	  break;
+	  
+      case MOVE:
+	  // reverse of move is move
+	  m->move_display_object(
+	      m_depth,
+	      m_has_cxform,
+	      m_color_transform,
+	      m_has_matrix,
+	      m_matrix,
+	      m_ratio,
+	      m_clip_depth);
+	  break;
+	  
+      case REPLACE:
+      {
+	  // reverse of replace is to re-add the previous object.
+	  execute_tag*	last_add = m->find_previous_replace_or_add_tag(frame, m_depth, -1);
+	  if (last_add) {
+	      last_add->execute_state(m);
+	  } else {
+	      log_error("reverse REPLACE can't find previous replace or add tag(%d, %d)",
+			frame, m_depth);
+	      
+	  }
+	  break;
+      }
+    }
+}
+
+uint32
+PlaceObject2Tag::get_depth_id_of_replace_or_add_tag() const
+{
+	uint32 depthid = 0;
+	if (m_place_type == PLACE || m_place_type == REPLACE)
+	{
+		int id = -1;
+		if (m_tag_type == SWF::PLACEOBJECT)
+		{
+		    // Old-style PlaceObject; the corresponding Remove
+		    // is specific to the character_id.
+		    id = m_character_id;
+		}
+		depthid = ((m_depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
+	}
+	return depthid;
+}
+
+} // namespace gnash::SWF::tag_loaders
+} // namespace gnash::SWF
+} // namespace gnash
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:

Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: server/swf/PlaceObject2Tag.h
diff -N server/swf/PlaceObject2Tag.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ server/swf/PlaceObject2Tag.h	11 Apr 2007 14:20:21 -0000	1.1
@@ -0,0 +1,139 @@
+// 
+//   Copyright (C) 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// 
+//
+//
+
+/* $Id: PlaceObject2Tag.h,v 1.1 2007/04/11 14:20:21 strk Exp $ */
+
+#ifndef GNASH_SWF_PLACEOBJECT2TAG_H
+#define GNASH_SWF_PLACEOBJECT2TAG_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "execute_tag.h" // for inheritance
+#include "swf.h" // for tag_type definition
+#include "matrix.h" // for composition
+#include "cxform.h" // for composition 
+#include "tu_types.h" // for uint16_t, uint32 etc. definition 
+
+//#include <boost/ptr_container/ptr_vector.hpp>
+#include <vector>
+
+// Forward declarations
+namespace gnash {
+	class stream;
+	class sprite_instance;
+	class swf_event;
+	class movie_definition;
+}
+
+namespace gnash {
+namespace SWF {
+namespace tag_loaders {
+
+/// SWF Tag PlaceObject (4) or PlaceObject2 (9) 
+//
+///
+///
+class PlaceObject2Tag : public execute_tag
+{
+public:
+
+	typedef std::vector<swf_event*> EventHandlers;
+
+	PlaceObject2Tag(const movie_definition& def)
+		:
+		m_tag_type(0),
+		m_name(NULL),
+		m_ratio(0),
+		m_has_matrix(false),
+		m_has_cxform(false),
+		m_depth(0),
+		m_character_id(0),
+		m_clip_depth(0),
+		m_place_type(PLACE),
+		_movie_def(def)
+	{
+	}
+
+	~PlaceObject2Tag();
+
+	/// Read SWF::PLACEOBJECT or SWF::PLACEOBJECT2
+	void read(stream* in, tag_type tag, int movie_version);
+
+	/// Place/move/whatever our object in the given movie.
+	void execute(sprite_instance* m);
+
+	/// Proxy for execute(sprite_instance*)
+	void execute_state(sprite_instance* m)
+	{
+	    execute(m);
+	}
+    
+private:
+
+	int	m_tag_type;
+	char*	m_name;
+	float	m_ratio;
+	cxform	m_color_transform;
+	matrix	m_matrix;
+	bool	m_has_matrix;
+	bool	m_has_cxform;
+	int		m_depth;
+	uint16_t	m_character_id;
+	int 	m_clip_depth;
+
+	enum place_type
+	{
+		PLACE,
+		MOVE,
+		REPLACE
+	} m_place_type;
+
+	const movie_definition& _movie_def;
+
+	EventHandlers m_event_handlers;
+
+	// read SWF::PLACEOBJECT 
+	void readPlaceObject(stream* in);
+
+	// read placeObject2 actions
+	void readPlaceActions(stream* in, int movie_version);
+
+	// read SWF::PLACEOBJECT2
+	void readPlaceObject2(stream* in, int movie_version);
+
+	void execute_state_reverse(sprite_instance* m, int frame);
+    
+	uint32	get_depth_id_of_replace_or_add_tag() const;
+};
+
+} // namespace gnash::SWF::tag_loaders
+} // namespace gnash::SWF
+} // namespace gnash
+
+
+#endif // GNASH_SWF_PLACEOBJECT2TAG_H
+
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End:



From MAILER-DAEMON Wed Apr 11 10:58:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbeHS-0000ep-KA
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 10:58:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbeHR-0000cZ-4C
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:58:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbeHQ-0000aw-5u
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:58:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbeHQ-0000an-0z
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:58:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbeDM-0007DE-4W
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 10:54:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbeDK-00047w-RL
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 14:54:26 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbeDK-00047s-Cq
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 14:54:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbeDK-00047s-Cq@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Wed, 11 Apr 2007 14:54:26 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 14:58:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/11 14:54:26

Modified files:
	.              : ChangeLog 
	backend        : render_handler_agg.cpp 

Log message:
	Stop relying on bounds passed from
	video definition for image buffer size (since we don't yet do proper
	scaling, that is a bad idea); fixes bug #19511. Also, cut off the
	video image if it extends beyond the width of our buffer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2847&r2=1.2848
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.68&r2=1.69

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2847
retrieving revision 1.2848
diff -u -b -r1.2847 -r1.2848
--- ChangeLog	11 Apr 2007 14:20:20 -0000	1.2847
+++ ChangeLog	11 Apr 2007 14:54:25 -0000	1.2848
@@ -43,6 +43,10 @@
 	This adds NULL-termination, which is also expected by FFMPEG.
 	* server/asobj/NetStreamFfmpeg.cpp: Initialize certain members to safe
 	defaults so they will not be read in their uninitialised states.
+	* backend/render_handler_agg.cpp: Stop relying on bounds passed from
+	video definition for image buffer size (since we don't yet do proper
+	scaling, that is a bad idea); fixes bug #19511. Also, cut off the
+	video image if it extends beyond the width of our buffer.
 
 2007-04-11 Sandro Santilli <strk@keybit.net>
 

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- backend/render_handler_agg.cpp	7 Mar 2007 11:03:42 -0000	1.68
+++ backend/render_handler_agg.cpp	11 Apr 2007 14:54:26 -0000	1.69
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.68 2007/03/07 11:03:42 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.69 2007/04/11 14:54:26 bjacques Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -454,13 +454,17 @@
 	  int bytes_per_pixel = 3;		
 	  image::rgb* frame = static_cast<image::rgb*>(baseframe);
 
-	  // Note that image::rgb* allocates a buffer with extra padding
-	  // for performance purposes. Therefore, we need to use the
-	  // actual image size so we don't copy padding bytes to the Agg
-	  // buffer.
-	  int frame_width = (int)TWIPS_TO_PIXELS(bounds->width()) * bytes_per_pixel;
+	  unsigned int frame_width = frame->m_width * bytes_per_pixel;
+
+	  if (frame_width + xpos * bytes_per_pixel  > m_rbuf.width() * bytes_per_pixel) {
+	    // the movie was placed too far to the right. let's cut it off at
+	    // the far right corner. (This is also how "that other player"
+	    // handles it, I'm told.)
+	    frame_width = (m_rbuf.width() * bytes_per_pixel - xpos * bytes_per_pixel);
+	  }
+
 	  unsigned char* rgbbuf_ptr = frame->m_data;
-	  unsigned char* rgbbuf_end = rgbbuf_ptr + frame_width *
+	  unsigned char* rgbbuf_end = rgbbuf_ptr + frame->m_pitch *
 				      frame->m_height;
 	
 	  unsigned char* aggbuf_ptr = memaddr;
@@ -471,7 +475,7 @@
 	  // Move xpos pixels to the right.
 	  aggbuf_ptr += xpos * bytes_per_pixel;		
 
-	  while(rgbbuf_ptr <= rgbbuf_end && aggbuf_ptr <= aggbuf_end) {
+	  while(rgbbuf_ptr < rgbbuf_end && aggbuf_ptr < aggbuf_end) {
     	    memcpy(aggbuf_ptr, rgbbuf_ptr, frame_width);
 	    aggbuf_ptr += m_rbuf.stride();
 	    rgbbuf_ptr += frame->m_pitch; 



From MAILER-DAEMON Wed Apr 11 11:49:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbf4k-000107-OC
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 11:49:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbf4i-0000v8-Q8
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 11:49:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbf4g-0000pc-20
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 11:49:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbf4f-0000p1-Pb
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 11:49:33 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1Hbf0b-0007xg-9k
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 11:45:21 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3BFj8U4030991;
	Wed, 11 Apr 2007 17:45:15 +0200
Date: Wed, 11 Apr 2007 17:45:06 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1043777274.20070411174506@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
In-Reply-To: <E1HWD1r-0007WY-8u@savannah.gnu.org>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 15:49:37 -0000

Tuesday, March 27, 2007, 4:52:07 PM, you wrote:
SS> +#include <boost/ptr_container/ptr_list.hpp>

Just want to point out that this requires Boost 1.33 while 1.32
(default in Debian Woody AFAIK) was enough previously.

Udo





From MAILER-DAEMON Wed Apr 11 12:56:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbg7f-0001jh-TX
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 12:56:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbg7e-0001dD-0t
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 12:56:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbg7d-0001Zd-Au
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 12:56:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbg7d-0001Yw-5e
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 12:56:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hbg3Y-0003jN-M3
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 12:52:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hbg3U-0006HZ-1E
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 16:52:24 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hbg3T-0006HW-QM
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 16:52:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hbg3T-0006HW-QM@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 11 Apr 2007 16:52:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/cxform.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 16:56:42 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/11 16:52:23

Modified files:
	.              : ChangeLog 
	server         : cxform.h 

Log message:
	include required inttypes.h

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2848&r2=1.2849
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2848
retrieving revision 1.2849
diff -u -b -r1.2848 -r1.2849
--- ChangeLog	11 Apr 2007 14:54:25 -0000	1.2848
+++ ChangeLog	11 Apr 2007 16:52:23 -0000	1.2849
@@ -1,3 +1,7 @@
+2007-04-11 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/cxform.h: include required inttypes.h
+		
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
 	* server/: Makefile.am, gnash.h, types.cpp, cxform.{cpp,h},

Index: server/cxform.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/cxform.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/cxform.h	11 Apr 2007 14:20:20 -0000	1.1
+++ server/cxform.h	11 Apr 2007 16:52:23 -0000	1.2
@@ -22,6 +22,7 @@
 #endif
 
 #include "tu_config.h" // for DSOEXPORT
+#include <inttypes.h> // for uint8_t
 
 #include <iosfwd>
 



From MAILER-DAEMON Wed Apr 11 13:07:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbgI9-00016p-I9
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 13:07:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbgI7-000136-UK
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:07:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbgI6-0000zi-No
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:07:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbgI6-0000zW-HV
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:07:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbgE1-0005PV-LK
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:03:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbgE1-0006rf-3z
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:03:17 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbgE0-0006rb-OY
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:03:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbgE0-0006rb-OY@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Wed, 11 Apr 2007 17:03:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/fltk.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 17:07:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/11 17:03:16

Modified files:
	.              : ChangeLog 
	gui            : fltk.cpp 

Log message:
	Fix compilation by adding statics for GUI methods
	that became nonstatic. Also fix some warnings.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2849&r2=1.2850
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2849
retrieving revision 1.2850
diff -u -b -r1.2849 -r1.2850
--- ChangeLog	11 Apr 2007 16:52:23 -0000	1.2849
+++ ChangeLog	11 Apr 2007 17:03:15 -0000	1.2850
@@ -51,6 +51,8 @@
 	video definition for image buffer size (since we don't yet do proper
 	scaling, that is a bad idea); fixes bug #19511. Also, cut off the
 	video image if it extends beyond the width of our buffer.
+	* gui/fltk.cpp: Fix compilation by adding statics for GUI methods
+	that became nonstatic. Also fix some warnings.
 
 2007-04-11 Sandro Santilli <strk@keybit.net>
 

Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/fltk.cpp	6 Mar 2007 17:40:04 -0000	1.8
+++ gui/fltk.cpp	11 Apr 2007 17:03:16 -0000	1.9
@@ -106,11 +106,11 @@
         return true;
       case MOVE:
       {
-        if (!_xid && event_y() < _menu_height) {
+        if (!_xid && event_y() < static_cast<int>(_menu_height)) {
           return Window::handle(event);
         }
-        int x = event_x() / _xscale;
-        int y = (event_y() - _menu_height) / _yscale;
+        int x = static_cast<int>(event_x() / _xscale);
+        int y = static_cast<int>((event_y() - _menu_height) / _yscale);
         notify_mouse_moved(x, y);
         return Window::handle(event);;
       }
@@ -173,7 +173,7 @@
 
     for (int i = 0; table[i].fltkKey; i++) {
         if (key == table[i].fltkKey) {
-            gnash::notify_key_event(table[i].gnashKey, true);
+            notify_key_event(table[i].gnashKey, true);
             break;
         }
     }
@@ -188,7 +188,7 @@
 }
 
 bool
-FltkGui::init(int argc, char **argv[])
+FltkGui::init(int /* argc */, char *** /*argv */)
 {
 
     return true;
@@ -250,7 +250,7 @@
 }
 
 
-static void menu_fltk_open_file()
+static void fltk_menu_open_file(Widget*, void*)
 {
     const char *newfile = fltk::file_chooser("Open File", "*.swf", NULL);
     if (!newfile) {
@@ -260,7 +260,7 @@
     // menu_open_file()..
 }
 
-static void menu_fltk_save_file_as()
+static void fltk_menu_save_file_as(Widget*, void*)
 {
     const char* savefile = file_chooser("Save File as", NULL, NULL);
     if (!savefile) {
@@ -270,9 +270,9 @@
     // menu_save_file();
 }
 
-static void full(Widget*, void* ptr)
+static void fltk_menu_fullscreen(Widget*, void* ptr)
 {
-    GNASH_REPORT_FUNCTION;
+//    GNASH_REPORT_FUNCTION;
 
     static bool fullscreen = false;
     static Rectangle oldBounds;
@@ -289,17 +289,87 @@
 }
 
 
+static void
+fltk_menu_quit(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_quit();
+}
+
+static void
+fltk_menu_play(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_play();
+}
+
+static void
+fltk_menu_pause(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_pause();
+}
+
+static void
+fltk_menu_stop(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_stop();
+}
+
+static void
+fltk_menu_restart(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_restart();
+}
+
+static void
+fltk_menu_step_forward(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_step_forward();
+}
+
+
+static void
+fltk_menu_step_backward(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_step_backward();
+}
+
+static void
+fltk_menu_jump_forward(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_jump_forward();
+}
+
+static void
+fltk_menu_jump_backward(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_jump_backward();
+}
+
+static void
+fltk_menu_toggle_sound(Widget*, void* ptr)
+{
+    FltkGui* gui = static_cast<FltkGui*>(ptr);
+    gui->menu_toggle_sound();
+}
+
 void
 FltkGui::addMenuItems()
 {
-
-#define callback_cast(ptr) reinterpret_cast<Callback*>(ptr)
     ItemGroup* file = new ItemGroup("File");
+
+
     file->begin();
-    new Item("Open",                    0, callback_cast(menu_fltk_open_file));
-    new Item("Save as",                 0, callback_cast(menu_fltk_save_file_as));
-    //new Item("Save as..."               0, callback_cast(menu_fltk_save_as));
-    new Item("Quit",                    0, callback_cast(menu_quit));
+    new Item("Open",                    0, fltk_menu_open_file);
+    new Item("Save as",                 0, fltk_menu_save_file_as);
+    new Item("Quit",                    0, fltk_menu_quit, this);
     file->end();
 
     ItemGroup* edit = new ItemGroup("Edit");
@@ -310,28 +380,26 @@
     ItemGroup* view = new ItemGroup("View");
     view->begin();
     new Item("Double size");
-    new Item("Fullscreen",              0, callback_cast(full), this);
+    new Item("Fullscreen",              0, fltk_menu_fullscreen, this);
     view->end();
 
     ItemGroup* movie_ctrl = new ItemGroup("Movie control");
     movie_ctrl->begin();
-    new Item("Play Movie",              0, callback_cast(menu_play));
-    new Item("Pause Movie",             0, callback_cast(menu_pause));
-    new Item("Stop Movie",              0, callback_cast(menu_stop));
-    new Item("Restart Movie",           0, callback_cast(menu_restart));
-    new Item("Step Forward Frame",      0, callback_cast(menu_step_forward));
-    new Item("Step Backward Frame",     0, callback_cast(menu_step_backward));
-    new Item("Jump Forward 10 Frames",  0, callback_cast(menu_jump_forward));
-    new Item("Jump Backward 10 Frames", 0, callback_cast(menu_jump_backward));
-    new Item("Toggle Sound",            0, callback_cast(menu_toggle_sound));
+    new Item("Play Movie",              0, fltk_menu_play, this);
+    new Item("Pause Movie",             0, fltk_menu_pause, this);
+    new Item("Stop Movie",              0, fltk_menu_stop, this);
+    new Item("Restart Movie",           0, fltk_menu_restart, this);
+    new Item("Step Forward Frame",      0, fltk_menu_step_forward, this);
+    new Item("Step Backward Frame",     0, fltk_menu_step_backward, this);
+    new Item("Jump Forward 10 Frames",  0, fltk_menu_jump_forward, this);
+    new Item("Jump Backward 10 Frames", 0, fltk_menu_jump_backward, this);
+    new Item("Toggle Sound",            0, fltk_menu_toggle_sound, this);
     movie_ctrl->end();
 
     ItemGroup* help = new ItemGroup("Help");
     help->begin();
     new Item("About");
     help->end();
-
-#undef callback_cast
 }
 
 
@@ -405,7 +473,7 @@
 
     _drawbounds_vec.clear();
 
-    for (int rno=0; rno<ranges.size(); rno++) {
+    for (size_t rno=0; rno<ranges.size(); rno++) {
 
       geometry::Range2d<int> bounds = Intersection(
       _renderer->world_to_pixel(ranges.getRange(rno)),
@@ -422,8 +490,6 @@
     }
 }
 
-
-
 // end of namespace
 }
 



From MAILER-DAEMON Wed Apr 11 13:14:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbgOu-0007HA-9q
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 13:14:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbgOs-0007Cy-JJ
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:14:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbgOs-0007C1-0R
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:14:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbgOr-0007Bd-Mk
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:14:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbgKm-0006cC-W0
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:10:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbgKi-0007C7-Vu
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:10:13 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbgKi-0007C4-Lq
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:10:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbgKi-0007C4-Lq@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 11 Apr 2007 17:10:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 17:14:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/11 17:10:12

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: add some tests
	          for _width,_height and getBounds (all failing!).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2850&r2=1.2851
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2850
retrieving revision 1.2851
diff -u -b -r1.2850 -r1.2851
--- ChangeLog	11 Apr 2007 17:03:15 -0000	1.2850
+++ ChangeLog	11 Apr 2007 17:10:12 -0000	1.2851
@@ -1,3 +1,8 @@
+2007-04-11 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as: add some tests
+	  for _width,_height and getBounds (all failing!).
+
 2007-04-11 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* server/cxform.h: include required inttypes.h

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- testsuite/actionscript.all/MovieClip.as	11 Apr 2007 14:20:21 -0000	1.51
+++ testsuite/actionscript.all/MovieClip.as	11 Apr 2007 17:10:12 -0000	1.52
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.51 2007/04/11 14:20:21 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.52 2007/04/11 17:10:12 strk Exp $";
 
 #include "check.as"
 
@@ -519,3 +519,89 @@
 }
 
 #endif // OUTPUT_VERSION > 5
+
+
+//----------------------------------------------
+// Test _width, _height and getBounds
+//----------------------------------------------
+
+#if OUTPUT_VERSION >= 6
+
+createEmptyMovieClip("container", 5);
+container.createEmptyMovieClip("draw", 5);
+draw = container.draw;
+
+check_equals(draw._width, 0);
+check_equals(draw._height, 0);
+b = draw.getBounds();
+check_equals(typeof(b), 'object');
+check_equals(typeof(b.xMin), 'number');
+check_equals(typeof(b.xMax), 'number');
+check_equals(typeof(b.yMin), 'number');
+check_equals(typeof(b.yMax), 'number');
+xcheck_equals(b.xMin, 6710886.35);
+xcheck_equals(b.xMax, 6710886.35);
+xcheck_equals(b.yMin, 6710886.35);
+xcheck_equals(b.yMax, 6710886.35);
+
+with (draw)
+{
+	lineStyle(0, 0x000000);
+	moveTo(10, 10);
+	lineTo(10, 30);
+	lineTo(20, 30);
+	lineTo(20, 10);
+	lineTo(10, 10);
+}
+xcheck_equals(draw._width, 10);
+xcheck_equals(draw._height, 20);
+b = draw.getBounds();
+xcheck_equals(b.xMin, 10);
+xcheck_equals(b.xMax, 20);
+xcheck_equals(b.yMin, 10);
+xcheck_equals(b.yMax, 30);
+
+draw._rotation = 90;
+xcheck_equals(draw._width, 20);
+xcheck_equals(draw._height, 10);
+b = draw.getBounds();
+xcheck_equals(b.xMin, 10);
+xcheck_equals(b.xMax, 20);
+xcheck_equals(b.yMin, 10);
+xcheck_equals(b.yMax, 30);
+b = draw.getBounds(container);
+xcheck_equals(b.xMin, -30);
+xcheck_equals(b.xMax, -10);
+xcheck_equals(b.yMin, 10);
+xcheck_equals(b.yMax, 20);
+
+draw._visible = false;
+xcheck_equals(draw._width, 20);
+xcheck_equals(draw._height, 10);
+
+draw._xscale = 200;
+xcheck_equals(draw._width, 20);
+xcheck_equals(draw._height, 20);
+
+draw._rotation = 0;
+xcheck_equals(draw._width, 20);
+xcheck_equals(draw._height, 20);
+
+draw._visible = true;
+draw._xscale = 100;
+xcheck_equals(draw._width, 10);
+xcheck_equals(draw._height, 20);
+
+draw._yscale = 50;
+xcheck_equals(draw._width, 10);
+xcheck_equals(draw._height, 10);
+xcheck_equals(container._width, 10);
+xcheck_equals(container._height, 10);
+
+container._xscale = 800;
+xcheck_equals(draw._width, 10);
+xcheck_equals(draw._height, 10);
+xcheck_equals(container._width, 80);
+xcheck_equals(container._height, 10);
+
+#endif // OUTPUT_VERSION >= 6



From MAILER-DAEMON Wed Apr 11 13:48:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbgw8-0008Vw-MD
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 13:48:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbgw7-0008Tz-4Z
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:48:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbgw6-0008SZ-86
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:48:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbgw6-0008S0-0m
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:48:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ann@lulu.com>) id 1Hbgs1-0003qx-3q
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:44:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hbgs0-0001np-Me
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:44:36 +0000
Received: from ann by cvs with local (Exim 4.50) id 1Hbgs0-0001nl-60
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:44:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hbgs0-0001nl-60@cvs>
From: Ann Barcomb <ann@lulu.com>
Date: Wed, 11 Apr 2007 17:44:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog devtools/lib/Gnash/Distribution.pm
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 17:48:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Ann Barcomb <ann>	07/04/11 17:44:36

Modified files:
	.              : ChangeLog 
	devtools/lib/Gnash: Distribution.pm 

Log message:
	This changes the way in which Distribution calculates the project root
	(or, rather, allows it to be overridden and checked), which will hopefully
	prevent me from using the wrong directory when writing one-off scripts.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2851&r2=1.2852
http://cvs.savannah.gnu.org/viewcvs/gnash/devtools/lib/Gnash/Distribution.pm?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2851
retrieving revision 1.2852
diff -u -b -r1.2851 -r1.2852
--- ChangeLog	11 Apr 2007 17:10:12 -0000	1.2851
+++ ChangeLog	11 Apr 2007 17:44:35 -0000	1.2852
@@ -1,3 +1,9 @@
+2007-04-11 Ann Barcomb <ann@lulu.com>
+
+	* devtools/lib/Gnash/Distribution.pm: made it more
+	  difficult to mistakenly use the wrong root distribution
+	  directory.
+
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/MovieClip.as: add some tests

Index: devtools/lib/Gnash/Distribution.pm
===================================================================
RCS file: /sources/gnash/gnash/devtools/lib/Gnash/Distribution.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- devtools/lib/Gnash/Distribution.pm	31 Jan 2007 02:54:59 -0000	1.1
+++ devtools/lib/Gnash/Distribution.pm	11 Apr 2007 17:44:35 -0000	1.2
@@ -11,20 +11,21 @@
 my $dist;
 
 sub new {
-    my( $class ) = @_;
+    my $class = shift;
 
     return $dist if defined $dist;
     my $self = bless {}, $class;
-    return $self->_initialize;
+    return $self->_initialize(@_);
 }
 
 {
     no warnings 'File::Find';
     my @found_files;
     sub _initialize {
-        my( $self ) = @_;
+        my $self = shift;
 
-        my $dist = $Bin.'/../..';
+        my $dist = $_[0] || $Bin.'/../..';
+        $self->{_distribution_root} = $dist; 
         _croak(undef, 
           "Failed to find distribution root; did you move the test directory?"
         ) unless (-d $dist);
@@ -53,6 +54,11 @@
 
 }
 
+sub distribution_root {
+    my $self = shift;
+    return $self->{_distribution_root};
+}
+
 sub _croak {
     my( $self, @message ) = @_;
     require Carp;
@@ -238,19 +244,32 @@
 
 In order to find files, it works on the assumption that it will be used
 by files in the directory devtools/testsuite, which will be located within
-the Gnash top-level checkout directory.
+the Gnash top-level checkout directory.  You may also explicitly specify
+a distribution root at construction.
 
 =head1 METHODS
 
 =over 4
 
-=item new()
+=item new([DISTRIBUTION_ROOT])
 
 The constructor will search the file system as described above, then
 create a list of all files in the top-level checkout directory or in
 nested directories.  It will throw an exception if the distribution
 root is not found.
 
+You may optionally supply your own distribution root, using a full
+path.
+
+=item distribution_root()
+
+Returns the full path of the directory this library considers to be
+your distribution root.  All files under that directory will be 
+considered for inclusion in the lists returned by the next two methods.
+
+Use this method if you want to ensure that you are operating on the
+correct directory (for example if you are writing a one-off script).
+
 =item get_cpp_language_files()
 
 This method will return an array containing all C++ files, which includes



From MAILER-DAEMON Wed Apr 11 13:58:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbh5d-0007St-NE
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 13:58:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbh5b-0007QH-2Z
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:58:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbh5Z-0007Q5-7M
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:58:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbh5Z-0007Q2-3C
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:58:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1Hbh1T-0005X5-Oh
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 13:54:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hbh1T-0002NW-EY
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:54:23 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1Hbh1T-0002NS-5y
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 17:54:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hbh1T-0002NS-5y@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Wed, 11 Apr 2007 17:54:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Apr 2007 17:58:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/11 17:54:22

Modified files:
	.              : ChangeLog 
	backend        : render_handler_ogl.cpp sound_handler.h 
	libbase        : container.cpp container.h image.cpp 
	                 triangulate.h triangulate_impl.h 
	                 triangulate_sint32.cpp tu_file.h tu_random.cpp 
	                 tu_swap.h tu_timer.cpp tu_timer.h tu_types.cpp 
	                 tu_types.h 
	libgeometry    : geometry.cpp kd_tree_packed.cpp 
	plugin         : plugin.cpp plugin.h 
	plugin/win32   : plugin.cpp plugin.h 
	server         : as_value.h execute_tag.h sprite_instance.cpp 
	                 swf_function.h textformat.cpp textformat.h 
	                 timers.cpp timers.h 
	server/asobj   : NetStreamFfmpeg.cpp NetStreamFfmpeg.h 
	                 SoundFfmpeg.h SoundGst.h SoundMad.h 
	server/parser  : action_buffer.cpp movie_def_impl.h 
	server/swf     : PlaceObject2Tag.cpp PlaceObject2Tag.h 
	server/vm      : ASHandlers.cpp 

Log message:
	Replace SDL integer type names by standard ones.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2852&r2=1.2853
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_sint32.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_random.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/geometry.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_packed.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/execute_tag.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.232&r2=1.233
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2852
retrieving revision 1.2853
diff -u -b -r1.2852 -r1.2853
--- ChangeLog	11 Apr 2007 17:44:35 -0000	1.2852
+++ ChangeLog	11 Apr 2007 17:54:21 -0000	1.2853
@@ -64,6 +64,7 @@
 	video image if it extends beyond the width of our buffer.
 	* gui/fltk.cpp: Fix compilation by adding statics for GUI methods
 	that became nonstatic. Also fix some warnings.
+	* all over the place: Replace SDL integer type names by standard ones.
 
 2007-04-11 Sandro Santilli <strk@keybit.net>
 

Index: backend/render_handler_ogl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- backend/render_handler_ogl.cpp	10 Apr 2007 18:18:45 -0000	1.71
+++ backend/render_handler_ogl.cpp	11 Apr 2007 17:54:21 -0000	1.72
@@ -5,7 +5,7 @@
 
 // A render_handler that uses SDL & OpenGL
 
-/* $Id: render_handler_ogl.cpp,v 1.71 2007/04/10 18:18:45 rsavoye Exp $ */
+/* $Id: render_handler_ogl.cpp,v 1.72 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -910,7 +910,7 @@
 
 */
 
-void	hardware_resample(int bytes_per_pixel, int src_width, int src_height, uint8* src_data, int dst_width, int dst_height)
+void	hardware_resample(int bytes_per_pixel, int src_width, int src_height, uint8_t* src_data, int dst_width, int dst_height)
 // Code from Alex Streit
 //
 // Sets the current texture to a resampled/expanded version of the
@@ -967,7 +967,7 @@
     int src_width,
     int src_height,
     int src_pitch,
-    uint8* src_data,
+    uint8_t* src_data,
     int dst_width,
     int dst_height)
 // Code from Alex Streit

Index: backend/sound_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- backend/sound_handler.h	27 Feb 2007 09:54:48 -0000	1.2
+++ backend/sound_handler.h	11 Apr 2007 17:54:21 -0000	1.3
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sound_handler.h,v 1.2 2007/02/27 09:54:48 strk Exp $ */
+/* $Id: sound_handler.h,v 1.3 2007/04/11 17:54:21 bjacques Exp $ */
 
 /// \page sound_handler_intro Sound handler introduction
 ///
@@ -52,7 +52,7 @@
 {
 public:
 
-	typedef bool (*aux_streamer_ptr)(void *udata, uint8 *stream, int len);
+	typedef bool (*aux_streamer_ptr)(void *udata, uint8_t *stream, int len);
 
 	struct sound_envelope
 	{

Index: libbase/container.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/container.cpp	17 Sep 2006 19:45:59 -0000	1.12
+++ libbase/container.cpp	11 Apr 2007 17:54:21 -0000	1.13
@@ -17,18 +17,18 @@
 #include "utf8.h"
 #include "tu_random.h"
 
-void tu_string::append_wide_char(uint16 c)
+void tu_string::append_wide_char(uint16_t c)
 {
 	char buf[8];
 	int index = 0;
-	utf8::encode_unicode_character(buf, &index, (uint32) c);
+	utf8::encode_unicode_character(buf, &index, (uint32_t) c);
 	buf[index] = '\0';
 
 	*this += buf;
 }
 
 
-void tu_string::append_wide_char(uint32 c)
+void tu_string::append_wide_char(uint32_t c)
 {
 	char buf[8];
 	int index = 0;
@@ -160,15 +160,15 @@
 	assert(result->length() == (int) strlen(result->c_str()));
 }
 
-void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32* wstr)
+void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr)
 {
-	encode_utf8_from_wchar_generic<uint32>(result, wstr);
+	encode_utf8_from_wchar_generic<uint32_t>(result, wstr);
 }
 
 
-void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16* wstr)
+void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr)
 {
-	encode_utf8_from_wchar_generic<uint16>(result, wstr);
+	encode_utf8_from_wchar_generic<uint16_t>(result, wstr);
 }
 
 
@@ -178,10 +178,10 @@
 }
 
 
-uint32	tu_string::utf8_char_at(int index) const
+uint32_t	tu_string::utf8_char_at(int index) const
 {
 	const char*	buf = get_buffer();
-	uint32	c;
+	uint32_t	c;
 
 	do
 	{
@@ -207,7 +207,7 @@
 	tu_string str;
 	for (;;)
 	{
-		uint32 c = utf8::decode_next_unicode_character(&buf);
+		uint32_t c = utf8::decode_next_unicode_character(&buf);
           
 		if (c == 0)
 		{
@@ -227,7 +227,7 @@
 	tu_string str;
 	for (;;)
 	{
-		uint32 c = utf8::decode_next_unicode_character(&buf);
+		uint32_t c = utf8::decode_next_unicode_character(&buf);
     
 		if (c == 0) {
 			// We've hit the end of the string; don't go further.
@@ -247,7 +247,7 @@
 
 	while (p - buf < buflen)
 	{
-		uint32	c = utf8::decode_next_unicode_character(&p);
+		uint32_t	c = utf8::decode_next_unicode_character(&p);
 		if (c == 0)
 		{
 			break;
@@ -282,7 +282,7 @@
 			start_pointer = p;
 		}
 
-		uint32	c = utf8::decode_next_unicode_character(&p);
+		uint32_t	c = utf8::decode_next_unicode_character(&p);
 		index++;
 
 		if (index == end)
@@ -424,23 +424,23 @@
 // still 33% slower in my tests.
 
 // // tu's hash
-#define HASH hash<uint32, uint32 >
+#define HASH hash<uint32_t, uint32_t >
 #define HASH_ADD(h, k, v) h.add(k, v)
 
 // STL's hash
-//#define HASH __gnu_cxx::hash_map<uint32, uint32>
-//#define HASH std::hash_map<uint32, uint32>
+//#define HASH __gnu_cxx::hash_map<uint32_t, uint32_t>
+//#define HASH std::hash_map<uint32_t, uint32_t>
 //#define HASH_ADD(h, k, v) h[k] = v
 
 // STL's map
-//#define HASH std::map<uint32, uint32>
+//#define HASH std::map<uint32_t, uint32_t>
 //#define HASH_ADD(h, k, v) h[k] = v
 
 //	const int	SIZE = 10000000;
 	const int	SIZE = 1000000;
 
 	// Make an array of random numbers.
-	std::vector<uint32>	numbers;
+	std::vector<uint32_t>	numbers;
 	numbers.resize(SIZE);
 
 	for (int i = 0, n = numbers.size(); i < n; i++)

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- libbase/container.h	12 Feb 2007 01:32:46 -0000	1.51
+++ libbase/container.h	11 Apr 2007 17:54:21 -0000	1.52
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: container.h,v 1.51 2007/02/12 01:32:46 nihilus Exp $ */
+/* $Id: container.h,v 1.52 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
@@ -736,14 +736,14 @@
 		resize(str.size());
 		strcpy(get_buffer(), str.get_buffer());
 	}
-	tu_string(const uint32* wide_char_str)
+	tu_string(const uint32_t* wide_char_str)
 	{
 		m_local.m_size = 1;
 		m_local.m_buffer[0] = '\0';
 
 		*this = wide_char_str;
 	}
-	tu_string(const uint16* wide_char_str)
+	tu_string(const uint16_t* wide_char_str)
 	{
 		m_local.m_size = 1;
 		m_local.m_buffer[0] = '\0';
@@ -850,8 +850,8 @@
 	}
 
 	// Append wide char.  Both versions of wide char.
-	void	append_wide_char(uint16 ch);
-	void	append_wide_char(uint32 ch);
+	void	append_wide_char(uint16_t ch);
+	void	append_wide_char(uint32_t ch);
 
 	void	operator+=(const tu_string& str)
 	{
@@ -901,8 +901,8 @@
 	//
 	// Could add operator= overloads, but maybe it's better to
 	// keep this very explicit.
-	static void	encode_utf8_from_wchar(tu_string* result, const uint32* wstr);
-	static void	encode_utf8_from_wchar(tu_string* result, const uint16* wstr);
+	static void	encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr);
+	static void	encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr);
 
 	// Utility: case-insensitive string compare.  stricmp() is not
 	// ANSI or POSIX, doesn't seem to appear in Linux.
@@ -910,7 +910,7 @@
 
 	// Return the Unicode char at the specified character
 	// position.  index is in UTF-8 chars, NOT bytes.
-	uint32	utf8_char_at(int index) const;
+	uint32_t	utf8_char_at(int index) const;
 
 	// Return the string in this container as all upper case letters
 	tu_string utf8_to_upper() const;

Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libbase/image.cpp	10 Apr 2007 20:24:23 -0000	1.18
+++ libbase/image.cpp	11 Apr 2007 17:54:21 -0000	1.19
@@ -424,7 +424,7 @@
 
 		for (int y = 0; y < im->m_height; y++)
 		{
-			uint8*	p = scanline(im, y);
+			uint8_t*	p = scanline(im, y);
 			for (int x = 0; x < im->m_width; x++)
 			{
 				out->write_byte(p[x * 4]);

Index: libbase/triangulate.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/triangulate.h	25 Feb 2006 03:54:03 -0000	1.3
+++ libbase/triangulate.h	11 Apr 2007 17:54:21 -0000	1.4
@@ -37,19 +37,19 @@
 
 	// Version using short coords
 	void	compute(
-		std::vector<sint16>* results,	// indexed trilist
+		std::vector<int16_t>* results,	// indexed trilist
 		int path_count,
-		const std::vector<sint16> paths[],
+		const std::vector<int16_t> paths[],
 		int debug_halt_step = -1,
-		std::vector<sint16>* debug_remaining_loop = NULL);
+		std::vector<int16_t>* debug_remaining_loop = NULL);
 
 	// Version using int coords
 	void	compute(
-		std::vector<sint32>* results,	// indexed trilist
+		std::vector<int32_t>* results,	// indexed trilist
 		int path_count,
-		const std::vector<sint32> paths[],
+		const std::vector<int32_t> paths[],
 		int debug_halt_step = -1,
-		std::vector<sint32>* debug_remaining_loop = NULL);
+		std::vector<int32_t>* debug_remaining_loop = NULL);
 }
 
 

Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libbase/triangulate_impl.h	12 Oct 2006 14:05:42 -0000	1.21
+++ libbase/triangulate_impl.h	11 Apr 2007 17:54:21 -0000	1.22
@@ -24,7 +24,7 @@
 // code, see the FIST web page at:
 // http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
 
-/* $Id: triangulate_impl.h,v 1.21 2006/10/12 14:05:42 nihilus Exp $ */
+/* $Id: triangulate_impl.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
 
 #include "utility.h"
 #include "triangulate.h"
@@ -37,7 +37,7 @@
 #include "tu_timer.h"
 #endif // PROFILE_TRIANGULATE
 
-// Template this whole thing on coord_t, so sint16 and float versions
+// Template this whole thing on coord_t, so int16_t and float versions
 // can easily reuse the code.
 //
 // These templates are instantiated in triangulate_<type>.cpp files.
@@ -72,10 +72,10 @@
 }
 
 
-inline sint64	determinant_sint32(const vec2<sint32>& a, const vec2<sint32>& b, const vec2<sint32>& c)
+inline int64_t	determinant_sint32(const vec2<int32_t>& a, const vec2<int32_t>& b, const vec2<int32_t>& c)
 {
-	return (sint64(b.x) - sint64(a.x)) * (sint64(c.y) - sint64(a.y))
-		- (sint64(b.y) - sint64(a.y)) * (sint64(c.x) - sint64(a.x));
+	return (int64_t(b.x) - int64_t(a.x)) * (int64_t(c.y) - int64_t(a.y))
+		- (int64_t(b.y) - int64_t(a.y)) * (int64_t(c.x) - int64_t(a.x));
 }
 
 
@@ -101,10 +101,10 @@
 
 
 template<>
-inline int	vertex_left_test(const vec2<sint32>& a, const vec2<sint32>& b, const vec2<sint32>& c)
-// Specialize for vec2<sint32>
+inline int	vertex_left_test(const vec2<int32_t>& a, const vec2<int32_t>& b, const vec2<int32_t>& c)
+// Specialize for vec2<int32_t>
 {
-	sint64	det = determinant_sint32(a, b, c);
+	int64_t	det = determinant_sint32(a, b, c);
 	if (det > 0) return 1;
 	else if (det < 0) return -1;
 	else return 0;
@@ -298,10 +298,10 @@
 
 
 template<>
-inline bool	edges_intersect_sub(const std::vector<poly_vert<sint32> >& sorted_verts, int e0v0i, int e0v1i, int e1v0i, int e1v1i)
+inline bool	edges_intersect_sub(const std::vector<poly_vert<int32_t> >& sorted_verts, int e0v0i, int e0v1i, int e1v0i, int e1v1i)
 // Return true if edge (e0v0,e0v1) intersects (e1v0,e1v1).
 //
-// Specialized for sint32
+// Specialized for int32_t
 {
 	// If e1v0,e1v1 are on opposite sides of e0, and e0v0,e0v1 are
 	// on opposite sides of e1, then the segments cross.  These
@@ -312,10 +312,10 @@
 	//
 	// If only one is degenerate, our tests are still OK.
 
-	const vec2<sint32>&	e0v0 = sorted_verts[e0v0i].m_v;
-	const vec2<sint32>&	e0v1 = sorted_verts[e0v1i].m_v;
-	const vec2<sint32>&	e1v0 = sorted_verts[e1v0i].m_v;
-	const vec2<sint32>&	e1v1 = sorted_verts[e1v1i].m_v;
+	const vec2<int32_t>&	e0v0 = sorted_verts[e0v0i].m_v;
+	const vec2<int32_t>&	e0v1 = sorted_verts[e0v1i].m_v;
+	const vec2<int32_t>&	e1v0 = sorted_verts[e1v0i].m_v;
+	const vec2<int32_t>&	e1v1 = sorted_verts[e1v1i].m_v;
 
 	if (e0v0.x == e0v1.x && e0v0.y == e0v1.y)
 	{
@@ -330,8 +330,8 @@
 	}
 
 	// See if e1 crosses line of e0.
-	sint64	det10 = determinant_sint32(e0v0, e0v1, e1v0);
-	sint64	det11 = determinant_sint32(e0v0, e0v1, e1v1);
+	int64_t	det10 = determinant_sint32(e0v0, e0v1, e1v0);
+	int64_t	det11 = determinant_sint32(e0v0, e0v1, e1v1);
 
 	// Note: we do > 0, which means a vertex on a line counts as
 	// intersecting.  In general, if one vert is on the other
@@ -346,8 +346,8 @@
 	}
 
 	// See if e0 crosses line of e1.
-	sint64	det00 = determinant_sint32(e1v0, e1v1, e0v0);
-	sint64	det01 = determinant_sint32(e1v0, e1v1, e0v1);
+	int64_t	det00 = determinant_sint32(e1v0, e1v1, e0v0);
+	int64_t	det01 = determinant_sint32(e1v0, e1v1, e0v1);
 
 	if (det00 * det01 > 0)
 	{
@@ -2222,7 +2222,7 @@
 	}
 
 #ifdef PROFILE_TRIANGULATE
-	uint64	start_ticks = tu_timer::get_profile_ticks();
+	uint64_t	start_ticks = tu_timer::get_profile_ticks();
 #endif // PROFILE_TRIANGULATE
 
 	// Local generator, for some parts of the algo that need random numbers.
@@ -2244,7 +2244,7 @@
 	}
 
 #ifdef PROFILE_TRIANGULATE
-	uint64	join_ticks = tu_timer::get_profile_ticks();
+	uint64_t	join_ticks = tu_timer::get_profile_ticks();
 	fprintf(stderr, "join poly = %1.6f sec\n", tu_timer::profile_ticks_to_seconds(join_ticks - start_ticks));
 #endif // PROFILE_TRIANGULATE
 
@@ -2377,7 +2377,7 @@
 	}
 	
 #ifdef PROFILE_TRIANGULATE
-	uint64	clip_ticks = tu_timer::get_profile_ticks();
+	uint64_t	clip_ticks = tu_timer::get_profile_ticks();
 	fprintf(stderr, "clip poly = %1.6f sec\n", tu_timer::profile_ticks_to_seconds(clip_ticks - join_ticks));
 	fprintf(stderr, "total for poly = %1.6f sec\n", tu_timer::profile_ticks_to_seconds(clip_ticks - start_ticks));
 	fprintf(stderr, "vert count = %d, verts clipped / sec = %f\n",

Index: libbase/triangulate_sint32.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_sint32.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/triangulate_sint32.cpp	10 Feb 2007 18:33:03 -0000	1.5
+++ libbase/triangulate_sint32.cpp	11 Apr 2007 17:54:21 -0000	1.6
@@ -7,7 +7,7 @@
 //
 // Instantiate our templated algo from triangulate_inst.h
 
-/* $Id: triangulate_sint32.cpp,v 1.5 2007/02/10 18:33:03 nihilus Exp $ */
+/* $Id: triangulate_sint32.cpp,v 1.6 2007/04/11 17:54:21 bjacques Exp $ */
 
 #include "triangulate_impl.h"
 
@@ -15,14 +15,14 @@
 
 namespace triangulate
 {
-	// Version using sint32 coords
+	// Version using int32_t coords
 	void	compute(
-		std::vector<sint32>* result,	// trilist
+		std::vector<int32_t>* result,	// trilist
 		int path_count,
-		const std::vector<sint32> paths[],
+		const std::vector<int32_t> paths[],
 		int debug_halt_step /* = -1 */,
-		std::vector<sint32>* debug_remaining_loop /* = NULL */)
+		std::vector<int32_t>* debug_remaining_loop /* = NULL */)
 	{
-		compute_triangulation<sint32>(result, path_count, paths, debug_halt_step, debug_remaining_loop);
+		compute_triangulation<int32_t>(result, path_count, paths, debug_halt_step, debug_remaining_loop);
 	}
 }

Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- libbase/tu_file.h	9 Mar 2007 14:38:29 -0000	1.11
+++ libbase/tu_file.h	11 Apr 2007 17:54:21 -0000	1.12
@@ -87,16 +87,16 @@
     // Returns number of bytes copied.
     int	copy_bytes(tu_file* in, int bytes);
     
-    uint64	read_le64();
+    uint64_t	read_le64();
     uint32_t 	read_le32();
     uint16_t 	read_le16();
-    uint64 	read_be64();
+    uint64_t 	read_be64();
     uint32_t 	read_be32();
     uint16_t 	read_be16();
-    void 	write_le64(uint64 u);
+    void 	write_le64(uint64_t u);
     void 	write_le32(uint32_t u);
     void 	write_le16(uint16_t u);
-    void	write_be64(uint64 u);
+    void	write_be64(uint64_t u);
     void 	write_be32(uint32_t u);
     void 	write_be16(uint16_t u);
     
@@ -146,8 +146,8 @@
     
     
 private:
-    uint64	read64() {
-	uint64 u;
+    uint64_t	read64() {
+	uint64_t u;
 	m_read(&u, 8, m_data);
 	return u;
     }
@@ -167,7 +167,7 @@
 	return u;
     }
     
-    void	write64(uint64 u) {
+    void	write64(uint64_t u) {
 	m_write(&u, 8, m_data);
     }
     void	write32(uint32_t u) {
@@ -201,29 +201,29 @@
 
 
 #if _TU_LITTLE_ENDIAN_
-inline uint64	tu_file::read_le64() { return read64(); }
+inline uint64_t	tu_file::read_le64() { return read64(); }
 inline uint32_t	tu_file::read_le32() { return read32(); }
 inline uint16_t	tu_file::read_le16() { return read16(); }
-inline uint64	tu_file::read_be64() { return swap64(read64()); }
+inline uint64_t	tu_file::read_be64() { return swap64(read64()); }
 inline uint32_t	tu_file::read_be32() { return swap32(read32()); }
 inline uint16_t	tu_file::read_be16() { return swap16(read16()); }
-inline void	tu_file::write_le64(uint64 u) { write64(u); }
+inline void	tu_file::write_le64(uint64_t u) { write64(u); }
 inline void	tu_file::write_le32(uint32_t u) { write32(u); }
 inline void	tu_file::write_le16(uint16_t u) { write16(u); }
-inline void	tu_file::write_be64(uint64 u) { write64(swap64(u)); }
+inline void	tu_file::write_be64(uint64_t u) { write64(swap64(u)); }
 inline void	tu_file::write_be32(uint32_t u) { write32(swap32(u)); }
 inline void	tu_file::write_be16(uint16_t u) { write16(swap16(u)); }
 #else // not _TU_LITTLE_ENDIAN_
-inline uint64	tu_file::read_le64() { return swap64(read64()); }
+inline uint64_t	tu_file::read_le64() { return swap64(read64()); }
 inline uint32_t	tu_file::read_le32() { return swap32(read32()); }
 inline uint16_t	tu_file::read_le16() { return swap16(read16()); }
-inline uint64	tu_file::read_be64() { return read64(); }
+inline uint64_t	tu_file::read_be64() { return read64(); }
 inline uint32_t	tu_file::read_be32() { return read32(); }
 inline uint16_t	tu_file::read_be16() { return read16(); }
-inline void	tu_file::write_le64(uint64 u) { write64(swap64(u)); }
+inline void	tu_file::write_le64(uint64_t u) { write64(swap64(u)); }
 inline void	tu_file::write_le32(uint32_t u) { write32(swap32(u)); }
 inline void	tu_file::write_le16(uint16_t u) { write16(swap16(u)); }
-inline void	tu_file::write_be64(uint64 u) { write64(u); }
+inline void	tu_file::write_be64(uint64_t u) { write64(u); }
 inline void	tu_file::write_be32(uint32_t u) { write32(u); }
 inline void	tu_file::write_be16(uint16_t u) { write16(u); }
 #endif	// not _TU_LITTLE_ENDIAN_
@@ -262,7 +262,7 @@
 {
     union {
 	double	d;
-	uint64	l;
+	uint64_t	l;
     } u;
     compiler_assert(sizeof(u) == sizeof(u.l));
     
@@ -276,7 +276,7 @@
 {
     union {
 	double	d;
-	uint64	l;
+	uint64_t	l;
     } u;
     compiler_assert(sizeof(u) == sizeof(u.l));
     

Index: libbase/tu_random.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_random.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_random.cpp	28 Aug 2006 11:07:14 -0000	1.6
+++ libbase/tu_random.cpp	11 Apr 2007 17:54:21 -0000	1.7
@@ -52,14 +52,14 @@
 	// random number generator.  _Statistics and Probability Letters
 	// 8_ (1990), 35-39.
 
-//	const uint64	a = 123471786;	// for SEED_COUNT=1024
-//	const uint64	a = 123554632;	// for SEED_COUNT=512
-//	const uint64	a = 8001634;	// for SEED_COUNT=255
-//	const uint64	a = 8007626;	// for SEED_COUNT=128
-//	const uint64	a = 647535442;	// for SEED_COUNT=64
-//	const uint64	a = 547416522;	// for SEED_COUNT=32
-//	const uint64	a = 487198574;	// for SEED_COUNT=16
-	const uint64	a = 716514398;	// for SEED_COUNT=8
+//	const uint64_t	a = 123471786;	// for SEED_COUNT=1024
+//	const uint64_t	a = 123554632;	// for SEED_COUNT=512
+//	const uint64_t	a = 8001634;	// for SEED_COUNT=255
+//	const uint64_t	a = 8007626;	// for SEED_COUNT=128
+//	const uint64_t	a = 647535442;	// for SEED_COUNT=64
+//	const uint64_t	a = 547416522;	// for SEED_COUNT=32
+//	const uint64_t	a = 487198574;	// for SEED_COUNT=16
+	const uint64_t	a = 716514398;	// for SEED_COUNT=8
 
 
 	generator::generator()
@@ -89,7 +89,7 @@
 	uint32_t	generator::next_random()
 	// Return the next pseudo-random number in the sequence.
 	{
-		uint64	t;
+		uint64_t	t;
 		uint32_t	x;
 
 		//static uint32_t	c = 362436;

Index: libbase/tu_swap.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_swap.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- libbase/tu_swap.h	27 Jul 2006 08:37:45 -0000	1.6
+++ libbase/tu_swap.h	11 Apr 2007 17:54:21 -0000	1.7
@@ -52,7 +52,7 @@
 #ifdef swap64
 #undef swap64
 #endif
-inline uint64 swap64(uint64 u)
+inline uint64_t swap64(uint64_t u)
 {
 #ifdef __GNUC__
 	return ((u & 0x00000000000000FFLL) << 56) |
@@ -76,7 +76,7 @@
 }
 
 
-inline uint64	swap_le64(uint64 le_64)
+inline uint64_t	swap_le64(uint64_t le_64)
 // Given a 64-bit little-endian piece of data, return it as a 64-bit
 // integer in native endian-ness.  I.e., do a swap if we're on a
 // big-endian machine.

Index: libbase/tu_timer.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/tu_timer.cpp	25 Aug 2006 23:35:20 -0000	1.5
+++ libbase/tu_timer.cpp	11 Apr 2007 17:54:21 -0000	1.6
@@ -15,19 +15,19 @@
 #include <Mmsystem.h>
 
 
-uint64 tu_timer::get_ticks()
+uint64_t tu_timer::get_ticks()
 {
 	return timeGetTime();
 }
 
 
-double tu_timer::ticks_to_seconds(uint64 ticks)
+double tu_timer::ticks_to_seconds(uint64_t ticks)
 {
 	return ticks * (1.0f / 1000.f);
 }
 
 
-uint64	tu_timer::get_profile_ticks()
+uint64_t	tu_timer::get_profile_ticks()
 {
 	// @@ use rdtsc?
 
@@ -38,7 +38,7 @@
 }
 
 
-double	tu_timer::profile_ticks_to_seconds(uint64 ticks)
+double	tu_timer::profile_ticks_to_seconds(uint64_t ticks)
 {
 	LARGE_INTEGER	freq;
 	QueryPerformanceFrequency(&freq);
@@ -59,19 +59,19 @@
 // The profile ticks implementation is just fine for a normal timer.
 
 
-uint64 tu_timer::get_ticks()
+uint64_t tu_timer::get_ticks()
 {
 	return get_profile_ticks();
 }
 
 
-double tu_timer::ticks_to_seconds(uint64 ticks)
+double tu_timer::ticks_to_seconds(uint64_t ticks)
 {
 	return profile_ticks_to_seconds(ticks);
 }
 
 
-uint64	tu_timer::get_profile_ticks()
+uint64_t	tu_timer::get_profile_ticks()
 {
 	// @@ TODO prefer rdtsc when available?
 
@@ -80,14 +80,14 @@
 	
 	gettimeofday(&tv, 0);
 
-	uint64 result = tv.tv_sec * 1000000;
+	uint64_t result = tv.tv_sec * 1000000;
 	result += tv.tv_usec;
 	
 	return result;
 }
 
 
-double	tu_timer::profile_ticks_to_seconds(uint64 ticks)
+double	tu_timer::profile_ticks_to_seconds(uint64_t ticks)
 {
 	// ticks is microseconds.  Convert to seconds.
 	return ticks / 1000000.0;

Index: libbase/tu_timer.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/tu_timer.h	14 Sep 2006 23:54:22 -0000	1.3
+++ libbase/tu_timer.h	11 Apr 2007 17:54:21 -0000	1.4
@@ -16,8 +16,8 @@
 {
 	// General-purpose wall-clock timer.  May not be hi-res enough
 	// for profiling.
-	uint64 get_ticks();
-	double ticks_to_seconds(uint64 ticks);
+	uint64_t get_ticks();
+	double ticks_to_seconds(uint64_t ticks);
 	
 	// Hi-res timer for CPU profiling.
 
@@ -26,10 +26,10 @@
 	// operation, and pass the difference to
 	// profile_ticks_to_seconds() to find out how long the
 	// operation took.
-	DSOEXPORT uint64	get_profile_ticks();
+	DSOEXPORT uint64_t	get_profile_ticks();
 
 	// Convert a hi-res ticks value into seconds.
-	DSOEXPORT double	profile_ticks_to_seconds(uint64 profile_ticks);
+	DSOEXPORT double	profile_ticks_to_seconds(uint64_t profile_ticks);
 }
 
 

Index: libbase/tu_types.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/tu_types.cpp	8 May 2006 21:12:24 -0000	1.4
+++ libbase/tu_types.cpp	11 Apr 2007 17:54:21 -0000	1.5
@@ -17,11 +17,11 @@
 	if (sizeof(uint8_t) != 1
 		|| sizeof(uint16_t) != 2
 		|| sizeof(uint32_t) != 4
-		|| sizeof(uint64) != 8
+		|| sizeof(uint64_t) != 8
 		|| sizeof(int8_t) != 1
 		|| sizeof(int16_t) != 2
 		|| sizeof(int32_t) != 4
-		|| sizeof(sint64) != 8)
+		|| sizeof(int64_t) != 8)
 	{
 		// No good.
 		assert(0);

Index: libbase/tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- libbase/tu_types.h	9 Feb 2007 17:23:03 -0000	1.32
+++ libbase/tu_types.h	11 Apr 2007 17:54:21 -0000	1.33
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: tu_types.h,v 1.32 2007/02/09 17:23:03 bjacques Exp $ */
+/* $Id: tu_types.h,v 1.33 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifndef TU_TYPES_H
 #define TU_TYPES_H
@@ -79,22 +79,6 @@
 #	undef _TU_LITTLE_ENDIAN_
 #endif //BYTE_ORDER == SDL_LIL_ENDIAN
 
-typedef uint8_t uint8;
-typedef int8_t sint8;
-typedef int8_t int8;
-typedef uint16_t uint16;
-typedef int16_t sint16;
-typedef int16_t int16;
-typedef uint32_t uint32;
-typedef int32_t sint32;
-typedef int32_t int32;
-
-#ifndef PROTYPES_H
-typedef uint64_t uint64;
-typedef int64_t sint64;
-typedef int64_t int64;
-#endif
-
 // A function to run some validation checks.
 DSOEXPORT bool	tu_types_validate();
 

Index: libgeometry/geometry.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/geometry.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libgeometry/geometry.cpp	10 Feb 2007 18:40:20 -0000	1.8
+++ libgeometry/geometry.cpp	11 Apr 2007 17:54:21 -0000	1.9
@@ -607,8 +607,8 @@
 // Pixels that have alpha > 0.5, but have color 0, should be tweaked slightly
 // so they don't get knocked out when blitting.
 {
-	uint32	Key32 = 0;
-	uint32*	p = GetData();
+	uint32_t	Key32 = 0;
+	uint32_t*	p = GetData();
 	int	pixels = GetHeight() * GetWidth();
 	for (int i = 0; i < pixels; i++, p++) {
 		if ((*p >> 24) >= 128) {

Index: libgeometry/kd_tree_packed.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/kd_tree_packed.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libgeometry/kd_tree_packed.cpp	10 Feb 2007 18:40:20 -0000	1.10
+++ libgeometry/kd_tree_packed.cpp	11 Apr 2007 17:54:21 -0000	1.11
@@ -124,7 +124,7 @@
 
 struct kd_face
 {
-	uint16	m_vi[3];	// vert indices
+	uint16_t	m_vi[3];	// vert indices
 
 //	void	local_assert() { compiler_assert(sizeof(struct kd_face) == 6); }
 };
@@ -132,14 +132,14 @@
 
 struct kd_leaf
 {
-	uint8	m_flags;	// low two bits == 0b11
-	uint8	m_face_count;
+	uint8_t	m_flags;	// low two bits == 0b11
+	uint8_t	m_face_count;
 
 	kd_face*	get_face(int index)
 	{
 		assert(index >= 0 && index < m_face_count);
 
-		return (kd_face*) (((uint8*) this) + sizeof(struct kd_leaf) + sizeof(kd_face) * index);
+		return (kd_face*) (((uint8_t*) this) + sizeof(struct kd_leaf) + sizeof(kd_face) * index);
 	}
 
 //	void	local_assert() { compiler_assert(sizeof(struct kd_leaf) == 2); }
@@ -162,7 +162,7 @@
 class kd_node
 {
 public:
-	uint8	m_flags[4];
+	uint8_t	m_flags[4];
 	// low two bits == axis, if axis == 3 then this is leaf.
 	// 0x04 is set if the neg child is present.
 	// 0x08 is set if the pos child is present
@@ -183,7 +183,7 @@
 		if (has_neg_child())
 		{
 			// Neg child follows immediately.
-			return (kd_node*) (((uint8*) this) + sizeof(kd_node));
+			return (kd_node*) (((uint8_t*) this) + sizeof(kd_node));
 		}
 		else return NULL;
 	}
@@ -195,7 +195,7 @@
 			unsigned int offset = (m_flags[1]) + (m_flags[2] << 8) + (m_flags[3] << 16);
 			assert(offset >= sizeof(kd_node));	// sanity check
 
-			return (kd_node*) (((uint8*) this) + offset);
+			return (kd_node*) (((uint8_t*) this) + offset);
 		}
 		else return NULL;
 	}

Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- plugin/plugin.cpp	7 Mar 2007 19:06:12 -0000	1.73
+++ plugin/plugin.cpp	11 Apr 2007 17:54:21 -0000	1.74
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.73 2007/03/07 19:06:12 bjacques Exp $ */
+/* $Id: plugin.cpp,v 1.74 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -437,7 +437,7 @@
 }
 
 /// \brief Return how many bytes we can read into the buffer
-int32
+int32_t
 nsPluginInstance::WriteReady(NPStream * /* stream */ )
 {
 #if 0
@@ -449,8 +449,8 @@
 /// \brief Read the data stream from Mozilla/Firefox
 ///
 /// For now we read the bytes and write them to a disk file.
-int32
-nsPluginInstance::Write(NPStream * /* stream */, int32 /* offset */, int32 len,
+int32_t
+nsPluginInstance::Write(NPStream * /* stream */, int32_t /* offset */, int32_t len,
                         void * buffer)
 {
 #if 0

Index: plugin/plugin.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- plugin/plugin.h	15 Dec 2006 21:25:59 -0000	1.29
+++ plugin/plugin.h	11 Apr 2007 17:54:21 -0000	1.30
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.h,v 1.29 2006/12/15 21:25:59 rsavoye Exp $ */
+/* $Id: plugin.h,v 1.30 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifndef __PLUGIN_H__
 #define __PLUGIN_H__
@@ -79,11 +79,11 @@
     NPError SetWindow(NPWindow *aWindow);
 
     NPError NewStream(NPMIMEType type, NPStream *stream, NPBool seekable,
-                      uint16 *stype);
+                      uint16_t *stype);
     NPError DestroyStream(NPStream * stream, NPError reason);
 
-    int32 WriteReady(NPStream *stream);
-    int32 Write(NPStream *stream, int32 offset, int32 len, void *buffer);
+    int32_t WriteReady(NPStream *stream);
+    int32_t Write(NPStream *stream, int32_t offset, int32_t len, void *buffer);
 
     NPError WriteStatus(char *msg) const;
     NPError WriteStatus(std::string msg) const;

Index: plugin/win32/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- plugin/win32/plugin.cpp	20 Nov 2006 16:40:22 -0000	1.5
+++ plugin/win32/plugin.cpp	11 Apr 2007 17:54:21 -0000	1.6
@@ -137,7 +137,7 @@
 }
 
 NPError nsPluginInstance::NewStream(NPMIMEType type, NPStream * stream,
-                            NPBool seekable, uint16 * stype)
+                            NPBool seekable, uint16_t * stype)
 {
 //	dbglogfile << "NewStream" << stream->url << endl;
 	return NPERR_NO_ERROR;
@@ -282,9 +282,9 @@
 		return;
 	}
 
-	uint64	start_ticks = 0;
+	uint64_t	start_ticks = 0;
 	start_ticks = tu_timer::get_ticks();
-	uint64	last_ticks = start_ticks;
+	uint64_t	last_ticks = start_ticks;
 
 	float	scale = 1.0f;
 	bool	background = true;
@@ -301,7 +301,7 @@
 		gnash::set_current_root(m);
 		gnash::delete_unused_root();
 	
-		uint64	ticks;
+		uint64_t	ticks;
 		ticks = tu_timer::get_ticks();
 		int	delta_ticks = tu_timer::get_ticks() - last_ticks;
 		float	delta_t = delta_ticks / 1000.f;

Index: plugin/win32/plugin.h
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- plugin/win32/plugin.h	29 Oct 2006 18:34:17 -0000	1.3
+++ plugin/win32/plugin.h	11 Apr 2007 17:54:21 -0000	1.4
@@ -43,7 +43,7 @@
 	NPBool isInitialized();
 	NPError SetWindow(NPP instance, NPWindow* window);
 	NPError NewStream(NPMIMEType type, NPStream * stream,
-                            NPBool seekable, uint16 * stype);
+                            NPBool seekable, uint16_t * stype);
 	NPError DestroyStream(NPStream * stream, NPError reason);
 
 	// locals

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/as_value.h	2 Apr 2007 22:45:09 -0000	1.41
+++ server/as_value.h	11 Apr 2007 17:54:21 -0000	1.42
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.41 2007/04/02 22:45:09 nihilus Exp $ */
+/* $Id: as_value.h,v 1.42 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -167,12 +167,12 @@
 		// continues to work.
 
 #if (WCHAR_MAX != MAXINT)
-		tu_string::encode_utf8_from_wchar(&m_string_value, (const uint16 *)wstr);
+		tu_string::encode_utf8_from_wchar(&m_string_value, (const uint16_t *)wstr);
 #else
 # if (WCHAR_MAX != MAXSHORT)
 # error "Can't determine the size of wchar_t"
 # else
-		tu_string::encode_utf8_from_wchar(&m_string_value, (const uint32 *)wstr);
+		tu_string::encode_utf8_from_wchar(&m_string_value, (const uint32_t *)wstr);
 # endif
 #endif
 	}

Index: server/execute_tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/execute_tag.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/execute_tag.h	11 Apr 2007 14:20:20 -0000	1.10
+++ server/execute_tag.h	11 Apr 2007 17:54:21 -0000	1.11
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "tu_types.h" // for uint32 typedef
+#include "tu_types.h" // for uint32_t typedef
 
 #include <cstdarg>
 #include <cassert>
@@ -92,7 +92,7 @@
 	//
 	/// The default implementation returns 0
 	///
-	virtual uint32	get_depth_id_of_replace_or_add_tag() const
+	virtual uint32_t	get_depth_id_of_replace_or_add_tag() const
 	{
 		return 0;
 	}

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -b -r1.232 -r1.233
--- server/sprite_instance.cpp	11 Apr 2007 14:20:20 -0000	1.232
+++ server/sprite_instance.cpp	11 Apr 2007 17:54:21 -0000	1.233
@@ -2410,7 +2410,7 @@
 sprite_instance::find_previous_replace_or_add_tag(int frame,
 		int depth, int id)
 {
-	uint32 depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
+	uint32_t depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
 
 	for (int f = frame - 1; f >= 0; f--)
 	{

Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/swf_function.h	20 Mar 2007 15:01:20 -0000	1.11
+++ server/swf_function.h	11 Apr 2007 17:54:21 -0000	1.12
@@ -71,12 +71,12 @@
 	};
 	std::vector<arg_spec>	m_args;
 	bool	m_is_function2;
-	uint8	m_local_register_count;
+	uint8_t	m_local_register_count;
 
 	/// used by function2 to control implicit arg register assignments
 	// 
 	/// See http://sswf.sourceforge.net/SWFalexref.html#action_declare_function2
-	uint16	m_function2_flags;
+	uint16_t	m_function2_flags;
 
 	/// Return a pointer to the given object's superclass interface
 	//
@@ -205,9 +205,9 @@
 
 	void	set_is_function2() { m_is_function2 = true; }
 
-	void	set_local_register_count(uint8 ct) { assert(m_is_function2); m_local_register_count = ct; }
+	void	set_local_register_count(uint8_t ct) { assert(m_is_function2); m_local_register_count = ct; }
 
-	void	set_function2_flags(uint16 flags) { assert(m_is_function2); m_function2_flags = flags; }
+	void	set_function2_flags(uint16_t flags) { assert(m_is_function2); m_function2_flags = flags; }
 
 	void	add_arg(int arg_register, const char* name)
 	{

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/textformat.cpp	8 Apr 2007 15:00:12 -0000	1.23
+++ server/textformat.cpp	11 Apr 2007 17:54:21 -0000	1.24
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: textformat.cpp,v 1.23 2007/04/08 15:00:12 nihilus Exp $
+// $Id: textformat.cpp,v 1.24 2007/04/11 17:54:21 bjacques Exp $
 //
 
 #include "log.h"
@@ -185,7 +185,7 @@
 
   if (obj->get_member("color", &method)) {
     //log_msg("Color exists and is set to %f\n", method.to_number());
-    obj->obj.colorSet((uint32)method.to_number());
+    obj->obj.colorSet((uint32_t)method.to_number());
   }
 
   if (obj->get_member("indent", &method)) {

Index: server/textformat.h
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/textformat.h	8 Apr 2007 15:00:12 -0000	1.14
+++ server/textformat.h	11 Apr 2007 17:54:21 -0000	1.15
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: textformat.h,v 1.14 2007/04/08 15:00:12 nihilus Exp $
+// $Id: textformat.h,v 1.15 2007/04/11 17:54:21 bjacques Exp $
 //
 
 #ifndef __TEXTFORMAT_H__
@@ -58,7 +58,7 @@
 	//
 	/// A number containing three 8-bit RGB components; for example,
         /// 0xFF0000 is red, 0x00FF00 is green.
-	uint32 color() const { return _color; }
+	uint32_t color() const { return _color; }
 
 	/// \brief
 	/// Return ann integer that indicates the indentation from the left
@@ -98,7 +98,7 @@
 	void italicedSet(bool x)     { _italic = x; }
 	void boldSet(bool x)         { _bold = x; }
 	void bulletSet(bool x)       { _bullet = x; }
-	void colorSet(uint32 x)      { _color = x; }
+	void colorSet(uint32_t x)      { _color = x; }
 	void indentSet(float x)      { _indent = x; }
 
 	void alignSet(const std::string& x)  { _align = x; }
@@ -151,7 +151,7 @@
 	//
 	/// A number containing three 8-bit RGB components; for example,
         /// 0xFF0000 is red, 0x00FF00 is green.
-	uint32	_color;	
+	uint32_t	_color;	
 
 	// The name of a font for text as a string.
 	std::string _font;	

Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/timers.cpp	5 Apr 2007 07:31:28 -0000	1.28
+++ server/timers.cpp	11 Apr 2007 17:54:21 -0000	1.29
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: timers.cpp,v 1.28 2007/04/05 07:31:28 strk Exp $ */
+/* $Id: timers.cpp,v 1.29 2007/04/11 17:54:21 bjacques Exp $ */
 
 #include "timers.h"
 #include "as_function.h" // for class as_function
@@ -89,7 +89,7 @@
 {
 	if (_start)
 	{
-		uint64 now = tu_timer::get_profile_ticks();
+		uint64_t now = tu_timer::get_profile_ticks();
 		//log_msg("now: %lu", now);
 		assert(now > _start);
 

Index: server/timers.h
===================================================================
RCS file: /sources/gnash/gnash/server/timers.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/timers.h	5 Apr 2007 07:31:28 -0000	1.18
+++ server/timers.h	11 Apr 2007 17:54:21 -0000	1.19
@@ -143,10 +143,10 @@
       void start();
 
       /// Number of microseconds between expirations 
-      uint64 _interval;
+      uint64_t _interval;
 
       /// Number of microseconds since epoch at Timer start
-      uint64 _start;
+      uint64_t _start;
 
       /// The associated function, stored in an intrusive pointer
       boost::intrusive_ptr<as_function> _function;

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/NetStreamFfmpeg.cpp	11 Apr 2007 13:03:45 -0000	1.36
+++ server/asobj/NetStreamFfmpeg.cpp	11 Apr 2007 17:54:21 -0000	1.37
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.36 2007/04/11 13:03:45 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.37 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -684,7 +684,7 @@
 }
 
 // audio callback is running in sound handler thread
-bool NetStreamFfmpeg::audio_streamer(void *owner, uint8 *stream, int len)
+bool NetStreamFfmpeg::audio_streamer(void *owner, uint8_t *stream, int len)
 {
 	NetStreamFfmpeg* ns = static_cast<NetStreamFfmpeg*>(owner);
 

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/NetStreamFfmpeg.h	10 Apr 2007 21:31:00 -0000	1.21
+++ server/asobj/NetStreamFfmpeg.h	11 Apr 2007 17:54:21 -0000	1.22
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetStreamFfmpeg.h,v 1.21 2007/04/10 21:31:00 tgc Exp $ */
+/* $Id: NetStreamFfmpeg.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifndef __NETSTREAMFFMPEG_H__
 #define __NETSTREAMFFMPEG_H__
@@ -210,7 +210,7 @@
 
 	static void startPlayback(NetStreamFfmpeg* ns);
 	static void av_streamer(NetStreamFfmpeg* ns);
-	static bool audio_streamer(void *udata, uint8 *stream, int len);
+	static bool audio_streamer(void *udata, uint8_t *stream, int len);
 
 private:
 

Index: server/asobj/SoundFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/SoundFfmpeg.h	9 Mar 2007 14:38:29 -0000	1.2
+++ server/asobj/SoundFfmpeg.h	11 Apr 2007 17:54:21 -0000	1.3
@@ -58,7 +58,7 @@
 	static offset_t seekMedia(void *opaque, offset_t offset, int whence);
 
 	static void setupDecoder(SoundFfmpeg* so);
-	static bool getAudio(void *owner, uint8 *stream, int len);
+	static bool getAudio(void *owner, uint8_t *stream, int len);
 private:
 
 	// audio

Index: server/asobj/SoundGst.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/SoundGst.h	14 Feb 2007 20:41:48 -0000	1.1
+++ server/asobj/SoundGst.h	11 Apr 2007 17:54:21 -0000	1.2
@@ -54,7 +54,7 @@
 	static int seekMedia(void *opaque, int offset, int whence);
 
 	static void setupDecoder(SoundGst* so);
-	static bool getAudio(void *owner, uint8 *stream, int len);
+	static bool getAudio(void *owner, uint8_t *stream, int len);
 
 	static void callback_newpad (GstElement *decodebin, GstPad *pad, gboolean last, gpointer data);
 private:

Index: server/asobj/SoundMad.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/SoundMad.h	14 Feb 2007 20:41:48 -0000	1.1
+++ server/asobj/SoundMad.h	11 Apr 2007 17:54:21 -0000	1.2
@@ -50,7 +50,7 @@
 	unsigned int getPosition();
 
 	static void setupDecoder(SoundMad* so);
-	static bool getAudio(void *owner, uint8 *stream, int len);
+	static bool getAudio(void *owner, uint8_t *stream, int len);
 private:
 
 	long inputPos;

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/parser/action_buffer.cpp	28 Feb 2007 09:46:48 -0000	1.14
+++ server/parser/action_buffer.cpp	11 Apr 2007 17:54:21 -0000	1.15
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: action_buffer.cpp,v 1.14 2007/02/28 09:46:48 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.15 2007/04/11 17:54:21 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -114,7 +114,7 @@
     // Actual processing.
     size_t i = start_pc;
     uint16_t length = uint16_t(read_int16(i+1));
-    uint16 count = uint16_t(read_int16(i+3)); 
+    uint16_t count = uint16_t(read_int16(i+3)); 
     i += 2;
     
 //log_msg("Start at %d, stop at %d, length read was %d, count read was %d", start_pc, stop_pc, length, count);
@@ -280,7 +280,7 @@
 		    // wacky format: 45670123
 		    union {
 			double	d;
-			uint64	i;
+			uint64_t	i;
 			struct {
 			    uint32_t	lo;
 			    uint32_t	hi;
@@ -295,7 +295,7 @@
 		    
 		    dbglogfile << "(double) " << u.d << endl;
 		} else if (type == 7) {
-		    // int32
+		    // int32_t
 		    int32_t	val = instruction_data[3 + i]
 			| (instruction_data[3 + i + 1] << 8)
 			| (instruction_data[3 + i + 2] << 16)
@@ -352,7 +352,7 @@
 		       << " arg_count = " << arg_count
 		       << " reg_count = " << reg_count << endl;
 	    
-	    uint16	flags = (instruction_data[3 + i]) | (instruction_data[3 + i + 1] << 8);
+	    uint16_t	flags = (instruction_data[3 + i]) | (instruction_data[3 + i + 1] << 8);
 	    i += 2;
 	    
 	    // @@ What is the difference between "super" and "_parent"?
@@ -435,7 +435,7 @@
 	// wacky format: 45670123
 	union {
 		double	d;
-		uint64	i;
+		uint64_t	i;
 		struct {
 			uint32_t	lo;
 			uint32_t	hi;

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/parser/movie_def_impl.h	10 Apr 2007 15:48:39 -0000	1.36
+++ server/parser/movie_def_impl.h	11 Apr 2007 17:54:22 -0000	1.37
@@ -263,7 +263,7 @@
 
 
 	int	m_loading_sound_stream;
-	uint32	m_file_length;
+	uint32_t	m_file_length;
 
 	std::auto_ptr<jpeg::input> m_jpeg_in;
 

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/PlaceObject2Tag.cpp	11 Apr 2007 14:20:21 -0000	1.1
+++ server/swf/PlaceObject2Tag.cpp	11 Apr 2007 17:54:22 -0000	1.2
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: PlaceObject2Tag.cpp,v 1.1 2007/04/11 14:20:21 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -104,7 +104,7 @@
 			break;
 		}
 
-		uint8 ch = key::INVALID;
+		uint8_t ch = key::INVALID;
 
 		if (flags & (1 << 17))	// has keypress event
 		{
@@ -385,10 +385,10 @@
     }
 }
 
-uint32
+uint32_t
 PlaceObject2Tag::get_depth_id_of_replace_or_add_tag() const
 {
-	uint32 depthid = 0;
+	uint32_t depthid = 0;
 	if (m_place_type == PLACE || m_place_type == REPLACE)
 	{
 		int id = -1;

Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/PlaceObject2Tag.h	11 Apr 2007 14:20:21 -0000	1.1
+++ server/swf/PlaceObject2Tag.h	11 Apr 2007 17:54:22 -0000	1.2
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: PlaceObject2Tag.h,v 1.1 2007/04/11 14:20:21 strk Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
 
 #ifndef GNASH_SWF_PLACEOBJECT2TAG_H
 #define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -31,7 +31,7 @@
 #include "swf.h" // for tag_type definition
 #include "matrix.h" // for composition
 #include "cxform.h" // for composition 
-#include "tu_types.h" // for uint16_t, uint32 etc. definition 
+#include "tu_types.h" // for uint16_t, uint32_t etc. definition 
 
 //#include <boost/ptr_container/ptr_vector.hpp>
 #include <vector>
@@ -122,7 +122,7 @@
 
 	void execute_state_reverse(sprite_instance* m, int frame);
     
-	uint32	get_depth_id_of_replace_or_add_tag() const;
+	uint32_t	get_depth_id_of_replace_or_add_tag() const;
 };
 
 } // namespace gnash::SWF::tag_loaders

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- server/vm/ASHandlers.cpp	10 Apr 2007 21:44:14 -0000	1.86
+++ server/vm/ASHandlers.cpp	11 Apr 2007 17:54:22 -0000	1.87
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.86 2007/04/10 21:44:14 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.87 2007/04/11 17:54:22 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -634,7 +634,7 @@
 	// skip the specified number of actions.
 	//
 	unsigned int framenum = code.read_int16(thread.pc+3);
-	uint8 skip = code[thread.pc+5];
+	uint8_t skip = code[thread.pc+5];
 
 	character* target = env.get_target();
 	sprite_instance* target_sprite = target->to_movie();
@@ -1464,7 +1464,7 @@
 	thread.ensureStack(1); // expression
 
 	// how many actions to skip if frame has not been loaded
-	uint8 skip = code[thread.pc+3];
+	uint8_t skip = code[thread.pc+3];
 
 	// env.top(0) contains frame specification,
 	// evaluated as for ActionGotoExpression
@@ -1534,7 +1534,7 @@
 		"register",	// 4
 		"bool",		// 5
 		"double",	// 6
-		"int32",	// 7
+		"int32_t",	// 7
 		"dict8",	// 8
 		"dict16"	// 9
 	};
@@ -3203,7 +3203,7 @@
 	//cerr << " nargs:" << nargs << endl;
 
 	// Get the count of local registers used by this function.
-	uint8 register_count = code[i];
+	uint8_t register_count = code[i];
 	i++;
 
 	//cerr << " nregisters:" << nargs << endl;
@@ -3211,7 +3211,7 @@
 	func->set_local_register_count(register_count);
 
 	// Flags, for controlling register assignment of implicit args.
-	uint16	flags = code.read_int16(i);
+	uint16_t	flags = code.read_int16(i);
 	i += 2;
 
 	func->set_function2_flags(flags);
@@ -3219,7 +3219,7 @@
 	// Get the register assignments and names of the arguments.
 	for (unsigned n = 0; n < nargs; n++)
 	{
-		uint8 arg_register = code[i];
+		uint8_t arg_register = code[i];
 		++i;
 	
 		// @@ security: watch out for possible missing terminator here!



From MAILER-DAEMON Wed Apr 11 21:08:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbnnQ-0003Wp-EC
	for mharc-gnash-commit@gnu.org; Wed, 11 Apr 2007 21:08:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbnnO-0003WL-Ff
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 21:08:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbnnM-0003Vt-OO
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 21:08:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbnnM-0003Vq-Kb
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 21:08:16 -0400
Received: from py-out-1112.google.com ([64.233.166.180])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HbnjE-0002c9-OG
	for gnash-commit@gnu.org; Wed, 11 Apr 2007 21:04:01 -0400
Received: by py-out-1112.google.com with SMTP id u77so453846pyb
	for <gnash-commit@gnu.org>; Wed, 11 Apr 2007 18:04:00 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=MK1/dMMzvFnACDGPJggqiG9QH6vBb0hsLaNuGJf1IxTBJpiWpNulSXW8nd9Mj4UrNXP7K3umpQu6x8G4opCOdkgob5QQ/lBD0y0jeoOLbJHN4NYqbiNCggHIKyCBzYl8jkFgqDNmC655uJL7OCTm3+q3gajdbt0i8g7ns4ZSadI=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=NHGmb0XWA2SCQWPJrKl7zUONjF+mkSikvGWK/AeiJi8ghDQT+AXBI/zUu61JgCdJmHJsTOdK4wOB4vpmYvwBHpsg/PC9EzbXF52fvzkARV3t9frLza0UwKcHM0gqBEfO37ArZc4HnjSQBF0PranKm02XD+AeHyLuYaAL0ekolVI=
Received: by 10.114.195.19 with SMTP id s19mr530134waf.1176339839582;
	Wed, 11 Apr 2007 18:03:59 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Wed, 11 Apr 2007 18:03:59 -0700 (PDT)
Message-ID: <ca4b43ff0704111803m4b8892aey1b82d6e609dfe07a@mail.gmail.com>
Date: Thu, 12 Apr 2007 09:03:59 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Bastiaan Jacques" <bastiaan@bjacques.org>
Subject: Re: [Gnash-commit] gnash ChangeLog backend/render_handler_ogl.cpp ...
In-Reply-To: <E1Hbh1T-0002NS-5y@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hbh1T-0002NS-5y@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 01:08:18 -0000

yeah, mix using  uint*  and uint*_t was really bad, and that often
caused  either "type redefinition" or "undefined type" here.  Not
mixing them is good to me!


On 4/12/07, Bastiaan Jacques <bastiaan@bjacques.org> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Bastiaan Jacques <bjacques>     07/04/11 17:54:22
>
> Modified files:
>        .              : ChangeLog
>        backend        : render_handler_ogl.cpp sound_handler.h
>        libbase        : container.cpp container.h image.cpp
>                         triangulate.h triangulate_impl.h
>                         triangulate_sint32.cpp tu_file.h tu_random.cpp
>                         tu_swap.h tu_timer.cpp tu_timer.h tu_types.cpp
>                         tu_types.h
>        libgeometry    : geometry.cpp kd_tree_packed.cpp
>        plugin         : plugin.cpp plugin.h
>        plugin/win32   : plugin.cpp plugin.h
>        server         : as_value.h execute_tag.h sprite_instance.cpp
>                         swf_function.h textformat.cpp textformat.h
>                         timers.cpp timers.h
>        server/asobj   : NetStreamFfmpeg.cpp NetStreamFfmpeg.h
>                         SoundFfmpeg.h SoundGst.h SoundMad.h
>        server/parser  : action_buffer.cpp movie_def_impl.h
>        server/swf     : PlaceObject2Tag.cpp PlaceObject2Tag.h
>        server/vm      : ASHandlers.cpp
>
> Log message:
>        Replace SDL integer type names by standard ones.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2852&r2=1.2853
> http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_ogl.cpp?cvsroot=gnash&r1=1.71&r2=1.72
> http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler.h?cvsroot=gnash&r1=1.2&r2=1.3
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.cpp?cvsroot=gnash&r1=1.12&r2=1.13
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.51&r2=1.52
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.18&r2=1.19
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate.h?cvsroot=gnash&r1=1.3&r2=1.4
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.21&r2=1.22
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_sint32.cpp?cvsroot=gnash&r1=1.5&r2=1.6
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.11&r2=1.12
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_random.cpp?cvsroot=gnash&r1=1.6&r2=1.7
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.6&r2=1.7
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.cpp?cvsroot=gnash&r1=1.5&r2=1.6
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.h?cvsroot=gnash&r1=1.3&r2=1.4
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.cpp?cvsroot=gnash&r1=1.4&r2=1.5
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.32&r2=1.33
> http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/geometry.cpp?cvsroot=gnash&r1=1.8&r2=1.9
> http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/kd_tree_packed.cpp?cvsroot=gnash&r1=1.10&r2=1.11
> http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.73&r2=1.74
> http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.h?cvsroot=gnash&r1=1.29&r2=1.30
> http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.5&r2=1.6
> http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.h?cvsroot=gnash&r1=1.3&r2=1.4
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.41&r2=1.42
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/execute_tag.h?cvsroot=gnash&r1=1.10&r2=1.11
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.232&r2=1.233
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.11&r2=1.12
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.23&r2=1.24
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.h?cvsroot=gnash&r1=1.14&r2=1.15
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.28&r2=1.29
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.h?cvsroot=gnash&r1=1.18&r2=1.19
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.36&r2=1.37
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.21&r2=1.22
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.h?cvsroot=gnash&r1=1.2&r2=1.3
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.h?cvsroot=gnash&r1=1.1&r2=1.2
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.h?cvsroot=gnash&r1=1.1&r2=1.2
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.14&r2=1.15
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.36&r2=1.37
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.1&r2=1.2
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.1&r2=1.2
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.86&r2=1.87
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2852
> retrieving revision 1.2853
> diff -u -b -r1.2852 -r1.2853
> --- ChangeLog   11 Apr 2007 17:44:35 -0000      1.2852
> +++ ChangeLog   11 Apr 2007 17:54:21 -0000      1.2853
> @@ -64,6 +64,7 @@
>        video image if it extends beyond the width of our buffer.
>        * gui/fltk.cpp: Fix compilation by adding statics for GUI methods
>        that became nonstatic. Also fix some warnings.
> +       * all over the place: Replace SDL integer type names by standard ones.
>
>  2007-04-11 Sandro Santilli <strk@keybit.net>
>
>
> Index: backend/render_handler_ogl.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/backend/render_handler_ogl.cpp,v
> retrieving revision 1.71
> retrieving revision 1.72
> diff -u -b -r1.71 -r1.72
> --- backend/render_handler_ogl.cpp      10 Apr 2007 18:18:45 -0000      1.71
> +++ backend/render_handler_ogl.cpp      11 Apr 2007 17:54:21 -0000      1.72
> @@ -5,7 +5,7 @@
>
>  // A render_handler that uses SDL & OpenGL
>
> -/* $Id: render_handler_ogl.cpp,v 1.71 2007/04/10 18:18:45 rsavoye Exp $ */
> +/* $Id: render_handler_ogl.cpp,v 1.72 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -910,7 +910,7 @@
>
>  */
>
> -void   hardware_resample(int bytes_per_pixel, int src_width, int src_height, uint8* src_data, int dst_width, int dst_height)
> +void   hardware_resample(int bytes_per_pixel, int src_width, int src_height, uint8_t* src_data, int dst_width, int dst_height)
>  // Code from Alex Streit
>  //
>  // Sets the current texture to a resampled/expanded version of the
> @@ -967,7 +967,7 @@
>     int src_width,
>     int src_height,
>     int src_pitch,
> -    uint8* src_data,
> +    uint8_t* src_data,
>     int dst_width,
>     int dst_height)
>  // Code from Alex Streit
>
> Index: backend/sound_handler.h
> ===================================================================
> RCS file: /sources/gnash/gnash/backend/sound_handler.h,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- backend/sound_handler.h     27 Feb 2007 09:54:48 -0000      1.2
> +++ backend/sound_handler.h     11 Apr 2007 17:54:21 -0000      1.3
> @@ -17,7 +17,7 @@
>  //
>  //
>
> -/* $Id: sound_handler.h,v 1.2 2007/02/27 09:54:48 strk Exp $ */
> +/* $Id: sound_handler.h,v 1.3 2007/04/11 17:54:21 bjacques Exp $ */
>
>  /// \page sound_handler_intro Sound handler introduction
>  ///
> @@ -52,7 +52,7 @@
>  {
>  public:
>
> -       typedef bool (*aux_streamer_ptr)(void *udata, uint8 *stream, int len);
> +       typedef bool (*aux_streamer_ptr)(void *udata, uint8_t *stream, int len);
>
>        struct sound_envelope
>        {
>
> Index: libbase/container.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/container.cpp,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -b -r1.12 -r1.13
> --- libbase/container.cpp       17 Sep 2006 19:45:59 -0000      1.12
> +++ libbase/container.cpp       11 Apr 2007 17:54:21 -0000      1.13
> @@ -17,18 +17,18 @@
>  #include "utf8.h"
>  #include "tu_random.h"
>
> -void tu_string::append_wide_char(uint16 c)
> +void tu_string::append_wide_char(uint16_t c)
>  {
>        char buf[8];
>        int index = 0;
> -       utf8::encode_unicode_character(buf, &index, (uint32) c);
> +       utf8::encode_unicode_character(buf, &index, (uint32_t) c);
>        buf[index] = '\0';
>
>        *this += buf;
>  }
>
>
> -void tu_string::append_wide_char(uint32 c)
> +void tu_string::append_wide_char(uint32_t c)
>  {
>        char buf[8];
>        int index = 0;
> @@ -160,15 +160,15 @@
>        assert(result->length() == (int) strlen(result->c_str()));
>  }
>
> -void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32* wstr)
> +void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr)
>  {
> -       encode_utf8_from_wchar_generic<uint32>(result, wstr);
> +       encode_utf8_from_wchar_generic<uint32_t>(result, wstr);
>  }
>
>
> -void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16* wstr)
> +void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr)
>  {
> -       encode_utf8_from_wchar_generic<uint16>(result, wstr);
> +       encode_utf8_from_wchar_generic<uint16_t>(result, wstr);
>  }
>
>
> @@ -178,10 +178,10 @@
>  }
>
>
> -uint32 tu_string::utf8_char_at(int index) const
> +uint32_t       tu_string::utf8_char_at(int index) const
>  {
>        const char*     buf = get_buffer();
> -       uint32  c;
> +       uint32_t        c;
>
>        do
>        {
> @@ -207,7 +207,7 @@
>        tu_string str;
>        for (;;)
>        {
> -               uint32 c = utf8::decode_next_unicode_character(&buf);
> +               uint32_t c = utf8::decode_next_unicode_character(&buf);
>
>                if (c == 0)
>                {
> @@ -227,7 +227,7 @@
>        tu_string str;
>        for (;;)
>        {
> -               uint32 c = utf8::decode_next_unicode_character(&buf);
> +               uint32_t c = utf8::decode_next_unicode_character(&buf);
>
>                if (c == 0) {
>                        // We've hit the end of the string; don't go further.
> @@ -247,7 +247,7 @@
>
>        while (p - buf < buflen)
>        {
> -               uint32  c = utf8::decode_next_unicode_character(&p);
> +               uint32_t        c = utf8::decode_next_unicode_character(&p);
>                if (c == 0)
>                {
>                        break;
> @@ -282,7 +282,7 @@
>                        start_pointer = p;
>                }
>
> -               uint32  c = utf8::decode_next_unicode_character(&p);
> +               uint32_t        c = utf8::decode_next_unicode_character(&p);
>                index++;
>
>                if (index == end)
> @@ -424,23 +424,23 @@
>  // still 33% slower in my tests.
>
>  // // tu's hash
> -#define HASH hash<uint32, uint32 >
> +#define HASH hash<uint32_t, uint32_t >
>  #define HASH_ADD(h, k, v) h.add(k, v)
>
>  // STL's hash
> -//#define HASH __gnu_cxx::hash_map<uint32, uint32>
> -//#define HASH std::hash_map<uint32, uint32>
> +//#define HASH __gnu_cxx::hash_map<uint32_t, uint32_t>
> +//#define HASH std::hash_map<uint32_t, uint32_t>
>  //#define HASH_ADD(h, k, v) h[k] = v
>
>  // STL's map
> -//#define HASH std::map<uint32, uint32>
> +//#define HASH std::map<uint32_t, uint32_t>
>  //#define HASH_ADD(h, k, v) h[k] = v
>
>  //     const int       SIZE = 10000000;
>        const int       SIZE = 1000000;
>
>        // Make an array of random numbers.
> -       std::vector<uint32>     numbers;
> +       std::vector<uint32_t>   numbers;
>        numbers.resize(SIZE);
>
>        for (int i = 0, n = numbers.size(); i < n; i++)
>
> Index: libbase/container.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/container.h,v
> retrieving revision 1.51
> retrieving revision 1.52
> diff -u -b -r1.51 -r1.52
> --- libbase/container.h 12 Feb 2007 01:32:46 -0000      1.51
> +++ libbase/container.h 11 Apr 2007 17:54:21 -0000      1.52
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: container.h,v 1.51 2007/02/12 01:32:46 nihilus Exp $ */
> +/* $Id: container.h,v 1.52 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifndef __CONTAINER_H__
>  #define __CONTAINER_H__
> @@ -736,14 +736,14 @@
>                resize(str.size());
>                strcpy(get_buffer(), str.get_buffer());
>        }
> -       tu_string(const uint32* wide_char_str)
> +       tu_string(const uint32_t* wide_char_str)
>        {
>                m_local.m_size = 1;
>                m_local.m_buffer[0] = '\0';
>
>                *this = wide_char_str;
>        }
> -       tu_string(const uint16* wide_char_str)
> +       tu_string(const uint16_t* wide_char_str)
>        {
>                m_local.m_size = 1;
>                m_local.m_buffer[0] = '\0';
> @@ -850,8 +850,8 @@
>        }
>
>        // Append wide char.  Both versions of wide char.
> -       void    append_wide_char(uint16 ch);
> -       void    append_wide_char(uint32 ch);
> +       void    append_wide_char(uint16_t ch);
> +       void    append_wide_char(uint32_t ch);
>
>        void    operator+=(const tu_string& str)
>        {
> @@ -901,8 +901,8 @@
>        //
>        // Could add operator= overloads, but maybe it's better to
>        // keep this very explicit.
> -       static void     encode_utf8_from_wchar(tu_string* result, const uint32* wstr);
> -       static void     encode_utf8_from_wchar(tu_string* result, const uint16* wstr);
> +       static void     encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr);
> +       static void     encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr);
>
>        // Utility: case-insensitive string compare.  stricmp() is not
>        // ANSI or POSIX, doesn't seem to appear in Linux.
> @@ -910,7 +910,7 @@
>
>        // Return the Unicode char at the specified character
>        // position.  index is in UTF-8 chars, NOT bytes.
> -       uint32  utf8_char_at(int index) const;
> +       uint32_t        utf8_char_at(int index) const;
>
>        // Return the string in this container as all upper case letters
>        tu_string utf8_to_upper() const;
>
> Index: libbase/image.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/image.cpp,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -b -r1.18 -r1.19
> --- libbase/image.cpp   10 Apr 2007 20:24:23 -0000      1.18
> +++ libbase/image.cpp   11 Apr 2007 17:54:21 -0000      1.19
> @@ -424,7 +424,7 @@
>
>                for (int y = 0; y < im->m_height; y++)
>                {
> -                       uint8*  p = scanline(im, y);
> +                       uint8_t*        p = scanline(im, y);
>                        for (int x = 0; x < im->m_width; x++)
>                        {
>                                out->write_byte(p[x * 4]);
>
> Index: libbase/triangulate.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/triangulate.h,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- libbase/triangulate.h       25 Feb 2006 03:54:03 -0000      1.3
> +++ libbase/triangulate.h       11 Apr 2007 17:54:21 -0000      1.4
> @@ -37,19 +37,19 @@
>
>        // Version using short coords
>        void    compute(
> -               std::vector<sint16>* results,   // indexed trilist
> +               std::vector<int16_t>* results,  // indexed trilist
>                int path_count,
> -               const std::vector<sint16> paths[],
> +               const std::vector<int16_t> paths[],
>                int debug_halt_step = -1,
> -               std::vector<sint16>* debug_remaining_loop = NULL);
> +               std::vector<int16_t>* debug_remaining_loop = NULL);
>
>        // Version using int coords
>        void    compute(
> -               std::vector<sint32>* results,   // indexed trilist
> +               std::vector<int32_t>* results,  // indexed trilist
>                int path_count,
> -               const std::vector<sint32> paths[],
> +               const std::vector<int32_t> paths[],
>                int debug_halt_step = -1,
> -               std::vector<sint32>* debug_remaining_loop = NULL);
> +               std::vector<int32_t>* debug_remaining_loop = NULL);
>  }
>
>
>
> Index: libbase/triangulate_impl.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -b -r1.21 -r1.22
> --- libbase/triangulate_impl.h  12 Oct 2006 14:05:42 -0000      1.21
> +++ libbase/triangulate_impl.h  11 Apr 2007 17:54:21 -0000      1.22
> @@ -24,7 +24,7 @@
>  // code, see the FIST web page at:
>  // http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
>
> -/* $Id: triangulate_impl.h,v 1.21 2006/10/12 14:05:42 nihilus Exp $ */
> +/* $Id: triangulate_impl.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #include "utility.h"
>  #include "triangulate.h"
> @@ -37,7 +37,7 @@
>  #include "tu_timer.h"
>  #endif // PROFILE_TRIANGULATE
>
> -// Template this whole thing on coord_t, so sint16 and float versions
> +// Template this whole thing on coord_t, so int16_t and float versions
>  // can easily reuse the code.
>  //
>  // These templates are instantiated in triangulate_<type>.cpp files.
> @@ -72,10 +72,10 @@
>  }
>
>
> -inline sint64  determinant_sint32(const vec2<sint32>& a, const vec2<sint32>& b, const vec2<sint32>& c)
> +inline int64_t determinant_sint32(const vec2<int32_t>& a, const vec2<int32_t>& b, const vec2<int32_t>& c)
>  {
> -       return (sint64(b.x) - sint64(a.x)) * (sint64(c.y) - sint64(a.y))
> -               - (sint64(b.y) - sint64(a.y)) * (sint64(c.x) - sint64(a.x));
> +       return (int64_t(b.x) - int64_t(a.x)) * (int64_t(c.y) - int64_t(a.y))
> +               - (int64_t(b.y) - int64_t(a.y)) * (int64_t(c.x) - int64_t(a.x));
>  }
>
>
> @@ -101,10 +101,10 @@
>
>
>  template<>
> -inline int     vertex_left_test(const vec2<sint32>& a, const vec2<sint32>& b, const vec2<sint32>& c)
> -// Specialize for vec2<sint32>
> +inline int     vertex_left_test(const vec2<int32_t>& a, const vec2<int32_t>& b, const vec2<int32_t>& c)
> +// Specialize for vec2<int32_t>
>  {
> -       sint64  det = determinant_sint32(a, b, c);
> +       int64_t det = determinant_sint32(a, b, c);
>        if (det > 0) return 1;
>        else if (det < 0) return -1;
>        else return 0;
> @@ -298,10 +298,10 @@
>
>
>  template<>
> -inline bool    edges_intersect_sub(const std::vector<poly_vert<sint32> >& sorted_verts, int e0v0i, int e0v1i, int e1v0i, int e1v1i)
> +inline bool    edges_intersect_sub(const std::vector<poly_vert<int32_t> >& sorted_verts, int e0v0i, int e0v1i, int e1v0i, int e1v1i)
>  // Return true if edge (e0v0,e0v1) intersects (e1v0,e1v1).
>  //
> -// Specialized for sint32
> +// Specialized for int32_t
>  {
>        // If e1v0,e1v1 are on opposite sides of e0, and e0v0,e0v1 are
>        // on opposite sides of e1, then the segments cross.  These
> @@ -312,10 +312,10 @@
>        //
>        // If only one is degenerate, our tests are still OK.
>
> -       const vec2<sint32>&     e0v0 = sorted_verts[e0v0i].m_v;
> -       const vec2<sint32>&     e0v1 = sorted_verts[e0v1i].m_v;
> -       const vec2<sint32>&     e1v0 = sorted_verts[e1v0i].m_v;
> -       const vec2<sint32>&     e1v1 = sorted_verts[e1v1i].m_v;
> +       const vec2<int32_t>&    e0v0 = sorted_verts[e0v0i].m_v;
> +       const vec2<int32_t>&    e0v1 = sorted_verts[e0v1i].m_v;
> +       const vec2<int32_t>&    e1v0 = sorted_verts[e1v0i].m_v;
> +       const vec2<int32_t>&    e1v1 = sorted_verts[e1v1i].m_v;
>
>        if (e0v0.x == e0v1.x && e0v0.y == e0v1.y)
>        {
> @@ -330,8 +330,8 @@
>        }
>
>        // See if e1 crosses line of e0.
> -       sint64  det10 = determinant_sint32(e0v0, e0v1, e1v0);
> -       sint64  det11 = determinant_sint32(e0v0, e0v1, e1v1);
> +       int64_t det10 = determinant_sint32(e0v0, e0v1, e1v0);
> +       int64_t det11 = determinant_sint32(e0v0, e0v1, e1v1);
>
>        // Note: we do > 0, which means a vertex on a line counts as
>        // intersecting.  In general, if one vert is on the other
> @@ -346,8 +346,8 @@
>        }
>
>        // See if e0 crosses line of e1.
> -       sint64  det00 = determinant_sint32(e1v0, e1v1, e0v0);
> -       sint64  det01 = determinant_sint32(e1v0, e1v1, e0v1);
> +       int64_t det00 = determinant_sint32(e1v0, e1v1, e0v0);
> +       int64_t det01 = determinant_sint32(e1v0, e1v1, e0v1);
>
>        if (det00 * det01 > 0)
>        {
> @@ -2222,7 +2222,7 @@
>        }
>
>  #ifdef PROFILE_TRIANGULATE
> -       uint64  start_ticks = tu_timer::get_profile_ticks();
> +       uint64_t        start_ticks = tu_timer::get_profile_ticks();
>  #endif // PROFILE_TRIANGULATE
>
>        // Local generator, for some parts of the algo that need random numbers.
> @@ -2244,7 +2244,7 @@
>        }
>
>  #ifdef PROFILE_TRIANGULATE
> -       uint64  join_ticks = tu_timer::get_profile_ticks();
> +       uint64_t        join_ticks = tu_timer::get_profile_ticks();
>        fprintf(stderr, "join poly = %1.6f sec\n", tu_timer::profile_ticks_to_seconds(join_ticks - start_ticks));
>  #endif // PROFILE_TRIANGULATE
>
> @@ -2377,7 +2377,7 @@
>        }
>
>  #ifdef PROFILE_TRIANGULATE
> -       uint64  clip_ticks = tu_timer::get_profile_ticks();
> +       uint64_t        clip_ticks = tu_timer::get_profile_ticks();
>        fprintf(stderr, "clip poly = %1.6f sec\n", tu_timer::profile_ticks_to_seconds(clip_ticks - join_ticks));
>        fprintf(stderr, "total for poly = %1.6f sec\n", tu_timer::profile_ticks_to_seconds(clip_ticks - start_ticks));
>        fprintf(stderr, "vert count = %d, verts clipped / sec = %f\n",
>
> Index: libbase/triangulate_sint32.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/triangulate_sint32.cpp,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- libbase/triangulate_sint32.cpp      10 Feb 2007 18:33:03 -0000      1.5
> +++ libbase/triangulate_sint32.cpp      11 Apr 2007 17:54:21 -0000      1.6
> @@ -7,7 +7,7 @@
>  //
>  // Instantiate our templated algo from triangulate_inst.h
>
> -/* $Id: triangulate_sint32.cpp,v 1.5 2007/02/10 18:33:03 nihilus Exp $ */
> +/* $Id: triangulate_sint32.cpp,v 1.6 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #include "triangulate_impl.h"
>
> @@ -15,14 +15,14 @@
>
>  namespace triangulate
>  {
> -       // Version using sint32 coords
> +       // Version using int32_t coords
>        void    compute(
> -               std::vector<sint32>* result,    // trilist
> +               std::vector<int32_t>* result,   // trilist
>                int path_count,
> -               const std::vector<sint32> paths[],
> +               const std::vector<int32_t> paths[],
>                int debug_halt_step /* = -1 */,
> -               std::vector<sint32>* debug_remaining_loop /* = NULL */)
> +               std::vector<int32_t>* debug_remaining_loop /* = NULL */)
>        {
> -               compute_triangulation<sint32>(result, path_count, paths, debug_halt_step, debug_remaining_loop);
> +               compute_triangulation<int32_t>(result, path_count, paths, debug_halt_step, debug_remaining_loop);
>        }
>  }
>
> Index: libbase/tu_file.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -b -r1.11 -r1.12
> --- libbase/tu_file.h   9 Mar 2007 14:38:29 -0000       1.11
> +++ libbase/tu_file.h   11 Apr 2007 17:54:21 -0000      1.12
> @@ -87,16 +87,16 @@
>     // Returns number of bytes copied.
>     int        copy_bytes(tu_file* in, int bytes);
>
> -    uint64     read_le64();
> +    uint64_t   read_le64();
>     uint32_t   read_le32();
>     uint16_t   read_le16();
> -    uint64     read_be64();
> +    uint64_t   read_be64();
>     uint32_t   read_be32();
>     uint16_t   read_be16();
> -    void       write_le64(uint64 u);
> +    void       write_le64(uint64_t u);
>     void       write_le32(uint32_t u);
>     void       write_le16(uint16_t u);
> -    void       write_be64(uint64 u);
> +    void       write_be64(uint64_t u);
>     void       write_be32(uint32_t u);
>     void       write_be16(uint16_t u);
>
> @@ -146,8 +146,8 @@
>
>
>  private:
> -    uint64     read64() {
> -       uint64 u;
> +    uint64_t   read64() {
> +       uint64_t u;
>        m_read(&u, 8, m_data);
>        return u;
>     }
> @@ -167,7 +167,7 @@
>        return u;
>     }
>
> -    void       write64(uint64 u) {
> +    void       write64(uint64_t u) {
>        m_write(&u, 8, m_data);
>     }
>     void       write32(uint32_t u) {
> @@ -201,29 +201,29 @@
>
>
>  #if _TU_LITTLE_ENDIAN_
> -inline uint64  tu_file::read_le64() { return read64(); }
> +inline uint64_t        tu_file::read_le64() { return read64(); }
>  inline uint32_t        tu_file::read_le32() { return read32(); }
>  inline uint16_t        tu_file::read_le16() { return read16(); }
> -inline uint64  tu_file::read_be64() { return swap64(read64()); }
> +inline uint64_t        tu_file::read_be64() { return swap64(read64()); }
>  inline uint32_t        tu_file::read_be32() { return swap32(read32()); }
>  inline uint16_t        tu_file::read_be16() { return swap16(read16()); }
> -inline void    tu_file::write_le64(uint64 u) { write64(u); }
> +inline void    tu_file::write_le64(uint64_t u) { write64(u); }
>  inline void    tu_file::write_le32(uint32_t u) { write32(u); }
>  inline void    tu_file::write_le16(uint16_t u) { write16(u); }
> -inline void    tu_file::write_be64(uint64 u) { write64(swap64(u)); }
> +inline void    tu_file::write_be64(uint64_t u) { write64(swap64(u)); }
>  inline void    tu_file::write_be32(uint32_t u) { write32(swap32(u)); }
>  inline void    tu_file::write_be16(uint16_t u) { write16(swap16(u)); }
>  #else // not _TU_LITTLE_ENDIAN_
> -inline uint64  tu_file::read_le64() { return swap64(read64()); }
> +inline uint64_t        tu_file::read_le64() { return swap64(read64()); }
>  inline uint32_t        tu_file::read_le32() { return swap32(read32()); }
>  inline uint16_t        tu_file::read_le16() { return swap16(read16()); }
> -inline uint64  tu_file::read_be64() { return read64(); }
> +inline uint64_t        tu_file::read_be64() { return read64(); }
>  inline uint32_t        tu_file::read_be32() { return read32(); }
>  inline uint16_t        tu_file::read_be16() { return read16(); }
> -inline void    tu_file::write_le64(uint64 u) { write64(swap64(u)); }
> +inline void    tu_file::write_le64(uint64_t u) { write64(swap64(u)); }
>  inline void    tu_file::write_le32(uint32_t u) { write32(swap32(u)); }
>  inline void    tu_file::write_le16(uint16_t u) { write16(swap16(u)); }
> -inline void    tu_file::write_be64(uint64 u) { write64(u); }
> +inline void    tu_file::write_be64(uint64_t u) { write64(u); }
>  inline void    tu_file::write_be32(uint32_t u) { write32(u); }
>  inline void    tu_file::write_be16(uint16_t u) { write16(u); }
>  #endif // not _TU_LITTLE_ENDIAN_
> @@ -262,7 +262,7 @@
>  {
>     union {
>        double  d;
> -       uint64  l;
> +       uint64_t        l;
>     } u;
>     compiler_assert(sizeof(u) == sizeof(u.l));
>
> @@ -276,7 +276,7 @@
>  {
>     union {
>        double  d;
> -       uint64  l;
> +       uint64_t        l;
>     } u;
>     compiler_assert(sizeof(u) == sizeof(u.l));
>
>
> Index: libbase/tu_random.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_random.cpp,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -b -r1.6 -r1.7
> --- libbase/tu_random.cpp       28 Aug 2006 11:07:14 -0000      1.6
> +++ libbase/tu_random.cpp       11 Apr 2007 17:54:21 -0000      1.7
> @@ -52,14 +52,14 @@
>        // random number generator.  _Statistics and Probability Letters
>        // 8_ (1990), 35-39.
>
> -//     const uint64    a = 123471786;  // for SEED_COUNT=1024
> -//     const uint64    a = 123554632;  // for SEED_COUNT=512
> -//     const uint64    a = 8001634;    // for SEED_COUNT=255
> -//     const uint64    a = 8007626;    // for SEED_COUNT=128
> -//     const uint64    a = 647535442;  // for SEED_COUNT=64
> -//     const uint64    a = 547416522;  // for SEED_COUNT=32
> -//     const uint64    a = 487198574;  // for SEED_COUNT=16
> -       const uint64    a = 716514398;  // for SEED_COUNT=8
> +//     const uint64_t  a = 123471786;  // for SEED_COUNT=1024
> +//     const uint64_t  a = 123554632;  // for SEED_COUNT=512
> +//     const uint64_t  a = 8001634;    // for SEED_COUNT=255
> +//     const uint64_t  a = 8007626;    // for SEED_COUNT=128
> +//     const uint64_t  a = 647535442;  // for SEED_COUNT=64
> +//     const uint64_t  a = 547416522;  // for SEED_COUNT=32
> +//     const uint64_t  a = 487198574;  // for SEED_COUNT=16
> +       const uint64_t  a = 716514398;  // for SEED_COUNT=8
>
>
>        generator::generator()
> @@ -89,7 +89,7 @@
>        uint32_t        generator::next_random()
>        // Return the next pseudo-random number in the sequence.
>        {
> -               uint64  t;
> +               uint64_t        t;
>                uint32_t        x;
>
>                //static uint32_t       c = 362436;
>
> Index: libbase/tu_swap.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_swap.h,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -b -r1.6 -r1.7
> --- libbase/tu_swap.h   27 Jul 2006 08:37:45 -0000      1.6
> +++ libbase/tu_swap.h   11 Apr 2007 17:54:21 -0000      1.7
> @@ -52,7 +52,7 @@
>  #ifdef swap64
>  #undef swap64
>  #endif
> -inline uint64 swap64(uint64 u)
> +inline uint64_t swap64(uint64_t u)
>  {
>  #ifdef __GNUC__
>        return ((u & 0x00000000000000FFLL) << 56) |
> @@ -76,7 +76,7 @@
>  }
>
>
> -inline uint64  swap_le64(uint64 le_64)
> +inline uint64_t        swap_le64(uint64_t le_64)
>  // Given a 64-bit little-endian piece of data, return it as a 64-bit
>  // integer in native endian-ness.  I.e., do a swap if we're on a
>  // big-endian machine.
>
> Index: libbase/tu_timer.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_timer.cpp,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- libbase/tu_timer.cpp        25 Aug 2006 23:35:20 -0000      1.5
> +++ libbase/tu_timer.cpp        11 Apr 2007 17:54:21 -0000      1.6
> @@ -15,19 +15,19 @@
>  #include <Mmsystem.h>
>
>
> -uint64 tu_timer::get_ticks()
> +uint64_t tu_timer::get_ticks()
>  {
>        return timeGetTime();
>  }
>
>
> -double tu_timer::ticks_to_seconds(uint64 ticks)
> +double tu_timer::ticks_to_seconds(uint64_t ticks)
>  {
>        return ticks * (1.0f / 1000.f);
>  }
>
>
> -uint64 tu_timer::get_profile_ticks()
> +uint64_t       tu_timer::get_profile_ticks()
>  {
>        // @@ use rdtsc?
>
> @@ -38,7 +38,7 @@
>  }
>
>
> -double tu_timer::profile_ticks_to_seconds(uint64 ticks)
> +double tu_timer::profile_ticks_to_seconds(uint64_t ticks)
>  {
>        LARGE_INTEGER   freq;
>        QueryPerformanceFrequency(&freq);
> @@ -59,19 +59,19 @@
>  // The profile ticks implementation is just fine for a normal timer.
>
>
> -uint64 tu_timer::get_ticks()
> +uint64_t tu_timer::get_ticks()
>  {
>        return get_profile_ticks();
>  }
>
>
> -double tu_timer::ticks_to_seconds(uint64 ticks)
> +double tu_timer::ticks_to_seconds(uint64_t ticks)
>  {
>        return profile_ticks_to_seconds(ticks);
>  }
>
>
> -uint64 tu_timer::get_profile_ticks()
> +uint64_t       tu_timer::get_profile_ticks()
>  {
>        // @@ TODO prefer rdtsc when available?
>
> @@ -80,14 +80,14 @@
>
>        gettimeofday(&tv, 0);
>
> -       uint64 result = tv.tv_sec * 1000000;
> +       uint64_t result = tv.tv_sec * 1000000;
>        result += tv.tv_usec;
>
>        return result;
>  }
>
>
> -double tu_timer::profile_ticks_to_seconds(uint64 ticks)
> +double tu_timer::profile_ticks_to_seconds(uint64_t ticks)
>  {
>        // ticks is microseconds.  Convert to seconds.
>        return ticks / 1000000.0;
>
> Index: libbase/tu_timer.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_timer.h,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- libbase/tu_timer.h  14 Sep 2006 23:54:22 -0000      1.3
> +++ libbase/tu_timer.h  11 Apr 2007 17:54:21 -0000      1.4
> @@ -16,8 +16,8 @@
>  {
>        // General-purpose wall-clock timer.  May not be hi-res enough
>        // for profiling.
> -       uint64 get_ticks();
> -       double ticks_to_seconds(uint64 ticks);
> +       uint64_t get_ticks();
> +       double ticks_to_seconds(uint64_t ticks);
>
>        // Hi-res timer for CPU profiling.
>
> @@ -26,10 +26,10 @@
>        // operation, and pass the difference to
>        // profile_ticks_to_seconds() to find out how long the
>        // operation took.
> -       DSOEXPORT uint64        get_profile_ticks();
> +       DSOEXPORT uint64_t      get_profile_ticks();
>
>        // Convert a hi-res ticks value into seconds.
> -       DSOEXPORT double        profile_ticks_to_seconds(uint64 profile_ticks);
> +       DSOEXPORT double        profile_ticks_to_seconds(uint64_t profile_ticks);
>  }
>
>
>
> Index: libbase/tu_types.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_types.cpp,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -b -r1.4 -r1.5
> --- libbase/tu_types.cpp        8 May 2006 21:12:24 -0000       1.4
> +++ libbase/tu_types.cpp        11 Apr 2007 17:54:21 -0000      1.5
> @@ -17,11 +17,11 @@
>        if (sizeof(uint8_t) != 1
>                || sizeof(uint16_t) != 2
>                || sizeof(uint32_t) != 4
> -               || sizeof(uint64) != 8
> +               || sizeof(uint64_t) != 8
>                || sizeof(int8_t) != 1
>                || sizeof(int16_t) != 2
>                || sizeof(int32_t) != 4
> -               || sizeof(sint64) != 8)
> +               || sizeof(int64_t) != 8)
>        {
>                // No good.
>                assert(0);
>
> Index: libbase/tu_types.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
> retrieving revision 1.32
> retrieving revision 1.33
> diff -u -b -r1.32 -r1.33
> --- libbase/tu_types.h  9 Feb 2007 17:23:03 -0000       1.32
> +++ libbase/tu_types.h  11 Apr 2007 17:54:21 -0000      1.33
> @@ -17,7 +17,7 @@
>  //
>  //
>
> -/* $Id: tu_types.h,v 1.32 2007/02/09 17:23:03 bjacques Exp $ */
> +/* $Id: tu_types.h,v 1.33 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifndef TU_TYPES_H
>  #define TU_TYPES_H
> @@ -79,22 +79,6 @@
>  #      undef _TU_LITTLE_ENDIAN_
>  #endif //BYTE_ORDER == SDL_LIL_ENDIAN
>
> -typedef uint8_t uint8;
> -typedef int8_t sint8;
> -typedef int8_t int8;
> -typedef uint16_t uint16;
> -typedef int16_t sint16;
> -typedef int16_t int16;
> -typedef uint32_t uint32;
> -typedef int32_t sint32;
> -typedef int32_t int32;
> -
> -#ifndef PROTYPES_H
> -typedef uint64_t uint64;
> -typedef int64_t sint64;
> -typedef int64_t int64;
> -#endif
> -
>  // A function to run some validation checks.
>  DSOEXPORT bool tu_types_validate();
>
>
> Index: libgeometry/geometry.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libgeometry/geometry.cpp,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -b -r1.8 -r1.9
> --- libgeometry/geometry.cpp    10 Feb 2007 18:40:20 -0000      1.8
> +++ libgeometry/geometry.cpp    11 Apr 2007 17:54:21 -0000      1.9
> @@ -607,8 +607,8 @@
>  // Pixels that have alpha > 0.5, but have color 0, should be tweaked slightly
>  // so they don't get knocked out when blitting.
>  {
> -       uint32  Key32 = 0;
> -       uint32* p = GetData();
> +       uint32_t        Key32 = 0;
> +       uint32_t*       p = GetData();
>        int     pixels = GetHeight() * GetWidth();
>        for (int i = 0; i < pixels; i++, p++) {
>                if ((*p >> 24) >= 128) {
>
> Index: libgeometry/kd_tree_packed.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/libgeometry/kd_tree_packed.cpp,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -b -r1.10 -r1.11
> --- libgeometry/kd_tree_packed.cpp      10 Feb 2007 18:40:20 -0000      1.10
> +++ libgeometry/kd_tree_packed.cpp      11 Apr 2007 17:54:21 -0000      1.11
> @@ -124,7 +124,7 @@
>
>  struct kd_face
>  {
> -       uint16  m_vi[3];        // vert indices
> +       uint16_t        m_vi[3];        // vert indices
>
>  //     void    local_assert() { compiler_assert(sizeof(struct kd_face) == 6); }
>  };
> @@ -132,14 +132,14 @@
>
>  struct kd_leaf
>  {
> -       uint8   m_flags;        // low two bits == 0b11
> -       uint8   m_face_count;
> +       uint8_t m_flags;        // low two bits == 0b11
> +       uint8_t m_face_count;
>
>        kd_face*        get_face(int index)
>        {
>                assert(index >= 0 && index < m_face_count);
>
> -               return (kd_face*) (((uint8*) this) + sizeof(struct kd_leaf) + sizeof(kd_face) * index);
> +               return (kd_face*) (((uint8_t*) this) + sizeof(struct kd_leaf) + sizeof(kd_face) * index);
>        }
>
>  //     void    local_assert() { compiler_assert(sizeof(struct kd_leaf) == 2); }
> @@ -162,7 +162,7 @@
>  class kd_node
>  {
>  public:
> -       uint8   m_flags[4];
> +       uint8_t m_flags[4];
>        // low two bits == axis, if axis == 3 then this is leaf.
>        // 0x04 is set if the neg child is present.
>        // 0x08 is set if the pos child is present
> @@ -183,7 +183,7 @@
>                if (has_neg_child())
>                {
>                        // Neg child follows immediately.
> -                       return (kd_node*) (((uint8*) this) + sizeof(kd_node));
> +                       return (kd_node*) (((uint8_t*) this) + sizeof(kd_node));
>                }
>                else return NULL;
>        }
> @@ -195,7 +195,7 @@
>                        unsigned int offset = (m_flags[1]) + (m_flags[2] << 8) + (m_flags[3] << 16);
>                        assert(offset >= sizeof(kd_node));      // sanity check
>
> -                       return (kd_node*) (((uint8*) this) + offset);
> +                       return (kd_node*) (((uint8_t*) this) + offset);
>                }
>                else return NULL;
>        }
>
> Index: plugin/plugin.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
> retrieving revision 1.73
> retrieving revision 1.74
> diff -u -b -r1.73 -r1.74
> --- plugin/plugin.cpp   7 Mar 2007 19:06:12 -0000       1.73
> +++ plugin/plugin.cpp   11 Apr 2007 17:54:21 -0000      1.74
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: plugin.cpp,v 1.73 2007/03/07 19:06:12 bjacques Exp $ */
> +/* $Id: plugin.cpp,v 1.74 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -437,7 +437,7 @@
>  }
>
>  /// \brief Return how many bytes we can read into the buffer
> -int32
> +int32_t
>  nsPluginInstance::WriteReady(NPStream * /* stream */ )
>  {
>  #if 0
> @@ -449,8 +449,8 @@
>  /// \brief Read the data stream from Mozilla/Firefox
>  ///
>  /// For now we read the bytes and write them to a disk file.
> -int32
> -nsPluginInstance::Write(NPStream * /* stream */, int32 /* offset */, int32 len,
> +int32_t
> +nsPluginInstance::Write(NPStream * /* stream */, int32_t /* offset */, int32_t len,
>                         void * buffer)
>  {
>  #if 0
>
> Index: plugin/plugin.h
> ===================================================================
> RCS file: /sources/gnash/gnash/plugin/plugin.h,v
> retrieving revision 1.29
> retrieving revision 1.30
> diff -u -b -r1.29 -r1.30
> --- plugin/plugin.h     15 Dec 2006 21:25:59 -0000      1.29
> +++ plugin/plugin.h     11 Apr 2007 17:54:21 -0000      1.30
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: plugin.h,v 1.29 2006/12/15 21:25:59 rsavoye Exp $ */
> +/* $Id: plugin.h,v 1.30 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifndef __PLUGIN_H__
>  #define __PLUGIN_H__
> @@ -79,11 +79,11 @@
>     NPError SetWindow(NPWindow *aWindow);
>
>     NPError NewStream(NPMIMEType type, NPStream *stream, NPBool seekable,
> -                      uint16 *stype);
> +                      uint16_t *stype);
>     NPError DestroyStream(NPStream * stream, NPError reason);
>
> -    int32 WriteReady(NPStream *stream);
> -    int32 Write(NPStream *stream, int32 offset, int32 len, void *buffer);
> +    int32_t WriteReady(NPStream *stream);
> +    int32_t Write(NPStream *stream, int32_t offset, int32_t len, void *buffer);
>
>     NPError WriteStatus(char *msg) const;
>     NPError WriteStatus(std::string msg) const;
>
> Index: plugin/win32/plugin.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- plugin/win32/plugin.cpp     20 Nov 2006 16:40:22 -0000      1.5
> +++ plugin/win32/plugin.cpp     11 Apr 2007 17:54:21 -0000      1.6
> @@ -137,7 +137,7 @@
>  }
>
>  NPError nsPluginInstance::NewStream(NPMIMEType type, NPStream * stream,
> -                            NPBool seekable, uint16 * stype)
> +                            NPBool seekable, uint16_t * stype)
>  {
>  //     dbglogfile << "NewStream" << stream->url << endl;
>        return NPERR_NO_ERROR;
> @@ -282,9 +282,9 @@
>                return;
>        }
>
> -       uint64  start_ticks = 0;
> +       uint64_t        start_ticks = 0;
>        start_ticks = tu_timer::get_ticks();
> -       uint64  last_ticks = start_ticks;
> +       uint64_t        last_ticks = start_ticks;
>
>        float   scale = 1.0f;
>        bool    background = true;
> @@ -301,7 +301,7 @@
>                gnash::set_current_root(m);
>                gnash::delete_unused_root();
>
> -               uint64  ticks;
> +               uint64_t        ticks;
>                ticks = tu_timer::get_ticks();
>                int     delta_ticks = tu_timer::get_ticks() - last_ticks;
>                float   delta_t = delta_ticks / 1000.f;
>
> Index: plugin/win32/plugin.h
> ===================================================================
> RCS file: /sources/gnash/gnash/plugin/win32/plugin.h,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- plugin/win32/plugin.h       29 Oct 2006 18:34:17 -0000      1.3
> +++ plugin/win32/plugin.h       11 Apr 2007 17:54:21 -0000      1.4
> @@ -43,7 +43,7 @@
>        NPBool isInitialized();
>        NPError SetWindow(NPP instance, NPWindow* window);
>        NPError NewStream(NPMIMEType type, NPStream * stream,
> -                            NPBool seekable, uint16 * stype);
> +                            NPBool seekable, uint16_t * stype);
>        NPError DestroyStream(NPStream * stream, NPError reason);
>
>        // locals
>
> Index: server/as_value.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_value.h,v
> retrieving revision 1.41
> retrieving revision 1.42
> diff -u -b -r1.41 -r1.42
> --- server/as_value.h   2 Apr 2007 22:45:09 -0000       1.41
> +++ server/as_value.h   11 Apr 2007 17:54:21 -0000      1.42
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: as_value.h,v 1.41 2007/04/02 22:45:09 nihilus Exp $ */
> +/* $Id: as_value.h,v 1.42 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifndef GNASH_AS_VALUE_H
>  #define GNASH_AS_VALUE_H
> @@ -167,12 +167,12 @@
>                // continues to work.
>
>  #if (WCHAR_MAX != MAXINT)
> -               tu_string::encode_utf8_from_wchar(&m_string_value, (const uint16 *)wstr);
> +               tu_string::encode_utf8_from_wchar(&m_string_value, (const uint16_t *)wstr);
>  #else
>  # if (WCHAR_MAX != MAXSHORT)
>  # error "Can't determine the size of wchar_t"
>  # else
> -               tu_string::encode_utf8_from_wchar(&m_string_value, (const uint32 *)wstr);
> +               tu_string::encode_utf8_from_wchar(&m_string_value, (const uint32_t *)wstr);
>  # endif
>  #endif
>        }
>
> Index: server/execute_tag.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/execute_tag.h,v
> retrieving revision 1.10
> retrieving revision 1.11
> diff -u -b -r1.10 -r1.11
> --- server/execute_tag.h        11 Apr 2007 14:20:20 -0000      1.10
> +++ server/execute_tag.h        11 Apr 2007 17:54:21 -0000      1.11
> @@ -25,7 +25,7 @@
>  #include "config.h"
>  #endif
>
> -#include "tu_types.h" // for uint32 typedef
> +#include "tu_types.h" // for uint32_t typedef
>
>  #include <cstdarg>
>  #include <cassert>
> @@ -92,7 +92,7 @@
>        //
>        /// The default implementation returns 0
>        ///
> -       virtual uint32  get_depth_id_of_replace_or_add_tag() const
> +       virtual uint32_t        get_depth_id_of_replace_or_add_tag() const
>        {
>                return 0;
>        }
>
> Index: server/sprite_instance.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
> retrieving revision 1.232
> retrieving revision 1.233
> diff -u -b -r1.232 -r1.233
> --- server/sprite_instance.cpp  11 Apr 2007 14:20:20 -0000      1.232
> +++ server/sprite_instance.cpp  11 Apr 2007 17:54:21 -0000      1.233
> @@ -2410,7 +2410,7 @@
>  sprite_instance::find_previous_replace_or_add_tag(int frame,
>                int depth, int id)
>  {
> -       uint32 depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
> +       uint32_t depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
>
>        for (int f = frame - 1; f >= 0; f--)
>        {
>
> Index: server/swf_function.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf_function.h,v
> retrieving revision 1.11
> retrieving revision 1.12
> diff -u -b -r1.11 -r1.12
> --- server/swf_function.h       20 Mar 2007 15:01:20 -0000      1.11
> +++ server/swf_function.h       11 Apr 2007 17:54:21 -0000      1.12
> @@ -71,12 +71,12 @@
>        };
>        std::vector<arg_spec>   m_args;
>        bool    m_is_function2;
> -       uint8   m_local_register_count;
> +       uint8_t m_local_register_count;
>
>        /// used by function2 to control implicit arg register assignments
>        //
>        /// See http://sswf.sourceforge.net/SWFalexref.html#action_declare_function2
> -       uint16  m_function2_flags;
> +       uint16_t        m_function2_flags;
>
>        /// Return a pointer to the given object's superclass interface
>        //
> @@ -205,9 +205,9 @@
>
>        void    set_is_function2() { m_is_function2 = true; }
>
> -       void    set_local_register_count(uint8 ct) { assert(m_is_function2); m_local_register_count = ct; }
> +       void    set_local_register_count(uint8_t ct) { assert(m_is_function2); m_local_register_count = ct; }
>
> -       void    set_function2_flags(uint16 flags) { assert(m_is_function2); m_function2_flags = flags; }
> +       void    set_function2_flags(uint16_t flags) { assert(m_is_function2); m_function2_flags = flags; }
>
>        void    add_arg(int arg_register, const char* name)
>        {
>
> Index: server/textformat.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/textformat.cpp,v
> retrieving revision 1.23
> retrieving revision 1.24
> diff -u -b -r1.23 -r1.24
> --- server/textformat.cpp       8 Apr 2007 15:00:12 -0000       1.23
> +++ server/textformat.cpp       11 Apr 2007 17:54:21 -0000      1.24
> @@ -15,7 +15,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
>  //
> -// $Id: textformat.cpp,v 1.23 2007/04/08 15:00:12 nihilus Exp $
> +// $Id: textformat.cpp,v 1.24 2007/04/11 17:54:21 bjacques Exp $
>  //
>
>  #include "log.h"
> @@ -185,7 +185,7 @@
>
>   if (obj->get_member("color", &method)) {
>     //log_msg("Color exists and is set to %f\n", method.to_number());
> -    obj->obj.colorSet((uint32)method.to_number());
> +    obj->obj.colorSet((uint32_t)method.to_number());
>   }
>
>   if (obj->get_member("indent", &method)) {
>
> Index: server/textformat.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/textformat.h,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- server/textformat.h 8 Apr 2007 15:00:12 -0000       1.14
> +++ server/textformat.h 11 Apr 2007 17:54:21 -0000      1.15
> @@ -15,7 +15,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
>  //
> -// $Id: textformat.h,v 1.14 2007/04/08 15:00:12 nihilus Exp $
> +// $Id: textformat.h,v 1.15 2007/04/11 17:54:21 bjacques Exp $
>  //
>
>  #ifndef __TEXTFORMAT_H__
> @@ -58,7 +58,7 @@
>        //
>        /// A number containing three 8-bit RGB components; for example,
>         /// 0xFF0000 is red, 0x00FF00 is green.
> -       uint32 color() const { return _color; }
> +       uint32_t color() const { return _color; }
>
>        /// \brief
>        /// Return ann integer that indicates the indentation from the left
> @@ -98,7 +98,7 @@
>        void italicedSet(bool x)     { _italic = x; }
>        void boldSet(bool x)         { _bold = x; }
>        void bulletSet(bool x)       { _bullet = x; }
> -       void colorSet(uint32 x)      { _color = x; }
> +       void colorSet(uint32_t x)      { _color = x; }
>        void indentSet(float x)      { _indent = x; }
>
>        void alignSet(const std::string& x)  { _align = x; }
> @@ -151,7 +151,7 @@
>        //
>        /// A number containing three 8-bit RGB components; for example,
>         /// 0xFF0000 is red, 0x00FF00 is green.
> -       uint32  _color;
> +       uint32_t        _color;
>
>        // The name of a font for text as a string.
>        std::string _font;
>
> Index: server/timers.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/timers.cpp,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -b -r1.28 -r1.29
> --- server/timers.cpp   5 Apr 2007 07:31:28 -0000       1.28
> +++ server/timers.cpp   11 Apr 2007 17:54:21 -0000      1.29
> @@ -18,7 +18,7 @@
>  //
>  //
>
> -/* $Id: timers.cpp,v 1.28 2007/04/05 07:31:28 strk Exp $ */
> +/* $Id: timers.cpp,v 1.29 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #include "timers.h"
>  #include "as_function.h" // for class as_function
> @@ -89,7 +89,7 @@
>  {
>        if (_start)
>        {
> -               uint64 now = tu_timer::get_profile_ticks();
> +               uint64_t now = tu_timer::get_profile_ticks();
>                //log_msg("now: %lu", now);
>                assert(now > _start);
>
>
> Index: server/timers.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/timers.h,v
> retrieving revision 1.18
> retrieving revision 1.19
> diff -u -b -r1.18 -r1.19
> --- server/timers.h     5 Apr 2007 07:31:28 -0000       1.18
> +++ server/timers.h     11 Apr 2007 17:54:21 -0000      1.19
> @@ -143,10 +143,10 @@
>       void start();
>
>       /// Number of microseconds between expirations
> -      uint64 _interval;
> +      uint64_t _interval;
>
>       /// Number of microseconds since epoch at Timer start
> -      uint64 _start;
> +      uint64_t _start;
>
>       /// The associated function, stored in an intrusive pointer
>       boost::intrusive_ptr<as_function> _function;
>
> Index: server/asobj/NetStreamFfmpeg.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
> retrieving revision 1.36
> retrieving revision 1.37
> diff -u -b -r1.36 -r1.37
> --- server/asobj/NetStreamFfmpeg.cpp    11 Apr 2007 13:03:45 -0000      1.36
> +++ server/asobj/NetStreamFfmpeg.cpp    11 Apr 2007 17:54:21 -0000      1.37
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: NetStreamFfmpeg.cpp,v 1.36 2007/04/11 13:03:45 bjacques Exp $ */
> +/* $Id: NetStreamFfmpeg.cpp,v 1.37 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -684,7 +684,7 @@
>  }
>
>  // audio callback is running in sound handler thread
> -bool NetStreamFfmpeg::audio_streamer(void *owner, uint8 *stream, int len)
> +bool NetStreamFfmpeg::audio_streamer(void *owner, uint8_t *stream, int len)
>  {
>        NetStreamFfmpeg* ns = static_cast<NetStreamFfmpeg*>(owner);
>
>
> Index: server/asobj/NetStreamFfmpeg.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
> retrieving revision 1.21
> retrieving revision 1.22
> diff -u -b -r1.21 -r1.22
> --- server/asobj/NetStreamFfmpeg.h      10 Apr 2007 21:31:00 -0000      1.21
> +++ server/asobj/NetStreamFfmpeg.h      11 Apr 2007 17:54:21 -0000      1.22
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: NetStreamFfmpeg.h,v 1.21 2007/04/10 21:31:00 tgc Exp $ */
> +/* $Id: NetStreamFfmpeg.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifndef __NETSTREAMFFMPEG_H__
>  #define __NETSTREAMFFMPEG_H__
> @@ -210,7 +210,7 @@
>
>        static void startPlayback(NetStreamFfmpeg* ns);
>        static void av_streamer(NetStreamFfmpeg* ns);
> -       static bool audio_streamer(void *udata, uint8 *stream, int len);
> +       static bool audio_streamer(void *udata, uint8_t *stream, int len);
>
>  private:
>
>
> Index: server/asobj/SoundFfmpeg.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.h,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -b -r1.2 -r1.3
> --- server/asobj/SoundFfmpeg.h  9 Mar 2007 14:38:29 -0000       1.2
> +++ server/asobj/SoundFfmpeg.h  11 Apr 2007 17:54:21 -0000      1.3
> @@ -58,7 +58,7 @@
>        static offset_t seekMedia(void *opaque, offset_t offset, int whence);
>
>        static void setupDecoder(SoundFfmpeg* so);
> -       static bool getAudio(void *owner, uint8 *stream, int len);
> +       static bool getAudio(void *owner, uint8_t *stream, int len);
>  private:
>
>        // audio
>
> Index: server/asobj/SoundGst.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/asobj/SoundGst.h,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -b -r1.1 -r1.2
> --- server/asobj/SoundGst.h     14 Feb 2007 20:41:48 -0000      1.1
> +++ server/asobj/SoundGst.h     11 Apr 2007 17:54:21 -0000      1.2
> @@ -54,7 +54,7 @@
>        static int seekMedia(void *opaque, int offset, int whence);
>
>        static void setupDecoder(SoundGst* so);
> -       static bool getAudio(void *owner, uint8 *stream, int len);
> +       static bool getAudio(void *owner, uint8_t *stream, int len);
>
>        static void callback_newpad (GstElement *decodebin, GstPad *pad, gboolean last, gpointer data);
>  private:
>
> Index: server/asobj/SoundMad.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/asobj/SoundMad.h,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -b -r1.1 -r1.2
> --- server/asobj/SoundMad.h     14 Feb 2007 20:41:48 -0000      1.1
> +++ server/asobj/SoundMad.h     11 Apr 2007 17:54:21 -0000      1.2
> @@ -50,7 +50,7 @@
>        unsigned int getPosition();
>
>        static void setupDecoder(SoundMad* so);
> -       static bool getAudio(void *owner, uint8 *stream, int len);
> +       static bool getAudio(void *owner, uint8_t *stream, int len);
>  private:
>
>        long inputPos;
>
> Index: server/parser/action_buffer.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- server/parser/action_buffer.cpp     28 Feb 2007 09:46:48 -0000      1.14
> +++ server/parser/action_buffer.cpp     11 Apr 2007 17:54:21 -0000      1.15
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: action_buffer.cpp,v 1.14 2007/02/28 09:46:48 strk Exp $ */
> +/* $Id: action_buffer.cpp,v 1.15 2007/04/11 17:54:21 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -114,7 +114,7 @@
>     // Actual processing.
>     size_t i = start_pc;
>     uint16_t length = uint16_t(read_int16(i+1));
> -    uint16 count = uint16_t(read_int16(i+3));
> +    uint16_t count = uint16_t(read_int16(i+3));
>     i += 2;
>
>  //log_msg("Start at %d, stop at %d, length read was %d, count read was %d", start_pc, stop_pc, length, count);
> @@ -280,7 +280,7 @@
>                    // wacky format: 45670123
>                    union {
>                        double  d;
> -                       uint64  i;
> +                       uint64_t        i;
>                        struct {
>                            uint32_t    lo;
>                            uint32_t    hi;
> @@ -295,7 +295,7 @@
>
>                    dbglogfile << "(double) " << u.d << endl;
>                } else if (type == 7) {
> -                   // int32
> +                   // int32_t
>                    int32_t     val = instruction_data[3 + i]
>                        | (instruction_data[3 + i + 1] << 8)
>                        | (instruction_data[3 + i + 2] << 16)
> @@ -352,7 +352,7 @@
>                       << " arg_count = " << arg_count
>                       << " reg_count = " << reg_count << endl;
>
> -           uint16      flags = (instruction_data[3 + i]) | (instruction_data[3 + i + 1] << 8);
> +           uint16_t    flags = (instruction_data[3 + i]) | (instruction_data[3 + i + 1] << 8);
>            i += 2;
>
>            // @@ What is the difference between "super" and "_parent"?
> @@ -435,7 +435,7 @@
>        // wacky format: 45670123
>        union {
>                double  d;
> -               uint64  i;
> +               uint64_t        i;
>                struct {
>                        uint32_t        lo;
>                        uint32_t        hi;
>
> Index: server/parser/movie_def_impl.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
> retrieving revision 1.36
> retrieving revision 1.37
> diff -u -b -r1.36 -r1.37
> --- server/parser/movie_def_impl.h      10 Apr 2007 15:48:39 -0000      1.36
> +++ server/parser/movie_def_impl.h      11 Apr 2007 17:54:22 -0000      1.37
> @@ -263,7 +263,7 @@
>
>
>        int     m_loading_sound_stream;
> -       uint32  m_file_length;
> +       uint32_t        m_file_length;
>
>        std::auto_ptr<jpeg::input> m_jpeg_in;
>
>
> Index: server/swf/PlaceObject2Tag.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -b -r1.1 -r1.2
> --- server/swf/PlaceObject2Tag.cpp      11 Apr 2007 14:20:21 -0000      1.1
> +++ server/swf/PlaceObject2Tag.cpp      11 Apr 2007 17:54:22 -0000      1.2
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: PlaceObject2Tag.cpp,v 1.1 2007/04/11 14:20:21 strk Exp $ */
> +/* $Id: PlaceObject2Tag.cpp,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -104,7 +104,7 @@
>                        break;
>                }
>
> -               uint8 ch = key::INVALID;
> +               uint8_t ch = key::INVALID;
>
>                if (flags & (1 << 17))  // has keypress event
>                {
> @@ -385,10 +385,10 @@
>     }
>  }
>
> -uint32
> +uint32_t
>  PlaceObject2Tag::get_depth_id_of_replace_or_add_tag() const
>  {
> -       uint32 depthid = 0;
> +       uint32_t depthid = 0;
>        if (m_place_type == PLACE || m_place_type == REPLACE)
>        {
>                int id = -1;
>
> Index: server/swf/PlaceObject2Tag.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -b -r1.1 -r1.2
> --- server/swf/PlaceObject2Tag.h        11 Apr 2007 14:20:21 -0000      1.1
> +++ server/swf/PlaceObject2Tag.h        11 Apr 2007 17:54:22 -0000      1.2
> @@ -18,7 +18,7 @@
>  //
>  //
>
> -/* $Id: PlaceObject2Tag.h,v 1.1 2007/04/11 14:20:21 strk Exp $ */
> +/* $Id: PlaceObject2Tag.h,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
>
>  #ifndef GNASH_SWF_PLACEOBJECT2TAG_H
>  #define GNASH_SWF_PLACEOBJECT2TAG_H
> @@ -31,7 +31,7 @@
>  #include "swf.h" // for tag_type definition
>  #include "matrix.h" // for composition
>  #include "cxform.h" // for composition
> -#include "tu_types.h" // for uint16_t, uint32 etc. definition
> +#include "tu_types.h" // for uint16_t, uint32_t etc. definition
>
>  //#include <boost/ptr_container/ptr_vector.hpp>
>  #include <vector>
> @@ -122,7 +122,7 @@
>
>        void execute_state_reverse(sprite_instance* m, int frame);
>
> -       uint32  get_depth_id_of_replace_or_add_tag() const;
> +       uint32_t        get_depth_id_of_replace_or_add_tag() const;
>  };
>
>  } // namespace gnash::SWF::tag_loaders
>
> Index: server/vm/ASHandlers.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
> retrieving revision 1.86
> retrieving revision 1.87
> diff -u -b -r1.86 -r1.87
> --- server/vm/ASHandlers.cpp    10 Apr 2007 21:44:14 -0000      1.86
> +++ server/vm/ASHandlers.cpp    11 Apr 2007 17:54:22 -0000      1.87
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: ASHandlers.cpp,v 1.86 2007/04/10 21:44:14 strk Exp $ */
> +/* $Id: ASHandlers.cpp,v 1.87 2007/04/11 17:54:22 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -634,7 +634,7 @@
>        // skip the specified number of actions.
>        //
>        unsigned int framenum = code.read_int16(thread.pc+3);
> -       uint8 skip = code[thread.pc+5];
> +       uint8_t skip = code[thread.pc+5];
>
>        character* target = env.get_target();
>        sprite_instance* target_sprite = target->to_movie();
> @@ -1464,7 +1464,7 @@
>        thread.ensureStack(1); // expression
>
>        // how many actions to skip if frame has not been loaded
> -       uint8 skip = code[thread.pc+3];
> +       uint8_t skip = code[thread.pc+3];
>
>        // env.top(0) contains frame specification,
>        // evaluated as for ActionGotoExpression
> @@ -1534,7 +1534,7 @@
>                "register",     // 4
>                "bool",         // 5
>                "double",       // 6
> -               "int32",        // 7
> +               "int32_t",      // 7
>                "dict8",        // 8
>                "dict16"        // 9
>        };
> @@ -3203,7 +3203,7 @@
>        //cerr << " nargs:" << nargs << endl;
>
>        // Get the count of local registers used by this function.
> -       uint8 register_count = code[i];
> +       uint8_t register_count = code[i];
>        i++;
>
>        //cerr << " nregisters:" << nargs << endl;
> @@ -3211,7 +3211,7 @@
>        func->set_local_register_count(register_count);
>
>        // Flags, for controlling register assignment of implicit args.
> -       uint16  flags = code.read_int16(i);
> +       uint16_t        flags = code.read_int16(i);
>        i += 2;
>
>        func->set_function2_flags(flags);
> @@ -3219,7 +3219,7 @@
>        // Get the register assignments and names of the arguments.
>        for (unsigned n = 0; n < nargs; n++)
>        {
> -               uint8 arg_register = code[i];
> +               uint8_t arg_register = code[i];
>                ++i;
>
>                // @@ security: watch out for possible missing terminator here!
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Thu Apr 12 01:42:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbs4M-0003Cz-HE
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 01:42:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbs4K-00035W-2b
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 01:42:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbs4I-000320-0g
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 01:42:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbs4H-00031v-QW
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 01:42:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hbs07-0002yu-PD
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 01:37:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hbrzy-0001LR-55
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:37:34 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hbrzx-0001LO-TL
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:37:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hbrzx-0001LO-TL@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 05:37:33 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.h server/sprite_in...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 05:42:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 05:37:33

Modified files:
	.              : ChangeLog 
	server         : dlist.h sprite_instance.cpp 
	server/parser  : shape_character_def.cpp 
	testsuite/actionscript.all: MovieClip.as 
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	        * server/parser/shape_character_def.cpp (compute_bound):
	          skip anchor point of empty paths; include both control
	          and anchor point of any edge.
	        * server/dlist.h: add a visitAll() method for unconditional
	          full scan.
	        * server/sprite_instance.cpp: optimize WidthFinder, HeightFinder,
	          ScriptObjectFinder and CharacterExtractor to return void
	          (can be used by visitAll); (get_width, get_height): include
	          scan of DrawingAPI canvas.
	        * testsuite/actionscript.all/MovieClip.as,
	          testsuite/misc-ming.all/displaylist_depths_test.c:
	          few more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2853&r2=1.2854
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.233&r2=1.234
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2853
retrieving revision 1.2854
diff -u -b -r1.2853 -r1.2854
--- ChangeLog	11 Apr 2007 17:54:21 -0000	1.2853
+++ ChangeLog	12 Apr 2007 05:37:33 -0000	1.2854
@@ -1,3 +1,18 @@
+2007-04-11 Sandro Santilli <strk@keybit.net>
+
+	* server/parser/shape_character_def.cpp (compute_bound):
+	  skip anchor point of empty paths; include both control
+	  and anchor point of any edge.
+	* server/dlist.h: add a visitAll() method for unconditional
+	  full scan.
+	* server/sprite_instance.cpp: optimize WidthFinder, HeightFinder,
+	  ScriptObjectFinder and CharacterExtractor to return void
+	  (can be used by visitAll); (get_width, get_height): include
+	  scan of DrawingAPI canvas.
+	* testsuite/actionscript.all/MovieClip.as, 
+	  testsuite/misc-ming.all/displaylist_depths_test.c:
+	  few more successes.
+
 2007-04-11 Ann Barcomb <ann@lulu.com>
 
 	* devtools/lib/Gnash/Distribution.pm: made it more

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/dlist.h	11 Apr 2007 14:20:20 -0000	1.33
+++ server/dlist.h	12 Apr 2007 05:37:33 -0000	1.34
@@ -269,6 +269,17 @@
 	template <class V>
 	inline void visitBackward(V& visitor);
 
+	/// \brief 
+	/// Visit each and all character in the list.
+	//
+	/// Scan happens in arbitrary order, if order is
+	/// important use visitBackward or visitForward
+	///
+	/// The visitor functor will receive a character pointer,
+	/// it's return value is not used so can return void.
+	template <class V>
+	inline void visitAll(V& visitor);
+
 	/// dump list to given output stream (debugging)
 	void dump(std::ostream& os) const;
 
@@ -353,6 +364,18 @@
 	}
 }
 
+template <class V>
+void
+DisplayList::visitAll(V& visitor)
+{
+	for (iterator it = _characters.begin(),
+			itEnd = _characters.end();
+		it != itEnd; ++it)
+	{
+		visitor(it->get());
+	}
+}
+
 std::ostream& operator<< (std::ostream&, const DisplayList&);
 
 } // namespace gnash

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- server/sprite_instance.cpp	11 Apr 2007 17:54:21 -0000	1.233
+++ server/sprite_instance.cpp	12 Apr 2007 05:37:33 -0000	1.234
@@ -25,7 +25,6 @@
 
 #include "log.h" 
 #include "action.h" // for call_method_parsed (call_method_args)
-//#include "gnash.h"
 #include "render.h"  // for bounds_in_clipping_area()
 #include "sprite_instance.h"
 #include "movie_definition.h"
@@ -1422,13 +1421,12 @@
 public:
 	float _h;
 	HeightFinder(): _h(0) {}
-	bool operator() (character* ch)
+	void operator() (character* ch)
 	{
 		float ch_h = ch->get_height();
 		if (ch_h > _h) {
 			_h = ch_h;
 		}
-		return true; // keep scanning
 	}
 	float getHeight() {
 		return _h;
@@ -1444,13 +1442,12 @@
 public:
 	float _w;
 	WidthFinder(): _w(0) {}
-	bool operator() (character* ch) 
+	void operator() (character* ch) 
 	{
 		float ch_w = ch->get_width();
 		if (ch_w > _w) {
 			_w = ch_w;
 		}
-		return true; // keep scanning
 	}
 	float getWidth() {
 		return _w;
@@ -1473,7 +1470,7 @@
 		_staticChars(staticChars)
 	{}
 
-	bool operator() (character* ch) 
+	void operator() (character* ch) 
 	{
 		// TODO: Are script-transformed object to be kept ?
 		//       Need a testcase for this
@@ -1488,7 +1485,6 @@
 		{
 			_staticChars.push_back(ch);
 		}
-		return true; // keep scanning
 	}
 };
 
@@ -1505,10 +1501,9 @@
 		_chars(chars)
 	{}
 
-	bool operator() (character* ch) 
+	void operator() (character* ch) 
 	{
 		_chars.push_back(ch);
-		return true; // keep scanning
 	}
 };
 
@@ -2271,7 +2266,7 @@
 	std::vector<character*> charsToAdd; 
 	std::vector<character*> charsToKeep; 
 	ScriptObjectsFinder scriptObjFinder(charsToAdd, charsToKeep);
-	m_display_list.visitForward(scriptObjFinder);
+	m_display_list.visitAll(scriptObjFinder);
 
 	// Resort frame0 DisplayList as depth of
 	// characters in it might have been
@@ -2410,7 +2405,7 @@
 sprite_instance::find_previous_replace_or_add_tag(int frame,
 		int depth, int id)
 {
-	uint32_t depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
+	uint32 depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
 
 	for (int f = frame - 1; f >= 0; f--)
 	{
@@ -2952,22 +2947,36 @@
 
 float sprite_instance::get_height() const
 {
+	// TODO: FIXME: this whole thing is bogus,
+	//       we should extract the actual bounds
+	//       and return their height
+
 	HeightFinder f;
 	// the const_cast is just to avoid defining a const version
 	// of DisplayList::visitForward, HeightFinder will NOT
 	// modify the DisplayList elements in any way
-	const_cast<DisplayList&>(m_display_list).visitForward(f);
-	return f.getHeight(); 
+	const_cast<DisplayList&>(m_display_list).visitAll(f);
+	float h = f.getHeight();
+	float hd = _drawable->get_height_local();
+	if ( hd > h ) h = hd;
+	return h;
 }
 
 float sprite_instance::get_width() const
 {
+	// TODO: FIXME: this whole thing is bogus,
+	//       we should extract the actual bounds
+	//       and return their width
+
 	WidthFinder f;
 	// the const_cast is just to avoid defining a const version
 	// of DisplayList::visitForward, WidthFinder will NOT
 	// modify the DisplayList elements in any way
-	const_cast<DisplayList&>(m_display_list).visitForward(f);
-	return f.getWidth(); 
+	const_cast<DisplayList&>(m_display_list).visitAll(f);
+	float w = f.getWidth(); 
+	float wd = _drawable->get_width_local();
+	if ( wd > w ) w = wd;
+	return w;
 }
 
 character*

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/parser/shape_character_def.cpp	10 Apr 2007 03:12:04 -0000	1.14
+++ server/parser/shape_character_def.cpp	12 Apr 2007 05:37:33 -0000	1.15
@@ -6,7 +6,7 @@
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
 
-/* $Id: shape_character_def.cpp,v 1.14 2007/04/10 03:12:04 zoulunkai Exp $ */
+/* $Id: shape_character_def.cpp,v 1.15 2007/04/12 05:37:33 strk Exp $ */
 
 #include "shape_character_def.h"
 
@@ -621,12 +621,16 @@
 {
 	r->set_null();
 
-    for (unsigned int i = 0; i < m_paths.size(); i++) {
+    for (unsigned int i = 0; i < m_paths.size(); i++)
+    {
 	const path&	p = m_paths[i];
+	size_t nedges = p.m_edges.size();
+	if ( ! nedges ) continue;
 	r->expand_to_point(p.m_ax, p.m_ay);
-	for (unsigned int j = 0; j < p.m_edges.size(); j++)	{
+	for (unsigned int j = 0; j<nedges; j++)
+	{
 	    r->expand_to_point(p.m_edges[j].m_ax, p.m_edges[j].m_ay);
-//					r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
+		r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
 	}
     }
 }

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- testsuite/actionscript.all/MovieClip.as	11 Apr 2007 17:10:12 -0000	1.52
+++ testsuite/actionscript.all/MovieClip.as	12 Apr 2007 05:37:33 -0000	1.53
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.52 2007/04/11 17:10:12 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.53 2007/04/12 05:37:33 strk Exp $";
 
 #include "check.as"
 
@@ -60,23 +60,6 @@
 check(mc.globalToLocal);
 check_equals(typeOf(mc.unloadMovie), 'function');
 
-
-//
-// Test getBounds (simple test)
-//
-var bounds = mc.getBounds();
-check_equals(typeof(bounds), "object");
-// Checking for real values would be a bit hard
-// atm, as the loaded Dejagnu.swf file might
-// write stuff all around thus making bounds
-// change often... we'll check it later, with
-// a user defined movieclip (more control over
-// it's bounds)
-check(bounds.xMin != undefined);
-check(bounds.yMin != undefined);
-check(bounds.xMax != undefined);
-check(bounds.yMax != undefined);
-
 // This seems unavailable
 // when targetting SWF > 6
 #if OUTPUT_VERSION > 6
@@ -539,6 +522,7 @@
 check_equals(typeof(b.xMax), 'number');
 check_equals(typeof(b.yMin), 'number');
 check_equals(typeof(b.yMax), 'number');
+// Returned number is (2^28/2)-1 twips : any ringing bell ?
 xcheck_equals(b.xMin, 6710886.35);
 xcheck_equals(b.xMax, 6710886.35);
 xcheck_equals(b.yMin, 6710886.35);
@@ -553,8 +537,8 @@
 	lineTo(20, 10);
 	lineTo(10, 10);
 }
-xcheck_equals(draw._width, 10);
-xcheck_equals(draw._height, 20);
+check_equals(draw._width, 10);
+check_equals(draw._height, 20);
 b = draw.getBounds();
 xcheck_equals(b.xMin, 10);
 xcheck_equals(b.xMax, 20);
@@ -581,25 +565,25 @@
 
 draw._xscale = 200;
 xcheck_equals(draw._width, 20);
-xcheck_equals(draw._height, 20);
+check_equals(draw._height, 20);
 
 draw._rotation = 0;
 xcheck_equals(draw._width, 20);
-xcheck_equals(draw._height, 20);
+check_equals(draw._height, 20);
 
 draw._visible = true;
 draw._xscale = 100;
-xcheck_equals(draw._width, 10);
-xcheck_equals(draw._height, 20);
+check_equals(draw._width, 10);
+check_equals(draw._height, 20);
 
 draw._yscale = 50;
-xcheck_equals(draw._width, 10);
+check_equals(draw._width, 10);
 xcheck_equals(draw._height, 10);
-xcheck_equals(container._width, 10);
+check_equals(container._width, 10);
 xcheck_equals(container._height, 10);
 
 container._xscale = 800;
-xcheck_equals(draw._width, 10);
+check_equals(draw._width, 10);
 xcheck_equals(draw._height, 10);
 xcheck_equals(container._width, 80);
 xcheck_equals(container._height, 10);

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/displaylist_depths_test.c	11 Apr 2007 14:20:21 -0000	1.5
+++ testsuite/misc-ming.all/displaylist_depths_test.c	12 Apr 2007 05:37:33 -0000	1.6
@@ -235,40 +235,40 @@
 	check_equals(mo, "typeof(staticmc_dup.child)", "'movieclip'"); 
 
 	// Note that dynamicmc_dup is at negative depth
-	check_equals(mo, "dynamicmc_dup._width", "dynamicmc._width"); 
+	xcheck_equals(mo, "dynamicmc_dup._width", "dynamicmc._width"); 
 	xcheck_equals(mo, "parseInt(dynamicmc_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc_dup.child)", "'undefined'"); 
 
-	check_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width"); 
+	xcheck_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width"); 
 	xcheck_equals(mo, "parseInt(dynamicmc_2000_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc_2000.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc_2000_dup.child)", "'undefined'"); 
 
-	check_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width"); 
+	xcheck_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width"); 
 	xcheck_equals(mo, "parseInt(dynamicmc_30000_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc_30000.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc_30000_dup.child)", "'undefined'"); 
 
 	// Note that dynamicmc0_dup is at negative depth
-	check_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width"); 
+	xcheck_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width"); 
 	xcheck_equals(mo, "parseInt(dynamicmc0_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc0.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc0_dup.child)", "'undefined'"); 
 
 	// Note that dynamicmc1048575_dup is at negative depth
-	check_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width"); 
+	xcheck_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width"); 
 	xcheck_equals(mo, "parseInt(dynamicmc1048575_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc1048575.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc1048575_dup.child)", "'undefined'"); 
 
-	check_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc1048576._width/10)", "6"); 
+	xcheck_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width"); 
+	check_equals(mo, "parseInt(dynamicmc1048576._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc1048576.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc1048576_dup.child)", "'undefined'"); 
 
-	check_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc2130690045._width/10)", "6"); 
+	xcheck_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width"); 
+	check_equals(mo, "parseInt(dynamicmc2130690045._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc2130690045.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc2130690045_dup.child)", "'undefined'"); 
 



From MAILER-DAEMON Thu Apr 12 02:36:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbsvN-00048u-8Y
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 02:36:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbsvL-00047g-SO
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:36:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbsvJ-0003zZ-So
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:36:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbsvJ-0003zE-Ko
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:36:49 -0400
Received: from wr-out-0506.google.com ([64.233.184.234])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hbsr8-0002HV-UJ
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:32:32 -0400
Received: by wr-out-0506.google.com with SMTP id i23so383465wra
	for <gnash-commit@gnu.org>; Wed, 11 Apr 2007 23:32:21 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=qP0DlVNvci6zEwfQkqILyG4Kg1j5JIWZ5xMy1ym+Gbl2GIcv4sg+HCTz6zbCrlXbHphME9bmOjXnz2+E+liRKbpTulHd/3dOSpTgg41ih8wYCa9u+XkPDSB5gTK6e8+ym0QlTPG5MuGFeeQW2z1+jh0Xi9I3618PSD2t/0Ybtog=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=JaiN0ZaYwtJjB6lMxnG38gYIZiTV9DzKWEITERpKXDOyUEts2FAuuZo661I36AJ14OP/6vW3QTZ7BADeDCSfee27ED0y3r4vi7RTKSRfvi+NaDpdQYkbdd4NxBJoo+yMlBsY25fWvdACovN+5kaEwxyMfn85EA2PQC01M5eWOSs=
Received: by 10.115.93.16 with SMTP id v16mr630082wal.1176359532707;
	Wed, 11 Apr 2007 23:32:12 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Wed, 11 Apr 2007 23:32:12 -0700 (PDT)
Message-ID: <ca4b43ff0704112332v154e69a0rc003d5c8bd3799a5@mail.gmail.com>
Date: Thu, 12 Apr 2007 14:32:12 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/dlist.h server/sprite_in...
In-Reply-To: <E1Hbrzx-0001LO-TL@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hbrzx-0001LO-TL@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 06:36:52 -0000

+       // TODO: FIXME: this whole thing is bogus,
+       //       we should extract the actual bounds
+       //       and return their height

I don't think so.  the "_height" property has nothing to do with the
"bound" returned by getBounds() method.   We can read and set
"_height", but only read "bound". Reset the "_height" property will
not reset the "bound".

On 4/12/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/04/12 05:37:33
>
> Modified files:
>        .              : ChangeLog
>        server         : dlist.h sprite_instance.cpp
>        server/parser  : shape_character_def.cpp
>        testsuite/actionscript.all: MovieClip.as
>        testsuite/misc-ming.all: displaylist_depths_test.c
>
> Log message:
>                * server/parser/shape_character_def.cpp (compute_bound):
>                  skip anchor point of empty paths; include both control
>                  and anchor point of any edge.
>                * server/dlist.h: add a visitAll() method for unconditional
>                  full scan.
>                * server/sprite_instance.cpp: optimize WidthFinder, HeightFinder,
>                  ScriptObjectFinder and CharacterExtractor to return void
>                  (can be used by visitAll); (get_width, get_height): include
>                  scan of DrawingAPI canvas.
>                * testsuite/actionscript.all/MovieClip.as,
>                  testsuite/misc-ming.all/displaylist_depths_test.c:
>                  few more successes.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2853&r2=1.2854
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.33&r2=1.34
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.233&r2=1.234
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.14&r2=1.15
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.52&r2=1.53
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.5&r2=1.6
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2853
> retrieving revision 1.2854
> diff -u -b -r1.2853 -r1.2854
> --- ChangeLog   11 Apr 2007 17:54:21 -0000      1.2853
> +++ ChangeLog   12 Apr 2007 05:37:33 -0000      1.2854
> @@ -1,3 +1,18 @@
> +2007-04-11 Sandro Santilli <strk@keybit.net>
> +
> +       * server/parser/shape_character_def.cpp (compute_bound):
> +         skip anchor point of empty paths; include both control
> +         and anchor point of any edge.
> +       * server/dlist.h: add a visitAll() method for unconditional
> +         full scan.
> +       * server/sprite_instance.cpp: optimize WidthFinder, HeightFinder,
> +         ScriptObjectFinder and CharacterExtractor to return void
> +         (can be used by visitAll); (get_width, get_height): include
> +         scan of DrawingAPI canvas.
> +       * testsuite/actionscript.all/MovieClip.as,
> +         testsuite/misc-ming.all/displaylist_depths_test.c:
> +         few more successes.
> +
>  2007-04-11 Ann Barcomb <ann@lulu.com>
>
>        * devtools/lib/Gnash/Distribution.pm: made it more
>
> Index: server/dlist.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/dlist.h,v
> retrieving revision 1.33
> retrieving revision 1.34
> diff -u -b -r1.33 -r1.34
> --- server/dlist.h      11 Apr 2007 14:20:20 -0000      1.33
> +++ server/dlist.h      12 Apr 2007 05:37:33 -0000      1.34
> @@ -269,6 +269,17 @@
>        template <class V>
>        inline void visitBackward(V& visitor);
>
> +       /// \brief
> +       /// Visit each and all character in the list.
> +       //
> +       /// Scan happens in arbitrary order, if order is
> +       /// important use visitBackward or visitForward
> +       ///
> +       /// The visitor functor will receive a character pointer,
> +       /// it's return value is not used so can return void.
> +       template <class V>
> +       inline void visitAll(V& visitor);
> +
>        /// dump list to given output stream (debugging)
>        void dump(std::ostream& os) const;
>
> @@ -353,6 +364,18 @@
>        }
>  }
>
> +template <class V>
> +void
> +DisplayList::visitAll(V& visitor)
> +{
> +       for (iterator it = _characters.begin(),
> +                       itEnd = _characters.end();
> +               it != itEnd; ++it)
> +       {
> +               visitor(it->get());
> +       }
> +}
> +
>  std::ostream& operator<< (std::ostream&, const DisplayList&);
>
>  } // namespace gnash
>
> Index: server/sprite_instance.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
> retrieving revision 1.233
> retrieving revision 1.234
> diff -u -b -r1.233 -r1.234
> --- server/sprite_instance.cpp  11 Apr 2007 17:54:21 -0000      1.233
> +++ server/sprite_instance.cpp  12 Apr 2007 05:37:33 -0000      1.234
> @@ -25,7 +25,6 @@
>
>  #include "log.h"
>  #include "action.h" // for call_method_parsed (call_method_args)
> -//#include "gnash.h"
>  #include "render.h"  // for bounds_in_clipping_area()
>  #include "sprite_instance.h"
>  #include "movie_definition.h"
> @@ -1422,13 +1421,12 @@
>  public:
>        float _h;
>        HeightFinder(): _h(0) {}
> -       bool operator() (character* ch)
> +       void operator() (character* ch)
>        {
>                float ch_h = ch->get_height();
>                if (ch_h > _h) {
>                        _h = ch_h;
>                }
> -               return true; // keep scanning
>        }
>        float getHeight() {
>                return _h;
> @@ -1444,13 +1442,12 @@
>  public:
>        float _w;
>        WidthFinder(): _w(0) {}
> -       bool operator() (character* ch)
> +       void operator() (character* ch)
>        {
>                float ch_w = ch->get_width();
>                if (ch_w > _w) {
>                        _w = ch_w;
>                }
> -               return true; // keep scanning
>        }
>        float getWidth() {
>                return _w;
> @@ -1473,7 +1470,7 @@
>                _staticChars(staticChars)
>        {}
>
> -       bool operator() (character* ch)
> +       void operator() (character* ch)
>        {
>                // TODO: Are script-transformed object to be kept ?
>                //       Need a testcase for this
> @@ -1488,7 +1485,6 @@
>                {
>                        _staticChars.push_back(ch);
>                }
> -               return true; // keep scanning
>        }
>  };
>
> @@ -1505,10 +1501,9 @@
>                _chars(chars)
>        {}
>
> -       bool operator() (character* ch)
> +       void operator() (character* ch)
>        {
>                _chars.push_back(ch);
> -               return true; // keep scanning
>        }
>  };
>
> @@ -2271,7 +2266,7 @@
>        std::vector<character*> charsToAdd;
>        std::vector<character*> charsToKeep;
>        ScriptObjectsFinder scriptObjFinder(charsToAdd, charsToKeep);
> -       m_display_list.visitForward(scriptObjFinder);
> +       m_display_list.visitAll(scriptObjFinder);
>
>        // Resort frame0 DisplayList as depth of
>        // characters in it might have been
> @@ -2410,7 +2405,7 @@
>  sprite_instance::find_previous_replace_or_add_tag(int frame,
>                int depth, int id)
>  {
> -       uint32_t depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
> +       uint32 depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
>
>        for (int f = frame - 1; f >= 0; f--)
>        {
> @@ -2952,22 +2947,36 @@
>
>  float sprite_instance::get_height() const
>  {
> +       // TODO: FIXME: this whole thing is bogus,
> +       //       we should extract the actual bounds
> +       //       and return their height
> +
>        HeightFinder f;
>        // the const_cast is just to avoid defining a const version
>        // of DisplayList::visitForward, HeightFinder will NOT
>        // modify the DisplayList elements in any way
> -       const_cast<DisplayList&>(m_display_list).visitForward(f);
> -       return f.getHeight();
> +       const_cast<DisplayList&>(m_display_list).visitAll(f);
> +       float h = f.getHeight();
> +       float hd = _drawable->get_height_local();
> +       if ( hd > h ) h = hd;
> +       return h;
>  }
>
>  float sprite_instance::get_width() const
>  {
> +       // TODO: FIXME: this whole thing is bogus,
> +       //       we should extract the actual bounds
> +       //       and return their width
> +
>        WidthFinder f;
>        // the const_cast is just to avoid defining a const version
>        // of DisplayList::visitForward, WidthFinder will NOT
>        // modify the DisplayList elements in any way
> -       const_cast<DisplayList&>(m_display_list).visitForward(f);
> -       return f.getWidth();
> +       const_cast<DisplayList&>(m_display_list).visitAll(f);
> +       float w = f.getWidth();
> +       float wd = _drawable->get_width_local();
> +       if ( wd > w ) w = wd;
> +       return w;
>  }
>
>  character*
>
> Index: server/parser/shape_character_def.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- server/parser/shape_character_def.cpp       10 Apr 2007 03:12:04 -0000      1.14
> +++ server/parser/shape_character_def.cpp       12 Apr 2007 05:37:33 -0000      1.15
> @@ -6,7 +6,7 @@
>  // Quadratic bezier outline shapes, the basis for most SWF rendering.
>
>
> -/* $Id: shape_character_def.cpp,v 1.14 2007/04/10 03:12:04 zoulunkai Exp $ */
> +/* $Id: shape_character_def.cpp,v 1.15 2007/04/12 05:37:33 strk Exp $ */
>
>  #include "shape_character_def.h"
>
> @@ -621,12 +621,16 @@
>  {
>        r->set_null();
>
> -    for (unsigned int i = 0; i < m_paths.size(); i++) {
> +    for (unsigned int i = 0; i < m_paths.size(); i++)
> +    {
>        const path&     p = m_paths[i];
> +       size_t nedges = p.m_edges.size();
> +       if ( ! nedges ) continue;
>        r->expand_to_point(p.m_ax, p.m_ay);
> -       for (unsigned int j = 0; j < p.m_edges.size(); j++)     {
> +       for (unsigned int j = 0; j<nedges; j++)
> +       {
>            r->expand_to_point(p.m_edges[j].m_ax, p.m_edges[j].m_ay);
> -//                                     r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
> +               r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
>        }
>     }
>  }
>
> Index: testsuite/actionscript.all/MovieClip.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
> retrieving revision 1.52
> retrieving revision 1.53
> diff -u -b -r1.52 -r1.53
> --- testsuite/actionscript.all/MovieClip.as     11 Apr 2007 17:10:12 -0000      1.52
> +++ testsuite/actionscript.all/MovieClip.as     12 Apr 2007 05:37:33 -0000      1.53
> @@ -22,7 +22,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: MovieClip.as,v 1.52 2007/04/11 17:10:12 strk Exp $";
> +rcsid="$Id: MovieClip.as,v 1.53 2007/04/12 05:37:33 strk Exp $";
>
>  #include "check.as"
>
> @@ -60,23 +60,6 @@
>  check(mc.globalToLocal);
>  check_equals(typeOf(mc.unloadMovie), 'function');
>
> -
> -//
> -// Test getBounds (simple test)
> -//
> -var bounds = mc.getBounds();
> -check_equals(typeof(bounds), "object");
> -// Checking for real values would be a bit hard
> -// atm, as the loaded Dejagnu.swf file might
> -// write stuff all around thus making bounds
> -// change often... we'll check it later, with
> -// a user defined movieclip (more control over
> -// it's bounds)
> -check(bounds.xMin != undefined);
> -check(bounds.yMin != undefined);
> -check(bounds.xMax != undefined);
> -check(bounds.yMax != undefined);
> -
>  // This seems unavailable
>  // when targetting SWF > 6
>  #if OUTPUT_VERSION > 6
> @@ -539,6 +522,7 @@
>  check_equals(typeof(b.xMax), 'number');
>  check_equals(typeof(b.yMin), 'number');
>  check_equals(typeof(b.yMax), 'number');
> +// Returned number is (2^28/2)-1 twips : any ringing bell ?
>  xcheck_equals(b.xMin, 6710886.35);
>  xcheck_equals(b.xMax, 6710886.35);
>  xcheck_equals(b.yMin, 6710886.35);
> @@ -553,8 +537,8 @@
>        lineTo(20, 10);
>        lineTo(10, 10);
>  }
> -xcheck_equals(draw._width, 10);
> -xcheck_equals(draw._height, 20);
> +check_equals(draw._width, 10);
> +check_equals(draw._height, 20);
>  b = draw.getBounds();
>  xcheck_equals(b.xMin, 10);
>  xcheck_equals(b.xMax, 20);
> @@ -581,25 +565,25 @@
>
>  draw._xscale = 200;
>  xcheck_equals(draw._width, 20);
> -xcheck_equals(draw._height, 20);
> +check_equals(draw._height, 20);
>
>  draw._rotation = 0;
>  xcheck_equals(draw._width, 20);
> -xcheck_equals(draw._height, 20);
> +check_equals(draw._height, 20);
>
>  draw._visible = true;
>  draw._xscale = 100;
> -xcheck_equals(draw._width, 10);
> -xcheck_equals(draw._height, 20);
> +check_equals(draw._width, 10);
> +check_equals(draw._height, 20);
>
>  draw._yscale = 50;
> -xcheck_equals(draw._width, 10);
> +check_equals(draw._width, 10);
>  xcheck_equals(draw._height, 10);
> -xcheck_equals(container._width, 10);
> +check_equals(container._width, 10);
>  xcheck_equals(container._height, 10);
>
>  container._xscale = 800;
> -xcheck_equals(draw._width, 10);
> +check_equals(draw._width, 10);
>  xcheck_equals(draw._height, 10);
>  xcheck_equals(container._width, 80);
>  xcheck_equals(container._height, 10);
>
> Index: testsuite/misc-ming.all/displaylist_depths_test.c
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- testsuite/misc-ming.all/displaylist_depths_test.c   11 Apr 2007 14:20:21 -0000      1.5
> +++ testsuite/misc-ming.all/displaylist_depths_test.c   12 Apr 2007 05:37:33 -0000      1.6
> @@ -235,40 +235,40 @@
>        check_equals(mo, "typeof(staticmc_dup.child)", "'movieclip'");
>
>        // Note that dynamicmc_dup is at negative depth
> -       check_equals(mo, "dynamicmc_dup._width", "dynamicmc._width");
> +       xcheck_equals(mo, "dynamicmc_dup._width", "dynamicmc._width");
>        xcheck_equals(mo, "parseInt(dynamicmc_dup._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc_dup.child)", "'undefined'");
>
> -       check_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width");
> +       xcheck_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width");
>        xcheck_equals(mo, "parseInt(dynamicmc_2000_dup._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc_2000.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc_2000_dup.child)", "'undefined'");
>
> -       check_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width");
> +       xcheck_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width");
>        xcheck_equals(mo, "parseInt(dynamicmc_30000_dup._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc_30000.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc_30000_dup.child)", "'undefined'");
>
>        // Note that dynamicmc0_dup is at negative depth
> -       check_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width");
> +       xcheck_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width");
>        xcheck_equals(mo, "parseInt(dynamicmc0_dup._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc0.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc0_dup.child)", "'undefined'");
>
>        // Note that dynamicmc1048575_dup is at negative depth
> -       check_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width");
> +       xcheck_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width");
>        xcheck_equals(mo, "parseInt(dynamicmc1048575_dup._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc1048575.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc1048575_dup.child)", "'undefined'");
>
> -       check_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width");
> -       xcheck_equals(mo, "parseInt(dynamicmc1048576._width/10)", "6");
> +       xcheck_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width");
> +       check_equals(mo, "parseInt(dynamicmc1048576._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc1048576.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc1048576_dup.child)", "'undefined'");
>
> -       check_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width");
> -       xcheck_equals(mo, "parseInt(dynamicmc2130690045._width/10)", "6");
> +       xcheck_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width");
> +       check_equals(mo, "parseInt(dynamicmc2130690045._width/10)", "6");
>        check_equals(mo, "typeof(dynamicmc2130690045.child)", "'movieclip'");
>        check_equals(mo, "typeof(dynamicmc2130690045_dup.child)", "'undefined'");
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Thu Apr 12 02:55:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbtDT-00065D-3t
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 02:55:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbtDS-000650-0Y
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:55:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbtDQ-00064o-9G
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:55:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbtDQ-00064l-4J
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:55:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1Hbt9F-0005uL-PY
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:51:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hbt96-0004C1-TL
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 06:51:05 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1Hbt96-0004By-Kr
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 06:51:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hbt96-0004By-Kr@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 12 Apr 2007 06:51:04 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gtksup.h gui/gu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 06:55:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/12 06:51:04

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp gtksup.h gui.cpp gui.h kde.cpp 
	                 kde_glue.h kdesup.h 

Log message:
	Applied patches from Anntti Ajanki

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2854&r2=1.2855
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2854
retrieving revision 1.2855
diff -u -b -r1.2854 -r1.2855
--- ChangeLog	12 Apr 2007 05:37:33 -0000	1.2854
+++ ChangeLog	12 Apr 2007 06:51:04 -0000	1.2855
@@ -1,3 +1,21 @@
+2007-04-11 Antti Ajanki <antti.ajanki@iki.fi>
+	
+	*  gui/gtk.cpp gui/gtksup.h gui/gui.cpp gui/gui.h
+    	*  gui/kde.cpp gui/kde_glue.h gui/kdesup.h
+	*  moves the handling of GUI shortcuts (Crtl+R for restarting the 
+	   movie, Ctrl+Q for quiting, etc.) form GtkGui to base class Gui. 
+	   This way all GUIs can inherit the same code instead of having 
+	   to duplicate it.
+           adds keyboard handling for the KdeGui using this new interface. 
+           Currently KdeGui has no support for keyboard input. 
+
+	    The destructor of KdeGlue deletes _drawing_area object even though 
+            it is not owned by KdeGlue. The _drawing_area is actually the 
+            _qwidget object from KdeGui and is (correctly) deleted at the 
+            destructor of 
+            KdeGui. This double-free error causes a segfault when closing 
+            Gnash. 
+
 2007-04-11 Sandro Santilli <strk@keybit.net>
 
 	* server/parser/shape_character_def.cpp (compute_bound):

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- gui/gtk.cpp	2 Apr 2007 16:46:32 -0000	1.81
+++ gui/gtk.cpp	12 Apr 2007 06:51:04 -0000	1.82
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.81 2007/04/02 16:46:32 tgc Exp $ */
+/* $Id: gtk.cpp,v 1.82 2007/04/12 06:51:04 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1154,6 +1154,24 @@
     return c;
 }
 
+int
+GtkGui::gdk_to_gnash_modifier(int state)
+{
+    int modifier = gnash::key::MOD_NONE;
+
+    if (state & GDK_SHIFT_MASK) {
+      modifier = modifier | gnash::key::MOD_SHIFT;
+    }
+    if (state & GDK_CONTROL_MASK) {
+      modifier = modifier | gnash::key::MOD_CONTROL;
+    }
+    if (state & GDK_MOD1_MASK) {
+      modifier = modifier | gnash::key::MOD_ALT;
+    }
+
+    return modifier;
+}
+
 gboolean
 GtkGui::key_press_event(GtkWidget *const /*widget*/,
                 GdkEventKey *const event,
@@ -1165,52 +1183,10 @@
 
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
+    int mod = gdk_to_gnash_modifier(event->state);
     
     if (c != gnash::key::INVALID) {
-        gui->notify_key_event(c, true);
-    }
-
-    /* Handle GUI shortcuts */
-    if (event->length <= 0) {
-        return true;
-    }
-    unsigned int key = gdk_unicode_to_keyval(event->keyval);
-    if (event->state == GDK_SHIFT_MASK) {
-        dbglogfile << "Got Shift-key: " << key << endl;
-    }
-    if (event->state == GDK_CONTROL_MASK) {
-        dbglogfile << "Got Control-key: " << key << endl;
-        switch(key) {
-          case 'r':
-              gui->menu_restart();
-              break;
-          case 'p':
-              gui->menu_pause();
-              break;
-          case 'q':
-          case 'w':
-              gui->menu_quit();
-              break;
-          default:
-              break;
-        }
-    } else {
-#if 0
-        dbglogfile << "Got key: '" << (char) key
-                   << "' its name is: " << gdk_keyval_name(key)
-                   << " it's value is: " << (int)key
-                   << " hwkeycode: " << event->hardware_keycode << endl;
-#endif
-        switch (key) {
-          case '[':
-              menuitem_step_forward_callback(NULL, NULL);
-              break;
-          case ']':
-              menuitem_step_backward_callback(NULL, NULL);
-              break;
-          default:
-              break;
-        }
+        gui->notify_key_event(c, mod, true);
     }
         
     return true;
@@ -1228,9 +1204,10 @@
 
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
+    int mod = gdk_to_gnash_modifier(event->state);
     
     if (c != gnash::key::INVALID) {
-        gui->notify_key_event(c, false);
+        gui->notify_key_event(c, mod, false);
     }
     
     return true;

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- gui/gtksup.h	6 Mar 2007 18:06:13 -0000	1.37
+++ gui/gtksup.h	12 Apr 2007 06:51:04 -0000	1.38
@@ -158,6 +158,7 @@
 #endif
 
     static gnash::key::code gdk_to_gnash_key(guint key);
+    static int gdk_to_gnash_modifier(int state);
     static void             open_file(GtkWidget* dialog, gpointer data);
 
 };

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- gui/gui.cpp	4 Apr 2007 20:30:45 -0000	1.69
+++ gui/gui.cpp	12 Apr 2007 06:51:04 -0000	1.70
@@ -277,17 +277,46 @@
 }
 
 void
-Gui::notify_key_event(gnash::key::code k, bool pressed) 
+Gui::notify_key_event(gnash::key::code k, int modifier, bool pressed) 
 {
 	movie_root* m = get_current_root();
 
-	//log_msg("mouse @ %d,%d", x, y);
 	if ( m->notify_key_event(k, pressed) )
 	{
 		// any action triggered by the
 		// event required screen refresh
 		display(m);
 	}
+
+	/* Handle GUI shortcuts */
+	if (!pressed) return;
+	if (modifier & gnash::key::MOD_CONTROL) {
+		switch(k) {
+		case gnash::key::R:
+			menu_restart();
+			break;
+		case gnash::key::P:
+			menu_pause();
+			break;
+		case gnash::key::Q:
+		case gnash::key::W:
+			menu_quit();
+			break;
+		default:
+			break;
+		}
+	} else {
+		switch (k) {
+		case gnash::key::LEFT_BRACKET:
+			menu_step_forward();
+			break;
+		case gnash::key::RIGHT_BRACKET:
+			menu_step_backward();
+			break;
+		default:
+			break;
+		}
+	}
 }
 
 bool

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gui/gui.h	2 Apr 2007 15:45:22 -0000	1.47
+++ gui/gui.h	12 Apr 2007 06:51:04 -0000	1.48
@@ -182,11 +182,11 @@
     /// Key event notification to be called when a key is pressed or depressed
     //
     /// @param k The key code.
-    ///
+    /// @param modifier Modifier key identifiers from gnash::key::modifier ORed together
     /// @param pressed Determines whether the key is being
     ///           pressed (true) or being released (false)
     ///
-    void notify_key_event(gnash::key::code k, bool pressed);
+    void notify_key_event(gnash::key::code k, int modifier, bool pressed);
 
     /// Resize the client area view and the window accordingly.
     //

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gui/kde.cpp	20 Mar 2007 16:22:38 -0000	1.10
+++ gui/kde.cpp	12 Apr 2007 06:51:04 -0000	1.11
@@ -149,6 +149,102 @@
   return true;
 }
 
+gnash::key::code
+KdeGui::qtToGnashKey(QKeyEvent *event)
+{
+    gnash::key::code c = gnash::key::INVALID;
+    int key = event->key();
+    
+    if (key >= Qt::Key_0 && key <= Qt::Key_9) {
+      if (event->state() & Qt::Keypad)
+          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::KP_0);
+      else
+          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::_0);
+    } else if (key >= Qt::Key_A && key <= Qt::Key_Z) {
+        c = (gnash::key::code) ((key - Qt::Key_A) + gnash::key::A);
+    } else if (key >= Qt::Key_F1 && key <= Qt::Key_F15) {
+        c = (gnash::key::code) ((key - Qt::Key_F1) + gnash::key::F1);
+    } else {
+        // many keys don't correlate, so just use a look-up table.
+        struct {
+            int               qt;
+            gnash::key::code  gs;
+        } table[] = {
+            { Qt::Key_Backspace, gnash::key::BACKSPACE },
+            { Qt::Key_Tab, gnash::key::TAB },
+            { Qt::Key_Clear, gnash::key::CLEAR },
+            { Qt::Key_Return, gnash::key::ENTER },
+            { Qt::Key_Enter, gnash::key::ENTER },
+
+            { Qt::Key_Shift, gnash::key::SHIFT },
+            { Qt::Key_Control, gnash::key::CONTROL },
+            { Qt::Key_Alt, gnash::key::ALT },
+            { Qt::Key_CapsLock, gnash::key::CAPSLOCK },
+
+            { Qt::Key_Escape, gnash::key::ESCAPE },
+            { Qt::Key_Space, gnash::key::SPACE },
+
+            { Qt::Key_Next, gnash::key::PGDN },
+            { Qt::Key_Prior, gnash::key::PGUP },
+            { Qt::Key_Home, gnash::key::HOME },
+            { Qt::Key_End, gnash::key::END },
+            { Qt::Key_Left, gnash::key::LEFT },
+            { Qt::Key_Up, gnash::key::UP },
+            { Qt::Key_Right, gnash::key::RIGHT },
+            { Qt::Key_Down, gnash::key::DOWN },
+            { Qt::Key_Insert, gnash::key::INSERT },
+            { Qt::Key_Delete, gnash::key::DELETEKEY },
+
+            { Qt::Key_Help, gnash::key::HELP },
+            { Qt::Key_NumLock, gnash::key::NUM_LOCK },
+            { Qt::Key_Semicolon, gnash::key::SEMICOLON },
+            { Qt::Key_Equal, gnash::key::EQUALS },
+            { Qt::Key_Minus, gnash::key::MINUS },
+            { Qt::Key_Slash, gnash::key::SLASH },
+            { Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET },
+            { Qt::Key_Backslash, gnash::key::BACKSLASH },
+            { Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET },
+            { Qt::Key_QuoteDbl, gnash::key::QUOTE },
+            { 0, gnash::key::INVALID }
+        };
+        
+        for (int i = 0; table[i].qt != 0; i++) {
+            if (key == table[i].qt) {
+                c = table[i].gs;
+                break;
+            }
+        }
+    }
+    
+    return c;
+}
+
+int
+KdeGui::qtToGnashModifier(Qt::ButtonState state)
+{
+    int modifier = gnash::key::MOD_NONE;
+
+    if (state & Qt::ShiftButton) {
+        modifier = modifier | gnash::key::MOD_SHIFT;
+    }
+    if (state & Qt::ControlButton) {
+        modifier = modifier | gnash::key::MOD_CONTROL;
+    }
+    if (state & Qt::AltButton) {
+       modifier = modifier | gnash::key::MOD_ALT;
+    }
+
+    return modifier;
+}
+
+void
+KdeGui::handleKeyEvent(QKeyEvent *event, bool down)
+{
+    gnash::key::code c = qtToGnashKey(event);
+    int mod = qtToGnashModifier(event->state());
+    notify_key_event(c, mod, down);
+}
+
 
 /// \brief restart the movie from the beginning
 void
@@ -259,6 +355,7 @@
     _godfather = godfather;
 
     setMouseTracking(true);  
+    setFocusPolicy(QWidget::StrongFocus);
 }
 
 void 
@@ -292,6 +389,17 @@
     _godfather->notify_mouse_clicked(false, 1);
 }
 
+void
+qwidget::keyPressEvent(QKeyEvent *event)
+{
+    _godfather->handleKeyEvent(event, true);
+}
+
+void
+qwidget::keyReleaseEvent(QKeyEvent *event)
+{
+    _godfather->handleKeyEvent(event, false);
+}
 
 void
 qwidget::resizeEvent(QResizeEvent *event)

Index: gui/kde_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gui/kde_glue.h	29 Oct 2006 18:34:10 -0000	1.6
+++ gui/kde_glue.h	12 Apr 2007 06:51:04 -0000	1.7
@@ -18,7 +18,7 @@
 //
 
 
-/* $Id: kde_glue.h,v 1.6 2006/10/29 18:34:10 rsavoye Exp $ */
+/* $Id: kde_glue.h,v 1.7 2007/04/12 06:51:04 nihilus Exp $ */
 
 #include "gnash.h"
 
@@ -30,7 +30,7 @@
 class KdeGlue
 {
   public:
-    virtual ~KdeGlue() { delete _drawing_area; }
+    virtual ~KdeGlue() { };
     virtual bool init(int argc, char **argv[]) = 0;
 
     virtual void prepDrawingArea(QWidget *drawing_area) = 0;

Index: gui/kdesup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kdesup.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gui/kdesup.h	20 Mar 2007 16:22:38 -0000	1.12
+++ gui/kdesup.h	12 Apr 2007 06:51:04 -0000	1.13
@@ -70,6 +70,8 @@
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent( QMouseEvent * );
     void mouseMoveEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void keyReleaseEvent(QKeyEvent *event);
     void timerEvent(QTimerEvent *);
     void resizeEvent(QResizeEvent *event);
 public slots:
@@ -102,12 +104,16 @@
     virtual void renderBuffer();
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);
+    virtual void handleKeyEvent(QKeyEvent *event, bool down);
  private:
     QApplication*  _qapp;
     qwidget*       _qwidget;
     KdeOpenGLGlue  _glue;    
 
     QTimer        *_timer;
+
+    gnash::key::code qtToGnashKey(QKeyEvent *event);
+    int qtToGnashModifier(Qt::ButtonState state);
 };
 
 // end of namespace gnash 



From MAILER-DAEMON Thu Apr 12 03:02:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbtKZ-0007YM-Bk
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 03:02:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbtKX-0007PY-8U
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:02:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbtKV-0007Ha-Nc
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:02:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbtKV-0007H5-Fa
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:02:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HbtGL-0007RI-Rz
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 02:58:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbtGG-0004KH-5S
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 06:58:28 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HbtGF-0004KE-NB
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 06:58:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbtGF-0004KE-NB@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 12 Apr 2007 06:58:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 07:02:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/12 06:58:27

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp 

Log message:
	Changed Copyright years from 2005-2007 -> 2005, 2006, 2007

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2855&r2=1.2856
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.82&r2=1.83

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2855
retrieving revision 1.2856
diff -u -b -r1.2855 -r1.2856
--- ChangeLog	12 Apr 2007 06:51:04 -0000	1.2855
+++ ChangeLog	12 Apr 2007 06:58:27 -0000	1.2856
@@ -1,3 +1,8 @@
+2007-04-11 Stephan Peijnik <sp@gnu.org>
+
+	* gui/gtk.cpp: Changed Copyright years from 2005-2007 -> 2005, 2006,
+	  2007
+
 2007-04-11 Antti Ajanki <antti.ajanki@iki.fi>
 	
 	*  gui/gtk.cpp gui/gtksup.h gui/gui.cpp gui/gui.h

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- gui/gtk.cpp	12 Apr 2007 06:51:04 -0000	1.82
+++ gui/gtk.cpp	12 Apr 2007 06:58:27 -0000	1.83
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.82 2007/04/12 06:51:04 nihilus Exp $ */
+/* $Id: gtk.cpp,v 1.83 2007/04/12 06:58:27 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -867,7 +867,7 @@
     		   NULL,
                    "name", "GNASH flash movie player", 
                    "version", VERSION,
-                   "copyright", "(C) 2005-2007 The Free Software Foundation",
+                   "copyright", "Copyright (C) 2005, 2006, 2007 The Free Software Foundation",
 	           "comments", comments.c_str(),
                    "authors", authors,
                    "documenters", documentors,



From MAILER-DAEMON Thu Apr 12 03:06:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbtOD-0002xP-4w
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 03:06:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbtOC-0002uP-6D
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:06:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbtOB-0002th-RW
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:06:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbtOB-0002tP-FZ
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:06:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HbtK1-0008PL-P5
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:02:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbtJw-0004Qq-IF
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:02:16 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HbtJw-0004Qn-35
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:02:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbtJw-0004Qn-35@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 12 Apr 2007 07:02:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 07:06:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/12 07:02:15

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp 

Log message:
	Fixed 'acces'-typo -> 'access'

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2856&r2=1.2857
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.83&r2=1.84

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2856
retrieving revision 1.2857
diff -u -b -r1.2856 -r1.2857
--- ChangeLog	12 Apr 2007 06:58:27 -0000	1.2856
+++ ChangeLog	12 Apr 2007 07:02:15 -0000	1.2857
@@ -1,7 +1,7 @@
 2007-04-11 Stephan Peijnik <sp@gnu.org>
 
 	* gui/gtk.cpp: Changed Copyright years from 2005-2007 -> 2005, 2006,
-	  2007
+	  2007. Fixed 'acces'-typo -> 'access'.
 
 2007-04-11 Antti Ajanki <antti.ajanki@iki.fi>
 	

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- gui/gtk.cpp	12 Apr 2007 06:58:27 -0000	1.83
+++ gui/gtk.cpp	12 Apr 2007 07:02:15 -0000	1.84
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.83 2007/04/12 06:58:27 nihilus Exp $ */
+/* $Id: gtk.cpp,v 1.84 2007/04/12 07:02:15 nihilus Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -636,7 +636,7 @@
     gtk_widget_show (table4);
     gtk_container_add (GTK_CONTAINER (alignment2), table4);
     
-    label13 = gtk_label_new ("Allow remote acces from: ");
+    label13 = gtk_label_new ("Allow remote access from: ");
     gtk_widget_show (label13);
     gtk_table_attach (GTK_TABLE (table4), label13, 0, 1, 0, 1,
                       (GtkAttachOptions) (GTK_FILL),



From MAILER-DAEMON Thu Apr 12 03:08:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbtQA-000531-G2
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 03:08:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbtQ9-00052g-5W
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:08:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbtQ8-00052H-At
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:08:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbtQ8-00052E-7H
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:08:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <markus@unixrus.se>) id 1HbtLy-0000GK-K8
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:04:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbtLt-0004Uv-FR
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:04:17 +0000
Received: from nihilus by cvs with local (Exim 4.50) id 1HbtLs-0004Ur-F3
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:04:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbtLs-0004Ur-F3@cvs>
From: Markus Gothe <markus@unixrus.se>
Date: Thu, 12 Apr 2007 07:04:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 07:08:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Markus Gothe <nihilus>	07/04/12 07:04:16

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	uint32 -> uint32_t.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2857&r2=1.2858
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.234&r2=1.235

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2857
retrieving revision 1.2858
diff -u -b -r1.2857 -r1.2858
--- ChangeLog	12 Apr 2007 07:02:15 -0000	1.2857
+++ ChangeLog	12 Apr 2007 07:04:15 -0000	1.2858
@@ -1,3 +1,7 @@
+2007-04-11 Markus Gothe <nietzsche@lysator.liu.se>
+
+	* server/sprite_instance.cpp: uint32 -> uint32_t.
+
 2007-04-11 Stephan Peijnik <sp@gnu.org>
 
 	* gui/gtk.cpp: Changed Copyright years from 2005-2007 -> 2005, 2006,

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -b -r1.234 -r1.235
--- server/sprite_instance.cpp	12 Apr 2007 05:37:33 -0000	1.234
+++ server/sprite_instance.cpp	12 Apr 2007 07:04:16 -0000	1.235
@@ -2405,7 +2405,7 @@
 sprite_instance::find_previous_replace_or_add_tag(int frame,
 		int depth, int id)
 {
-	uint32 depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
+	uint32_t depth_id = ((depth & 0x0FFFF) << 16) | (id & 0x0FFFF);
 
 	for (int f = frame - 1; f >= 0; f--)
 	{



From MAILER-DAEMON Thu Apr 12 03:13:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbtV1-0001pO-DE
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 03:13:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbtUy-0001o9-RE
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:13:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbtUw-0001nq-CN
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:13:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbtUw-0001nn-7t
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:13:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbtQm-0000yK-7J
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 03:09:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbtQY-0004dt-ML
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:09:06 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbtQY-0004dq-BL
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:09:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbtQY-0004dq-BL@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Thu, 12 Apr 2007 07:09:06 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp server/asobj/string...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 07:13:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/12 07:09:06

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp 
	server/asobj   : string.cpp 

Log message:
	from_char_code: create a wide string in case the user tries to create one.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2858&r2=1.2859
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2858
retrieving revision 1.2859
diff -u -b -r1.2858 -r1.2859
--- ChangeLog	12 Apr 2007 07:04:15 -0000	1.2858
+++ ChangeLog	12 Apr 2007 07:09:05 -0000	1.2859
@@ -1,3 +1,8 @@
+2007-04-11 Bastiaan Jacques
+
+	* server/asobj/string.cpp: from_char_code: create a wide string
+	in case the user tries to create one.
+
 2007-04-11 Markus Gothe <nietzsche@lysator.liu.se>
 
 	* server/sprite_instance.cpp: uint32 -> uint32_t.
@@ -10,8 +15,8 @@
 2007-04-11 Antti Ajanki <antti.ajanki@iki.fi>
 	
 	*  gui/gtk.cpp gui/gtksup.h gui/gui.cpp gui/gui.h
-    	*  gui/kde.cpp gui/kde_glue.h gui/kdesup.h
-	*  moves the handling of GUI shortcuts (Crtl+R for restarting the 
+	*  gui/kde.cpp gui/kde_glue.h gui/kdesup.h:
+	moves the handling of GUI shortcuts (Crtl+R for restarting the 
 	   movie, Ctrl+Q for quiting, etc.) form GtkGui to base class Gui. 
 	   This way all GUIs can inherit the same code instead of having 
 	   to duplicate it.
@@ -107,6 +112,7 @@
 	* gui/fltk.cpp: Fix compilation by adding statics for GUI methods
 	that became nonstatic. Also fix some warnings.
 	* all over the place: Replace SDL integer type names by standard ones.
+	Thanks to Ann for writing a Perl script to do search-and-replace.
 
 2007-04-11 Sandro Santilli <strk@keybit.net>
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- gui/gtk.cpp	12 Apr 2007 07:02:15 -0000	1.84
+++ gui/gtk.cpp	12 Apr 2007 07:09:06 -0000	1.85
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.84 2007/04/12 07:02:15 nihilus Exp $ */
+/* $Id: gtk.cpp,v 1.85 2007/04/12 07:09:06 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1403,3 +1403,4 @@
 }
 
 } // end of namespace gnash
+

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/string.cpp	29 Mar 2007 08:44:05 -0000	1.25
+++ server/asobj/string.cpp	12 Apr 2007 07:09:06 -0000	1.26
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.25 2007/03/29 08:44:05 strk Exp $ */
+/* $Id: string.cpp,v 1.26 2007/04/12 07:09:06 bjacques Exp $ */
 
 // Implementation of ActionScript String class.
 
@@ -403,16 +403,16 @@
 static as_value
 string_from_char_code(const fn_call& fn)
 {
-    std::string result;
+    std::wstring result;
 
     // isn't this function supposed to take one argument?
 
     for (unsigned int i = 0; i < fn.nargs; i++) {
-        uint32_t c = fn.arg(i).to_number<uint32_t>();
+        wchar_t c = fn.arg(i).to_number<wchar_t>();
         result += c;
     }
 
-    return as_value(result);
+    return as_value(result.c_str());
 }
 
 static as_value



From MAILER-DAEMON Thu Apr 12 05:00:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbvAI-00049U-4a
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 05:00:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbvAD-00044D-Ji
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:00:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbvAB-00042c-HL
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:00:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbvAB-00042D-3Y
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:00:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <ann@lulu.com>) id 1Hbv60-0005WX-An
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 04:56:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hbv5t-0001eT-U8
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 08:55:54 +0000
Received: from ann by cvs with local (Exim 4.50) id 1Hbv5t-0001eQ-Gq
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 08:55:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hbv5t-0001eQ-Gq@cvs>
From: Ann Barcomb <ann@lulu.com>
Date: Thu, 12 Apr 2007 08:55:53 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/internals.xml doc/C/plugi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 09:00:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Ann Barcomb <ann>	07/04/12 08:55:53

Modified files:
	.              : ChangeLog 
	doc/C          : internals.xml plugin.xml 

Log message:
	Applied patch #5820 from Mathew Cucuzella (documentation fixes)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2859&r2=1.2860
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/internals.xml?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/plugin.xml?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2859
retrieving revision 1.2860
diff -u -b -r1.2859 -r1.2860
--- ChangeLog	12 Apr 2007 07:09:05 -0000	1.2859
+++ ChangeLog	12 Apr 2007 08:55:52 -0000	1.2860
@@ -1,4 +1,9 @@
-2007-04-11 Bastiaan Jacques
+2007-04-12 Mathew Cucuzella <kookjr@gmail.com>
+
+	* doc/C/internals.xml plugin.xml: Fix typos in documentation
+          (patch #5820).
+
+2007-04-11 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/asobj/string.cpp: from_char_code: create a wide string
 	in case the user tries to create one.

Index: doc/C/internals.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/internals.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- doc/C/internals.xml	24 Mar 2007 19:30:44 -0000	1.61
+++ doc/C/internals.xml	12 Apr 2007 08:55:53 -0000	1.62
@@ -441,12 +441,12 @@
 	The Gstreamer backend, though not complete, supports both soundstreams
 	and event-sounds. When receiving sound data it stores it compressed,
 	unless if it's ADPCM event-sounds, which it decodes by the parser.
-	When the playback starts, the backend setup a 
+        When the playback starts, the backend sets up a
 	Gstreamer bin containing a decoder (and other things needed) and places
 	it in a Gstreamer pipeline, which plays the audio. All the sound data is
 	not passed at once, but in small chunks, and via callbacks the
 	pipeline gets fed. The advantages of the Gstreamer backend is that it
-	supports both kind of sounds, it avoids all the legal MP3-stuff, and it
+        supports both kinds of sound, it avoids all the legal MP3-stuff, and it
 	should be relatively easy to add VORBIS support. The drawbacks are that
 	it has longer "reply delay" when starting the playback of a sound, and
 	it suffers under some bugs in Gstreamer that are yet to be fixed. 

Index: doc/C/plugin.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/plugin.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- doc/C/plugin.xml	4 Dec 2006 18:48:27 -0000	1.9
+++ doc/C/plugin.xml	12 Apr 2007 08:55:53 -0000	1.10
@@ -31,7 +31,7 @@
       The lower layer is a C based API which is used by Firefox to
       initialize and destroy a plugin. This is so a plugin can be
       portable across multiple systems, since C++ emphasis is not portable
-      between most C++ compilers. This where most of the behind the
+      between most C++ compilers. This is where most of the behind the
       scenes work is done in a plugin. For Gnash, the sources this
       lower layer are in <emphasis>plugin/mozilla-sdk</emphasis>. They were
       added to the Gnash source tree so it wouldn't be necessary to
@@ -307,7 +307,7 @@
     </para>
     
     <para>
-      The <emphasis>The GLX Context</emphasis> is maintained one per
+      The <emphasis>GLX Context</emphasis> is maintained one per
       instantiation of the plugin for a web page. If there are more
       than one Flash movie, there is more than one GLX Context. A GLX
       context can be created by using <emphasis>glXCreateContext()</emphasis>,



From MAILER-DAEMON Thu Apr 12 05:08:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbvI4-000872-Mt
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 05:08:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbvI1-00080O-QV
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:08:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbvHx-0007pW-Sd
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:08:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbvHw-0007oC-IH
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:08:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HbvDm-0006N8-Tx
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:04:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbvDm-0001sl-EE
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:04:02 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HbvDm-0001si-AH
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:04:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbvDm-0001si-AH@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Thu, 12 Apr 2007 09:04:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gtksup.h gui/gu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 09:08:26 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/12 09:04:02

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp gtksup.h gui.cpp gui.h kde.cpp 
	                 kde_glue.h kdesup.h 

Log message:
	Reverted Antti's patches, because they appear to be
	        lacking some changes in the gnash::key namespace. Fixes build.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2860&r2=1.2861
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2860
retrieving revision 1.2861
diff -u -b -r1.2860 -r1.2861
--- ChangeLog	12 Apr 2007 08:55:52 -0000	1.2860
+++ ChangeLog	12 Apr 2007 09:04:01 -0000	1.2861
@@ -7,6 +7,8 @@
 
 	* server/asobj/string.cpp: from_char_code: create a wide string
 	in case the user tries to create one.
+	* gui: Reverted Antti's patches, because they appear to be
+	lacking some changes in the gnash::key namespace. Fixes build.
 
 2007-04-11 Markus Gothe <nietzsche@lysator.liu.se>
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- gui/gtk.cpp	12 Apr 2007 07:09:06 -0000	1.85
+++ gui/gtk.cpp	12 Apr 2007 09:04:01 -0000	1.86
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.85 2007/04/12 07:09:06 bjacques Exp $ */
+/* $Id: gtk.cpp,v 1.86 2007/04/12 09:04:01 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1154,24 +1154,6 @@
     return c;
 }
 
-int
-GtkGui::gdk_to_gnash_modifier(int state)
-{
-    int modifier = gnash::key::MOD_NONE;
-
-    if (state & GDK_SHIFT_MASK) {
-      modifier = modifier | gnash::key::MOD_SHIFT;
-    }
-    if (state & GDK_CONTROL_MASK) {
-      modifier = modifier | gnash::key::MOD_CONTROL;
-    }
-    if (state & GDK_MOD1_MASK) {
-      modifier = modifier | gnash::key::MOD_ALT;
-    }
-
-    return modifier;
-}
-
 gboolean
 GtkGui::key_press_event(GtkWidget *const /*widget*/,
                 GdkEventKey *const event,
@@ -1183,10 +1165,52 @@
 
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
-    int mod = gdk_to_gnash_modifier(event->state);
     
     if (c != gnash::key::INVALID) {
-        gui->notify_key_event(c, mod, true);
+        gui->notify_key_event(c, true);
+    }
+
+    /* Handle GUI shortcuts */
+    if (event->length <= 0) {
+        return true;
+    }
+    unsigned int key = gdk_unicode_to_keyval(event->keyval);
+    if (event->state == GDK_SHIFT_MASK) {
+        dbglogfile << "Got Shift-key: " << key << endl;
+    }
+    if (event->state == GDK_CONTROL_MASK) {
+        dbglogfile << "Got Control-key: " << key << endl;
+        switch(key) {
+          case 'r':
+              gui->menu_restart();
+              break;
+          case 'p':
+              gui->menu_pause();
+              break;
+          case 'q':
+          case 'w':
+              gui->menu_quit();
+              break;
+          default:
+              break;
+        }
+    } else {
+#if 0
+        dbglogfile << "Got key: '" << (char) key
+                   << "' its name is: " << gdk_keyval_name(key)
+                   << " it's value is: " << (int)key
+                   << " hwkeycode: " << event->hardware_keycode << endl;
+#endif
+        switch (key) {
+          case '[':
+              menuitem_step_forward_callback(NULL, NULL);
+              break;
+          case ']':
+              menuitem_step_backward_callback(NULL, NULL);
+              break;
+          default:
+              break;
+        }
     }
         
     return true;
@@ -1204,10 +1228,9 @@
 
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
-    int mod = gdk_to_gnash_modifier(event->state);
     
     if (c != gnash::key::INVALID) {
-        gui->notify_key_event(c, mod, false);
+        gui->notify_key_event(c, false);
     }
     
     return true;

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gui/gtksup.h	12 Apr 2007 06:51:04 -0000	1.38
+++ gui/gtksup.h	12 Apr 2007 09:04:01 -0000	1.39
@@ -158,7 +158,6 @@
 #endif
 
     static gnash::key::code gdk_to_gnash_key(guint key);
-    static int gdk_to_gnash_modifier(int state);
     static void             open_file(GtkWidget* dialog, gpointer data);
 
 };

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- gui/gui.cpp	12 Apr 2007 06:51:04 -0000	1.70
+++ gui/gui.cpp	12 Apr 2007 09:04:01 -0000	1.71
@@ -277,46 +277,17 @@
 }
 
 void
-Gui::notify_key_event(gnash::key::code k, int modifier, bool pressed) 
+Gui::notify_key_event(gnash::key::code k, bool pressed) 
 {
 	movie_root* m = get_current_root();
 
+	//log_msg("mouse @ %d,%d", x, y);
 	if ( m->notify_key_event(k, pressed) )
 	{
 		// any action triggered by the
 		// event required screen refresh
 		display(m);
 	}
-
-	/* Handle GUI shortcuts */
-	if (!pressed) return;
-	if (modifier & gnash::key::MOD_CONTROL) {
-		switch(k) {
-		case gnash::key::R:
-			menu_restart();
-			break;
-		case gnash::key::P:
-			menu_pause();
-			break;
-		case gnash::key::Q:
-		case gnash::key::W:
-			menu_quit();
-			break;
-		default:
-			break;
-		}
-	} else {
-		switch (k) {
-		case gnash::key::LEFT_BRACKET:
-			menu_step_forward();
-			break;
-		case gnash::key::RIGHT_BRACKET:
-			menu_step_backward();
-			break;
-		default:
-			break;
-		}
-	}
 }
 
 bool

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- gui/gui.h	12 Apr 2007 06:51:04 -0000	1.48
+++ gui/gui.h	12 Apr 2007 09:04:01 -0000	1.49
@@ -182,11 +182,11 @@
     /// Key event notification to be called when a key is pressed or depressed
     //
     /// @param k The key code.
-    /// @param modifier Modifier key identifiers from gnash::key::modifier ORed together
+    ///
     /// @param pressed Determines whether the key is being
     ///           pressed (true) or being released (false)
     ///
-    void notify_key_event(gnash::key::code k, int modifier, bool pressed);
+    void notify_key_event(gnash::key::code k, bool pressed);
 
     /// Resize the client area view and the window accordingly.
     //

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gui/kde.cpp	12 Apr 2007 06:51:04 -0000	1.11
+++ gui/kde.cpp	12 Apr 2007 09:04:01 -0000	1.12
@@ -149,102 +149,6 @@
   return true;
 }
 
-gnash::key::code
-KdeGui::qtToGnashKey(QKeyEvent *event)
-{
-    gnash::key::code c = gnash::key::INVALID;
-    int key = event->key();
-    
-    if (key >= Qt::Key_0 && key <= Qt::Key_9) {
-      if (event->state() & Qt::Keypad)
-          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::KP_0);
-      else
-          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::_0);
-    } else if (key >= Qt::Key_A && key <= Qt::Key_Z) {
-        c = (gnash::key::code) ((key - Qt::Key_A) + gnash::key::A);
-    } else if (key >= Qt::Key_F1 && key <= Qt::Key_F15) {
-        c = (gnash::key::code) ((key - Qt::Key_F1) + gnash::key::F1);
-    } else {
-        // many keys don't correlate, so just use a look-up table.
-        struct {
-            int               qt;
-            gnash::key::code  gs;
-        } table[] = {
-            { Qt::Key_Backspace, gnash::key::BACKSPACE },
-            { Qt::Key_Tab, gnash::key::TAB },
-            { Qt::Key_Clear, gnash::key::CLEAR },
-            { Qt::Key_Return, gnash::key::ENTER },
-            { Qt::Key_Enter, gnash::key::ENTER },
-
-            { Qt::Key_Shift, gnash::key::SHIFT },
-            { Qt::Key_Control, gnash::key::CONTROL },
-            { Qt::Key_Alt, gnash::key::ALT },
-            { Qt::Key_CapsLock, gnash::key::CAPSLOCK },
-
-            { Qt::Key_Escape, gnash::key::ESCAPE },
-            { Qt::Key_Space, gnash::key::SPACE },
-
-            { Qt::Key_Next, gnash::key::PGDN },
-            { Qt::Key_Prior, gnash::key::PGUP },
-            { Qt::Key_Home, gnash::key::HOME },
-            { Qt::Key_End, gnash::key::END },
-            { Qt::Key_Left, gnash::key::LEFT },
-            { Qt::Key_Up, gnash::key::UP },
-            { Qt::Key_Right, gnash::key::RIGHT },
-            { Qt::Key_Down, gnash::key::DOWN },
-            { Qt::Key_Insert, gnash::key::INSERT },
-            { Qt::Key_Delete, gnash::key::DELETEKEY },
-
-            { Qt::Key_Help, gnash::key::HELP },
-            { Qt::Key_NumLock, gnash::key::NUM_LOCK },
-            { Qt::Key_Semicolon, gnash::key::SEMICOLON },
-            { Qt::Key_Equal, gnash::key::EQUALS },
-            { Qt::Key_Minus, gnash::key::MINUS },
-            { Qt::Key_Slash, gnash::key::SLASH },
-            { Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET },
-            { Qt::Key_Backslash, gnash::key::BACKSLASH },
-            { Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET },
-            { Qt::Key_QuoteDbl, gnash::key::QUOTE },
-            { 0, gnash::key::INVALID }
-        };
-        
-        for (int i = 0; table[i].qt != 0; i++) {
-            if (key == table[i].qt) {
-                c = table[i].gs;
-                break;
-            }
-        }
-    }
-    
-    return c;
-}
-
-int
-KdeGui::qtToGnashModifier(Qt::ButtonState state)
-{
-    int modifier = gnash::key::MOD_NONE;
-
-    if (state & Qt::ShiftButton) {
-        modifier = modifier | gnash::key::MOD_SHIFT;
-    }
-    if (state & Qt::ControlButton) {
-        modifier = modifier | gnash::key::MOD_CONTROL;
-    }
-    if (state & Qt::AltButton) {
-       modifier = modifier | gnash::key::MOD_ALT;
-    }
-
-    return modifier;
-}
-
-void
-KdeGui::handleKeyEvent(QKeyEvent *event, bool down)
-{
-    gnash::key::code c = qtToGnashKey(event);
-    int mod = qtToGnashModifier(event->state());
-    notify_key_event(c, mod, down);
-}
-
 
 /// \brief restart the movie from the beginning
 void
@@ -355,7 +259,6 @@
     _godfather = godfather;
 
     setMouseTracking(true);  
-    setFocusPolicy(QWidget::StrongFocus);
 }
 
 void 
@@ -389,17 +292,6 @@
     _godfather->notify_mouse_clicked(false, 1);
 }
 
-void
-qwidget::keyPressEvent(QKeyEvent *event)
-{
-    _godfather->handleKeyEvent(event, true);
-}
-
-void
-qwidget::keyReleaseEvent(QKeyEvent *event)
-{
-    _godfather->handleKeyEvent(event, false);
-}
 
 void
 qwidget::resizeEvent(QResizeEvent *event)

Index: gui/kde_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/kde_glue.h	12 Apr 2007 06:51:04 -0000	1.7
+++ gui/kde_glue.h	12 Apr 2007 09:04:01 -0000	1.8
@@ -18,7 +18,7 @@
 //
 
 
-/* $Id: kde_glue.h,v 1.7 2007/04/12 06:51:04 nihilus Exp $ */
+/* $Id: kde_glue.h,v 1.8 2007/04/12 09:04:01 bjacques Exp $ */
 
 #include "gnash.h"
 
@@ -30,7 +30,7 @@
 class KdeGlue
 {
   public:
-    virtual ~KdeGlue() { };
+    virtual ~KdeGlue() { delete _drawing_area; }
     virtual bool init(int argc, char **argv[]) = 0;
 
     virtual void prepDrawingArea(QWidget *drawing_area) = 0;

Index: gui/kdesup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kdesup.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gui/kdesup.h	12 Apr 2007 06:51:04 -0000	1.13
+++ gui/kdesup.h	12 Apr 2007 09:04:01 -0000	1.14
@@ -70,8 +70,6 @@
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent( QMouseEvent * );
     void mouseMoveEvent(QMouseEvent *event);
-    void keyPressEvent(QKeyEvent *event);
-    void keyReleaseEvent(QKeyEvent *event);
     void timerEvent(QTimerEvent *);
     void resizeEvent(QResizeEvent *event);
 public slots:
@@ -104,16 +102,12 @@
     virtual void renderBuffer();
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);
-    virtual void handleKeyEvent(QKeyEvent *event, bool down);
  private:
     QApplication*  _qapp;
     qwidget*       _qwidget;
     KdeOpenGLGlue  _glue;    
 
     QTimer        *_timer;
-
-    gnash::key::code qtToGnashKey(QKeyEvent *event);
-    int qtToGnashModifier(Qt::ButtonState state);
 };
 
 // end of namespace gnash 



From MAILER-DAEMON Thu Apr 12 05:19:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HbvSS-0005gR-36
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 05:19:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbvSP-0005ea-Hc
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:19:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbvSN-0005cK-O1
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:19:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbvSN-0005cB-Ey
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:19:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbvOD-00087R-Kj
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:14:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbvO2-00024T-6K
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:14:38 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbvO1-00024Q-Nx
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:14:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbvO1-00024Q-Nx@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 09:14:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 09:19:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 09:14:37

Modified files:
	.              : ChangeLog 
	server         : button_character_instance.cpp 
	                 button_character_instance.h character.cpp 
	                 character.h edit_text_character.h 
	                 generic_character.h matrix.cpp matrix.h 
	                 sprite_instance.cpp sprite_instance.h 
	                 video_stream_instance.h 
	testsuite/actionscript.all: MovieClip.as 
	testsuite/swfdec: PASSING 

Log message:
	        * server/matrix.{cpp,h}: add transform and transform_by_inverse
	          for Range2d<float> type.
	        * server/character.h: add a getBounds() virutual method.
	        * server/: generic_character.h, button_character_instance.{cpp,h},
	          edit_text_character.h, video_stream_instance.h:
	          Implement getBounds.
	        * server/character.cpp: fix width_getset and height_getset
	          to use the new getBounds interface.
	        * server/sprite_instance.{cpp,h}: implement getBounds;
	          implement MovieClip.getBounds.
	        * testsuite/actionscript.all/MovieClip.as: more tests for
	          getBounds, more successes.
	        * testsuite/swfdec/PASSING: height2.swf and height3.swf tests
	          now succeed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2861&r2=1.2862
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.235&r2=1.236
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2861
retrieving revision 1.2862
diff -u -b -r1.2861 -r1.2862
--- ChangeLog	12 Apr 2007 09:04:01 -0000	1.2861
+++ ChangeLog	12 Apr 2007 09:14:36 -0000	1.2862
@@ -1,3 +1,20 @@
+2007-04-12 Sandro Santilli <strk@keybit.net>
+
+	* server/matrix.{cpp,h}: add transform and transform_by_inverse
+	  for Range2d<float> type.
+	* server/character.h: add a getBounds() virutual method.
+	* server/: generic_character.h, button_character_instance.{cpp,h},
+	  edit_text_character.h, video_stream_instance.h:
+	  Implement getBounds.
+	* server/character.cpp: fix width_getset and height_getset
+	  to use the new getBounds interface.
+	* server/sprite_instance.{cpp,h}: implement getBounds;
+	  implement MovieClip.getBounds.
+	* testsuite/actionscript.all/MovieClip.as: more tests for
+	  getBounds, more successes.
+	* testsuite/swfdec/PASSING: height2.swf and height3.swf tests
+	  now succeed.
+
 2007-04-12 Mathew Cucuzella <kookjr@gmail.com>
 
 	* doc/C/internals.xml plugin.xml: Fix typos in documentation

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/button_character_instance.cpp	11 Apr 2007 14:20:20 -0000	1.40
+++ server/button_character_instance.cpp	12 Apr 2007 09:14:36 -0000	1.41
@@ -1,7 +1,23 @@
-// button.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// 
+//
+//
 
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
 
 // SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
@@ -814,6 +830,26 @@
 	return 0.0;
 }
 
+geometry::Range2d<float>
+button_character_instance::getBounds() const
+{
+	for (unsigned int i = 0; i < m_def->m_button_records.size(); i++)
+	{
+		button_record&	rec = m_def->m_button_records[i];
+		if (m_record_character[i] == NULL)
+		{
+			continue;
+		}
+		if ((m_mouse_state == UP && rec.m_up)
+		    || (m_mouse_state == DOWN && rec.m_down)
+		    || (m_mouse_state == OVER && rec.m_over))
+		{
+			return m_record_character[i]->getBounds();
+		}
+	}
+	return geometry::Range2d<float>(geometry::nullRange);
+}
+
 character*
 button_character_instance::get_relative_target(const std::string& name)
 {

Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/button_character_instance.h	19 Mar 2007 17:11:14 -0000	1.17
+++ server/button_character_instance.h	12 Apr 2007 09:14:36 -0000	1.18
@@ -1,11 +1,26 @@
-// Thatcher Ulrich <tu@tulrich.com> 2003
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+// 
+//
+//
 
 // SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
-/* $Id: button_character_instance.h,v 1.17 2007/03/19 17:11:14 bjacques Exp $ */
+/* $Id: button_character_instance.h,v 1.18 2007/04/12 09:14:36 strk Exp $ */
 
 #ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
 #define GNASH_BUTTON_CHARACTER_INSTANCE_H
@@ -127,6 +142,8 @@
 
 	virtual float get_height() const;
 	
+	geometry::Range2d<float> getBounds() const;
+	
 	static as_value enabled_getset(const fn_call& fn);
 	
 	bool get_enabled();

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/character.cpp	11 Apr 2007 14:20:20 -0000	1.30
+++ server/character.cpp	12 Apr 2007 09:14:36 -0000	1.31
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.30 2007/04/11 14:20:20 strk Exp $ */
+/* $Id: character.cpp,v 1.31 2007/04/12 09:14:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -471,7 +471,16 @@
 	as_value rv;
 	if ( fn.nargs == 0 ) // getter
 	{
-		rv = as_value(TWIPS_TO_PIXELS(ptr->get_width()));
+		float w = 0;
+		geometry::Range2d<float> bounds = ptr->getBounds();
+		if ( bounds.isFinite() )
+		{
+			matrix m = ptr->get_matrix();
+			m.transform(bounds);
+			assert(bounds.isFinite());
+			w = TWIPS_TO_PIXELS(int(bounds.width()));
+		}
+		rv = as_value(w);
 	}
 	else // setter
 	{
@@ -497,14 +506,23 @@
 	as_value rv;
 	if ( fn.nargs == 0 ) // getter
 	{
-		rv = as_value(TWIPS_TO_PIXELS(ptr->get_height()));
+		float h = 0;
+		geometry::Range2d<float> bounds = ptr->getBounds();
+		if ( bounds.isFinite() )
+		{
+			matrix m = ptr->get_matrix();
+			m.transform(bounds);
+			assert(bounds.isFinite());
+			h = TWIPS_TO_PIXELS(int(bounds.height()));
+		}
+		rv = as_value(h);
 	}
 	else // setter
 	{
 		// @@ tulrich: is parameter in world-coords or local-coords?
 		matrix m = ptr->get_matrix();
 		m.m_[1][1] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number()));
-		float h = ptr->get_height(); // WARNING: was get_width originally, sounds as a bug
+		float h = ptr->get_height(); 
 		if (fabsf(h) > 1e-6f)
 		{
 			m.m_[1][1] /= h;

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/character.h	11 Apr 2007 14:20:20 -0000	1.64
+++ server/character.h	12 Apr 2007 09:14:36 -0000	1.65
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.64 2007/04/11 14:20:20 strk Exp $ */
+/* $Id: character.h,v 1.65 2007/04/12 09:14:36 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -38,6 +38,7 @@
 #include "cxform.h" // for composition
 #include "log.h"
 #include "snappingrange.h"
+#include "Range2d.h"
 
 #include <map>
 #include <cstdarg>
@@ -411,6 +412,21 @@
 		return 0;
 	}
 
+    	/// Returns local, untransformed bounds of this character in TWIPS
+	//
+	/// The default implementation prints an error and returns a NULL rect.
+	///
+	/// Container characters (sprite and buttons) return the composite
+	/// bounds of all their childrens, appropriaterly transformed with
+	/// their local matrix.
+	///
+	virtual geometry::Range2d<float> getBounds() const
+	{
+		log_error("FIXME: character %s did not override the getBounds() method",
+				typeid(*this).name());
+		return geometry::Range2d<float>(geometry::nullRange);
+	}
+
 	/// Return the "relative" root of this character
 	//
 	/// The "relative" is the movie_instance created by

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/edit_text_character.h	28 Mar 2007 20:38:35 -0000	1.26
+++ server/edit_text_character.h	12 Apr 2007 09:14:36 -0000	1.27
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@
 #include "edit_text_character_def.h" // for inlines
 #include "styles.h" // for fill_style and line_style
 #include "text.h" // for text_glyph_record
+#include "Range2d.h"
+#include "rect.h" // for inlines
 
 
 // Forward declarations
@@ -92,6 +94,11 @@
 	virtual float	get_height() const;
 	virtual float	get_width() const;
 
+	geometry::Range2d<float> getBounds() const
+	{
+		return m_def->get_bounds().getRange();
+	}
+
 private:
 
 	/// The actual text

Index: server/generic_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/generic_character.h	28 Feb 2007 17:25:26 -0000	1.19
+++ server/generic_character.h	12 Apr 2007 09:14:36 -0000	1.20
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -86,6 +86,11 @@
 		return m_def->get_width_local();
 	}
 
+	geometry::Range2d<float> getBounds() const
+	{
+		return m_def->get_bound().getRange();
+	}
+
 	virtual character* get_topmost_mouse_entity(float x, float y);
 
 	/// \brief

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/matrix.cpp	12 Feb 2007 12:26:13 -0000	1.7
+++ server/matrix.cpp	12 Apr 2007 09:14:36 -0000	1.8
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.7 2007/02/12 12:26:13 nihilus Exp $ 
+// $Id: matrix.cpp,v 1.8 2007/04/12 09:14:36 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -218,6 +218,29 @@
 }
 
 void
+matrix::transform(geometry::Range2d<float>& r) const
+{
+	if ( ! r.isFinite() ) return;
+
+	float xmin = r.getMinX();
+	float xmax = r.getMaxX();
+	float ymin = r.getMinY();
+	float ymax = r.getMaxY();
+
+	xmin = m_[0][0] * xmin + m_[0][1] * ymin + m_[0][2];
+	ymin = m_[1][0] * xmin + m_[1][1] * ymin + m_[1][2];
+
+	xmax = m_[0][0] * xmax + m_[0][1] * ymax + m_[0][2];
+	ymax = m_[1][0] * xmax + m_[1][1] * ymax + m_[1][2];
+
+	// Rotation can swap the max/min coordinates
+	if ( xmax < xmin ) std::swap(xmin, xmax);
+	if ( ymax < ymin ) std::swap(ymin, ymax);
+
+	r.setTo(xmin, ymin, xmax, ymax);
+}
+
+void
 matrix::transform_vector(point* result, const point& v) const
 // Transform vector 'v' by our matrix. Doesn't apply translation.
 // Put the result in *result.
@@ -238,6 +261,15 @@
 	m.transform(result, p);
 }
 
+void
+matrix::transform_by_inverse(geometry::Range2d<float>& r) const
+{
+	// @@ TODO optimize this!
+	matrix	m;
+	m.set_inverse(*this);
+	m.transform(r);
+}
+
 
 void
 matrix::set_inverse(const matrix& m)

Index: server/matrix.h
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/matrix.h	2 Nov 2006 14:00:55 -0000	1.4
+++ server/matrix.h	12 Apr 2007 09:14:36 -0000	1.5
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.h,v 1.4 2006/11/02 14:00:55 udog Exp $ 
+// $Id: matrix.h,v 1.5 2007/04/12 09:14:36 strk Exp $ 
 //
 
 #ifndef GNASH_MATRIX_H
@@ -29,13 +29,19 @@
 #endif
 
 #include "tu_config.h" // for DSOEXPORT
+#include "Range2d.h" // for transforming Range2d<float>
 
 #include <iosfwd>
 
+// Forward declarations
+namespace gnash {
+	class point;
+	class stream;
+}
+
+
 namespace gnash {
 
-class point;
-class stream;
 
 /// Matrix type, used by render handler.
 //
@@ -130,6 +136,19 @@
 	///
 	void	transform_by_inverse(point* result, const point& p) const;
 
+	/// Transform Range2d<float> 'r' by our matrix. 
+	//
+	/// NULL and WORLD ranges are untouched.
+	///
+	void	transform(geometry::Range2d<float>& r) const;
+
+	/// Transform Range2d<float> 'r' by the inverse our matrix. 
+	//
+	/// NULL and WORLD ranges are untouched.
+	///
+	void	transform_by_inverse(geometry::Range2d<float>& r) const;
+
+
 	/// Set this matrix to the inverse of the given matrix.
 	void	set_inverse(const matrix& m);
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -b -r1.235 -r1.236
--- server/sprite_instance.cpp	12 Apr 2007 07:04:16 -0000	1.235
+++ server/sprite_instance.cpp	12 Apr 2007 09:14:36 -0000	1.236
@@ -798,20 +798,54 @@
 {
 	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
 
-	boost::intrusive_ptr<as_object> target;
+
+	geometry::Range2d<float> bounds  = sprite->getBounds();
+
 	if ( fn.nargs > 0 )
 	{
-		target = fn.arg(0).to_object();
+		boost::intrusive_ptr<sprite_instance> target = fn.arg(0).to_sprite();
+		if ( ! target )
+		{
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("MovieClip.getBounds(%s) : invalid call, first arg must be a sprite",
+				fn.arg(0).to_debug_string().c_str());
+			);
+			return as_value();
 	}
 
-	// TODO: implement 'Range2d<float> character::getBounds(character* ref=NULL)'
-	UNUSED(sprite);
-	geometry::Range2d<float> bounds(0, 0, 0, 0); //  = sprite->getBounds(target.get());
-
-	double xMin = bounds.getMinX();
-	double yMin = bounds.getMinY();
-	double xMax = bounds.getMaxX();
-	double yMax = bounds.getMaxY();
+		matrix tgtwmat = target->get_world_matrix();
+		matrix srcwmat = sprite->get_world_matrix();
+		// TODO: fixme, we should likely use the world matrixes for a straight and inverse transform
+		matrix invtgtwmat; invtgtwmat.set_inverse(tgtwmat);
+		matrix m = srcwmat;
+		m.concatenate(invtgtwmat);
+
+		//m.transform(bounds);
+		//tgtwmat.transform_by_inverse(bounds);
+		std::stringstream ss;
+
+		ss << "Local bounds: " << bounds << endl;
+		srcwmat.transform(bounds);
+		ss << "src-w-transformed bounds: " << bounds << "(srcwmat is " << srcwmat << ")" << endl;
+		tgtwmat.transform_by_inverse(bounds);
+		ss << "tgt-w-invtransfor bounds: " << bounds << "(tgtwmat is " << tgtwmat << ")" << endl;
+		log_msg("%s", ss.str().c_str());
+		log_error("FIXME: MovieClip.getBounds(%s) broken", fn.arg(0).to_debug_string().c_str());
+	}
+
+	// Magic numbers here... dunno why
+	double xMin = 6710886.35;
+	double yMin = 6710886.35;
+	double xMax = 6710886.35;
+	double yMax = 6710886.35;
+
+	if ( bounds.isFinite() )
+	{
+		xMin = bounds.getMinX()/20;
+		yMin = bounds.getMinY()/20;
+		xMax = bounds.getMaxX()/20;
+		yMax = bounds.getMaxY()/20;
+	}
 
 	boost::intrusive_ptr<as_object> bounds_obj(new as_object());
 	bounds_obj->init_member("xMin", as_value(xMin));
@@ -823,7 +857,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.getBounds() not implemented yet (just stubbed)");
+		log_error("FIXME: MovieClip.getBounds() TESTING");
 		warned=true;
 	}
 
@@ -1411,6 +1445,23 @@
 // sprite_instance helper classes
 //------------------------------------------------
 
+/// A DisplayList visitor used to compute its overall bounds.
+//
+class BoundsFinder {
+public:
+	geometry::Range2d<float>& _bounds;
+	BoundsFinder(geometry::Range2d<float>& b)
+		:
+		_bounds(b)
+	{}
+	void operator() (character* ch)
+	{
+		geometry::Range2d<float> chb = ch->getBounds();
+		matrix m = ch->get_matrix();
+		m.transform(chb);
+		_bounds.expandTo(chb);
+	}
+};
 
 /// A DisplayList visitor used to compute its overall height.
 //
@@ -3484,5 +3535,17 @@
 
 }
 
+geometry::Range2d<float>
+sprite_instance::getBounds() const
+{
+	typedef geometry::Range2d<float> Range;
+
+	Range bounds;
+	BoundsFinder f(bounds);
+	const_cast<DisplayList&>(m_display_list).visitAll(f);
+	Range drawableBounds = _drawable->get_bound().getRange();
+	bounds.expandTo(drawableBounds);
+	return bounds;
+}
 
 } // namespace gnash

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/sprite_instance.h	11 Apr 2007 14:20:20 -0000	1.94
+++ server/sprite_instance.h	12 Apr 2007 09:14:36 -0000	1.95
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.94 2007/04/11 14:20:20 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.95 2007/04/12 09:14:36 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -35,6 +35,7 @@
 #include "as_environment.h" // for composition
 #include "DynamicShape.h" // for composition
 //#include "LoadVariablesThread.h" // for composition
+#include "Range2d.h"
 
 #include <vector>
 #include <list>
@@ -139,6 +140,9 @@
 
 	float get_height() const;
 
+	/// Get the composite bounds of all component drawing elements
+	geometry::Range2d<float> getBounds() const;
+
 	size_t get_current_frame() const
 	{
 		return m_current_frame;

Index: server/video_stream_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/video_stream_instance.h	20 Mar 2007 15:01:20 -0000	1.9
+++ server/video_stream_instance.h	12 Apr 2007 09:14:36 -0000	1.10
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: video_stream_instance.h,v 1.9 2007/03/20 15:01:20 strk Exp $
+// $Id: video_stream_instance.h,v 1.10 2007/04/12 09:14:36 strk Exp $
 
 #ifndef GNASH_VIDEO_STREAM_INSTANCE_H
 #define GNASH_VIDEO_STREAM_INSTANCE_H
@@ -49,6 +49,11 @@
 
 	~video_stream_instance();
 
+	geometry::Range2d<float> getBounds() const
+	{
+		return m_def->get_bound().getRange();
+	}
+
 	virtual void	advance(float delta_time);
 	void	display();
 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- testsuite/actionscript.all/MovieClip.as	12 Apr 2007 05:37:33 -0000	1.53
+++ testsuite/actionscript.all/MovieClip.as	12 Apr 2007 09:14:36 -0000	1.54
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.53 2007/04/12 05:37:33 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.54 2007/04/12 09:14:36 strk Exp $";
 
 #include "check.as"
 
@@ -523,10 +523,10 @@
 check_equals(typeof(b.yMin), 'number');
 check_equals(typeof(b.yMax), 'number');
 // Returned number is (2^28/2)-1 twips : any ringing bell ?
-xcheck_equals(b.xMin, 6710886.35);
-xcheck_equals(b.xMax, 6710886.35);
-xcheck_equals(b.yMin, 6710886.35);
-xcheck_equals(b.yMax, 6710886.35);
+check_equals(b.xMin, 6710886.35);
+check_equals(b.xMax, 6710886.35);
+check_equals(b.yMin, 6710886.35);
+check_equals(b.yMax, 6710886.35);
 
 with (draw)
 {
@@ -540,52 +540,177 @@
 check_equals(draw._width, 10);
 check_equals(draw._height, 20);
 b = draw.getBounds();
-xcheck_equals(b.xMin, 10);
-xcheck_equals(b.xMax, 20);
-xcheck_equals(b.yMin, 10);
-xcheck_equals(b.yMax, 30);
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+b = draw.getBounds(container);
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
 
-draw._rotation = 90;
-xcheck_equals(draw._width, 20);
-xcheck_equals(draw._height, 10);
+draw._x += 20;
 b = draw.getBounds();
-xcheck_equals(b.xMin, 10);
-xcheck_equals(b.xMax, 20);
-xcheck_equals(b.yMin, 10);
-xcheck_equals(b.yMax, 30);
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+b = draw.getBounds(container);
+check_equals(b.xMin, 30);
+check_equals(b.xMax, 40);
+container._x -= 20;
+b = draw.getBounds();
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
 b = draw.getBounds(container);
-xcheck_equals(b.xMin, -30);
+check_equals(b.xMin, 30);
+check_equals(b.xMax, 40);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+check_equals(draw._width, 10); 
+check_equals(draw._height, 20);
+b = draw.getBounds(_root);
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+draw._x -= 20;
+container._x += 20;
+
+draw._rotation = 90;
+check_equals(draw._width, 20); 
+xcheck_equals(draw._height, 10); 
+b = draw.getBounds(); // these are local, untransformed
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+b = draw.getBounds(container); // these are transformed by container draw matrix
+check_equals(b.xMin, -30);
 xcheck_equals(b.xMax, -10);
 xcheck_equals(b.yMin, 10);
 xcheck_equals(b.yMax, 20);
 
 draw._visible = false;
-xcheck_equals(draw._width, 20);
+check_equals(draw._width, 20);
 xcheck_equals(draw._height, 10);
+b = draw.getBounds(); // these are local, untransformed
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+b = draw.getBounds(container); // these are transformed by container draw matrix
+check_equals(b.xMin, -30);
+xcheck_equals(b.xMax, -10);
+xcheck_equals(b.yMin, 10);
+xcheck_equals(b.yMax, 20);
 
 draw._xscale = 200;
-xcheck_equals(draw._width, 20);
-check_equals(draw._height, 20);
+check_equals(draw._width, 20);
+xcheck_equals(draw._height, 20);
 
 draw._rotation = 0;
 xcheck_equals(draw._width, 20);
-check_equals(draw._height, 20);
+xcheck_equals(draw._height, 20);
 
 draw._visible = true;
 draw._xscale = 100;
 check_equals(draw._width, 10);
-check_equals(draw._height, 20);
+xcheck_equals(draw._height, 20);
 
 draw._yscale = 50;
 check_equals(draw._width, 10);
-xcheck_equals(draw._height, 10);
+check_equals(draw._height, 10);
 check_equals(container._width, 10);
-xcheck_equals(container._height, 10);
+check_equals(container._height, 10);
 
 container._xscale = 800;
 check_equals(draw._width, 10);
-xcheck_equals(draw._height, 10);
-xcheck_equals(container._width, 80);
-xcheck_equals(container._height, 10);
+check_equals(draw._height, 10);
+check_equals(container._width, 80);
+check_equals(container._height, 10);
+b = draw.getBounds(); // these are local, untransformed
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+b = draw.getBounds(container); // these are transformed by container draw matrix
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 5);
+check_equals(b.yMax, 15);
+
+container._xscale = 100;
+container._yscale = 100;
+draw._yscale = 100;
+draw._xscale = 100;
+b = draw.getBounds(container); // these are transformed by container draw matrix
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+container.createEmptyMovieClip("draw2", 6);
+draw = container.draw2;
+with (draw)
+{
+	lineStyle(0, 0x000000);
+	moveTo(60, 20);
+	lineTo(60, 40);
+	lineTo(80, 40);
+	lineTo(80, 20);
+	lineTo(60, 20);
+}
+
+b = container.draw.getBounds(container); 
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+b = container.draw.getBounds(); 
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 20);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 30);
+b = container.draw2.getBounds(container); 
+check_equals(b.xMin, 60);
+check_equals(b.xMax, 80);
+check_equals(b.yMin, 20);
+check_equals(b.yMax, 40);
+b = container.draw2.getBounds(container.draw);
+check_equals(b.xMin, 60);
+check_equals(b.xMax, 80);
+check_equals(b.yMin, 20);
+check_equals(b.yMax, 40);
+b = container.draw2.getBounds(invalid);
+check_equals(typeof(b), 'undefined');
+b = container.draw2.getBounds(__shared_assets);
+check_equals(b.xMin, 60);
+check_equals(b.xMax, 80);
+check_equals(b.yMin, 20);
+check_equals(b.yMax, 40);
+
+b = container.draw2.getBounds(); 
+check_equals(b.xMin, 60);
+check_equals(b.xMax, 80);
+check_equals(b.yMin, 20);
+check_equals(b.yMax, 40);
+b = container.getBounds(); 
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 80);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 40);
+
+container.draw2._x += 20;
+b = container.getBounds(); 
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 100);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 40);
+check_equals(container._width, 90);
+check_equals(container._height, 30);
+
+container.draw2._xscale = 200;
+b = container.getBounds(); 
+check_equals(b.xMin, 10);
+check_equals(b.xMax, 180);
+check_equals(b.yMin, 10);
+check_equals(b.yMax, 40);
 
 #endif // OUTPUT_VERSION >= 6

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/swfdec/PASSING	5 Apr 2007 11:16:11 -0000	1.14
+++ testsuite/swfdec/PASSING	12 Apr 2007 09:14:37 -0000	1.15
@@ -50,3 +50,5 @@
 comparisons-7.swf
 doaction-before-placeobject.swf
 undefined2-7.swf
+height1.swf
+height3.swf



From MAILER-DAEMON Thu Apr 12 05:50:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbvwi-0008NG-UL
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 05:50:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbvwh-0008Iv-8P
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:50:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbvwg-0008HG-EI
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:50:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbvwg-0008GU-7y
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:50:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbvsW-0003zI-FI
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:46:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbvsV-000423-RH
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:46:08 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbvsV-000420-EM
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:46:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbvsV-000420-EM@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 09:46:07 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 09:50:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 09:46:07

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	        * server/sprite_instance.cpp (duplicateMovieClip):
	          Duplicate also the drawable.
	        * testsuite/misc-ming.all/displaylist_depths_test.c:
	          More successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2862&r2=1.2863
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.236&r2=1.237
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2862
retrieving revision 1.2863
diff -u -b -r1.2862 -r1.2863
--- ChangeLog	12 Apr 2007 09:14:36 -0000	1.2862
+++ ChangeLog	12 Apr 2007 09:46:06 -0000	1.2863
@@ -1,5 +1,12 @@
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (duplicateMovieClip): 
+	  Duplicate also the drawable.
+	* testsuite/misc-ming.all/displaylist_depths_test.c:
+	  More successes.
+
+2007-04-12 Sandro Santilli <strk@keybit.net>
+
 	* server/matrix.{cpp,h}: add transform and transform_by_inverse
 	  for Range2d<float> type.
 	* server/character.h: add a getBounds() virutual method.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -b -r1.236 -r1.237
--- server/sprite_instance.cpp	12 Apr 2007 09:14:36 -0000	1.236
+++ server/sprite_instance.cpp	12 Apr 2007 09:46:06 -0000	1.237
@@ -1914,6 +1914,9 @@
 	// We should not copy 'm_action_buffer' since the 'm_method' already contains it
 	newsprite->set_event_handlers(get_event_handlers());
 
+	// Copy drawable
+	newsprite->_drawable = new DynamicShape(*_drawable);
+
 	parent->m_display_list.place_character(
 		newsprite.get(),
 		depth,

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-ming.all/displaylist_depths_test.c	12 Apr 2007 05:37:33 -0000	1.6
+++ testsuite/misc-ming.all/displaylist_depths_test.c	12 Apr 2007 09:46:07 -0000	1.7
@@ -235,39 +235,39 @@
 	check_equals(mo, "typeof(staticmc_dup.child)", "'movieclip'"); 
 
 	// Note that dynamicmc_dup is at negative depth
-	xcheck_equals(mo, "dynamicmc_dup._width", "dynamicmc._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc_dup._width/10)", "6"); 
+	check_equals(mo, "dynamicmc_dup._width", "dynamicmc._width"); 
+	check_equals(mo, "parseInt(dynamicmc_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc_dup.child)", "'undefined'"); 
 
-	xcheck_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc_2000_dup._width/10)", "6"); 
+	check_equals(mo, "dynamicmc_2000_dup._width", "dynamicmc_2000._width"); 
+	check_equals(mo, "parseInt(dynamicmc_2000_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc_2000.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc_2000_dup.child)", "'undefined'"); 
 
-	xcheck_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc_30000_dup._width/10)", "6"); 
+	check_equals(mo, "dynamicmc_30000_dup._width", "dynamicmc_30000._width"); 
+	check_equals(mo, "parseInt(dynamicmc_30000_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc_30000.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc_30000_dup.child)", "'undefined'"); 
 
 	// Note that dynamicmc0_dup is at negative depth
-	xcheck_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc0_dup._width/10)", "6"); 
+	check_equals(mo, "dynamicmc0_dup._width", "dynamicmc0._width"); 
+	check_equals(mo, "parseInt(dynamicmc0_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc0.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc0_dup.child)", "'undefined'"); 
 
 	// Note that dynamicmc1048575_dup is at negative depth
-	xcheck_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width"); 
-	xcheck_equals(mo, "parseInt(dynamicmc1048575_dup._width/10)", "6"); 
+	check_equals(mo, "dynamicmc1048575_dup._width", "dynamicmc1048575._width"); 
+	check_equals(mo, "parseInt(dynamicmc1048575_dup._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc1048575.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc1048575_dup.child)", "'undefined'"); 
 
-	xcheck_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width"); 
+	check_equals(mo, "dynamicmc1048576_dup._width", "dynamicmc1048576._width"); 
 	check_equals(mo, "parseInt(dynamicmc1048576._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc1048576.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc1048576_dup.child)", "'undefined'"); 
 
-	xcheck_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width"); 
+	check_equals(mo, "dynamicmc2130690045_dup._width", "dynamicmc2130690045._width"); 
 	check_equals(mo, "parseInt(dynamicmc2130690045._width/10)", "6"); 
 	check_equals(mo, "typeof(dynamicmc2130690045.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(dynamicmc2130690045_dup.child)", "'undefined'"); 



From MAILER-DAEMON Thu Apr 12 05:57:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbw3W-0002B2-41
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 05:57:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hbw3U-0002Ar-RE
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:57:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hbw3T-0002AT-7m
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:57:28 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hbw3T-0002AJ-0C
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:57:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbvzJ-0004tq-9a
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 05:53:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbvzJ-0004CY-9b
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:53:09 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbvzI-0004CV-U2
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 09:53:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbvzI-0004CV-U2@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 09:53:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash .cvsignore doc/.cvsignore testsuite/misc-...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 09:57:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 09:53:08

Modified files:
	.              : .cvsignore 
	doc            : .cvsignore 
	testsuite/misc-ming.all: .cvsignore 
Added files:
	doc/C/asspec   : .cvsignore 
	po             : .cvsignore 

Log message:
	update cvsignore files

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/.cvsignore?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/.cvsignore?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/.cvsignore?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/po/.cvsignore?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/.cvsignore?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: .cvsignore
===================================================================
RCS file: /sources/gnash/gnash/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- .cvsignore	17 Jan 2007 08:56:33 -0000	1.6
+++ .cvsignore	12 Apr 2007 09:53:08 -0000	1.7
@@ -12,7 +12,6 @@
 aclocal.m4
 *.tar.gz
 compile
-libltdl
 ltmain.sh
 config.guess
 config.sub

Index: doc/.cvsignore
===================================================================
RCS file: /sources/gnash/gnash/doc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- doc/.cvsignore	5 Apr 2006 04:08:27 -0000	1.3
+++ doc/.cvsignore	12 Apr 2007 09:53:08 -0000	1.4
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
 Doxyfile
+apidoc

Index: testsuite/misc-ming.all/.cvsignore
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/.cvsignore	2 Apr 2007 14:42:55 -0000	1.9
+++ testsuite/misc-ming.all/.cvsignore	12 Apr 2007 09:53:08 -0000	1.10
@@ -24,3 +24,4 @@
 eventSoundTest1
 action_execution_order_test6
 reverse_execute_PlaceObject2_test1
+reverse_execute_PlaceObject2_test2

Index: doc/C/asspec/.cvsignore
===================================================================
RCS file: doc/C/asspec/.cvsignore
diff -N doc/C/asspec/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ doc/C/asspec/.cvsignore	12 Apr 2007 09:53:08 -0000	1.1
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

Index: po/.cvsignore
===================================================================
RCS file: po/.cvsignore
diff -N po/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/.cvsignore	12 Apr 2007 09:53:08 -0000	1.1
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+POTFILES
+es.gmo
+stamp-po



From MAILER-DAEMON Thu Apr 12 07:39:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hbxeb-0006At-7l
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 07:39:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HbxeZ-00063S-Ul
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:39:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HbxeY-0005uD-FT
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:39:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HbxeY-0005tT-Bz
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:39:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HbxaO-0003uF-7A
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 07:35:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HbxaM-0007te-Pp
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 11:35:30 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HbxaM-0007tZ-J2
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 11:35:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HbxaM-0007tZ-J2@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 11:35:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 11:39:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 11:35:30

Modified files:
	.              : ChangeLog 
	server         : button_character_instance.cpp 
	                 button_character_instance.h character.cpp 
	                 character.h edit_text_character.cpp 
	                 edit_text_character.h generic_character.h 
	                 sprite_instance.cpp sprite_instance.h 

Log message:
	        * server/: button_character_instance.{cpp,h},
	          character.{cpp,h}, edit_text_character.{cpp,h},
	          generic_character.h, sprite_instance.{cpp,h}:
	          get_width() and get_height() made non-virtual
	          methods using getBounds() internally.
	          Fixed _width, _height, _xscale, _yscale and _rotation
	          getter/setter to call valueOf when available.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2863&r2=1.2864
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.237&r2=1.238
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.95&r2=1.96

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2863
retrieving revision 1.2864
diff -u -b -r1.2863 -r1.2864
--- ChangeLog	12 Apr 2007 09:46:06 -0000	1.2863
+++ ChangeLog	12 Apr 2007 11:35:29 -0000	1.2864
@@ -1,5 +1,15 @@
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
+	* server/: button_character_instance.{cpp,h},
+	  character.{cpp,h}, edit_text_character.{cpp,h},
+	  generic_character.h, sprite_instance.{cpp,h}:
+	  get_width() and get_height() made non-virtual
+	  methods using getBounds() internally.
+	  Fixed _width, _height, _xscale, _yscale and _rotation
+	  getter/setter to call valueOf when available.
+
+2007-04-12 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp (duplicateMovieClip): 
 	  Duplicate also the drawable.
 	* testsuite/misc-ming.all/displaylist_depths_test.c:

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/button_character_instance.cpp	12 Apr 2007 09:14:36 -0000	1.41
+++ server/button_character_instance.cpp	12 Apr 2007 11:35:30 -0000	1.42
@@ -790,46 +790,6 @@
 
 }
 
-float
-button_character_instance::get_width() const
-{
-	for (unsigned int i = 0; i < m_def->m_button_records.size(); i++)
-	{
-		button_record&	rec = m_def->m_button_records[i];
-		if (m_record_character[i] == NULL)
-		{
-			continue;
-		}
-		if ((m_mouse_state == UP && rec.m_up)
-		    || (m_mouse_state == DOWN && rec.m_down)
-		    || (m_mouse_state == OVER && rec.m_over))
-		{
-			return m_record_character[i]->get_width();
-		}
-	}
-	return 0.0;
-}
-
-float
-button_character_instance::get_height() const
-{
-	for (unsigned int i = 0; i < m_def->m_button_records.size(); i++)
-	{
-		button_record&	rec = m_def->m_button_records[i];
-		if (m_record_character[i] == NULL)
-		{
-			continue;
-		}
-		if ((m_mouse_state == UP && rec.m_up)
-		    || (m_mouse_state == DOWN && rec.m_down)
-		    || (m_mouse_state == OVER && rec.m_over))
-		{
-			return m_record_character[i]->get_height();
-		}
-	}
-	return 0.0;
-}
-
 geometry::Range2d<float>
 button_character_instance::getBounds() const
 {

Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/button_character_instance.h	12 Apr 2007 09:14:36 -0000	1.18
+++ server/button_character_instance.h	12 Apr 2007 11:35:30 -0000	1.19
@@ -20,7 +20,7 @@
 
 // SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
-/* $Id: button_character_instance.h,v 1.18 2007/04/12 09:14:36 strk Exp $ */
+/* $Id: button_character_instance.h,v 1.19 2007/04/12 11:35:30 strk Exp $ */
 
 #ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
 #define GNASH_BUTTON_CHARACTER_INSTANCE_H
@@ -134,14 +134,6 @@
 
 	void add_invalidated_bounds(InvalidatedRanges& ranges, bool force);
 	
-
-	// not sure if we need to override this one.
-	//virtual const char*	get_text_value() const { return NULL; }	// edit_text_character overrides this
-	
-	virtual float get_width() const;
-
-	virtual float get_height() const;
-
 	geometry::Range2d<float> getBounds() const;
 	
 	static as_value enabled_getset(const fn_call& fn);

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/character.cpp	12 Apr 2007 09:14:36 -0000	1.31
+++ server/character.cpp	12 Apr 2007 11:35:30 -0000	1.32
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.31 2007/04/12 09:14:36 strk Exp $ */
+/* $Id: character.cpp,v 1.32 2007/04/12 11:35:30 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -250,7 +250,7 @@
 	else // setter
 	{
 		matrix m = ptr->get_matrix();
-		m.m_[0][2] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number()));
+		m.m_[0][2] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number(&(fn.env()))));
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
 	}
@@ -272,7 +272,7 @@
 	else // setter
 	{
 		matrix m = ptr->get_matrix();
-		m.m_[1][2] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number()));
+		m.m_[1][2] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number(&(fn.env()))));
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
 	}
@@ -296,7 +296,7 @@
 	{
 		matrix m = ptr->get_matrix();
 
-		double scale_percent = fn.arg(0).to_number();
+		double scale_percent = fn.arg(0).to_number(&(fn.env()));
 
 		// Handle bogus values
 		if (isnan(scale_percent))
@@ -348,7 +348,7 @@
 	{
 		matrix m = ptr->get_matrix();
 
-		double scale_percent = fn.arg(0).to_number();
+		double scale_percent = fn.arg(0).to_number(&(fn.env()));
 
 		// Handle bogus values
 		if (isnan(scale_percent))
@@ -468,11 +468,13 @@
 {
 	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
 
+	// Bounds are used for both getter and setter
+	geometry::Range2d<float> bounds = ptr->getBounds();
+
 	as_value rv;
 	if ( fn.nargs == 0 ) // getter
 	{
 		float w = 0;
-		geometry::Range2d<float> bounds = ptr->getBounds();
 		if ( bounds.isFinite() )
 		{
 			matrix m = ptr->get_matrix();
@@ -484,14 +486,13 @@
 	}
 	else // setter
 	{
-		// @@ tulrich: is parameter in world-coords or local-coords?
 		matrix m = ptr->get_matrix();
-		m.m_[0][0] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number()));
-		float w = ptr->get_width();
-		if (fabsf(w) > 1e-6f)
-		{
-			m.m_[0][0] /= w;
-		}
+
+		double newwidth = fn.arg(0).to_number(&(fn.env()));
+		m.m_[0][0] = infinite_to_fzero(PIXELS_TO_TWIPS(newwidth));
+
+		if ( bounds.isFinite() ) m.m_[0][0] /= bounds.width();
+
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
 	}
@@ -503,11 +504,13 @@
 {
 	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
 
+	// Bounds are used for both getter and setter
+	geometry::Range2d<float> bounds = ptr->getBounds();
+
 	as_value rv;
 	if ( fn.nargs == 0 ) // getter
 	{
 		float h = 0;
-		geometry::Range2d<float> bounds = ptr->getBounds();
 		if ( bounds.isFinite() )
 		{
 			matrix m = ptr->get_matrix();
@@ -519,14 +522,13 @@
 	}
 	else // setter
 	{
-		// @@ tulrich: is parameter in world-coords or local-coords?
 		matrix m = ptr->get_matrix();
-		m.m_[1][1] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number()));
-		float h = ptr->get_height(); 
-		if (fabsf(h) > 1e-6f)
-		{
-			m.m_[1][1] /= h;
-		}
+
+		double newheight = fn.arg(0).to_number(&(fn.env()));
+		m.m_[1][1] = infinite_to_fzero(PIXELS_TO_TWIPS(newheight));
+
+		if ( bounds.isFinite() ) m.m_[1][1] /= bounds.height();
+
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
 	}
@@ -558,7 +560,7 @@
 		float x_scale = m.get_x_scale();
 		float y_scale = m.get_y_scale();
 		// input is in degrees
-		float rotation = (float) fn.arg(0).to_number() * float(M_PI) / 180.f;
+		float rotation = (float) fn.arg(0).to_number(&(fn.env())) * float(M_PI) / 180.f;
 		m.set_scale_rotation(x_scale, y_scale, rotation);
 
 		ptr->set_matrix(m);

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/character.h	12 Apr 2007 09:14:36 -0000	1.65
+++ server/character.h	12 Apr 2007 11:35:30 -0000	1.66
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.65 2007/04/12 09:14:36 strk Exp $ */
+/* $Id: character.h,v 1.66 2007/04/12 11:35:30 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -399,16 +399,24 @@
     virtual void	display() {}
 
     	/// Returns local, untransformed height of this character in TWIPS
-	virtual float	get_height() const
+	//
+	/// Use getBounds() if you need more then simply the height.
+	///
+	float get_height() const
 	{
-		log_error("a character class didn't override get_height: %s", typeid(*this).name());
+		geometry::Range2d<float> bounds = getBounds();
+		if ( bounds.isFinite() ) return bounds.height();
     		return 0;
 	}
 
     	/// Returns local, untransformed width of this character in TWIPS
-	virtual float	get_width() const
+	//
+	/// Use getBounds() if you need more then simply the width.
+	///
+	float get_width() const
 	{
-		log_error("a character class didn't override get_width: %s", typeid(*this).name());
+		geometry::Range2d<float> bounds = getBounds();
+		if ( bounds.isFinite() ) return bounds.width();
 		return 0;
 	}
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/edit_text_character.cpp	3 Apr 2007 17:21:38 -0000	1.51
+++ server/edit_text_character.cpp	12 Apr 2007 11:35:30 -0000	1.52
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.51 2007/04/03 17:21:38 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.52 2007/04/12 11:35:30 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1291,32 +1291,6 @@
 	_text_variable_registered=true;
 }
 
-float
-edit_text_character::get_height() const
-{
-	// @@ TODO should implement this in
-	// character and inherit into both here and sprite_instance
-	rect	transformed_rect;
-	transformed_rect.enclose_transformed_rect(get_world_matrix(), m_def->get_bounds());
-	return transformed_rect.height();
-
-	log_error("%s: not implmented yet", __PRETTY_FUNCTION__);
-	return 0;
-}
-
-float
-edit_text_character::get_width() const
-{
-	// @@ TODO should implement this in
-	// character and inherit into both here and sprite_instance
-	rect	transformed_rect;
-	transformed_rect.enclose_transformed_rect(get_world_matrix(), m_def->get_bounds());
-	return transformed_rect.width();
-
-	log_error("%s: not implmented yet", __PRETTY_FUNCTION__);
-	return 0;
-}
-
 void
 edit_text_character::set_variable_name(const std::string& newname)
 {

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/edit_text_character.h	12 Apr 2007 09:14:36 -0000	1.27
+++ server/edit_text_character.h	12 Apr 2007 11:35:30 -0000	1.28
@@ -91,9 +91,6 @@
 
 	void add_invalidated_bounds(InvalidatedRanges& ranges, bool force);
 
-	virtual float	get_height() const;
-	virtual float	get_width() const;
-
 	geometry::Range2d<float> getBounds() const
 	{
 		return m_def->get_bounds().getRange();

Index: server/generic_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/generic_character.h	12 Apr 2007 09:14:36 -0000	1.20
+++ server/generic_character.h	12 Apr 2007 11:35:30 -0000	1.21
@@ -70,22 +70,6 @@
 	    do_display_callback();
 	}
 
-    // @@ tulrich: these are used for finding bounds; TODO
-    // need to do this using enclose_transformed_rect(),
-    // not by scaling the local height/width!
-
-	virtual float	get_height() const
-	{
-		// Verified using samples/test_rotation.swf
-		return m_def->get_height_local();
-	}
-
-	virtual float	get_width() const
-	{
-		// Verified using samples/test_rotation.swf
-		return m_def->get_width_local();
-	}
-
 	geometry::Range2d<float> getBounds() const
 	{
 		return m_def->get_bound().getRange();

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -b -r1.237 -r1.238
--- server/sprite_instance.cpp	12 Apr 2007 09:46:06 -0000	1.237
+++ server/sprite_instance.cpp	12 Apr 2007 11:35:30 -0000	1.238
@@ -1463,48 +1463,6 @@
 	}
 };
 
-/// A DisplayList visitor used to compute its overall height.
-//
-/// TODO: this seems bogus actually, as it will just return
-///       the height of the tallest character in the list !!
-///
-class HeightFinder {
-public:
-	float _h;
-	HeightFinder(): _h(0) {}
-	void operator() (character* ch)
-	{
-		float ch_h = ch->get_height();
-		if (ch_h > _h) {
-			_h = ch_h;
-		}
-	}
-	float getHeight() {
-		return _h;
-	}
-};
-
-/// A DisplayList visitor used to compute its overall width.
-//
-/// TODO: this seems bogus actually, as it will just return
-///       the width of the widest character in the list !!
-///
-class WidthFinder {
-public:
-	float _w;
-	WidthFinder(): _w(0) {}
-	void operator() (character* ch) 
-	{
-		float ch_w = ch->get_width();
-		if (ch_w > _w) {
-			_w = ch_w;
-		}
-	}
-	float getWidth() {
-		return _w;
-	}
-};
-
 /// A DisplayList visitor used to extract script characters
 //
 /// Script characters are characters created or transformed
@@ -2999,40 +2957,6 @@
 
 }
 
-float sprite_instance::get_height() const
-{
-	// TODO: FIXME: this whole thing is bogus,
-	//       we should extract the actual bounds
-	//       and return their height
-
-	HeightFinder f;
-	// the const_cast is just to avoid defining a const version
-	// of DisplayList::visitForward, HeightFinder will NOT
-	// modify the DisplayList elements in any way
-	const_cast<DisplayList&>(m_display_list).visitAll(f);
-	float h = f.getHeight();
-	float hd = _drawable->get_height_local();
-	if ( hd > h ) h = hd;
-	return h;
-}
-
-float sprite_instance::get_width() const
-{
-	// TODO: FIXME: this whole thing is bogus,
-	//       we should extract the actual bounds
-	//       and return their width
-
-	WidthFinder f;
-	// the const_cast is just to avoid defining a const version
-	// of DisplayList::visitForward, WidthFinder will NOT
-	// modify the DisplayList elements in any way
-	const_cast<DisplayList&>(m_display_list).visitAll(f);
-	float w = f.getWidth(); 
-	float wd = _drawable->get_width_local();
-	if ( wd > w ) w = wd;
-	return w;
-}
-
 character*
 sprite_instance::get_character(int /* character_id */)
 {

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/sprite_instance.h	12 Apr 2007 09:14:36 -0000	1.95
+++ server/sprite_instance.h	12 Apr 2007 11:35:30 -0000	1.96
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.95 2007/04/12 09:14:36 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.96 2007/04/12 11:35:30 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -136,10 +136,6 @@
                 return m_def.get();
         }
 
-	float get_width() const;
-
-	float get_height() const;
-
 	/// Get the composite bounds of all component drawing elements
 	geometry::Range2d<float> getBounds() const;
 



From MAILER-DAEMON Thu Apr 12 12:33:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hc2Ew-0005Ty-JO
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 12:33:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hc2Eu-0005T2-60
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:33:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hc2Er-0005Sq-0p
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:33:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hc2Eq-0005Sn-UB
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:33:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hc2Af-0003sA-FD
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:29:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hc2Ac-0000um-ON
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 16:29:14 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hc2Ac-0000ug-Eq
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 16:29:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hc2Ac-0000ug-Eq@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 16:29:14 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp server/cha...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 16:33:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 16:29:14

Modified files:
	.              : ChangeLog 
	server         : character.cpp character.h 
	testsuite/server: MatrixTest.cpp 

Log message:
	        * server/character.{cpp,h}: add set_x_scale and set_y_scale
	          methods to reduce code messing with matrices. Changed
	          {x,y}scale_getset and {width,height}_getset to use
	          these two new functions.
	        * testsuite/server/MatrixTest.cpp: add a few tests for
	          set_scale_rotation. I'm not sure the tests are correct
	          thought, I'd like to hear from Martin about that.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2864&r2=1.2865
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/MatrixTest.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2864
retrieving revision 1.2865
diff -u -b -r1.2864 -r1.2865
--- ChangeLog	12 Apr 2007 11:35:29 -0000	1.2864
+++ ChangeLog	12 Apr 2007 16:29:13 -0000	1.2865
@@ -1,5 +1,15 @@
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
+	* server/character.{cpp,h}: add set_x_scale and set_y_scale
+	  methods to reduce code messing with matrices. Changed
+	  {x,y}scale_getset and {width,height}_getset to use 
+	  these two new functions.
+	* testsuite/server/MatrixTest.cpp: add a few tests for
+	  set_scale_rotation. I'm not sure the tests are correct
+	  thought, I'd like to hear from Martin about that.
+
+2007-04-12 Sandro Santilli <strk@keybit.net>
+
 	* server/: button_character_instance.{cpp,h},
 	  character.{cpp,h}, edit_text_character.{cpp,h},
 	  generic_character.h, sprite_instance.{cpp,h}:

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/character.cpp	12 Apr 2007 11:35:30 -0000	1.32
+++ server/character.cpp	12 Apr 2007 16:29:14 -0000	1.33
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.32 2007/04/12 11:35:30 strk Exp $ */
+/* $Id: character.cpp,v 1.33 2007/04/12 16:29:14 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -318,15 +318,7 @@
 
 		// input is in percent
 		float scale = (float)scale_percent/100.f;
-
-		// Decompose matrix and insert the desired value.
-		float x_scale = scale;
-		float y_scale = m.get_y_scale();
-		float rotation = m.get_rotation();
-		m.set_scale_rotation(x_scale, y_scale, rotation);
-
-		ptr->set_matrix(m);
-		ptr->transformedByScript(); // m_accept_anim_moves = false; 
+		ptr->set_x_scale(scale);
 	}
 	return rv;
 
@@ -370,15 +362,7 @@
 
 		// input is in percent
 		float scale = (float)scale_percent/100.f;
-
-		// Decompose matrix and insert the desired value.
-		float x_scale = m.get_x_scale();
-		float y_scale = scale;
-		float rotation = m.get_rotation();
-		m.set_scale_rotation(x_scale, y_scale, rotation);
-
-		ptr->set_matrix(m);
-		ptr->transformedByScript(); // m_accept_anim_moves = false; 
+		ptr->set_y_scale(scale);
 	}
 	return rv;
 
@@ -486,15 +470,24 @@
 	}
 	else // setter
 	{
-		matrix m = ptr->get_matrix();
+		if ( ! bounds.isFinite() )
+		{
+			log_error("FIXME: can't set _width on character with null or world bounds");
+			return rv;
+		}
 
-		double newwidth = fn.arg(0).to_number(&(fn.env()));
-		m.m_[0][0] = infinite_to_fzero(PIXELS_TO_TWIPS(newwidth));
+		double oldwidth = bounds.width();
+		assert(oldwidth>0);
 
-		if ( bounds.isFinite() ) m.m_[0][0] /= bounds.width();
+		double newwidth = PIXELS_TO_TWIPS(fn.arg(0).to_number(&(fn.env())));
+		if ( newwidth <= 0 )
+		{
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("Setting _width=%g ?", newwidth/20);
+			);
+		}
 
-		ptr->set_matrix(m);
-		ptr->transformedByScript(); // m_accept_anim_moves = false; 
+		ptr->set_x_scale(newwidth/oldwidth);
 	}
 	return rv;
 }
@@ -522,16 +515,26 @@
 	}
 	else // setter
 	{
-		matrix m = ptr->get_matrix();
+		if ( ! bounds.isFinite() )
+		{
+			log_error("FIXME: can't set _height on character with null or world bounds");
+			return rv;
+		}
 
-		double newheight = fn.arg(0).to_number(&(fn.env()));
-		m.m_[1][1] = infinite_to_fzero(PIXELS_TO_TWIPS(newheight));
+		double oldheight = bounds.height();
+		assert(oldheight>0);
 
-		if ( bounds.isFinite() ) m.m_[1][1] /= bounds.height();
+		double newheight = PIXELS_TO_TWIPS(fn.arg(0).to_number(&(fn.env())));
+		if ( newheight <= 0 )
+		{
+			IF_VERBOSE_ASCODING_ERRORS(
+			log_aserror("Setting _height=%g ?", newheight/20);
+			);
+		}
 
-		ptr->set_matrix(m);
-		ptr->transformedByScript(); // m_accept_anim_moves = false; 
+		ptr->set_y_scale(newheight/oldheight);
 	}
+
 	return rv;
 }
 
@@ -710,6 +713,33 @@
 	return func;
 }
 
+void
+character::set_x_scale(float x_scale)
+{
+	matrix m = get_matrix();
+
+	// Decompose matrix and insert the desired value.
+	float y_scale = m.get_y_scale();
+	float rotation = m.get_rotation();
+	m.set_scale_rotation(x_scale, y_scale, rotation);
+
+	set_matrix(m);
+	transformedByScript(); // m_accept_anim_moves = false; 
+}
+
+void
+character::set_y_scale(float y_scale)
+{
+	matrix m = get_matrix();
+
+	// Decompose matrix and insert the desired value.
+	float x_scale = m.get_x_scale();
+	float rotation = m.get_rotation();
+	m.set_scale_rotation(x_scale, y_scale, rotation);
+
+	set_matrix(m);
+	transformedByScript(); // m_accept_anim_moves = false; 
+}
 
 } // namespace gnash
 

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/character.h	12 Apr 2007 11:35:30 -0000	1.66
+++ server/character.h	12 Apr 2007 16:29:14 -0000	1.67
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.66 2007/04/12 11:35:30 strk Exp $ */
+/* $Id: character.h,v 1.67 2007/04/12 16:29:14 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -192,28 +192,40 @@
 	static as_value onmousemove_getset(const fn_call& fn);
 #endif
 
+	/// Getter-setter for _x
 	static as_value x_getset(const fn_call& fn);
 
+	/// Getter-setter for _y
 	static as_value y_getset(const fn_call& fn);
 
+	/// Getter-setter for _xscale
 	static as_value xscale_getset(const fn_call& fn);
 
+	/// Getter-setter for _yscale
 	static as_value yscale_getset(const fn_call& fn);
 
+	/// Getter-setter for _xmouse
 	static as_value xmouse_get(const fn_call& fn);
 
+	/// Getter-setter for _ymouse
 	static as_value ymouse_get(const fn_call& fn);
 
+	/// Getter-setter for _alpha
 	static as_value alpha_getset(const fn_call& fn);
 
+	/// Getter-setter for _visible
 	static as_value visible_getset(const fn_call& fn);
 
+	/// Getter-setter for _width
 	static as_value width_getset(const fn_call& fn);
 
+	/// Getter-setter for _height
 	static as_value height_getset(const fn_call& fn);
 
+	/// Getter-setter for _rotation
 	static as_value rotation_getset(const fn_call& fn);
 
+	/// Getter-setter for _parent 
 	static as_value parent_getset(const fn_call& fn);
 
 	/// @} Common ActionScript getter-setters for characters
@@ -290,6 +302,22 @@
 	      m_matrix = m;
 	    }
 	}
+
+    /// Set the xscale value of current matrix
+    //
+    /// This is used when setting either _xscale or _width.
+    /// See xscale_getset and width_getset
+    ///
+    void set_x_scale(float factor);
+
+    /// Set the yscale value of current matrix
+    //
+    ///
+    /// This is used when setting either _yscale or _height
+    /// See xscale_getset and width_getset
+    ///
+    void set_y_scale(float factor);
+
     const cxform&	get_cxform() const { return m_color_transform; }
     void	set_cxform(const cxform& cx) 
     { 

Index: testsuite/server/MatrixTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/MatrixTest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/server/MatrixTest.cpp	15 Mar 2007 22:39:54 -0000	1.4
+++ testsuite/server/MatrixTest.cpp	12 Apr 2007 16:29:14 -0000	1.5
@@ -28,6 +28,32 @@
 using namespace std;
 using namespace gnash;
 
+// for double comparison
+struct D {
+	double _d;
+	double _t; // tolerance
+
+	D(double d) : _d(d), _t(1e-6) {}
+
+	// Set tolerance
+	D(double d, double t) : _d(d), _t(t) {}
+
+	// Return true if the difference between the two
+	// doubles is below the minimum tolerance defined for the two
+	bool operator==(const D& d)
+	{
+		double tol = std::min(_t, d._t);
+		double delta = fabs(_d - d._d);
+		bool ret = delta < tol;
+		//cout << "D " << _d << "operator==(const D " << d._d <<") returning " << ret << " (delta is " << delta << ") " << endl;
+		return ret;
+	}
+};
+std::ostream& operator<<(std::ostream& os, const D& d)
+{
+	return os << d._d << " [tol: " << d._t << "]";
+}
+
 int
 main(int /*argc*/, char** /*argv*/)
 {
@@ -50,5 +76,37 @@
 	invert.set_inverse(identity);
 	check_equals(invert, matrix::identity);
 
+	// Try setting and getting some values
+	matrix m1;
+	m1.set_scale_rotation(1, 3, 0);
+	check_equals(m1.get_x_scale(), 1);
+	check_equals(m1.get_y_scale(), 3);
+	check_equals(m1.get_rotation(), 0);
+	check(!m1.does_flip());
+
+	m1.set_scale_rotation(1.5, 2.5, 0);
+	check_equals(D(m1.get_x_scale()), 1.5);
+	check_equals(D(m1.get_y_scale()), 2.5);
+	check_equals(D(m1.get_rotation()), 0);
+
+	m1.set_scale_rotation(34, 4, 0);
+	check_equals(D(m1.get_x_scale()), 34);
+	check_equals(D(m1.get_y_scale()), 4);
+	check_equals(D(m1.get_rotation()), 0);
+
+	m1.set_scale_rotation(1, 1, 2);
+	check_equals(D(m1.get_x_scale()), 1);
+	check_equals(D(m1.get_y_scale()), 1);
+	check_equals(D(m1.get_rotation()), 2);
+
+	m1.set_scale_rotation(2, 1, 2);
+	xcheck_equals(D(m1.get_x_scale()), 2);
+	xcheck_equals(D(m1.get_y_scale()), 1);
+	check_equals(D(m1.get_rotation()), 2);
+
+	m1.set_scale_rotation(1, 2, 2);
+	xcheck_equals(D(m1.get_x_scale()), 1);
+	xcheck_equals(D(m1.get_y_scale()), 2);
+	check_equals(D(m1.get_rotation()), 2);
 }
 



From MAILER-DAEMON Thu Apr 12 12:36:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hc2HE-0007Sz-NF
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 12:36:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hc2HD-0007Sg-F0
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:36:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hc2HC-0007SU-3P
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:36:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hc2HB-0007SR-UT
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:36:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hc2D0-0004OL-If
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 12:31:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hc2Cz-0001Ix-SE
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 16:31:41 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hc2Cz-0001Ir-F2
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 16:31:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hc2Cz-0001Ir-F2@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 12 Apr 2007 16:31:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/string.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 16:36:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/12 16:31:41

Modified files:
	.              : ChangeLog 
	server/asobj   : string.cpp 

Log message:
	        * server/asobj/string.cpp (fromCharCode): revert bastiaan change
	          breaking existing tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2865&r2=1.2866
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2865
retrieving revision 1.2866
diff -u -b -r1.2865 -r1.2866
--- ChangeLog	12 Apr 2007 16:29:13 -0000	1.2865
+++ ChangeLog	12 Apr 2007 16:31:41 -0000	1.2866
@@ -1,5 +1,7 @@
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
+	* server/asobj/string.cpp (fromCharCode): revert bastiaan change
+	  breaking existing tests.
 	* server/character.{cpp,h}: add set_x_scale and set_y_scale
 	  methods to reduce code messing with matrices. Changed
 	  {x,y}scale_getset and {width,height}_getset to use 

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/asobj/string.cpp	12 Apr 2007 07:09:06 -0000	1.26
+++ server/asobj/string.cpp	12 Apr 2007 16:31:41 -0000	1.27
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.26 2007/04/12 07:09:06 bjacques Exp $ */
+/* $Id: string.cpp,v 1.27 2007/04/12 16:31:41 strk Exp $ */
 
 // Implementation of ActionScript String class.
 
@@ -403,16 +403,16 @@
 static as_value
 string_from_char_code(const fn_call& fn)
 {
-    std::wstring result;
+    std::string result;
 
     // isn't this function supposed to take one argument?
 
     for (unsigned int i = 0; i < fn.nargs; i++) {
-        wchar_t c = fn.arg(i).to_number<wchar_t>();
+        uint32_t c = fn.arg(i).to_number<uint32_t>();
         result += c;
     }
 
-    return as_value(result.c_str());
+    return as_value(result);
 }
 
 static as_value



From MAILER-DAEMON Thu Apr 12 17:57:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hc7IQ-0002Cg-MH
	for mharc-gnash-commit@gnu.org; Thu, 12 Apr 2007 17:57:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hc7IP-0002Cb-GZ
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 17:57:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hc7IO-0002CP-Vm
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 17:57:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hc7IO-0002CM-Sk
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 17:57:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1Hc7EB-0004fB-TP
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 17:53:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hc7E9-0008T5-15
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 21:53:13 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1Hc7E8-0008T1-L5
	for gnash-commit@gnu.org; Thu, 12 Apr 2007 21:53:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hc7E8-0008T1-L5@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Thu, 12 Apr 2007 21:53:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/parser/movie_def_impl.h server/par...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2007 21:57:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/12 21:53:12

Modified files:
	server/parser  : movie_def_impl.h movie_def_impl.cpp 
	.              : ChangeLog 

Log message:
	Replace pthread usage by boost threads.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2866&r2=1.2867

Patches:
Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/parser/movie_def_impl.h	11 Apr 2007 17:54:22 -0000	1.37
+++ server/parser/movie_def_impl.h	12 Apr 2007 21:53:12 -0000	1.38
@@ -35,10 +35,9 @@
 #include <map> // for CharacterDictionary
 #include <string>
 #include <memory> // for auto_ptr
-#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
 #include <boost/thread/condition.hpp>
 
-#include <pthread.h>
 //
 // Forward declarations
 namespace gnash {
@@ -113,8 +112,8 @@
 
 	movie_def_impl& _movie_def;
 
-	pthread_mutex_t _mutex;
-	pthread_t _thread;
+	mutable boost::mutex _mutex;
+	boost::thread* _thread;
 
 	/// Entry point for the actual thread
 	static void *execute(void* arg);

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- server/parser/movie_def_impl.cpp	10 Apr 2007 16:17:54 -0000	1.64
+++ server/parser/movie_def_impl.cpp	12 Apr 2007 21:53:12 -0000	1.65
@@ -37,14 +37,12 @@
 #include "GnashException.h" // for parser exception
 #include "execute_tag.h"
 #include "sound_definition.h" // for sound_sample
+#include <boost/bind.hpp> 
 
 #include <memory>
 #include <string>
 #include <unistd.h> 
 
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
 
 // Increment this when the cache data format changes.
 #define CACHE_FILE_VERSION 4
@@ -74,47 +72,32 @@
 MovieLoader::MovieLoader(movie_def_impl& md)
 	:
 	_movie_def(md)
-#ifndef WIN32
-	,_thread(0)
-#endif
+	,_thread(NULL)
 {
-#ifdef LOAD_MOVIES_IN_A_SEPARATE_THREAD
-	pthread_mutex_init(&_mutex, NULL);
-#endif
-
-#ifdef WIN32
-	_thread.p = 0;
-#endif
 }
 
 MovieLoader::~MovieLoader()
 {
-#ifdef LOAD_MOVIES_IN_A_SEPARATE_THREAD
-	if ( pthread_mutex_destroy(&_mutex) != 0 )
-	{
-		log_error("Error destroying MovieLoader mutex");
-	}
-#endif
 }
 
 bool
 MovieLoader::started() const
 {
-#ifdef WIN32
-	return _thread.p != NULL;
-#else
-	return _thread != 0;
-#endif
+	boost::mutex::scoped_lock lock(_mutex);
+
+	return _thread != NULL;
 }
 
 bool
 MovieLoader::isSelfThread() const
 {
-#ifdef WIN32
-	return _thread.p == pthread_self().p;
-#else
-	return pthread_self() == _thread;
-#endif
+	boost::mutex::scoped_lock lock(_mutex);
+
+	if (!_thread) {
+		return false;
+	}
+	boost::thread this_thread;
+	return this_thread == *_thread;
 }
 
 void*
@@ -123,12 +106,6 @@
 	movie_def_impl* md = static_cast<movie_def_impl*>(arg);
 	md->read_all_swf();
 
-	// maybe this frees all resources and that's bad !
-	//pthread_exit(NULL);
-	
-	/* Better to cancel yourself methinks: 'man 3p pthread_cancel' */
-	pthread_cancel(pthread_self());
-        pthread_testcancel();
 	return NULL;
 }
 
@@ -139,12 +116,13 @@
 	// don't start MovieLoader thread !
 	assert(0);
 #endif
-	if ( pthread_create(&_thread, NULL, execute, &_movie_def) )
-	{
-		return false;
-	}
+	// We have two sanity checks, started() and isSelfThread() which rely
+	// on boost::thread() returning before they are executed. Therefore,
+	// we must employ locking.
+	// Those tests do seem a bit redundant, though...
+	boost::mutex::scoped_lock lock(_mutex);
 
-	// should set some mutexes ?
+	_thread = new boost::thread(boost::bind(execute, &_movie_def));
 
 	return true;
 }

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2866
retrieving revision 1.2867
diff -u -b -r1.2866 -r1.2867
--- ChangeLog	12 Apr 2007 16:31:41 -0000	1.2866
+++ ChangeLog	12 Apr 2007 21:53:12 -0000	1.2867
@@ -1,3 +1,8 @@
+2007-04-12 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* server/parser/movie_def_impl.{cpp,h}: Replace pthread usage
+	by boost threads.
+
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/string.cpp (fromCharCode): revert bastiaan change



From MAILER-DAEMON Fri Apr 13 03:40:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HcGOb-0002Mk-Pr
	for mharc-gnash-commit@gnu.org; Fri, 13 Apr 2007 03:40:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HcGOa-0002Ln-4i
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 03:40:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HcGOZ-0002LQ-9w
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 03:40:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HcGOZ-0002LL-4e
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 03:40:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HcGKH-000545-Uo
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 03:36:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HcGK6-0007FL-EG
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 07:35:58 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HcGK6-0007FB-2U
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 07:35:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HcGK6-0007FB-2U@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Fri, 13 Apr 2007 07:35:58 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_gst.cpp b...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2007 07:40:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/13 07:35:57

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_gst.cpp sound_handler_sdl.cpp 
	libbase        : Makefile.am 
	server         : URLAccessManager.cpp array.cpp impl.cpp 
	                 movie_instance.cpp movie_root.cpp shape.cpp 
	                 sprite_instance.cpp textformat.h 
	server/parser  : action_buffer.cpp bitmap_character_def.cpp 
	                 sprite_definition.cpp 
	server/vm      : ActionExec.cpp action.cpp 
	testsuite      : sound_handler_test.cpp 

Log message:
	        * libbase/Makefile.am: No longer include Thread.{h,cpp} in the
	        build, because this pthread based class is unused and
	        deprecated.
	        * server/URLAccessManager.cpp: Comment out unused parameter.
	        * server/shape.cpp: Comment out dead code.
	        * server/textformat.cpp: make text_format DSOEXPORT, because
	        it is used in another DSO.
	        * all over the place: Remove all inclusions of pthread.h, 
	        because we're no longer directly using pthreads.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2867&r2=1.2868
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_gst.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/URLAccessManager.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_instance.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.238&r2=1.239
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/sound_handler_test.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2867
retrieving revision 1.2868
diff -u -b -r1.2867 -r1.2868
--- ChangeLog	12 Apr 2007 21:53:12 -0000	1.2867
+++ ChangeLog	13 Apr 2007 07:35:55 -0000	1.2868
@@ -2,6 +2,15 @@
 
 	* server/parser/movie_def_impl.{cpp,h}: Replace pthread usage
 	by boost threads.
+	* libbase/Makefile.am: No longer include Thread.{h,cpp} in the
+	build, because this pthread based class is unused and
+	deprecated.
+	* server/URLAccessManager.cpp: Comment out unused parameter.
+	* server/shape.cpp: Comment out dead code.
+	* server/textformat.cpp: make text_format DSOEXPORT, because
+	it is used in another DSO.
+	* all over the place: Remove all inclusions of pthread.h,
+	because we're no longer directly using pthreads.
 
 2007-04-12 Sandro Santilli <strk@keybit.net>
 

Index: backend/sound_handler_gst.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_gst.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- backend/sound_handler_gst.cpp	28 Mar 2007 16:12:08 -0000	1.34
+++ backend/sound_handler_gst.cpp	13 Apr 2007 07:35:55 -0000	1.35
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-/* $Id: sound_handler_gst.cpp,v 1.34 2007/03/28 16:12:08 tgc Exp $ */
+/* $Id: sound_handler_gst.cpp,v 1.35 2007/04/13 07:35:55 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,7 +35,6 @@
 #include "container.h"
 #include "log.h"
 #include "types.h"	// for IF_VERBOSE_* macros
-#include <pthread.h>
 #include <cmath>
 #include <vector>
 

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- backend/sound_handler_sdl.cpp	23 Mar 2007 00:30:10 -0000	1.49
+++ backend/sound_handler_sdl.cpp	13 Apr 2007 07:35:55 -0000	1.50
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.49 2007/03/23 00:30:10 tgc Exp $
+// $Id: sound_handler_sdl.cpp,v 1.50 2007/04/13 07:35:55 bjacques Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -27,7 +27,6 @@
 #include "sound_handler_sdl.h"
 
 #include "log.h"
-#include <pthread.h>
 #include <cmath>
 #include <vector>
 #include <SDL.h>

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- libbase/Makefile.am	23 Mar 2007 00:30:10 -0000	1.61
+++ libbase/Makefile.am	13 Apr 2007 07:35:55 -0000	1.62
@@ -97,7 +97,6 @@
 	curl_adapter.cpp \
 	noseek_fd_adapter.cpp \
 	zlib_adapter.cpp \
-	Thread.cpp \
 	URL.cpp \
 	LoadThread.cpp \
 	FLVParser.cpp
@@ -137,7 +136,6 @@
 	curl_adapter.h \
 	noseek_fd_adapter.h \
 	zlib_adapter.h \
-	Thread.h \
 	URL.h \
 	LoadThread.h \
 	FLVParser.h

Index: server/URLAccessManager.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/URLAccessManager.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/URLAccessManager.cpp	4 Apr 2007 07:10:19 -0000	1.13
+++ server/URLAccessManager.cpp	13 Apr 2007 07:35:55 -0000	1.14
@@ -268,7 +268,7 @@
 }
 
 bool
-allowHost(const std::string& host, short port)
+allowHost(const std::string& host, short /* port */)
 {
 	return allowHost(host);
 }

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/array.cpp	4 Apr 2007 10:32:42 -0000	1.57
+++ server/array.cpp	13 Apr 2007 07:35:55 -0000	1.58
@@ -22,13 +22,6 @@
 #include "config.h"
 #endif
 
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 #include "as_value.h"
 #include "array.h"
 #include "log.h"

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/impl.cpp	30 Mar 2007 15:18:24 -0000	1.102
+++ server/impl.cpp	13 Apr 2007 07:35:55 -0000	1.103
@@ -14,19 +14,12 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: impl.cpp,v 1.102 2007/03/30 15:18:24 strk Exp $ */
+/* $Id: impl.cpp,v 1.103 2007/04/13 07:35:55 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 #include "tu_file.h"
 #include "utility.h"
 #include "action.h"

Index: server/movie_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_instance.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/movie_instance.cpp	10 Apr 2007 16:17:54 -0000	1.9
+++ server/movie_instance.cpp	13 Apr 2007 07:35:55 -0000	1.10
@@ -21,13 +21,6 @@
 #include "config.h"
 #endif
 
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 #include "movie_instance.h"
 #include "movie_definition.h"
 #include "movie_root.h"

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/movie_root.cpp	11 Apr 2007 14:20:20 -0000	1.56
+++ server/movie_root.cpp	13 Apr 2007 07:35:55 -0000	1.57
@@ -20,10 +20,6 @@
 #include "config.h"
 #endif
 
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 #include "movie_root.h"
 #include "log.h"
 #include "sprite_instance.h"

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/shape.cpp	3 Mar 2007 13:05:27 -0000	1.30
+++ server/shape.cpp	13 Apr 2007 07:35:55 -0000	1.31
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.cpp,v 1.30 2007/03/03 13:05:27 martinwguy Exp $ */
+/* $Id: shape.cpp,v 1.31 2007/04/13 07:35:55 bjacques Exp $ */
 
 #include "shape.h"
 
@@ -118,7 +118,7 @@
     if (m_edges.size() <= 0) {
 	return false;
     }
-
+#if 0
     // This test makes no sense: m_fill0 is unsigned and "1-based" -martin
     if (m_fill0 < 0) {
 	// No interior fill.
@@ -137,6 +137,7 @@
 	// group.
 	return false;
     }
+#endif
     
     // Shoot a horizontal ray from (x,y) to the right, and
     // count the number of edge crossings.  An even number

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -b -r1.238 -r1.239
--- server/sprite_instance.cpp	12 Apr 2007 11:35:30 -0000	1.238
+++ server/sprite_instance.cpp	13 Apr 2007 07:35:55 -0000	1.239
@@ -60,13 +60,6 @@
 #include <algorithm> // for for_each
 #include <boost/algorithm/string/case_conv.hpp>
 
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 namespace gnash {
 
 //#define GNASH_DEBUG 1

Index: server/textformat.h
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/textformat.h	11 Apr 2007 17:54:21 -0000	1.15
+++ server/textformat.h	13 Apr 2007 07:35:56 -0000	1.16
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: textformat.h,v 1.15 2007/04/11 17:54:21 bjacques Exp $
+// $Id: textformat.h,v 1.16 2007/04/13 07:35:56 bjacques Exp $
 //
 
 #ifndef __TEXTFORMAT_H__
@@ -33,7 +33,7 @@
 namespace gnash {  
 
 /// new text_format([font, [size, [color, [bold, [italic, [underline, [url, [target, [align,[leftMargin, [rightMargin, [indent, [leading]]]]]]]]]]]]])
-class DSOLOCAL text_format
+class DSOEXPORT text_format
 {
 public:
   

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/action_buffer.cpp	11 Apr 2007 17:54:21 -0000	1.15
+++ server/parser/action_buffer.cpp	13 Apr 2007 07:35:56 -0000	1.16
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: action_buffer.cpp,v 1.15 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: action_buffer.cpp,v 1.16 2007/04/13 07:35:56 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -29,10 +29,6 @@
 
 #include <typeinfo> 
 
-#if !defined(_WIN32) && !defined(WIN32)
-# include <pthread.h> 
-#endif
-
 #include <string>
 
 using std::string;

Index: server/parser/bitmap_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/bitmap_character_def.cpp	29 Oct 2006 18:34:15 -0000	1.4
+++ server/parser/bitmap_character_def.cpp	13 Apr 2007 07:35:56 -0000	1.5
@@ -21,13 +21,6 @@
 #include "config.h"
 #endif
 
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 #include "bitmap_character_def.h"
 //#include "bitmap_character_instance.h"
 #include "gnash.h" // for bitmap_info

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/parser/sprite_definition.cpp	10 Apr 2007 15:48:39 -0000	1.11
+++ server/parser/sprite_definition.cpp	13 Apr 2007 07:35:56 -0000	1.12
@@ -21,13 +21,6 @@
 #include "config.h"
 #endif
 
-// This needs to be included first for NetBSD systems or we get a weird
-// problem with pthread_t being defined too many times if we use any
-// STL containers.
-#ifdef HAVE_PTHREADS
-#include <pthread.h>
-#endif
-
 #include "sprite_instance.h"
 #include "sprite_definition.h"
 #include "execute_tag.h" // for dtor visibility

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/vm/ActionExec.cpp	4 Apr 2007 20:30:45 -0000	1.25
+++ server/vm/ActionExec.cpp	13 Apr 2007 07:35:56 -0000	1.26
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ActionExec.cpp,v 1.25 2007/04/04 20:30:45 bjacques Exp $ */
+/* $Id: ActionExec.cpp,v 1.26 2007/04/13 07:35:56 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,10 +35,6 @@
 #include <typeinfo> 
 #include <boost/algorithm/string/case_conv.hpp>
 
-#if !defined(_WIN32) && !defined(WIN32)
-# include <pthread.h> 
-#endif
-
 #include <sstream>
 #include <string>
 

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/vm/action.cpp	11 Apr 2007 14:20:21 -0000	1.12
+++ server/vm/action.cpp	13 Apr 2007 07:35:56 -0000	1.13
@@ -48,11 +48,6 @@
 #include <typeinfo> 
 #include <string>
 
-#if !defined(_WIN32) && !defined(WIN32)
-# include <pthread.h> 
-#endif
-
-
 using namespace gnash;
 using namespace SWF;
 

Index: testsuite/sound_handler_test.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/sound_handler_test.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/sound_handler_test.cpp	21 Feb 2007 14:51:01 -0000	1.2
+++ testsuite/sound_handler_test.cpp	13 Apr 2007 07:35:57 -0000	1.3
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: sound_handler_test.cpp,v 1.2 2007/02/21 14:51:01 tgc Exp $
+// $Id: sound_handler_test.cpp,v 1.3 2007/04/13 07:35:57 bjacques Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -24,7 +24,6 @@
 #include "sound_handler_test.h"
 
 #include "log.h"
-#include <pthread.h>
 #include <cmath>
 #include <vector>
 



From MAILER-DAEMON Fri Apr 13 05:20:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HcHxD-0003ol-GY
	for mharc-gnash-commit@gnu.org; Fri, 13 Apr 2007 05:20:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HcHx9-0003nP-DG
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 05:20:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HcHx7-0003mo-HV
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 05:20:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HcHx6-0003ma-VY
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 05:20:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HcHsq-0000aT-EQ
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 05:15:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HcHsp-0005ln-Iv
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 09:15:55 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HcHsp-0005lj-89
	for gnash-commit@gnu.org; Fri, 13 Apr 2007 09:15:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HcHsp-0005lj-89@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Fri, 13 Apr 2007 09:15:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gtksup.h gui/gu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Apr 2007 09:20:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/13 09:15:55

Modified files:
	.              : ChangeLog 
	gui            : gtk.cpp gtksup.h gui.cpp gui.h kde.cpp 
	                 kde_glue.h kdesup.h 
	libbase        : container.h 
	server         : gnash.h 

Log message:
	        * server/gnash.h, gui: version two of Antti Ajanki's GUI 
	        patches, this time the whole thing.
	        * libbase/container.h: Remove the last pthread.h include

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2868&r2=1.2869
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.86&r2=1.87
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.91&r2=1.92

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2868
retrieving revision 1.2869
diff -u -b -r1.2868 -r1.2869
--- ChangeLog	13 Apr 2007 07:35:55 -0000	1.2868
+++ ChangeLog	13 Apr 2007 09:15:54 -0000	1.2869
@@ -11,6 +11,9 @@
 	it is used in another DSO.
 	* all over the place: Remove all inclusions of pthread.h,
 	because we're no longer directly using pthreads.
+	* server/gnash.h, gui: version two of Antti Ajanki's GUI
+	patches, this time the whole thing.
+	* libbase/container.h: Remove the last pthread.h include.
 
 2007-04-12 Sandro Santilli <strk@keybit.net>
 

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- gui/gtk.cpp	12 Apr 2007 09:04:01 -0000	1.86
+++ gui/gtk.cpp	13 Apr 2007 09:15:54 -0000	1.87
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.86 2007/04/12 09:04:01 bjacques Exp $ */
+/* $Id: gtk.cpp,v 1.87 2007/04/13 09:15:54 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1154,6 +1154,24 @@
     return c;
 }
 
+int
+GtkGui::gdk_to_gnash_modifier(int state)
+{
+    int modifier = gnash::key::MOD_NONE;
+
+    if (state & GDK_SHIFT_MASK) {
+      modifier = modifier | gnash::key::MOD_SHIFT;
+    }
+    if (state & GDK_CONTROL_MASK) {
+      modifier = modifier | gnash::key::MOD_CONTROL;
+    }
+    if (state & GDK_MOD1_MASK) {
+      modifier = modifier | gnash::key::MOD_ALT;
+    }
+
+    return modifier;
+}
+
 gboolean
 GtkGui::key_press_event(GtkWidget *const /*widget*/,
                 GdkEventKey *const event,
@@ -1165,52 +1183,10 @@
 
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
+    int mod = gdk_to_gnash_modifier(event->state);
     
     if (c != gnash::key::INVALID) {
-        gui->notify_key_event(c, true);
-    }
-
-    /* Handle GUI shortcuts */
-    if (event->length <= 0) {
-        return true;
-    }
-    unsigned int key = gdk_unicode_to_keyval(event->keyval);
-    if (event->state == GDK_SHIFT_MASK) {
-        dbglogfile << "Got Shift-key: " << key << endl;
-    }
-    if (event->state == GDK_CONTROL_MASK) {
-        dbglogfile << "Got Control-key: " << key << endl;
-        switch(key) {
-          case 'r':
-              gui->menu_restart();
-              break;
-          case 'p':
-              gui->menu_pause();
-              break;
-          case 'q':
-          case 'w':
-              gui->menu_quit();
-              break;
-          default:
-              break;
-        }
-    } else {
-#if 0
-        dbglogfile << "Got key: '" << (char) key
-                   << "' its name is: " << gdk_keyval_name(key)
-                   << " it's value is: " << (int)key
-                   << " hwkeycode: " << event->hardware_keycode << endl;
-#endif
-        switch (key) {
-          case '[':
-              menuitem_step_forward_callback(NULL, NULL);
-              break;
-          case ']':
-              menuitem_step_backward_callback(NULL, NULL);
-              break;
-          default:
-              break;
-        }
+        gui->notify_key_event(c, mod, true);
     }
         
     return true;
@@ -1228,9 +1204,10 @@
 
     /* Forward key event to gnash */
     gnash::key::code	c = gdk_to_gnash_key(event->keyval);
+    int mod = gdk_to_gnash_modifier(event->state);
     
     if (c != gnash::key::INVALID) {
-        gui->notify_key_event(c, false);
+        gui->notify_key_event(c, mod, false);
     }
     
     return true;

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- gui/gtksup.h	12 Apr 2007 09:04:01 -0000	1.39
+++ gui/gtksup.h	13 Apr 2007 09:15:54 -0000	1.40
@@ -158,6 +158,7 @@
 #endif
 
     static gnash::key::code gdk_to_gnash_key(guint key);
+    static int gdk_to_gnash_modifier(int state);
     static void             open_file(GtkWidget* dialog, gpointer data);
 
 };

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- gui/gui.cpp	12 Apr 2007 09:04:01 -0000	1.71
+++ gui/gui.cpp	13 Apr 2007 09:15:54 -0000	1.72
@@ -277,17 +277,46 @@
 }
 
 void
-Gui::notify_key_event(gnash::key::code k, bool pressed) 
+Gui::notify_key_event(gnash::key::code k, int modifier, bool pressed) 
 {
 	movie_root* m = get_current_root();
 
-	//log_msg("mouse @ %d,%d", x, y);
 	if ( m->notify_key_event(k, pressed) )
 	{
 		// any action triggered by the
 		// event required screen refresh
 		display(m);
 	}
+
+	/* Handle GUI shortcuts */
+	if (!pressed) return;
+	if (modifier & gnash::key::MOD_CONTROL) {
+		switch(k) {
+		case gnash::key::R:
+			menu_restart();
+			break;
+		case gnash::key::P:
+			menu_pause();
+			break;
+		case gnash::key::Q:
+		case gnash::key::W:
+			menu_quit();
+			break;
+		default:
+			break;
+		}
+	} else {
+		switch (k) {
+		case gnash::key::LEFT_BRACKET:
+			menu_step_forward();
+			break;
+		case gnash::key::RIGHT_BRACKET:
+			menu_step_backward();
+			break;
+		default:
+			break;
+		}
+	}
 }
 
 bool

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- gui/gui.h	12 Apr 2007 09:04:01 -0000	1.49
+++ gui/gui.h	13 Apr 2007 09:15:54 -0000	1.50
@@ -182,11 +182,11 @@
     /// Key event notification to be called when a key is pressed or depressed
     //
     /// @param k The key code.
-    ///
+    /// @param modifier Modifier key identifiers from gnash::key::modifier ORed together
     /// @param pressed Determines whether the key is being
     ///           pressed (true) or being released (false)
     ///
-    void notify_key_event(gnash::key::code k, bool pressed);
+    void notify_key_event(gnash::key::code k, int modifier, bool pressed);
 
     /// Resize the client area view and the window accordingly.
     //

Index: gui/kde.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/kde.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gui/kde.cpp	12 Apr 2007 09:04:01 -0000	1.12
+++ gui/kde.cpp	13 Apr 2007 09:15:54 -0000	1.13
@@ -149,6 +149,102 @@
   return true;
 }
 
+gnash::key::code
+KdeGui::qtToGnashKey(QKeyEvent *event)
+{
+    gnash::key::code c = gnash::key::INVALID;
+    int key = event->key();
+    
+    if (key >= Qt::Key_0 && key <= Qt::Key_9) {
+      if (event->state() & Qt::Keypad)
+          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::KP_0);
+      else
+          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::_0);
+    } else if (key >= Qt::Key_A && key <= Qt::Key_Z) {
+        c = (gnash::key::code) ((key - Qt::Key_A) + gnash::key::A);
+    } else if (key >= Qt::Key_F1 && key <= Qt::Key_F15) {
+        c = (gnash::key::code) ((key - Qt::Key_F1) + gnash::key::F1);
+    } else {
+        // many keys don't correlate, so just use a look-up table.
+        struct {
+            int               qt;
+            gnash::key::code  gs;
+        } table[] = {
+            { Qt::Key_Backspace, gnash::key::BACKSPACE },
+            { Qt::Key_Tab, gnash::key::TAB },
+            { Qt::Key_Clear, gnash::key::CLEAR },
+            { Qt::Key_Return, gnash::key::ENTER },
+            { Qt::Key_Enter, gnash::key::ENTER },
+
+            { Qt::Key_Shift, gnash::key::SHIFT },
+            { Qt::Key_Control, gnash::key::CONTROL },
+            { Qt::Key_Alt, gnash::key::ALT },
+            { Qt::Key_CapsLock, gnash::key::CAPSLOCK },
+
+            { Qt::Key_Escape, gnash::key::ESCAPE },
+            { Qt::Key_Space, gnash::key::SPACE },
+
+            { Qt::Key_Next, gnash::key::PGDN },
+            { Qt::Key_Prior, gnash::key::PGUP },
+            { Qt::Key_Home, gnash::key::HOME },
+            { Qt::Key_End, gnash::key::END },
+            { Qt::Key_Left, gnash::key::LEFT },
+            { Qt::Key_Up, gnash::key::UP },
+            { Qt::Key_Right, gnash::key::RIGHT },
+            { Qt::Key_Down, gnash::key::DOWN },
+            { Qt::Key_Insert, gnash::key::INSERT },
+            { Qt::Key_Delete, gnash::key::DELETEKEY },
+
+            { Qt::Key_Help, gnash::key::HELP },
+            { Qt::Key_NumLock, gnash::key::NUM_LOCK },
+            { Qt::Key_Semicolon, gnash::key::SEMICOLON },
+            { Qt::Key_Equal, gnash::key::EQUALS },
+            { Qt::Key_Minus, gnash::key::MINUS },
+            { Qt::Key_Slash, gnash::key::SLASH },
+            { Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET },
+            { Qt::Key_Backslash, gnash::key::BACKSLASH },
+            { Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET },
+            { Qt::Key_QuoteDbl, gnash::key::QUOTE },
+            { 0, gnash::key::INVALID }
+        };
+        
+        for (int i = 0; table[i].qt != 0; i++) {
+            if (key == table[i].qt) {
+                c = table[i].gs;
+                break;
+            }
+        }
+    }
+    
+    return c;
+}
+
+int
+KdeGui::qtToGnashModifier(Qt::ButtonState state)
+{
+    int modifier = gnash::key::MOD_NONE;
+
+    if (state & Qt::ShiftButton) {
+        modifier = modifier | gnash::key::MOD_SHIFT;
+    }
+    if (state & Qt::ControlButton) {
+        modifier = modifier | gnash::key::MOD_CONTROL;
+    }
+    if (state & Qt::AltButton) {
+       modifier = modifier | gnash::key::MOD_ALT;
+    }
+
+    return modifier;
+}
+
+void
+KdeGui::handleKeyEvent(QKeyEvent *event, bool down)
+{
+    gnash::key::code c = qtToGnashKey(event);
+    int mod = qtToGnashModifier(event->state());
+    notify_key_event(c, mod, down);
+}
+
 
 /// \brief restart the movie from the beginning
 void
@@ -259,6 +355,7 @@
     _godfather = godfather;
 
     setMouseTracking(true);  
+    setFocusPolicy(QWidget::StrongFocus);
 }
 
 void 
@@ -292,6 +389,17 @@
     _godfather->notify_mouse_clicked(false, 1);
 }
 
+void
+qwidget::keyPressEvent(QKeyEvent *event)
+{
+    _godfather->handleKeyEvent(event, true);
+}
+
+void
+qwidget::keyReleaseEvent(QKeyEvent *event)
+{
+    _godfather->handleKeyEvent(event, false);
+}
 
 void
 qwidget::resizeEvent(QResizeEvent *event)

Index: gui/kde_glue.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/kde_glue.h	12 Apr 2007 09:04:01 -0000	1.8
+++ gui/kde_glue.h	13 Apr 2007 09:15:54 -0000	1.9
@@ -18,7 +18,7 @@
 //
 
 
-/* $Id: kde_glue.h,v 1.8 2007/04/12 09:04:01 bjacques Exp $ */
+/* $Id: kde_glue.h,v 1.9 2007/04/13 09:15:54 bjacques Exp $ */
 
 #include "gnash.h"
 
@@ -30,7 +30,7 @@
 class KdeGlue
 {
   public:
-    virtual ~KdeGlue() { delete _drawing_area; }
+    virtual ~KdeGlue() { };
     virtual bool init(int argc, char **argv[]) = 0;
 
     virtual void prepDrawingArea(QWidget *drawing_area) = 0;

Index: gui/kdesup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/kdesup.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gui/kdesup.h	12 Apr 2007 09:04:01 -0000	1.14
+++ gui/kdesup.h	13 Apr 2007 09:15:54 -0000	1.15
@@ -70,6 +70,8 @@
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent( QMouseEvent * );
     void mouseMoveEvent(QMouseEvent *event);
+    void keyPressEvent(QKeyEvent *event);
+    void keyReleaseEvent(QKeyEvent *event);
     void timerEvent(QTimerEvent *);
     void resizeEvent(QResizeEvent *event);
 public slots:
@@ -102,12 +104,16 @@
     virtual void renderBuffer();
     virtual void setInterval(unsigned int interval);
     virtual void setTimeout(unsigned int timeout);
+    virtual void handleKeyEvent(QKeyEvent *event, bool down);
  private:
     QApplication*  _qapp;
     qwidget*       _qwidget;
     KdeOpenGLGlue  _glue;    
 
     QTimer        *_timer;
+
+    gnash::key::code qtToGnashKey(QKeyEvent *event);
+    int qtToGnashModifier(Qt::ButtonState state);
 };
 
 // end of namespace gnash 

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- libbase/container.h	11 Apr 2007 17:54:21 -0000	1.52
+++ libbase/container.h	13 Apr 2007 09:15:54 -0000	1.53
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: container.h,v 1.52 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: container.h,v 1.53 2007/04/13 09:15:54 bjacques Exp $ */
 
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
@@ -52,8 +52,8 @@
 #ifndef _LIB_PTHREAD_TYPES_H
 # define _LIB_PTHREAD_TYPES_H 1
 #endif
+
 #include <sys/types.h>
-#include <pthread.h>
 
 // This screws up MingW
 #if 0

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/gnash.h	11 Apr 2007 14:20:20 -0000	1.91
+++ server/gnash.h	13 Apr 2007 09:15:54 -0000	1.92
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.91 2007/04/11 14:20:20 strk Exp $ */
+/* $Id: gnash.h,v 1.92 2007/04/13 09:15:54 bjacques Exp $ */
 
 /// \mainpage
 ///
@@ -545,6 +545,13 @@
 
 	KEYCOUNT
 };
+enum modifier
+{
+    MOD_NONE = 0,
+    MOD_SHIFT = 1,
+    MOD_CONTROL = 2,
+    MOD_ALT = 4
+};
 }	// end namespace key
 
 /// Some optional helpers.



From MAILER-DAEMON Sat Apr 14 09:33:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HciNR-0005LD-6g
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 09:33:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HciNO-0005JR-8O
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 09:33:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HciNN-0005Io-3a
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 09:33:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HciNM-0005Il-UR
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 09:33:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HciIy-0007xr-Ek
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 09:28:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HciIq-00057q-L0
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:28:32 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HciIq-00057n-BX
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:28:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HciIq-00057n-BX@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 13:28:32 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/matrix.cpp testsuite/act...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 13:33:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 13:28:32

Modified files:
	.              : ChangeLog 
	server         : matrix.cpp 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/matrix.cpp: fix conceptual bug in Range2d transform
	          function.
	        * testsuite/actionscript.all/MovieClip.as: one unexpected
	          success when fetching _height.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2869&r2=1.2870
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2869
retrieving revision 1.2870
diff -u -b -r1.2869 -r1.2870
--- ChangeLog	13 Apr 2007 09:15:54 -0000	1.2869
+++ ChangeLog	14 Apr 2007 13:28:31 -0000	1.2870
@@ -1,3 +1,10 @@
+2007-04-12 Sandro Santilli <strk@keybit.net>
+
+	* server/matrix.cpp: fix conceptual bug in Range2d transform
+	  function.
+	* testsuite/actionscript.all/MovieClip.as: one unexpected
+	  success when fetching _height.
+
 2007-04-12 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/parser/movie_def_impl.{cpp,h}: Replace pthread usage

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/matrix.cpp	12 Apr 2007 09:14:36 -0000	1.8
+++ server/matrix.cpp	14 Apr 2007 13:28:32 -0000	1.9
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.8 2007/04/12 09:14:36 strk Exp $ 
+// $Id: matrix.cpp,v 1.9 2007/04/14 13:28:32 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -227,17 +227,17 @@
 	float ymin = r.getMinY();
 	float ymax = r.getMaxY();
 
-	xmin = m_[0][0] * xmin + m_[0][1] * ymin + m_[0][2];
-	ymin = m_[1][0] * xmin + m_[1][1] * ymin + m_[1][2];
+	float n_xmin = m_[0][0] * xmin + m_[0][1] * ymin + m_[0][2];
+	float n_ymin = m_[1][0] * xmin + m_[1][1] * ymin + m_[1][2];
 
-	xmax = m_[0][0] * xmax + m_[0][1] * ymax + m_[0][2];
-	ymax = m_[1][0] * xmax + m_[1][1] * ymax + m_[1][2];
+	float n_xmax = m_[0][0] * xmax + m_[0][1] * ymax + m_[0][2];
+	float n_ymax = m_[1][0] * xmax + m_[1][1] * ymax + m_[1][2];
 
 	// Rotation can swap the max/min coordinates
-	if ( xmax < xmin ) std::swap(xmin, xmax);
-	if ( ymax < ymin ) std::swap(ymin, ymax);
+	if ( n_xmax < n_xmin ) std::swap(n_xmin, n_xmax);
+	if ( n_ymax < n_ymin ) std::swap(n_ymin, n_ymax);
 
-	r.setTo(xmin, ymin, xmax, ymax);
+	r.setTo(n_xmin, n_ymin, n_xmax, n_ymax);
 }
 
 void

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- testsuite/actionscript.all/MovieClip.as	12 Apr 2007 09:14:36 -0000	1.54
+++ testsuite/actionscript.all/MovieClip.as	14 Apr 2007 13:28:32 -0000	1.55
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.54 2007/04/12 09:14:36 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.55 2007/04/14 13:28:32 strk Exp $";
 
 #include "check.as"
 
@@ -604,7 +604,7 @@
 
 draw._xscale = 200;
 check_equals(draw._width, 20);
-xcheck_equals(draw._height, 20);
+check_equals(draw._height, 20);
 
 draw._rotation = 0;
 xcheck_equals(draw._width, 20);



From MAILER-DAEMON Sat Apr 14 10:43:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HcjT4-0002yY-KI
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 10:43:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HcjT2-0002uA-Q4
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 10:43:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HcjT0-0002ti-3c
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 10:43:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HcjSz-0002tY-Ua
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 10:43:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HcjOb-0007v1-2y
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 10:38:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HcjOX-00035K-Mq
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 14:38:29 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HcjOX-00035G-BM
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 14:38:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HcjOX-00035G-BM@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 14:38:29 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/matrix.cpp server/matrix...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 14:43:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 14:38:29

Modified files:
	.              : ChangeLog 
	server         : matrix.cpp matrix.h 
	testsuite/actionscript.all: MovieClip.as 
	testsuite/misc-ming.all: displaylist_depths_test.c 

Log message:
	Range2d transform was still bogues, this fix seems better

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2870&r2=1.2871
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/displaylist_depths_test.c?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2870
retrieving revision 1.2871
diff -u -b -r1.2870 -r1.2871
--- ChangeLog	14 Apr 2007 13:28:31 -0000	1.2870
+++ ChangeLog	14 Apr 2007 14:38:28 -0000	1.2871
@@ -1,9 +1,9 @@
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
-	* server/matrix.cpp: fix conceptual bug in Range2d transform
+	* server/matrix.{h,cpp}: fix conceptual bug in Range2d transform
 	  function.
-	* testsuite/actionscript.all/MovieClip.as: one unexpected
-	  success when fetching _height.
+	* testsuite/misc-ming.all/displaylist_depths_test.c,
+	  testsuite/actionscript.all/MovieClip.as: more successes.
 
 2007-04-12 Bastiaan Jacques <bastiaan@bjacques.org>
 

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/matrix.cpp	14 Apr 2007 13:28:32 -0000	1.9
+++ server/matrix.cpp	14 Apr 2007 14:38:28 -0000	1.10
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.9 2007/04/14 13:28:32 strk Exp $ 
+// $Id: matrix.cpp,v 1.10 2007/04/14 14:38:28 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -218,6 +218,16 @@
 }
 
 void
+matrix::transform(point& p) const
+// Transform point 'p' by our matrix.
+{
+	float nx = m_[0][0] * p.m_x + m_[0][1] * p.m_y + m_[0][2];
+	float ny = m_[1][0] * p.m_x + m_[1][1] * p.m_y + m_[1][2];
+	p.m_x = nx;
+	p.m_y = ny;
+}
+
+void
 matrix::transform(geometry::Range2d<float>& r) const
 {
 	if ( ! r.isFinite() ) return;
@@ -227,17 +237,20 @@
 	float ymin = r.getMinY();
 	float ymax = r.getMaxY();
 
-	float n_xmin = m_[0][0] * xmin + m_[0][1] * ymin + m_[0][2];
-	float n_ymin = m_[1][0] * xmin + m_[1][1] * ymin + m_[1][2];
-
-	float n_xmax = m_[0][0] * xmax + m_[0][1] * ymax + m_[0][2];
-	float n_ymax = m_[1][0] * xmax + m_[1][1] * ymax + m_[1][2];
-
-	// Rotation can swap the max/min coordinates
-	if ( n_xmax < n_xmin ) std::swap(n_xmin, n_xmax);
-	if ( n_ymax < n_ymin ) std::swap(n_ymin, n_ymax);
-
-	r.setTo(n_xmin, n_ymin, n_xmax, n_ymax);
+        point p0(xmin, ymin);
+        point p1(xmin, ymax);
+        point p2(xmax, ymax);
+        point p3(xmax, ymin);
+
+        transform(p0);
+        transform(p1);
+        transform(p2);
+        transform(p3);
+
+        r.setTo(p0.m_x, p0.m_y);
+        r.expandTo(p1.m_x, p1.m_y);
+        r.expandTo(p2.m_x, p2.m_y);
+        r.expandTo(p3.m_x, p3.m_y);
 }
 
 void

Index: server/matrix.h
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/matrix.h	12 Apr 2007 09:14:36 -0000	1.5
+++ server/matrix.h	14 Apr 2007 14:38:28 -0000	1.6
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.h,v 1.5 2007/04/12 09:14:36 strk Exp $ 
+// $Id: matrix.h,v 1.6 2007/04/14 14:38:28 strk Exp $ 
 //
 
 #ifndef GNASH_MATRIX_H
@@ -124,6 +124,9 @@
 	///
 	void	transform(point* result, const point& p) const;
 
+	/// Transform point 'p' by our matrix. 
+	void	transform(point& p) const;
+
 	/// Transform vector 'v' by our matrix. Doesn't apply translation.
 	//
 	/// Put the result in *result.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- testsuite/actionscript.all/MovieClip.as	14 Apr 2007 13:28:32 -0000	1.55
+++ testsuite/actionscript.all/MovieClip.as	14 Apr 2007 14:38:29 -0000	1.56
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.55 2007/04/14 13:28:32 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.56 2007/04/14 14:38:29 strk Exp $";
 
 #include "check.as"
 
@@ -576,7 +576,7 @@
 
 draw._rotation = 90;
 check_equals(draw._width, 20); 
-xcheck_equals(draw._height, 10); 
+check_equals(draw._height, 10); 
 b = draw.getBounds(); // these are local, untransformed
 check_equals(b.xMin, 10);
 check_equals(b.xMax, 20);
@@ -586,11 +586,11 @@
 check_equals(b.xMin, -30);
 xcheck_equals(b.xMax, -10);
 xcheck_equals(b.yMin, 10);
-xcheck_equals(b.yMax, 20);
+check_equals(b.yMax, 20);
 
 draw._visible = false;
 check_equals(draw._width, 20);
-xcheck_equals(draw._height, 10);
+check_equals(draw._height, 10);
 b = draw.getBounds(); // these are local, untransformed
 check_equals(b.xMin, 10);
 check_equals(b.xMax, 20);
@@ -600,7 +600,7 @@
 check_equals(b.xMin, -30);
 xcheck_equals(b.xMax, -10);
 xcheck_equals(b.yMin, 10);
-xcheck_equals(b.yMax, 20);
+check_equals(b.yMax, 20);
 
 draw._xscale = 200;
 check_equals(draw._width, 20);

Index: testsuite/misc-ming.all/displaylist_depths_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/displaylist_depths_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/displaylist_depths_test.c	12 Apr 2007 09:46:07 -0000	1.7
+++ testsuite/misc-ming.all/displaylist_depths_test.c	14 Apr 2007 14:38:29 -0000	1.8
@@ -230,7 +230,7 @@
 	// And (but only for the static case) child duplication
 
 	check_equals(mo, "staticmc_dup._width", "staticmc._width"); 
-	xcheck_equals(mo, "parseInt(staticmc_dup._width/10)", "7"); 
+	check_equals(mo, "parseInt(staticmc_dup._width/10)", "7"); 
 	check_equals(mo, "typeof(staticmc.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(staticmc_dup.child)", "'movieclip'"); 
 
@@ -274,7 +274,7 @@
 
 	// Note that staticmc0_dup is at negative depth
 	check_equals(mo, "staticmc0_dup._width", "staticmc0._width"); 
-	xcheck_equals(mo, "parseInt(staticmc0._width/10)", "7"); 
+	check_equals(mo, "parseInt(staticmc0._width/10)", "7"); 
 	check_equals(mo, "typeof(staticmc0.child)", "'movieclip'"); 
 	check_equals(mo, "typeof(staticmc0_dup.child)", "'movieclip'"); 
 



From MAILER-DAEMON Sat Apr 14 11:58:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HckdY-0006MW-3b
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 11:58:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HckdW-0006MR-U2
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 11:58:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HckdV-0006MF-5E
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 11:58:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HckdU-0006MC-VT
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 11:58:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HckZ5-0000Ci-KI
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 11:53:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HckYx-0000Y4-OM
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 15:53:19 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HckYx-0000Y0-3y
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 15:53:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HckYx-0000Y0-3y@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Sat, 14 Apr 2007 15:53:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/LoadVars.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 15:58:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/14 15:53:18

Modified files:
	.              : ChangeLog 
	server/asobj   : LoadVars.cpp NetStream.cpp Sound.cpp 
	                 xmlnode.cpp 
	server/parser  : movie_def_impl.cpp movie_def_impl.h 
	testsuite/actionscript.all: check.as 
	testsuite/libamf.all: test_number.cpp test_string.cpp 
	testsuite/misc-ming.all: intervalTestRunner.cpp 
	                         loadMovieTestRunner.cpp 

Log message:
	        * server/asobj/{Loadvars,NetStream,Sound,xmlnode}.cpp: Use
	        init_readonly_property for read-only properties.
	        * server/parser/movie_def_impl.{cpp,h}: Since we're not using
	        pthreads, there is no need to have our thread function 
	        match a specfic pattern; use one that fits our design.
	        * testsuite/actionscript.all/check.as: Don't prepend # where
	        it is not needed to avoid choking gcc3's C preprocessor.
	        * testsuite/libamf.all/{test_number,test_string}.cpp,
	        * testsuite/misc.ming.all/{intervalTestRunner,
	        loadMovieTestRunner}: Add needed includes for OpenBSD.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2871&r2=1.2872
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.h?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_number.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_string.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/intervalTestRunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2871
retrieving revision 1.2872
diff -u -b -r1.2871 -r1.2872
--- ChangeLog	14 Apr 2007 14:38:28 -0000	1.2871
+++ ChangeLog	14 Apr 2007 15:53:17 -0000	1.2872
@@ -1,3 +1,16 @@
+2007-04-14 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* server/asobj/{Loadvars,NetStream,Sound,xmlnode}.cpp: Use
+	init_readonly_property for read-only properties.
+	* server/parser/movie_def_impl.{cpp,h}: Since we're not using
+	pthreads, there is no need to have our thread function
+	match a specfic pattern; use one that fits our design.
+	* testsuite/actionscript.all/check.as: Don't prepend # where
+	it is not needed to avoid choking gcc3's C preprocessor.
+	* testsuite/libamf.all/{test_number,test_string}.cpp,
+	* testsuite/misc.ming.all/{intervalTestRunner,
+	loadMovieTestRunner}: Add needed includes for OpenBSD.
+
 2007-04-12 Sandro Santilli <strk@keybit.net>
 
 	* server/matrix.{h,cpp}: fix conceptual bug in Range2d transform

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/asobj/LoadVars.cpp	5 Apr 2007 07:31:28 -0000	1.19
+++ server/asobj/LoadVars.cpp	14 Apr 2007 15:53:17 -0000	1.20
@@ -177,7 +177,7 @@
 
 	static as_value checkLoads_wrapper(const fn_call& fn);
 
-	static as_value loaded_getset(const fn_call& fn);
+	static as_value loaded_get(const fn_call& fn);
 
 	static as_value onData_getset(const fn_call& fn);
 
@@ -286,8 +286,8 @@
 	gettersetter = new builtin_function(&LoadVars::onData_getset, NULL);
 	o.init_property("onData", *gettersetter, *gettersetter);
 
-	gettersetter = new builtin_function(&LoadVars::loaded_getset, NULL);
-	o.init_property("loaded", *gettersetter, *gettersetter);
+	gettersetter = new builtin_function(&LoadVars::loaded_get, NULL);
+	o.init_readonly_property("loaded", *gettersetter);
 }
 
 as_object*
@@ -476,25 +476,14 @@
 
 /* private static */
 as_value
-LoadVars::loaded_getset(const fn_call& fn)
+LoadVars::loaded_get(const fn_call& fn)
 {
 
 	boost::intrusive_ptr<LoadVars> ptr = ensureType<LoadVars>(fn.this_ptr);
 
-	if ( fn.nargs == 0 ) // getter
-	{
 		return as_value(ptr->loaded() > 0);
-	}
-	else // setter
-	{
-		IF_VERBOSE_ASCODING_ERRORS(
-			log_msg("Tried to set LoadVars.loaded, which is a read-only property");
-		);
-		return as_value();
-	}
 }
 
-
 static as_value
 loadvars_addrequestheader(const fn_call& fn)
 {

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/asobj/NetStream.cpp	30 Mar 2007 13:57:27 -0000	1.34
+++ server/asobj/NetStream.cpp	14 Apr 2007 15:53:17 -0000	1.35
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.34 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetStream.cpp,v 1.35 2007/04/14 15:53:17 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -163,17 +163,7 @@
 
 	boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
-	if ( fn.nargs == 0 )
-	{
 		return as_value(static_cast<double>(ns->time()));
-	}
-	else
-	{
-		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Tried to set read-only property NetStream.time");
-		);
-	}
-	return as_value();
 }
 
 // Both a getter and a (do-nothing) setter for bytesLoaded
@@ -183,17 +173,7 @@
 
 	boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
-	if ( fn.nargs == 0 )
-	{
 		return as_value(int(ns->bytesLoaded()));
-	}
-	else
-	{
-		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Tried to set read-only property NetStream.bytesLoaded");
-		);
-	}
-	return as_value();
 }
 
 // Both a getter and a (do-nothing) setter for bytesTotal
@@ -203,17 +183,7 @@
 
 	boost::intrusive_ptr<NetStream> ns = ensureType<NetStream>(fn.this_ptr);
 
-	if ( fn.nargs == 0 )
-	{
 		return as_value(int(ns->bytesTotal()));
-	}
-	else
-	{
-		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Tried to set read-only property NetStream.bytesTotal");
-		);
-	}
-	return as_value();
 }
 
 void
@@ -232,13 +202,13 @@
     boost::intrusive_ptr<builtin_function> gettersetter;
 
     gettersetter = new builtin_function(&netstream_time, NULL);
-    o.init_property("time", *gettersetter, *gettersetter);
+    o.init_readonly_property("time", *gettersetter);
 
     gettersetter = new builtin_function(&netstream_bytesloaded, NULL);
-    o.init_property("bytesLoaded", *gettersetter, *gettersetter);
+    o.init_readonly_property("bytesLoaded", *gettersetter);
 
     gettersetter = new builtin_function(&netstream_bytestotal, NULL);
-    o.init_property("bytesTotal", *gettersetter, *gettersetter);
+    o.init_readonly_property("bytesTotal", *gettersetter);
 
 }
 

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/Sound.cpp	22 Mar 2007 22:37:46 -0000	1.11
+++ server/asobj/Sound.cpp	14 Apr 2007 15:53:17 -0000	1.12
@@ -488,14 +488,7 @@
 sound_duration(const fn_call& fn)
 {
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
-	if ( fn.nargs == 0 ) {
 		return as_value(so->getDuration());
-    } else {
-		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Tried to set read-only property Sound.duration");
-		);
-    }
-	return as_value();
 }
 
 as_value
@@ -514,14 +507,8 @@
 sound_position(const fn_call& fn)
 {
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
-	if ( fn.nargs == 0 ) {
+
 		return as_value(so->getPosition());
-    } else {
-		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Tried to set read-only property Sound.position");
-		);
-    }
-	return as_value();
 }
 
 void
@@ -546,13 +533,13 @@
 	boost::intrusive_ptr<builtin_function> gettersetter;
 
 	gettersetter = new builtin_function(&sound_duration, NULL);
-	o.init_property("duration", *gettersetter, *gettersetter);
+	o.init_readonly_property("duration", *gettersetter);
 
 	gettersetter = new builtin_function(&sound_ID3, NULL);
 	o.init_property("ID3", *gettersetter, *gettersetter);
 
 	gettersetter = new builtin_function(&sound_position, NULL);
-	o.init_property("position", *gettersetter, *gettersetter);
+	o.init_readonly_property("position", *gettersetter);
 
 }
 

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/xmlnode.cpp	10 Apr 2007 10:46:19 -0000	1.28
+++ server/asobj/xmlnode.cpp	14 Apr 2007 15:53:17 -0000	1.29
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.28 2007/04/10 10:46:19 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.29 2007/04/14 15:53:17 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -359,14 +359,14 @@
     o.init_property("nodeName", *gettersetter, *gettersetter);
 
     gettersetter = new builtin_function(&xmlnode_nodetype, NULL);
-    o.init_property("nodeType", *gettersetter, *gettersetter);
+    o.init_readonly_property("nodeType", *gettersetter);
 
     gettersetter = new builtin_function(&xmlnode_attributes, NULL);
-    o.init_property("attributes", *gettersetter, *gettersetter);
+    o.init_readonly_property("attributes", *gettersetter);
 
     // These two return an array of objects
     gettersetter = new builtin_function(xmlnode_childNodes, NULL);
-    o.init_property("childNodes", *gettersetter, *gettersetter);
+    o.init_readonly_property("childNodes", *gettersetter);
 
     /// \fn MLNode::firstChild
     /// \brief XMLNode::firstChild property
@@ -379,7 +379,7 @@
     /// manipulate child nodes; use the appendChild(), insertBefore(),
     /// and removeNode() methods to manipulate child nodes. 
     gettersetter = new builtin_function(&xmlnode_firstchild, NULL);
-    o.init_property("firstChild", *gettersetter, *gettersetter);
+    o.init_readonly_property("firstChild", *gettersetter);
 
     /// \fn MLNode::lastChild
     /// \brief XMLNode::lastChild property 
@@ -391,16 +391,16 @@
     /// insertBefore(), and removeNode() methods to manipulate child
     /// nodes.
     gettersetter = new builtin_function(&xmlnode_lastchild, NULL);
-    o.init_property("lastChild", *gettersetter, *gettersetter);
+    o.init_readonly_property("lastChild", *gettersetter);
 
     gettersetter = new builtin_function(&xmlnode_nextsibling, NULL);
-    o.init_property("nextSibling", *gettersetter, *gettersetter);
+    o.init_readonly_property("nextSibling", *gettersetter);
 
     gettersetter = new builtin_function(&xmlnode_previoussibling, NULL);
-    o.init_property("previousSibling", *gettersetter, *gettersetter);
+    o.init_readonly_property("previousSibling", *gettersetter);
 
     gettersetter = new builtin_function(&xmlnode_parentNode, NULL);
-    o.init_property("parentNode",  *gettersetter, *gettersetter);
+    o.init_readonly_property("parentNode", *gettersetter);
 
 }
 
@@ -609,14 +609,7 @@
     
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
 
-    if ( fn.nargs == 0 ) {
 	return as_value(ptr->nodeType());
-    } else {
-	IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XMLNode.nodeType");
-	    );
-    }
-    return as_value();
 }
 
 // Both a getter and a (do-nothing) setter for attributes
@@ -627,29 +620,18 @@
     
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
 
-    if ( fn.nargs == 0 )
-	{
         XMLNode::AttribList& attrs = ptr->attributes();
 		boost::intrusive_ptr<as_object> ret = new as_object();
 		for (XMLNode::AttribList::const_iterator it=attrs.begin(),
-                        itEnd=attrs.end();
-                it != itEnd; ++it)
-		{
+         itEnd=attrs.end(); it != itEnd; ++it) {
+
                 const XMLAttr& at = *it;
                 const std::string& name = at.name();
                 const std::string& val = at.value();
                 ret->init_member(name, val);
 		}
-		//log_error("FIXME: XMLNode.attributes not implemented yet");
+
 		return as_value(ret); 
-    }
-	else
-	{
-		IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XMLNode.attributes");
-	    );
-    }
-    return as_value();
 }
 
 // Both a getter and a (do-nothing) setter for firstChild
@@ -661,19 +643,10 @@
     as_value rv;
     rv.set_null();
 
-    if ( fn.nargs == 0 )
-    {
         boost::intrusive_ptr<XMLNode> node = ptr->firstChild();
         if (node) {
 		    rv = node.get();
 	    }
-    }
-    else
-    {
-        IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XMLNode.firstChild");
-	    );
-    }
 
     return rv;
 }
@@ -687,14 +660,6 @@
     as_value rv;
     rv.set_null();
 
-    if ( fn.nargs != 0 )
-    {
-        IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XMLNode.lastChild");
-	    );
-        return rv;
-    } 
-
     boost::intrusive_ptr<XMLNode> node = ptr->lastChild();
     if (node) rv = node.get();
 
@@ -709,14 +674,6 @@
     as_value rv;
     rv.set_null();
 
-    if ( fn.nargs != 0 )
-    {
-        IF_VERBOSE_ASCODING_ERRORS(
-        log_aserror("Tried to set read-only property XMLNode.nextSibling");
-        );
-        return rv;
-    }
-    
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     XMLNode *node = ptr->nextSibling();
     if (node) {
@@ -733,14 +690,6 @@
     as_value rv;
     rv.set_null();
 
-    if ( fn.nargs != 0 )
-    {
-        IF_VERBOSE_ASCODING_ERRORS(
-        log_aserror("Tried to set read-only property XMLNode.previousSibling");
-        );
-        return rv;
-    }
-
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     XMLNode *node = ptr->previousSibling();
     if (node) {
@@ -757,14 +706,6 @@
     as_value rv;
     rv.set_null();
 
-    if ( fn.nargs != 0 )
-    {
-        IF_VERBOSE_ASCODING_ERRORS(
-        log_aserror("Tried to set read-only property XMLNode.parentNode");
-        );
-        return rv;
-    }
-
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     XMLNode *node = ptr->getParent();
     if (node) {
@@ -781,14 +722,6 @@
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     boost::intrusive_ptr<as_array_object> ary = new as_array_object();
 
-    if ( fn.nargs )  // setter
-    {
-        IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("Tried to set read-only property XMLNode.childNodes");
-	    );
-        return as_value();
-    }
-
     typedef XMLNode::ChildList ChildList;
 
     ChildList& child = ptr->childNodes();

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- server/parser/movie_def_impl.cpp	12 Apr 2007 21:53:12 -0000	1.65
+++ server/parser/movie_def_impl.cpp	14 Apr 2007 15:53:17 -0000	1.66
@@ -100,13 +100,10 @@
 	return this_thread == *_thread;
 }
 
-void*
-MovieLoader::execute(void* arg)
+void
+MovieLoader::execute(movie_def_impl* md)
 {
-	movie_def_impl* md = static_cast<movie_def_impl*>(arg);
 	md->read_all_swf();
-
-	return NULL;
 }
 
 bool

Index: server/parser/movie_def_impl.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/parser/movie_def_impl.h	12 Apr 2007 21:53:12 -0000	1.38
+++ server/parser/movie_def_impl.h	14 Apr 2007 15:53:18 -0000	1.39
@@ -116,7 +116,7 @@
 	boost::thread* _thread;
 
 	/// Entry point for the actual thread
-	static void *execute(void* arg);
+	static void execute(movie_def_impl* md);
 };
 
 /// The Characters dictionary associated with each SWF file.

Index: testsuite/actionscript.all/check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/actionscript.all/check.as	30 Mar 2007 07:32:28 -0000	1.25
+++ testsuite/actionscript.all/check.as	14 Apr 2007 15:53:18 -0000	1.26
@@ -67,21 +67,21 @@
 //
 //   getUrl( MEDIA(green.swf) );
 //
-#define MEDIA(x) MEDIADIR + "/" + #x
+#define MEDIA(x) MEDIADIR + "/" + x
 
 //
 // Use check(<expression>)
 //
 #define check(expr)  \
-	if ( expr ) pass_check(#expr + \
+	if ( expr ) pass_check(expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-	else fail_check(#expr + \
+	else fail_check(expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 
 #define xcheck(expr)  \
-        if ( expr ) xpass_check(#expr + \
+        if ( expr ) xpass_check(expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-        else xfail_check(#expr + \
+        else xfail_check(expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 
 //
@@ -89,17 +89,17 @@
 //
 #define check_equals(obt, exp)  \
 	if ( obt == exp ) pass_check( \
-		#obt + " == " + #exp + \
+		obt + " == " + exp + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-	else fail_check("expected: " + #exp + \
+	else fail_check("expected: " + exp + \
 		" obtained: " + obt + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 
 #define xcheck_equals(obt, exp)  \
         if ( obt == exp ) xpass_check( \
-                #obt + " == " + #exp + \
+                obt + " == " + exp + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-        else xfail_check("expected: " + #exp + \
+        else xfail_check("expected: " + exp + \
                 " obtained: " + obt + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 

Index: testsuite/libamf.all/test_number.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_number.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libamf.all/test_number.cpp	19 Mar 2007 01:13:23 -0000	1.3
+++ testsuite/libamf.all/test_number.cpp	14 Apr 2007 15:53:18 -0000	1.4
@@ -20,7 +20,7 @@
 
 #ifdef HAVE_DEJAGNU_H
 
-#include <netinet/in.h>
+//#include <netinet/in.h>
 #include <string>
 #include <sys/types.h>
 #include <unistd.h>

Index: testsuite/libamf.all/test_string.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_string.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libamf.all/test_string.cpp	17 Mar 2007 05:21:34 -0000	1.2
+++ testsuite/libamf.all/test_string.cpp	14 Apr 2007 15:53:18 -0000	1.3
@@ -21,6 +21,7 @@
 #ifdef HAVE_DEJAGNU_H
 
 #include <sys/types.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 

Index: testsuite/misc-ming.all/intervalTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/intervalTestRunner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/intervalTestRunner.cpp	30 Mar 2007 10:18:29 -0000	1.3
+++ testsuite/misc-ming.all/intervalTestRunner.cpp	14 Apr 2007 15:53:18 -0000	1.4
@@ -29,6 +29,7 @@
 #include "check.h"
 #include <string>
 #include <cassert>
+#include <unistd.h>
 
 using namespace gnash;
 using namespace std;

Index: testsuite/misc-ming.all/loadMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/loadMovieTestRunner.cpp	28 Feb 2007 17:25:26 -0000	1.4
+++ testsuite/misc-ming.all/loadMovieTestRunner.cpp	14 Apr 2007 15:53:18 -0000	1.5
@@ -30,6 +30,7 @@
 #include "check.h"
 #include <string>
 #include <cassert>
+#include <unistd.h>
 
 using namespace gnash;
 using namespace std;



From MAILER-DAEMON Sat Apr 14 12:32:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HclAT-0006YV-V8
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 12:32:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HclAR-0006YK-Ss
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 12:32:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HclAQ-0006Y8-Bs
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 12:32:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HclAQ-0006Y5-6r
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 12:32:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hcl60-0004B3-P9
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 12:27:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hcl5v-0002iL-Fk
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 16:27:23 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hcl5v-0002iH-3g
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 16:27:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hcl5v-0002iH-3g@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 16:27:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 16:32:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 16:27:22

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/actionscript.all: MovieClip.as check.as 

Log message:
	        * server/sprite_instance.cpp (sprite_getBounds): round bounds
	          to twips.
	        * testsuite/actionscript.all/MovieClip.as: more successes.
	        * testsuite/actionscript.all/check.as: Revert bastiaan patch,
	          changing semantic of most tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2872&r2=1.2873
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.239&r2=1.240
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/check.as?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2872
retrieving revision 1.2873
diff -u -b -r1.2872 -r1.2873
--- ChangeLog	14 Apr 2007 15:53:17 -0000	1.2872
+++ ChangeLog	14 Apr 2007 16:27:22 -0000	1.2873
@@ -1,3 +1,11 @@
+2007-04-14 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (sprite_getBounds): round bounds
+	  to twips.
+	* testsuite/actionscript.all/MovieClip.as: more successes.
+	* testsuite/actionscript.all/check.as: Revert bastiaan patch,
+	  changing semantic of most tests.
+
 2007-04-14 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* server/asobj/{Loadvars,NetStream,Sound,xmlnode}.cpp: Use
@@ -8,11 +16,13 @@
 	* testsuite/actionscript.all/check.as: Don't prepend # where
 	it is not needed to avoid choking gcc3's C preprocessor.
 	* testsuite/libamf.all/{test_number,test_string}.cpp,
-	* testsuite/misc.ming.all/{intervalTestRunner,
+	testsuite/misc.ming.all/{intervalTestRunner,
 	loadMovieTestRunner}: Add needed includes for OpenBSD.
 
-2007-04-12 Sandro Santilli <strk@keybit.net>
+2007-04-14 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (sprite_getBounds): round bounds
+	  to twips.
 	* server/matrix.{h,cpp}: fix conceptual bug in Range2d transform
 	  function.
 	* testsuite/misc-ming.all/displaylist_depths_test.c,

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -b -r1.239 -r1.240
--- server/sprite_instance.cpp	13 Apr 2007 07:35:55 -0000	1.239
+++ server/sprite_instance.cpp	14 Apr 2007 16:27:22 -0000	1.240
@@ -815,15 +815,15 @@
 
 		//m.transform(bounds);
 		//tgtwmat.transform_by_inverse(bounds);
-		std::stringstream ss;
+		//std::stringstream ss;
 
-		ss << "Local bounds: " << bounds << endl;
+		//ss << "Local bounds: " << bounds << endl;
 		srcwmat.transform(bounds);
-		ss << "src-w-transformed bounds: " << bounds << "(srcwmat is " << srcwmat << ")" << endl;
+		//ss << "src-w-transformed bounds: " << bounds << "(srcwmat is " << srcwmat << ")" << endl;
 		tgtwmat.transform_by_inverse(bounds);
-		ss << "tgt-w-invtransfor bounds: " << bounds << "(tgtwmat is " << tgtwmat << ")" << endl;
-		log_msg("%s", ss.str().c_str());
-		log_error("FIXME: MovieClip.getBounds(%s) broken", fn.arg(0).to_debug_string().c_str());
+		//ss << "tgt-w-invtransfor bounds: " << bounds << "(tgtwmat is " << tgtwmat << ")" << endl;
+		//log_msg("%s", ss.str().c_str());
+		log_error("FIXME: MovieClip.getBounds(%s) TESTING", fn.arg(0).to_debug_string().c_str());
 	}
 
 	// Magic numbers here... dunno why
@@ -834,10 +834,11 @@
 
 	if ( bounds.isFinite() )
 	{
-		xMin = bounds.getMinX()/20;
-		yMin = bounds.getMinY()/20;
-		xMax = bounds.getMaxX()/20;
-		yMax = bounds.getMaxY()/20;
+		// Round to the twip
+		xMin = int(rint(bounds.getMinX())) / 20.0f;
+		yMin = int(rint(bounds.getMinY())) / 20.0f;
+		xMax = int(rint(bounds.getMaxX())) / 20.0f;
+		yMax = int(rint(bounds.getMaxY())) / 20.0f;
 	}
 
 	boost::intrusive_ptr<as_object> bounds_obj(new as_object());
@@ -846,14 +847,6 @@
 	bounds_obj->init_member("xMax", as_value(xMax));
 	bounds_obj->init_member("yMax", as_value(yMax));
 
-	// xMin, xMax, yMin, and yMax
-	static bool warned = false;
-	if ( ! warned )
-	{
-		log_error("FIXME: MovieClip.getBounds() TESTING");
-		warned=true;
-	}
-
 	return as_value(bounds_obj.get());
 }
 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- testsuite/actionscript.all/MovieClip.as	14 Apr 2007 14:38:29 -0000	1.56
+++ testsuite/actionscript.all/MovieClip.as	14 Apr 2007 16:27:22 -0000	1.57
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.56 2007/04/14 14:38:29 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.57 2007/04/14 16:27:22 strk Exp $";
 
 #include "check.as"
 
@@ -584,8 +584,8 @@
 check_equals(b.yMax, 30);
 b = draw.getBounds(container); // these are transformed by container draw matrix
 check_equals(b.xMin, -30);
-xcheck_equals(b.xMax, -10);
-xcheck_equals(b.yMin, 10);
+check_equals(b.xMax, -10);
+check_equals(b.yMin, 10);
 check_equals(b.yMax, 20);
 
 draw._visible = false;
@@ -598,8 +598,8 @@
 check_equals(b.yMax, 30);
 b = draw.getBounds(container); // these are transformed by container draw matrix
 check_equals(b.xMin, -30);
-xcheck_equals(b.xMax, -10);
-xcheck_equals(b.yMin, 10);
+check_equals(b.xMax, -10);
+check_equals(b.yMin, 10);
 check_equals(b.yMax, 20);
 
 draw._xscale = 200;

Index: testsuite/actionscript.all/check.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/check.as,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/actionscript.all/check.as	14 Apr 2007 15:53:18 -0000	1.26
+++ testsuite/actionscript.all/check.as	14 Apr 2007 16:27:22 -0000	1.27
@@ -67,21 +67,21 @@
 //
 //   getUrl( MEDIA(green.swf) );
 //
-#define MEDIA(x) MEDIADIR + "/" + x
+#define MEDIA(x) MEDIADIR + "/" + #x
 
 //
 // Use check(<expression>)
 //
 #define check(expr)  \
-	if ( expr ) pass_check(expr + \
+	if ( expr ) pass_check(#expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-	else fail_check(expr + \
+	else fail_check(#expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 
 #define xcheck(expr)  \
-        if ( expr ) xpass_check(expr + \
+        if ( expr ) xpass_check(#expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-        else xfail_check(expr + \
+        else xfail_check(#expr + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 
 //
@@ -89,17 +89,17 @@
 //
 #define check_equals(obt, exp)  \
 	if ( obt == exp ) pass_check( \
-		obt + " == " + exp + \
+		#obt + " == " + #exp + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-	else fail_check("expected: " + exp + \
+	else fail_check("expected: " + #exp + \
 		" obtained: " + obt + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 
 #define xcheck_equals(obt, exp)  \
         if ( obt == exp ) xpass_check( \
-                obt + " == " + exp + \
+                #obt + " == " + #exp + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
-        else xfail_check("expected: " + exp + \
+        else xfail_check("expected: " + #exp + \
                 " obtained: " + obt + \
 		" [" + __FILE__ + ":" + __LINE__ + "]" ); \
 



From MAILER-DAEMON Sat Apr 14 13:36:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HcmAN-0006Gg-Sh
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 13:36:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HcmAM-0006GX-S5
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:36:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HcmAL-0006GL-6w
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:36:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HcmAL-0006GI-1V
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:36:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hcm5v-0003zH-DX
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:31:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hcm5t-0008NG-14
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 17:31:25 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hcm5s-0008N9-QB
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 17:31:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hcm5s-0008N9-QB@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 17:31:24 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server as_value.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 17:36:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 17:31:24

Modified files:
	server         : as_value.cpp 

Log message:
	comment out debugging prints in bool converters

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- as_value.cpp	2 Apr 2007 10:42:21 -0000	1.34
+++ as_value.cpp	14 Apr 2007 17:31:24 -0000	1.35
@@ -393,7 +393,7 @@
 			{
 				double num = to_number();
 				bool ret = num && ! isnan(num);
-				log_msg("m_string_value: %s, to_number: %g, to_bool: %d", m_string_value.c_str(), num, ret);
+				//log_msg("m_string_value: %s, to_number: %g, to_bool: %d", m_string_value.c_str(), num, ret);
 				return ret;
 			}
 		}
@@ -427,7 +427,7 @@
 			{
 				double num = to_number();
 				bool ret = num && ! isnan(num);
-				log_msg("m_string_value: %s, to_number: %g, to_bool: %d", m_string_value.c_str(), num, ret);
+				//log_msg("m_string_value: %s, to_number: %g, to_bool: %d", m_string_value.c_str(), num, ret);
 				return ret;
 			}
 		}



From MAILER-DAEMON Sat Apr 14 13:37:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HcmCB-0006TF-8K
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 13:37:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HcmC9-0006T9-JJ
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:37:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HcmC8-0006Sx-7I
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:37:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HcmC8-0006Su-2S
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:37:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hcm7i-0004DD-Dj
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 13:33:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hcm7g-0000Yn-Hj
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 17:33:16 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hcm7g-0000Yg-9Q
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 17:33:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hcm7g-0000Yg-9Q@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 17:33:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/vm ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 17:37:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 17:33:16

Modified files:
	server/vm      : ASHandlers.cpp 

Log message:
	remove debugging print in ActionDuplicateClip

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.87&r2=1.88

Patches:
Index: ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- ASHandlers.cpp	11 Apr 2007 17:54:22 -0000	1.87
+++ ASHandlers.cpp	14 Apr 2007 17:33:16 -0000	1.88
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.87 2007/04/11 17:54:22 bjacques Exp $ */
+/* $Id: ASHandlers.cpp,v 1.88 2007/04/14 17:33:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1141,7 +1141,7 @@
 void
 SWFHandlers::ActionDuplicateClip(ActionExec& thread)
 {
-	GNASH_REPORT_FUNCTION;
+	//GNASH_REPORT_FUNCTION;
 	as_environment& env = thread.env;
 
 	thread.ensureStack(3); 



From MAILER-DAEMON Sat Apr 14 14:24:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HcmvF-000780-AW
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 14:24:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HcmvD-00077s-FU
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 14:24:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HcmvB-00077g-No
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 14:24:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HcmvB-00077d-IM
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 14:24:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hcmql-0002kg-Ja
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 14:19:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hcmqk-0003sL-Av
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 18:19:50 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hcmqk-0003sH-0x
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 18:19:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hcmqk-0003sH-0x@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 18:19:50 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp testsuite/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 18:24:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 18:19:49

Modified files:
	.              : ChangeLog 
	server         : character.cpp 
	testsuite/swfdec: PASSING 
	testsuite/misc-ming.all: Makefile.am 
Added files:
	testsuite/misc-ming.all: matrix_test.c 

Log message:
	        * server/character.cpp (height_getset, width_getset): round
	          width and heights to nearest integer twip.
	        * testsuite/swfdec/PASSING: height4.swf succeeds.
	        * testsuite/misc-ming.all: Makefile.am, matrix_test.c: new test
	          for statically-defined matrix interpretation (just started, needs
	          many more tests).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2873&r2=1.2874
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2873
retrieving revision 1.2874
diff -u -b -r1.2873 -r1.2874
--- ChangeLog	14 Apr 2007 16:27:22 -0000	1.2873
+++ ChangeLog	14 Apr 2007 18:19:49 -0000	1.2874
@@ -1,5 +1,14 @@
 2007-04-14 Sandro Santilli <strk@keybit.net>
 
+	* server/character.cpp (height_getset, width_getset): round
+	  width and heights to nearest integer twip.
+	* testsuite/swfdec/PASSING: height4.swf succeeds.
+	* testsuite/misc-ming.all: Makefile.am, matrix_test.c: new test
+	  for statically-defined matrix interpretation (just started, needs
+	  many more tests).
+	  
+2007-04-14 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp (sprite_getBounds): round bounds
 	  to twips.
 	* testsuite/actionscript.all/MovieClip.as: more successes.

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/character.cpp	12 Apr 2007 16:29:14 -0000	1.33
+++ server/character.cpp	14 Apr 2007 18:19:49 -0000	1.34
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.33 2007/04/12 16:29:14 strk Exp $ */
+/* $Id: character.cpp,v 1.34 2007/04/14 18:19:49 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -458,13 +458,13 @@
 	as_value rv;
 	if ( fn.nargs == 0 ) // getter
 	{
-		float w = 0;
+		double w = 0;
 		if ( bounds.isFinite() )
 		{
 			matrix m = ptr->get_matrix();
 			m.transform(bounds);
 			assert(bounds.isFinite());
-			w = TWIPS_TO_PIXELS(int(bounds.width()));
+			w = TWIPS_TO_PIXELS(rint(bounds.width()));
 		}
 		rv = as_value(w);
 	}
@@ -503,13 +503,13 @@
 	as_value rv;
 	if ( fn.nargs == 0 ) // getter
 	{
-		float h = 0;
+		double h = 0;
 		if ( bounds.isFinite() )
 		{
 			matrix m = ptr->get_matrix();
 			m.transform(bounds);
 			assert(bounds.isFinite());
-			h = TWIPS_TO_PIXELS(int(bounds.height()));
+			h = TWIPS_TO_PIXELS(rint(bounds.height()));
 		}
 		rv = as_value(h);
 	}

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/swfdec/PASSING	12 Apr 2007 09:14:37 -0000	1.15
+++ testsuite/swfdec/PASSING	14 Apr 2007 18:19:49 -0000	1.16
@@ -52,3 +52,4 @@
 undefined2-7.swf
 height1.swf
 height3.swf
+height4.swf

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- testsuite/misc-ming.all/Makefile.am	9 Apr 2007 09:04:09 -0000	1.90
+++ testsuite/misc-ming.all/Makefile.am	14 Apr 2007 18:19:49 -0000	1.91
@@ -52,7 +52,6 @@
 	-DMING_VERSION_CODE=$(MING_VERSION_CODE) \
 	$(NULL)
 
-
 check_PROGRAMS = \
 	ButtonEventsTest \
 	ButtonEventsTest-Runner \
@@ -86,6 +85,7 @@
 	registerClassTestRunner \
 	goto_frame_test \
 	consecutive_goto_frame_test \
+	matrix_test \
 	multi_doactions_and_goto_frame_test \
 	simple_loop_test \
 	simple_loop_testrunner \
@@ -140,6 +140,7 @@
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \
 	get_frame_number_testrunner \
+	matrix_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -372,6 +373,20 @@
 	sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
 	chmod 755 $@
 
+matrix_test_SOURCES =	\
+	matrix_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+matrix_test_LDADD = $(MING_LIBS)
+
+matrix_test.swf: matrix_test
+	./matrix_test $(top_srcdir)/testsuite/media
+
+matrix_testrunner: $(srcdir)/../generic-testrunner.sh matrix_test.swf
+	sh $< -r5 $(top_builddir) matrix_test.swf > $@
+	chmod 755 $@
+
 get_frame_number_test_SOURCES =	\
 	get_frame_number_test.c	\
 	ming_utils.h		\
@@ -892,6 +907,7 @@
 	reverse_execute_PlaceObject2_test1runner \
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \
+	matrix_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/matrix_test.c
===================================================================
RCS file: testsuite/misc-ming.all/matrix_test.c
diff -N testsuite/misc-ming.all/matrix_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/matrix_test.c	14 Apr 2007 18:19:49 -0000	1.1
@@ -0,0 +1,138 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Sandro Santilli, strk@keybit.net
+ *
+ * Test extracting _width, _height, _xscale, _yscale, _x, _y and _rotation
+ * from hard-coded matrices.
+ *
+ * run as ./matrix_test
+ */
+
+#include "ming_utils.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "matrix_test.swf"
+
+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
+
+SWFDisplayItem
+add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
+{
+	SWFShape sh;
+	SWFMovieClip mc, mc2;
+	SWFDisplayItem it;
+
+	sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 255, 0, 0);
+	mc = newSWFMovieClip();
+	SWFMovieClip_add(mc, (SWFBlock)sh);
+
+	sh = make_square (-(width/2)+5, -(height/2)+5, width-10, height-10, 0, 0, 0);
+	mc2 = newSWFMovieClip(); // child
+	SWFMovieClip_add(mc2, (SWFBlock)sh);
+	SWFMovieClip_nextFrame(mc2);
+
+	it = SWFMovieClip_add(mc, (SWFBlock)mc2);
+	SWFDisplayItem_setName(it, "child");
+	SWFMovieClip_nextFrame(mc);
+
+	it = SWFMovie_add(mo, (SWFBlock)mc);
+	SWFDisplayItem_setDepth(it, depth); 
+	SWFDisplayItem_moveTo(it, x, y); 
+	SWFDisplayItem_setName(it, name);
+
+	return it;
+}
+
+
+int
+main(int argc, char** argv)
+{
+	SWFMovie mo;
+	SWFMovieClip dejagnuclip;
+	SWFDisplayItem it;
+	int i;
+
+	const char *srcdir=".";
+	if ( argc>1 ) 
+		srcdir=argv[1];
+	else
+	{
+   		//fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+   		//return 1;
+	}
+
+	Ming_init();
+	mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+	SWFMovie_setDimension(mo, 800, 600);
+	SWFMovie_setRate (mo, 1);
+
+	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+	SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+
+	add_actions(mo, "printBounds = function(b) { return ''+b.xMin+','+b.yMin+' '+b.xMax+','+b.yMax; };");
+
+	SWFMovie_nextFrame(mo); 
+
+
+	// Static 60x60 movieclip 
+	it = add_static_mc(mo, "staticmc", 3, 50, 300, 60, 60);
+
+	// Check if we cleaned them all now
+	check_equals(mo, "typeof(staticmc)", "'movieclip'");
+	check_equals(mo, "staticmc._x", "50");
+	check_equals(mo, "staticmc._y", "300");
+	check_equals(mo, "staticmc._xscale", "100");
+	check_equals(mo, "staticmc._yscale", "100");
+	check_equals(mo, "staticmc._rotation", "0");
+	check_equals(mo, "Math.round(staticmc._width)", "60");
+	check_equals(mo, "Math.round(staticmc._height)", "60");
+
+	SWFMovie_nextFrame(mo);        
+
+	SWFDisplayItem_rotate(it, -45);
+
+	check_equals(mo, "staticmc._x", "50");
+	check_equals(mo, "staticmc._y", "300");
+	check_equals(mo, "Math.round(staticmc._xscale)", "100");
+	check_equals(mo, "Math.round(staticmc._yscale)", "100");
+	check_equals(mo, "staticmc._rotation", "45");
+	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
+	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'7.5,257.5 92.5,342.5'");
+	check_equals(mo, "staticmc._width", "85");
+	check_equals(mo, "staticmc._height", "85");
+
+	// TODO:
+	// - test mixing rotation and scale !
+
+
+
+	add_actions(mo, "_root.totals(); stop();");
+	SWFMovie_nextFrame(mo);        
+
+	//Output movie
+	puts("Saving " OUTPUT_FILENAME );
+	SWFMovie_save(mo, OUTPUT_FILENAME);
+
+	return 0;
+}



From MAILER-DAEMON Sat Apr 14 18:27:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hcqig-0001HL-CW
	for mharc-gnash-commit@gnu.org; Sat, 14 Apr 2007 18:27:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hcqif-0001HG-3h
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 18:27:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hcqid-0001H4-75
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 18:27:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hcqid-0001H1-13
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 18:27:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HcqeB-0005JA-R3
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 18:23:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HcqeA-00053w-Dl
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 22:23:06 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HcqeA-00053t-2z
	for gnash-commit@gnu.org; Sat, 14 Apr 2007 22:23:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HcqeA-00053t-2z@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 14 Apr 2007 22:23:06 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/matrix.cpp testsuite/act...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Apr 2007 22:27:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/14 22:23:05

Modified files:
	.              : ChangeLog 
	server         : matrix.cpp 
	testsuite/actionscript.all: MovieClip.as 
	testsuite/misc-ming.all: matrix_test.c 
	testsuite/server: MatrixTest.cpp 

Log message:
	        * testsuite/actionscript.all/MovieClip.as,
	          testsuite/misc-ming.all/matrix_test.c,
	          testsuite/server/MatrixTest.cpp: more successes
	          after Eric patch ! A few more tests added in
	          matrix_test.c too, and more will be needed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2874&r2=1.2875
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/MatrixTest.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2874
retrieving revision 1.2875
diff -u -b -r1.2874 -r1.2875
--- ChangeLog	14 Apr 2007 18:19:49 -0000	1.2874
+++ ChangeLog	14 Apr 2007 22:23:04 -0000	1.2875
@@ -1,3 +1,16 @@
+2007-04-15 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as,
+	  testsuite/misc-ming.all/matrix_test.c,
+	  testsuite/server/MatrixTest.cpp: more successes
+	  after Eric patch ! A few more tests added in
+	  matrix_test.c too, and more will be needed.
+
+2007-04-15 Eric Hughes <eh@narthex.us>
+
+	* server/matrix.cpp (get_x_scale, get_y_scale): fixed implementations
+	  to match the interpretation of matrix used in set_scale_rotation.
+
 2007-04-14 Sandro Santilli <strk@keybit.net>
 
 	* server/character.cpp (height_getset, width_getset): round

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/matrix.cpp	14 Apr 2007 14:38:28 -0000	1.10
+++ server/matrix.cpp	14 Apr 2007 22:23:05 -0000	1.11
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.10 2007/04/14 14:38:28 strk Exp $ 
+// $Id: matrix.cpp,v 1.11 2007/04/14 22:23:05 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -343,8 +343,13 @@
 	// @@ not 100% sure what the heck I'm doing here.  I
 	// think this is roughly what I want; take the max
 	// length of the two basis vectors.
-	float	basis0_length2 = m_[0][0] * m_[0][0] + m_[0][1] * m_[0][1];
-	float	basis1_length2 = m_[1][0] * m_[1][0] + m_[1][1] * m_[1][1];
+
+	//float	basis0_length2 = m_[0][0] * m_[0][0] + m_[0][1] * m_[0][1];
+	float	basis0_length2 = m_[0][0] * m_[0][0] + m_[1][0] * m_[1][0];
+
+	//float	basis1_length2 = m_[1][0] * m_[1][0] + m_[1][1] * m_[1][1];
+	float	basis1_length2 = m_[0][1] * m_[0][1] + m_[1][1] * m_[1][1];
+
 	float	max_length2 = fmax(basis0_length2, basis1_length2);
 	return sqrtf(max_length2);
 }
@@ -352,7 +357,9 @@
 float
 matrix::get_x_scale() const
 {
-	float	scale = sqrtf(m_[0][0] * m_[0][0] + m_[0][1] * m_[0][1]);
+	// Scale is applied before rotation, must match implementation
+	// in set_scale_rotation
+	float	scale = sqrtf(m_[0][0] * m_[0][0] + m_[1][0] * m_[1][0]);
 
 	// Are we turned inside out?
 	if (get_determinant() < 0.f)
@@ -366,7 +373,9 @@
 float
 matrix::get_y_scale() const
 {
-	return sqrtf(m_[1][1] * m_[1][1] + m_[1][0] * m_[1][0]);
+	// Scale is applied before rotation, must match implementation
+	// in set_scale_rotation
+	return sqrtf(m_[1][1] * m_[1][1] + m_[0][1] * m_[0][1]);
 }
 
 float

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- testsuite/actionscript.all/MovieClip.as	14 Apr 2007 16:27:22 -0000	1.57
+++ testsuite/actionscript.all/MovieClip.as	14 Apr 2007 22:23:05 -0000	1.58
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.57 2007/04/14 16:27:22 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.58 2007/04/14 22:23:05 strk Exp $";
 
 #include "check.as"
 
@@ -607,13 +607,13 @@
 check_equals(draw._height, 20);
 
 draw._rotation = 0;
-xcheck_equals(draw._width, 20);
-xcheck_equals(draw._height, 20);
+check_equals(draw._width, 20);
+check_equals(draw._height, 20);
 
 draw._visible = true;
 draw._xscale = 100;
 check_equals(draw._width, 10);
-xcheck_equals(draw._height, 20);
+check_equals(draw._height, 20);
 
 draw._yscale = 50;
 check_equals(draw._width, 10);

Index: testsuite/misc-ming.all/matrix_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/matrix_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/matrix_test.c	14 Apr 2007 18:19:49 -0000	1.1
+++ testsuite/misc-ming.all/matrix_test.c	14 Apr 2007 22:23:05 -0000	1.2
@@ -122,8 +122,23 @@
 	check_equals(mo, "staticmc._width", "85");
 	check_equals(mo, "staticmc._height", "85");
 
+	SWFMovie_nextFrame(mo);        
+
+	SWFDisplayItem_scale(it, 2, 3);
+
+	check_equals(mo, "staticmc._x", "50");
+	check_equals(mo, "staticmc._y", "300");
+	check_equals(mo, "Math.round(staticmc._xscale)", "200");
+	check_equals(mo, "Math.round(staticmc._yscale)", "300");
+	check_equals(mo, "staticmc._rotation", "45");
+	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
+	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'-56.25,193.75 156.25,406.25'");
+	check_equals(mo, "staticmc._width", "212.5");
+	check_equals(mo, "staticmc._height", "212.5");
+
 	// TODO:
-	// - test mixing rotation and scale !
+	// - test more rotations and scales (corner cases too!)
+	// - test 'skew' (since Ming supports it)
 
 
 

Index: testsuite/server/MatrixTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/MatrixTest.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/server/MatrixTest.cpp	12 Apr 2007 16:29:14 -0000	1.5
+++ testsuite/server/MatrixTest.cpp	14 Apr 2007 22:23:05 -0000	1.6
@@ -100,13 +100,13 @@
 	check_equals(D(m1.get_rotation()), 2);
 
 	m1.set_scale_rotation(2, 1, 2);
-	xcheck_equals(D(m1.get_x_scale()), 2);
-	xcheck_equals(D(m1.get_y_scale()), 1);
+	check_equals(D(m1.get_x_scale()), 2);
+	check_equals(D(m1.get_y_scale()), 1);
 	check_equals(D(m1.get_rotation()), 2);
 
 	m1.set_scale_rotation(1, 2, 2);
-	xcheck_equals(D(m1.get_x_scale()), 1);
-	xcheck_equals(D(m1.get_y_scale()), 2);
+	check_equals(D(m1.get_x_scale()), 1);
+	check_equals(D(m1.get_y_scale()), 2);
 	check_equals(D(m1.get_rotation()), 2);
 }
 



From MAILER-DAEMON Sun Apr 15 06:56:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hd2Pf-0006Be-Tj
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 06:56:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hd2Pe-0006Ax-6p
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 06:56:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hd2Pc-0006A9-Dr
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 06:56:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hd2Pb-0006A6-Vl
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 06:56:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1Hd2L6-0003uU-ML
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 06:52:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hd2L5-0001bW-4F
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 10:52:11 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1Hd2L4-0001bR-6x
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 10:52:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hd2L4-0001bR-6x@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Sun, 15 Apr 2007 10:52:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/container.cpp libbase/c...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2007 10:56:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/15 10:52:09

Modified files:
	.              : ChangeLog 
	libbase        : container.cpp container.h membuf.cpp membuf.h 
	server         : PropertyList.cpp array.cpp as_function.cpp 
	                 as_object.h as_value.cpp as_value.h 
	                 edit_text_character.cpp gnash.h 
	                 sprite_instance.cpp sprite_instance.h 
	                 textformat.cpp 
	server/asobj   : Global.cpp LocalConnection.cpp 
	                 MovieClipLoader.cpp NetConnection.cpp 
	                 NetStream.cpp Object.cpp Sound.cpp xml.cpp 
	                 xmlnode.cpp 
	server/vm      : ASHandlers.cpp action.cpp 

Log message:
	        * libbase/container.{cpp,h}: Remove tu_string{,i}.
	        * server/as_value.{cpp,h}: Replace tu_string with std::string.
	        Remove wide string code that was both unused and inherently
	        broken.
	        * all over the place: Update to match changes in as_value.h.
	        Also, eliminate tu_string usage entirely.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2875&r2=1.2876
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/membuf.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/membuf.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.240&r2=1.241
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LocalConnection.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2875
retrieving revision 1.2876
diff -u -b -r1.2875 -r1.2876
--- ChangeLog	14 Apr 2007 22:23:04 -0000	1.2875
+++ ChangeLog	15 Apr 2007 10:52:08 -0000	1.2876
@@ -1,3 +1,12 @@
+2007-04-15 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* libbase/container.{cpp,h}: Remove tu_string{,i}.
+	* server/as_value.{cpp,h}: Replace tu_string with std::string.
+	Remove wide string code that was both unused and inherently
+	broken.
+	* all over the place: Update to match changes in as_value.h.
+	Also, eliminate tu_string usage entirely.
+
 2007-04-15 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/MovieClip.as,

Index: libbase/container.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libbase/container.cpp	11 Apr 2007 17:54:21 -0000	1.13
+++ libbase/container.cpp	15 Apr 2007 10:52:09 -0000	1.14
@@ -17,319 +17,6 @@
 #include "utf8.h"
 #include "tu_random.h"
 
-void tu_string::append_wide_char(uint16_t c)
-{
-	char buf[8];
-	int index = 0;
-	utf8::encode_unicode_character(buf, &index, (uint32_t) c);
-	buf[index] = '\0';
-
-	*this += buf;
-}
-
-
-void tu_string::append_wide_char(uint32_t c)
-{
-	char buf[8];
-	int index = 0;
-	utf8::encode_unicode_character(buf, &index, c);
-	buf[index] = '\0';
-
-	*this += buf;
-}
-
-
-void	tu_string::resize(int new_size)
-{
-	assert(new_size >= 0);
-
-	if (using_heap() == false)
-	{
-		if (new_size < 15)
-		{
-			// Stay with internal storage.
-			m_local.m_size = (char) (new_size + 1);
-			m_local.m_buffer[new_size] = '\0';	// terminate
-		}
-		else
-		{
-			// need to allocate heap buffer.
-			int	capacity = new_size + 1;
-			// round up.
-			capacity = (capacity + 15) & ~15;
-			char*	buf = (char*) tu_malloc(capacity);
-                        memset(buf, 0, capacity);
-
-			// Copy existing data.
-			strcpy(buf, m_local.m_buffer);
-
-			// Set the heap state.
-			m_heap.m_buffer = buf;
-			m_heap.m_all_ones = char(~0);
-			m_heap.m_size = new_size + 1;
-			m_heap.m_capacity = capacity;
-		}
-	}
-	else
-	{
-		// Currently using heap storage.
-		if (new_size < 15)
-		{
-			// Switch to local storage.
-
-			// Be sure to get stack copies of m_heap info, before we overwrite it.
-			char*	old_buffer = m_heap.m_buffer;
-			int	old_capacity = m_heap.m_capacity;
-			UNUSED(old_capacity);
-
-			// Copy existing string info.
-			m_local.m_size = (char) (new_size + 1);
-			strncpy(m_local.m_buffer, old_buffer, 15);
-			m_local.m_buffer[new_size] = '\0';	// ensure termination.
-
-			tu_free(old_buffer, old_capacity);
-		}
-		else
-		{
-			// Changing size of heap buffer.
-			int	capacity = new_size + 1;
-			// Round up.
-			capacity = (capacity + 15) & ~15;
-			if (capacity != m_heap.m_capacity)	// @@ TODO should use hysteresis when resizing
-			{
-				m_heap.m_buffer = (char*) tu_realloc(m_heap.m_buffer, capacity, m_heap.m_capacity);
-				m_heap.m_capacity = capacity;
-			}
-			// else we're OK with existing buffer.
-
-			m_heap.m_size = new_size + 1;
-
-			// Ensure termination.
-			m_heap.m_buffer[new_size] = '\0';
-		}
-	}
-}
-
-
-template<class char_type>
-/*static*/ void	encode_utf8_from_wchar_generic(tu_string* result, const char_type* wstr)
-{
-	const char_type*	in = wstr;
-
-	// First pass: compute the necessary string length.
-	int	bytes_needed = 0;
-	char	dummy[10];
-	int	offset;
-	for (;;)
-	{
-		uint32_t	uc = *in++;
-		offset = 0;
-		utf8::encode_unicode_character(dummy, &offset, uc);
-		bytes_needed += offset;
-
-		assert(offset <= 6);
-
-		if (uc == 0)
-		{
-			break;
-		}
-	}
-
-	// Second pass: transfer the data.
-	result->resize(bytes_needed - 1);	// resize() adds 1 for the \0 terminator
-	in = wstr;
-	char*	out = &((*result)[0]);
-	offset = 0;
-	for (;;)
-	{
-		assert(offset < bytes_needed);
-
-		uint32_t	uc = *in++;
-		utf8::encode_unicode_character(out, &offset, uc);
-
-		assert(offset <= bytes_needed);
-
-		if (uc == 0)
-		{
-			break;
-		}
-	}
-
-	assert(offset == bytes_needed);
-	assert((*result)[offset - 1] == 0);
-	assert(result->length() == (int) strlen(result->c_str()));
-}
-
-void tu_string::encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr)
-{
-	encode_utf8_from_wchar_generic<uint32_t>(result, wstr);
-}
-
-
-void tu_string::encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr)
-{
-	encode_utf8_from_wchar_generic<uint16_t>(result, wstr);
-}
-
-
-/*static*/ int	tu_string::stricmp(const char* a, const char* b)
-{
-    return STRCASECMP(a, b);
-}
-
-
-uint32_t	tu_string::utf8_char_at(int index) const
-{
-	const char*	buf = get_buffer();
-	uint32_t	c;
-
-	do
-	{
-		c = utf8::decode_next_unicode_character(&buf);
-		index--;
-
-		if (c == 0)
-		{
-			// We've hit the end of the string; don't go further.
-			assert(index == 0);
-			return c;
-		}
-	}
-	while (index >= 0);
-
-	return c;
-}
-
-
-tu_string	tu_string::utf8_to_upper() const
-{
-	const char*	buf = get_buffer();
-	tu_string str;
-	for (;;)
-	{
-		uint32_t c = utf8::decode_next_unicode_character(&buf);
-          
-		if (c == 0)
-		{
-			// We've hit the end of the string; don't go further.
-			return str;
-		}
-		str += toupper(c);
-	}
-  
-	return str;
-}
-
-
-tu_string	tu_string::utf8_to_lower() const
-{
-	const char*	buf = get_buffer();
-	tu_string str;
-	for (;;)
-	{
-		uint32_t c = utf8::decode_next_unicode_character(&buf);
-    
-		if (c == 0) {
-			// We've hit the end of the string; don't go further.
-			return str;
-		}
-		str += tolower(c);
-	}
-  
-	return str;
-}
-
-
-/*static*/ int	tu_string::utf8_char_count(const char* buf, int buflen)
-{
-	const char*	p = buf;
-	int	length = 0;
-
-	while (p - buf < buflen)
-	{
-		uint32_t	c = utf8::decode_next_unicode_character(&p);
-		if (c == 0)
-		{
-			break;
-		}
-
-		length++;
-	}
-
-	return length;
-}
-
-
-tu_string	tu_string::utf8_substring(int start, int end) const
-{
-	assert(start <= end);
-
-	if (start == end)
-	{
-		// Special case, always return empty string.
-		return tu_string();
-	}
-
-	const char*	p = get_buffer();
-	int	index = 0;
-	const char*	start_pointer = p;
-	const char*	end_pointer = p;
-
-	for (;;)
-	{
-		if (index == start)
-		{
-			start_pointer = p;
-		}
-
-		uint32_t	c = utf8::decode_next_unicode_character(&p);
-		index++;
-
-		if (index == end)
-		{
-			end_pointer = p;
-			break;
-		}
-
-		if (c == 0)
-		{
-			if (index < end)
-			{
-				assert(0);
-				end_pointer = p;
-			}
-			break;
-		}
-	}
-
-	if (end_pointer < start_pointer)
-	{
-		end_pointer = start_pointer;
-	}
-
-	return tu_string(start_pointer, end_pointer - start_pointer);
-}
-
-
-// #ifndef HAVE_VSNPRINTF
-// #define vsnprintf	_vsnprintf
-// #endif
-
-tu_string string_printf(const char* fmt, ...)
-// Handy sprintf wrapper.
-{
-	static const int	BUFFER_SIZE = 500;
-	char	s_buffer[BUFFER_SIZE];
-
-	va_list ap;
-	va_start(ap, fmt);
-	vsnprintf(s_buffer, BUFFER_SIZE, fmt, ap);
-	va_end(ap);
-
-	return s_buffer;
-}
-
-
 
 #ifdef CONTAINER_UNIT_TEST
 
@@ -473,222 +160,6 @@
 	printf("next_new_index = %d\n", next_new_index);
 }
 
-
-void	test_stringi()
-{
-	tu_stringi	a, b;
-
-	// Equality.
-	a = "this is a test";
-	b = "This is a test";
-	assert(a == b);
-
-	b = "tHiS Is a tEsT";
-	assert(a == b);
-
-	a += "Hello";
-	b += "hellO";
-	assert(a == b);
-
-	tu_string	c(b);
-	assert(a.to_tu_string() != c);
-
-	// Ordering.
-	a = "a";
-	b = "B";
-	assert(a < b);
-
-	a = "b";
-	b = "A";
-	assert(a > b);
-}
-
-
-void	test_stringi_hash()
-{
-	stringi_hash<int>	a;
-
-	assert(a.is_empty());
-
-	a.add("bobo", 1);
-
-	assert(a.is_empty() == false);
-
-	a.add("hello", 2);
-	a.add("it's", 3);
-	a.add("a", 4);
-	a.add("beautiful day!", 5);
-
-	int	result = 0;
-	a.get("boBO", &result);
-	assert(result == 1);
-
-	a.set("BObo", 2);
-	a.get("bObO", &result);
-	assert(result == 2);
-
-	assert(a.is_empty() == false);
-	a.clear();
-	assert(a.is_empty() == true);
-
-	// Hammer on one key that differs only by case.
-	tu_stringi	original_key("thisisatest");
-	tu_stringi	key(original_key);
-	a.add(key, 1234567);
-
-	int	variations = 1 << key.length();
-	for (int i = 0; i < variations; i++)
-	{
-		// Twiddle the case of the key.
-		for (int c = 0; c < key.length(); c++)
-		{
-			if (i & (1 << c))
-			{
-				key[c] = toupper(key[c]);
-			}
-			else
-			{
-				key[c] = tolower(key[c]);
-			}
-		}
-
-		a.set(key, 7654321);
-
-		// Make sure original entry was modified.
-		int	value = 0;
-		a.get(original_key, &value);
-		assert(value == 7654321);
-
-		// Make sure hash keys are preserving case.
-		assert(a.find(key)->first.to_tu_string() == original_key.to_tu_string());
-
-		// Make sure they're actually the same entry.
-		assert(a.find(original_key) == a.find(key));
-		
-		a.set(original_key, 1234567);
-		assert(a.find(key)->second == 1234567);
-	}
-}
-
-
-void test_unicode()
-{
-	tu_string a;
-
-	tu_string::encode_utf8_from_wchar(&a, L"19 character string");
-	assert(a.length() == 19);
-
-	// TODO add some more tests; should test actual UTF-8 conversions.
-}
-
-
-
-int	main()
-{
-#if 1
-	printf("sizeof(tu_string) == %d\n", sizeof(tu_string));
-
-	std::vector<tu_string>	storage;
-	storage.resize(2);
-
-	tu_string&	a = storage[0];
-	tu_string&	b = storage[1];
-	a = "test1";
-	
-	printf("&a = 0x%X, &b = 0x%X\n", int(&a), int(&b));
-
-	printf("%s\n", a.c_str());
-
-	assert(a == "test1");
-	assert(a.length() == 5);
-
-	a += "2";
-	assert(a == "test12");
-
-	a += "this is some more text";
-	assert(a.length() == 28);
-
-	assert(a[2] == 's');
-	assert(a[3] == 't');
-	assert(a[4] == '1');
-	assert(a[5] == '2');
-	assert(a[7] == 'h');
-	assert(a[28] == 0);
-
-	assert(b.length() == 0);
-	assert(b[0] == 0);
-	assert(b.c_str()[0] == 0);
-
-	tu_string c = a + b;
-
-	assert(c.length() == a.length());
-
-	c.resize(2);
-	assert(c == "te");
-	assert(c == tu_string("te"));
-
-	assert(tu_string("fourscore and sevent") == "fourscore and sevent");
-
-	b = "#sacrificial lamb";
-
-	// Test growing & shrinking.
-	a = "";
-	for (int i = 0; i < 1000; i++)
-	{
-		assert(a.length() == i);
-
-		if (i == 8)
-		{
-			assert(a == "01234567");
-		}
-		else if (i == 27)
-		{
-			assert(a == "012345678901234567890123456");
-		}
-
-		a.resize(a.length() + 1);
-		a[a.length() - 1] = '0' + (i % 10);
-	}
-
-	{for (int i = 999; i >= 0; i--)
-	{
-		a.resize(a.length() - 1);
-		assert(a.length() == i);
-
-		if (i == 8)
-		{
-			assert(a == "01234567");
-		}
-		else if (i == 27)
-		{
-			assert(a == "012345678901234567890123456");
-		}
-	}}
-
-	// Test larger shrinking across heap/local boundary.
-	a = "this is a string longer than 16 characters";
-	a = "short";
-
-	// Test larger expand across heap/local boundary.
-	a = "another longer string...";
-
-	assert(b == "#sacrificial lamb");
-
-	test_hash();
-	test_stringi();
-	test_stringi_hash();
-
-	test_unicode();
-
-	// TODO: unit tests for std::vector<>, string_hash<>
-#endif
-
-	test_hash_speed();
-
-	return 0;
-}
-
-
 #endif // CONTAINER_UNIT_TEST
 
 

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- libbase/container.h	13 Apr 2007 09:15:54 -0000	1.53
+++ libbase/container.h	15 Apr 2007 10:52:09 -0000	1.54
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: container.h,v 1.53 2007/04/13 09:15:54 bjacques Exp $ */
+/* $Id: container.h,v 1.54 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
@@ -702,356 +702,6 @@
 #pragma warning(disable : 4345)	// in MSVC 7.1, warning about placement new POD default initializer
 #endif // _WIN32
 
-class tu_stringi;
-
-// String-like type.  Attempt to be memory-efficient with small strings.
-class DSOEXPORT tu_string
-{
-public:
-	tu_string() { m_local.m_size = 1; memset(m_local.m_buffer, 0, 15); }
-	tu_string(const char* str)
-	{
-		m_local.m_size = 1;
-		m_local.m_buffer[0] = '\0';
-
-		int	new_size = strlen(str);
-		resize(new_size);
-		strcpy(get_buffer(), str);
-	}
-	tu_string(const char* buf, int buflen)
-	{
-		m_local.m_size = 1;
-		m_local.m_buffer[0] = '\0';
-
-		int	new_size = buflen;
-		resize(new_size);
-		memcpy(get_buffer(), buf, buflen);
-		get_buffer()[buflen] = '\0';	// terminate.
-	}
-	tu_string(const tu_string& str)
-	{
-		m_local.m_size = 1;
-		m_local.m_buffer[0] = '\0';
-
-		resize(str.size());
-		strcpy(get_buffer(), str.get_buffer());
-	}
-	tu_string(const uint32_t* wide_char_str)
-	{
-		m_local.m_size = 1;
-		m_local.m_buffer[0] = '\0';
-
-		*this = wide_char_str;
-	}
-	tu_string(const uint16_t* wide_char_str)
-	{
-		m_local.m_size = 1;
-		m_local.m_buffer[0] = '\0';
-
-		*this = wide_char_str;
-	}
-
-	~tu_string()
-	{
-		if (using_heap())
-		{
-			tu_free(m_heap.m_buffer, m_heap.m_capacity);
-		}
-	}
-
-	operator const char*() const
-	{
-		return get_buffer();
-	}
-
-	const char*	c_str() const
-	{
-		return (const char*) (*this);
-	}
-
-	/// \brief
-	/// If you need a const tu_stringi, don't create a new object;
-	/// these things have the same internal representation.
-	const tu_stringi&	to_tu_stringi() const { return *(const tu_stringi*) this; }
-
-	/// \brief
-	/// operator= returns void; if you want to know why, ask Charles Bloom :)
-	/// (executive summary: a = b = c is an invitation to bad code)
-	void	operator=(const char* str)
-	{
-		resize(strlen(str));
-		strcpy(get_buffer(), str);
-	}
-
-	void	operator=(const tu_string& str)
-	{
-		resize(str.size());
-		strcpy(get_buffer(), str.get_buffer());
-	}
-
-	bool	operator==(const char* str) const
-	{
-		return strcmp(*this, str) == 0;
-	}
-
-	bool	operator!=(const char* str) const
-	{
-		return strcmp(*this, str) != 0;
-	}
-
-	bool	operator==(const tu_string& str) const
-	{
-		return strcmp(*this, str) == 0;
-	}
-
-	bool	operator!=(const tu_string& str) const
-	{
-		return strcmp(*this, str) != 0;
-	}
-
-	int	length() const
-	{
-		if (using_heap() == false)
-		{
-			return m_local.m_size - 1;
-		}
-		else
-		{
-			return m_heap.m_size - 1;
-		}
-	}
-	int	size() const { return length(); }
-
-	char&	operator[](int index)
-	{
-		assert(index >= 0 && index <= size());
-		return get_buffer()[index];
-	}
-	const char&	operator[](int index) const
-	{
-		return (*(const_cast<tu_string*>(this)))[index];
-	}
-
-	void	operator+=(const char* str)
-	{
-		int	str_length = strlen(str);
-		int	old_length = length();
-		assert(old_length >= 0);
-		resize(old_length + str_length);
-		strcpy(get_buffer() + old_length, str);
-	}
-
-	void	operator+=(char ch)
-	{
-		int	old_length = length();
-		assert(old_length >= 0);
-		resize(old_length + 1);
-		strncpy(get_buffer() + old_length, (char *)&ch, 1);
-	}
-
-	// Append wide char.  Both versions of wide char.
-	void	append_wide_char(uint16_t ch);
-	void	append_wide_char(uint32_t ch);
-
-	void	operator+=(const tu_string& str)
-	{
-		int	str_length = str.length();
-		int	old_length = length();
-		assert(old_length >= 0);
-		resize(old_length + str_length);
-		strcpy(get_buffer() + old_length, str.c_str());
-	}
-
-	tu_string	operator+(const char* str) const
-	// NOT EFFICIENT!  But convenient.
-	{
-		tu_string	new_string(*this);
-		new_string += str;
-		return new_string;
-	}
-
-	bool	operator<(const char* str) const
-	{
-		return strcmp(c_str(), str) < 0;
-	}
-	bool	operator<(const tu_string& str) const
-	{
-		return *this < str.c_str();
-	}
-	bool	operator>(const char* str) const
-	{
-		return strcmp(c_str(), str) > 0;
-	}
-	bool	operator>(const tu_string& str) const
-	{
-		return *this > str.c_str();
-	}
-
-	void clear()
-	{
-		resize(0);
-	}
-	
-	// Sets buffer size to new_size+1 (i.e. enough room for
-	// new_size chars, plus terminating 0).
-	void	resize(int new_size);
-
-	// Set *result to the UTF-8 encoded version of wstr[].
-	// Both version of wchar_t.
-	//
-	// Could add operator= overloads, but maybe it's better to
-	// keep this very explicit.
-	static void	encode_utf8_from_wchar(tu_string* result, const uint32_t* wstr);
-	static void	encode_utf8_from_wchar(tu_string* result, const uint16_t* wstr);
-
-	// Utility: case-insensitive string compare.  stricmp() is not
-	// ANSI or POSIX, doesn't seem to appear in Linux.
-	static int	stricmp(const char* a, const char* b);
-
-	// Return the Unicode char at the specified character
-	// position.  index is in UTF-8 chars, NOT bytes.
-	uint32_t	utf8_char_at(int index) const;
-
-	// Return the string in this container as all upper case letters
-	tu_string utf8_to_upper() const;
-
-	// Return the string in this container as all lower case letters
-	tu_string utf8_to_lower() const;
-
-	// Return the number of UTF-8 characters in the given
-	// substring buffer.  You must pass in a valid buffer length;
-	// this routine does not look for a terminating \0.
-	static int	utf8_char_count(const char* buf, int buflen);
-
-	int	utf8_length() const { return utf8_char_count(get_buffer(), length()); }
-
-	// Returns a tu_string that's a substring of this.  start and
-	// end are in UTF-8 character positions (NOT bytes).
-	//
-	// start is the index of the first character you want to include.
-	//
-	// end is the index one past the last character you want to include.
-	tu_string	utf8_substring(int start, int end) const;
-
-private:
-	char*	get_buffer()
-	{
-		if (using_heap() == false)
-		{
-			return m_local.m_buffer;
-		}
-		else
-		{
-			return m_heap.m_buffer;
-		}
-	}
-
-	const char*	get_buffer() const
-	{
-		return const_cast<tu_string*>(this)->get_buffer();
-	}
-
-
-	bool	using_heap() const
-	{
-		bool	heap = (m_heap.m_all_ones == (char) ~0);
-		return heap;
-	}
-
-	// The idea here is that tu_string is a 16-byte structure,
-	// which uses internal storage for strings of 14 characters or
-	// less.  For longer strings, it allocates a heap buffer, and
-	// keeps the buffer-tracking info in the same bytes that would
-	// be used for internal string storage.
-	//
-	// A string that's implemented like vector<char> is typically
-	// 12 bytes plus heap storage, so this seems like a decent
-	// thing to try.  Also, a zero-length string still needs a
-	// terminator character, which with vector<char> means an
-	// unfortunate heap alloc just to hold a single '0'.
-	union
-	{
-		// Internal storage.
-		struct
-		{
-			char	m_size;
-			char	m_buffer[15];
-		} m_local;
-
-		// Heap storage.
-		struct
-		{
-			char	m_all_ones;	// flag to indicate heap storage is in effect.
-			int	m_size;
-			int	m_capacity;
-			char*	m_buffer;
-		} m_heap;
-	};
-};
-
-
-// String-like type; comparisons are CASE INSENSITIVE.
-// Uses tu_string for implementation.
-class tu_stringi
-{
-public:
-	tu_stringi() {}
-	tu_stringi(const char* str) : m_string(str) {}
-	tu_stringi(const tu_string& str) : m_string(str) {}
-	tu_stringi(const tu_stringi& stri) : m_string(stri.c_str()) {}
-
-	~tu_stringi() {}
-
-	operator const char*() const { return (const char*) m_string; }
-	const char*	c_str() const { return m_string.c_str(); }
-	void	operator=(const char* str) { m_string = str; }
-	void	operator=(const tu_string& str) { m_string = str; }
-	void	operator=(const tu_stringi& str) { m_string = str.m_string; }
-	int	length() const { return m_string.length(); }
-	int	size() const { return length(); }
-	char&	operator[](int index) { return m_string[index]; }
-	const char&	operator[](int index) const { return m_string[index]; }
-	void	operator+=(const char* str) { m_string += str; }
-	void	operator+=(const tu_string& str) { m_string += str; }
-	void	operator+=(const tu_stringi& str) { m_string += str.m_string; }
-	tu_stringi	operator+(const char* str) const { return tu_stringi(m_string + str); }
-
-	// The special stuff.
-	tu_string& to_tu_string() { return m_string; }
-	const tu_string& to_tu_string() const { return m_string; }
-
-	bool	operator==(const char* str) const
-	{
-		return tu_string::stricmp(*this, str) == 0;
-	}
-	bool	operator==(const tu_stringi& str) const
-	{
-		return tu_string::stricmp(*this, str) == 0;
-	}
-	bool	operator<(const char* str) const
-	{
-		return tu_string::stricmp(c_str(), str) < 0;
-	}
-	bool	operator<(const tu_stringi& str) const
-	{
-		return *this < str.c_str();
-	}
-	bool	operator>(const char* str) const
-	{
-		return tu_string::stricmp(c_str(), str) > 0;
-	}
-	bool	operator>(const tu_stringi& str) const
-	{
-		return *this > str.c_str();
-	}
-
-	void	resize(int new_size) { m_string.resize(new_size); }
-
-private:
-	tu_string	m_string;
-};
-
-
 template<class T>
 class string_hash_functor
 // Computes a hash of a string-like object (something that has
@@ -1066,13 +716,6 @@
 	}
 };
 
-
-template<class U>
-class string_hash : public gnash::hash<tu_string, U, string_hash_functor<tu_string> >
-{
-};
-
-
 template<class T>
 class stringi_hash_functor
 // Computes a case-insensitive hash of a string-like object (something that has
@@ -1087,22 +730,6 @@
 	}
 };
 
-
-// Case-insensitive string hash.
-template<class U>
-class stringi_hash : public gnash::hash<tu_stringi, U, stringi_hash_functor<tu_stringi> >
-{
-};
-
-
-// Utility: handy sprintf wrapper.
-tu_string string_printf(const char* fmt, ...)
-#ifdef __GNUC__
-	// use the following to catch errors: (only with gcc)
-	__attribute__((format (printf, 1, 2)))
-#endif	// not __GNUC__
-;
-
 #endif // __CONTAINER_H__
 
 // Local Variables:

Index: libbase/membuf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/membuf.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/membuf.cpp	6 Aug 2006 02:00:54 -0000	1.4
+++ libbase/membuf.cpp	15 Apr 2007 10:52:09 -0000	1.5
@@ -65,7 +65,7 @@
 }
 
 
-membuf::membuf(const tu_string& str)
+membuf::membuf(const std::string& str)
 	:
 	m_size(0),
 	m_capacity(0),
@@ -152,7 +152,7 @@
 }
 
 
-bool membuf::append(const tu_string& str)
+bool membuf::append(const std::string& str)
 {
 	return append(str.c_str(), str.length());
 }

Index: libbase/membuf.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/membuf.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/membuf.h	25 Aug 2006 23:35:20 -0000	1.3
+++ libbase/membuf.h	15 Apr 2007 10:52:09 -0000	1.4
@@ -13,9 +13,7 @@
 
 #include "tu_config.h"
 #include "utility.h"
-
-class tu_string;
-
+#include <string>
 
 class membuf
 {
@@ -23,7 +21,7 @@
 	membuf();
 	membuf(const void* data, int size);
 	membuf(const membuf& buf);
-	membuf(const tu_string& str);
+	membuf(const std::string& str);
 	~membuf();
 
 	// Construct a read-only membuf that points at the given data,
@@ -44,7 +42,7 @@
 	bool append(const void* data, int size);
 	bool append(const membuf& buf);
 	// We do not append the terminating '\0'.
-	bool append(const tu_string& str);
+	bool append(const std::string& str);
 
 private:
 	int m_size;

Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/PropertyList.cpp	22 Mar 2007 15:26:16 -0000	1.12
+++ server/PropertyList.cpp	15 Apr 2007 10:52:09 -0000	1.13
@@ -210,7 +210,7 @@
 	for ( const_iterator it=begin(), itEnd=end(); it != itEnd; ++it )
 	{
 		log_msg("  %s: %s", it->first.c_str(),
-			it->second->getValue(this_ptr).to_string());
+			it->second->getValue(this_ptr).to_string().c_str());
 	}
 }
 

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/array.cpp	13 Apr 2007 07:35:55 -0000	1.58
+++ server/array.cpp	15 Apr 2007 10:52:09 -0000	1.59
@@ -33,6 +33,7 @@
 #include <string>
 #include <algorithm>
 #include <memory> // for auto_ptr
+#include <boost/algorithm/string/case_conv.hpp>
 
 //#define GNASH_DEBUG 
 
@@ -49,7 +50,7 @@
 public:
 	bool operator() (const as_value& a, const as_value& b)
 	{
-		return ( a.to_tu_string() < b.to_tu_string() );
+		return a.to_string().compare(b.to_string()) < 0;
 	}
 };
 
@@ -59,7 +60,7 @@
 public:
 	bool operator() (const as_value& a, const as_value& b)
 	{
-		return ( a.to_string() > b.to_string() );
+		return a.to_string().compare(b.to_string()) > 0;
 	}
 };
 
@@ -69,7 +70,12 @@
 public:
 	bool operator() (const as_value& a, const as_value& b)
 	{
-		return ( a.to_tu_stringi() < b.to_tu_stringi() );
+		using namespace boost::algorithm;
+
+		std::string strA = to_upper_copy(a.to_string());
+		std::string strB = to_upper_copy(b.to_string());
+
+		return strA.compare(strB) < 0;
 	}
 };
 
@@ -79,7 +85,12 @@
 public:
 	bool operator() (const as_value& a, const as_value& b)
 	{
-		return ( a.to_tu_stringi() > b.to_tu_stringi() );
+		using namespace boost::algorithm;
+
+		std::string strA = to_upper_copy(a.to_string());
+		std::string strB = to_upper_copy(b.to_string());
+
+		return strA.compare(strB) > 0;
 	}
 };
 
@@ -632,7 +643,7 @@
 
 	IF_VERBOSE_ACTION (
 	log_action("calling array pop, result:%s, new array size:%d",
-		rv.to_string(), array->size());
+		rv.to_string().c_str(), array->size());
 	);
         return rv;
 }
@@ -648,7 +659,7 @@
 
 	IF_VERBOSE_ACTION (
 	log_action("calling array shift, result:%s, new array size:%d",
-		rv.to_string(), array->size());
+		rv.to_string().c_str(), array->size());
 	);
 	return rv;
 }
@@ -665,7 +676,7 @@
 
 	IF_VERBOSE_ACTION (
 	log_action("called array reverse, result:%s, new array size:%d",
-		rv.to_string(), array->size());
+		rv.to_string().c_str(), array->size());
 	);
 	return rv;
 }
@@ -846,7 +857,7 @@
 		for (int i = 0; i < int(fn.arg(0).to_number()); i++)
 		{
 			index_number.set_int(i);
-			ao->set_member(index_number.to_string(), null_value);
+			ao->set_member(index_number.to_string().c_str(), null_value);
 		}
 	}
 	else

Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/as_function.cpp	24 Mar 2007 11:35:02 -0000	1.28
+++ server/as_function.cpp	15 Apr 2007 10:52:09 -0000	1.29
@@ -246,7 +246,7 @@
 						" (expected array)"
 						" - considering as call with no args",
 						fn.arg(1).typeOf(),
-						fn.arg(1).to_string());
+						fn.arg(1).to_string().c_str());
 				);
 				goto call_it;
 			}

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/as_object.h	29 Mar 2007 14:29:15 -0000	1.53
+++ server/as_object.h	15 Apr 2007 10:52:09 -0000	1.54
@@ -465,8 +465,6 @@
         /// The derived class should not override this method,
         /// but instead implement its own gettersetter properties.
 	///
-	/// TODO: take a std::string rather then a tu_stringi
-	///
 	/// @parame name
 	///     Name of the property.
 	///	Case insensitive up to SWF6,

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/as_value.cpp	14 Apr 2007 17:31:24 -0000	1.35
+++ server/as_value.cpp	15 Apr 2007 10:52:09 -0000	1.36
@@ -66,32 +66,15 @@
     }
 }
 
-
-// Conversion to string.
-const char
-*as_value::to_string(as_environment* env) const
-{
-    return to_tu_string(env).c_str();
-}
-
-
 std::string
 as_value::to_std_string(as_environment* env) const
 {
-    const char* c = to_string(env);
-    assert(c);
-    return std::string(c);
+    return to_string(env);
 }
 
-const tu_stringi
-&as_value::to_tu_stringi(as_environment* env) const
-{
-    return reinterpret_cast<const tu_stringi&>(to_tu_string(env));
-}
-
-// Conversion to const tu_string&.
-const tu_string&
-as_value::to_tu_string(as_environment* env) const
+// Conversion to const std::string&.
+const std::string&
+as_value::to_string(as_environment* env) const
 {
 	switch (m_type)
 	{
@@ -214,9 +197,9 @@
     return m_string_value;
 }
 
-// Conversion to const tu_string&.
-const tu_string
-&as_value::to_tu_string_versioned(int version, as_environment* env) const
+// Conversion to const std::string&.
+const std::string&
+as_value::to_string_versioned(int version, as_environment* env) const
 {
     if (m_type == UNDEFINED) {
 	// Version-dependent behavior.
@@ -228,14 +211,14 @@
 	return m_string_value;
     }
 		
-    return to_tu_string(env);
+    return to_string(env);
 }
 
 // Version-based Conversion to std::string
 std::string
 as_value::to_std_string_versioned(int version, as_environment* env) const
 {
-	return std::string(to_tu_string_versioned(version, env).c_str());
+	return to_string_versioned(version, env);
 }
 
 // Conversion to primitive value.
@@ -554,7 +537,7 @@
 void
 as_value::convert_to_string()
 {
-    to_tu_string();	// init our string data.
+    to_string();	// init our string data.
     m_type = STRING;	// force type.
 }
 
@@ -563,7 +546,7 @@
 as_value::convert_to_string_versioned(int version, as_environment* env)
     // Force type to string.
 {
-    to_tu_string_versioned(version, env); // init our string data.
+    to_string_versioned(version, env); // init our string data.
     m_type = STRING;	// force type.
 }
 
@@ -633,7 +616,7 @@
     }
     else if (m_type == STRING)
     {
-	return m_string_value == v.to_tu_string();
+	return m_string_value == v.to_string();
     }
     else if (m_type == NUMBER)
     {
@@ -677,7 +660,7 @@
     }
     else if (m_type == STRING)
     {
-	return m_string_value == v.to_tu_string(env);
+	return m_string_value == v.to_string(env);
     }
     else if (m_type == NUMBER)
     {
@@ -718,9 +701,9 @@
 	
 // Sets *this to this string plus the given string.
 void
-as_value::string_concat(const tu_string& str)
+as_value::string_concat(const std::string& str)
 {
-    to_tu_string();	// make sure our m_string_value is initialized
+    to_string();	// make sure our m_string_value is initialized
     m_type = STRING;
     m_string_value += str;
 }
@@ -785,7 +768,6 @@
 std::string
 as_value::to_debug_string() const
 {
-	std::string ret;
 	char buf[512];
 
 	switch (m_type)
@@ -804,14 +786,15 @@
 			sprintf(buf, "[function:%p]", m_object_value);
 			return buf;
 		case STRING:
-			ret = "[string:" + std::string(m_string_value.c_str()) + std::string("]");
-			return ret;
+			return "[string:" + m_string_value + "]";
 		case NUMBER:
-			sprintf(buf, "[number:%g]", m_number_value);
-			return buf;
+		{
+			std::stringstream stream;
+			stream << m_number_value;
+			return "[number:" + stream.str() + "]";
+		}
 		case MOVIECLIP:
-			sprintf(buf, "[movieclip:%s]", m_string_value.c_str());
-			return buf;
+			return "[movieclip:" + m_string_value + "]";
 		default:
 			assert(0);
 	}
@@ -823,7 +806,7 @@
 	if (v.m_type == UNDEFINED) set_undefined();
 	else if (v.m_type == NULLTYPE) set_null();
 	else if (v.m_type == BOOLEAN) set_bool(v.m_boolean_value);
-	else if (v.m_type == STRING) set_tu_string(v.m_string_value);
+	else if (v.m_type == STRING) set_string(v.m_string_value);
 	else if (v.m_type == NUMBER) set_double(v.m_number_value);
 	else if (v.m_type == OBJECT) set_as_object(v.m_object_value);
 

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/as_value.h	11 Apr 2007 17:54:21 -0000	1.42
+++ server/as_value.h	15 Apr 2007 10:52:09 -0000	1.43
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.42 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: as_value.h,v 1.43 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -141,42 +141,6 @@
 	{
 	}
 
-	/// Construct a STRING value
-	as_value(const wchar_t* wstr)
-		:
-		m_type(STRING),
-		m_string_value(""),
-		m_number_value(0.0)
-	{
-		// Encode the string value as UTF-8.
-		//
-		// Is this dumb?  Alternatives:
-		//
-		// 1. store a tu_wstring instead of tu_string?
-		// Bloats typical ASCII strings, needs a
-		// tu_wstring type, and conversion back the
-		// other way to interface with char[].
-		// 
-		// 2. store a tu_wstring as a union with
-		// tu_string?  Extra complexity.
-		//
-		// 3. ??
-		//
-		// Storing UTF-8 seems like a pretty decent
-		// way to do it.  Everything else just
-		// continues to work.
-
-#if (WCHAR_MAX != MAXINT)
-		tu_string::encode_utf8_from_wchar(&m_string_value, (const uint16_t *)wstr);
-#else
-# if (WCHAR_MAX != MAXSHORT)
-# error "Can't determine the size of wchar_t"
-# else
-		tu_string::encode_utf8_from_wchar(&m_string_value, (const uint32_t *)wstr);
-# endif
-#endif
-	}
-
 	/// Construct a BOOLEAN value
 	as_value(bool val)
 		:
@@ -311,28 +275,13 @@
 		return m_type == OBJECT || m_type == AS_FUNCTION || m_type == MOVIECLIP;
 	}
 
-	/// Get a C string representation of this value.
-	//
-	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
-	///
-	const char*	to_string(as_environment* env=NULL) const;
-
-	/// Get a tu_string representation for this value.
-	//
-	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
-	///
-	const tu_string&	to_tu_string(as_environment* env=NULL) const;
-
 	/// Get a std::string representation for this value.
 	//
 	/// @param env
 	///	The environment to use for running the toString() method
 	///	for object values. If NULL, toString() won't be run.
 	///
+	const std::string& to_string(as_environment* env=NULL) const;
 	std::string to_std_string(as_environment* env=NULL) const;
 
 	std::string to_debug_string() const;
@@ -348,9 +297,9 @@
 	///
 	std::string to_std_string_versioned(int version, as_environment* env=NULL) const;
 
-	/// Get a tu_string representation for this value.
+	/// Get a string representation for this value.
 	//
-	/// This differs from to_tu_string() in that returned
+	/// This differs from to_string() in that returned
 	/// representation will depend on version of the SWF
 	/// source. 
 	/// @@ shouldn't this be the default ?
@@ -359,15 +308,7 @@
 	///	The environment to use for running the toString() method
 	///	for object values. If NULL, toString() won't be run.
 	///
-	const tu_string&	to_tu_string_versioned(int version, as_environment* env=NULL) const;
-
-	/// Calls to_tu_string() returning a cast to tu_stringi
-	//
-	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
-	///
-	const tu_stringi&	to_tu_stringi(as_environment* env=NULL) const;
+	const std::string&	to_string_versioned(int version, as_environment* env=NULL) const;
 
 	/// Conversion to number 
 	//
@@ -472,7 +413,7 @@
 	///	The environment to use for running the toString() method
 	///	for object values. If NULL, toString() won't be run.
 	///
-	/// @see to_tu_string_versionioned
+	/// @see to_string_versionioned
 	///
 	void	convert_to_string_versioned(int version, as_environment* env=NULL);
 
@@ -480,7 +421,7 @@
 	// in preference to generic overloaded set().  You are
 	// more likely to get a warning/error if misused.
 
-	void	set_tu_string(const tu_string& str) {
+	void	set_string(const std::string& str) {
           drop_refs();
           m_type = STRING;
           m_string_value = str;
@@ -582,9 +523,7 @@
 //	void	lsr(const as_value& v) { set_int((uint32_t(to_number()) >> int(v.to_number()))); }
 
 	/// Sets this value to this string plus the given string.
-	void	string_concat(const tu_string& str);
-
-	//tu_string* get_mutable_tu_string() { assert(m_type == STRING); return &m_string_value; }
+	void	string_concat(const std::string& str);
 
 private:
 
@@ -598,8 +537,7 @@
 
 	type	m_type;
 
-	// TODO: switch to std::string
-	mutable tu_string	m_string_value;
+	mutable std::string	m_string_value;
 
 	union
 	{

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/edit_text_character.cpp	12 Apr 2007 11:35:30 -0000	1.52
+++ server/edit_text_character.cpp	15 Apr 2007 10:52:09 -0000	1.53
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.52 2007/04/12 11:35:30 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.53 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -666,7 +666,7 @@
 		//if (name == "text")
 	{
 		int version = get_parent()->get_movie_definition()->get_version();
-		set_text_value(val.to_tu_string_versioned(version).c_str());
+		set_text_value(val.to_string_versioned(version).c_str());
 		return;
 	}
 	case M_X:
@@ -1276,7 +1276,7 @@
 #ifdef DEBUG_DYNTEXT_VARIABLES
 		log_msg("target sprite (%p) does have a member named %s", (void*)sprite, varname);
 #endif
-		set_text_value(val.to_string());
+		set_text_value(val.to_string().c_str());
 	}
 #ifdef DEBUG_DYNTEXT_VARIABLES
 	else

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/gnash.h	13 Apr 2007 09:15:54 -0000	1.92
+++ server/gnash.h	15 Apr 2007 10:52:09 -0000	1.93
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.92 2007/04/13 09:15:54 bjacques Exp $ */
+/* $Id: gnash.h,v 1.93 2007/04/15 10:52:09 bjacques Exp $ */
 
 /// \mainpage
 ///
@@ -61,8 +61,6 @@
 
 // forward decl
 namespace jpeg { class input; }
-class tu_string;
-class tu_stringi;
 
 namespace gnash {
 // Forward declarations.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- server/sprite_instance.cpp	14 Apr 2007 16:27:22 -0000	1.240
+++ server/sprite_instance.cpp	15 Apr 2007 10:52:09 -0000	1.241
@@ -206,7 +206,7 @@
 			IF_VERBOSE_MALFORMED_SWF(
 			log_aserror("Fourth argument of attachMovie "
 				"doesn't cast to an object (%s)",
-				fn.arg(3).to_string());
+				fn.arg(3).to_string().c_str());
 			);
 		}
 	}
@@ -258,7 +258,7 @@
 		}
 	}
 
-	character* ch = sprite->add_empty_movieclip(fn.arg(0).to_string(), int(fn.arg(1).to_number()));
+	character* ch = sprite->add_empty_movieclip(fn.arg(0).to_string().c_str(), int(fn.arg(1).to_number()));
 	return as_value(ch);
 }
 
@@ -628,7 +628,7 @@
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
 				log_aserror("Can't find hitTest target %s",
-					tgt_val.to_string());
+					tgt_val.to_string().c_str());
 				);
 				return as_value();
 			}
@@ -1126,7 +1126,7 @@
 	}
 	else // setter
 	{
-		ptr->set_name(fn.arg(0).to_string(&fn.env()));
+		ptr->set_name(fn.arg(0).to_string(&fn.env()).c_str());
 		//IF_VERBOSE_ASCODING_ERRORS(
 		//log_aserror("Attempt to set read-only property '_name'");
 		//);
@@ -1902,13 +1902,11 @@
     }
 }
 
-void sprite_instance::remove_display_object(const tu_string& name_tu)
+void sprite_instance::remove_display_object(const std::string& name)
 {
 //	    GNASH_REPORT_FUNCTION;
 
-	std::string name(name_tu.c_str());
-
-	character* ch = m_display_list.get_character_by_name(name);
+	character* ch = m_display_list.get_character_by_name(name.c_str());
 	if (ch)
 	{
 	    // @@ TODO: should only remove movies that were created via clone_display_object --
@@ -1995,7 +1993,7 @@
 		const as_value& val)
 {
 #ifdef DEBUG_DYNTEXT_VARIABLES
-	log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_string());
+log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_string().c_str());
 #endif
 
 	if ( val.is_function() )
@@ -2018,7 +2016,7 @@
 #ifdef DEBUG_DYNTEXT_VARIABLES
 		log_msg(" it's a Text Variable!");
 #endif
-		etc->set_text_value(val.to_string());
+		etc->set_text_value(val.to_string().c_str());
 	}
 #ifdef DEBUG_DYNTEXT_VARIABLES
 	else
@@ -2046,7 +2044,7 @@
 
     val = m_as_environment.get_variable(path);
 
-    return val.to_string();	// ack!
+    return val.to_string().c_str();	// ack!
 }
 
 void sprite_instance::set_variable(const char* path_to_var,

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/sprite_instance.h	12 Apr 2007 11:35:30 -0000	1.96
+++ server/sprite_instance.h	15 Apr 2007 10:52:09 -0000	1.97
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.96 2007/04/12 11:35:30 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.97 2007/04/15 10:52:09 bjacques Exp $ */
 
 // Stateful live Sprite instance
 
@@ -551,7 +551,7 @@
 	//
 	/// @@ what happens if the we have multiple objects
 	///    with the same name ?
-	void remove_display_object(const tu_string& name);
+	void remove_display_object(const std::string& name);
 
 	/// Dispatch event handler(s), if any.
 	virtual bool	on_event(const event_id& id);

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/textformat.cpp	11 Apr 2007 17:54:21 -0000	1.24
+++ server/textformat.cpp	15 Apr 2007 10:52:09 -0000	1.25
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: textformat.cpp,v 1.24 2007/04/11 17:54:21 bjacques Exp $
+// $Id: textformat.cpp,v 1.25 2007/04/15 10:52:09 bjacques Exp $
 //
 
 #include "log.h"
@@ -195,7 +195,7 @@
 
   if (obj->get_member("align", &method)) {
     //log_msg("Align exists and is set to %s\n", method.to_string());
-    const char* align = method.to_string();
+    const char* align = method.to_string().c_str();
     if ( align ) obj->obj.alignSet(align);
   }
 

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/asobj/Global.cpp	30 Mar 2007 14:51:38 -0000	1.57
+++ server/asobj/Global.cpp	15 Apr 2007 10:52:09 -0000	1.58
@@ -18,7 +18,7 @@
 
 // Implementation of the Global ActionScript Object
 
-/* $Id: Global.cpp,v 1.57 2007/03/30 14:51:38 strk Exp $ */
+/* $Id: Global.cpp,v 1.58 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -104,7 +104,7 @@
     //
     // @@ Nothing needs special treatment,
     //    as_value::to_string() will take care of everything
-    const char* arg0 = fn.arg(0).to_string();
+    const char* arg0 = fn.arg(0).to_string().c_str();
     log_trace("%s", arg0);
     return as_value();
 }
@@ -175,7 +175,7 @@
     as_value rv;
 
     // sscanf will handle the whitespace / unneeded characters etc. automatically
-    if (1 == sscanf(fn.arg(0).to_string(), "%f", &result))
+    if (1 == sscanf(fn.arg(0).to_string().c_str(), "%f", &result))
 	rv = double(result);
     else
 	// if sscanf didn't find anything, return NaN
@@ -206,9 +206,9 @@
 
     // Set up some variables
     const string digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-    char *input_buffer = new char[strlen(fn.arg(0).to_string())+1];
+    char *input_buffer = new char[fn.arg(0).to_string().size()+1];
     char *input = input_buffer;
-    strcpy(input,fn.arg(0).to_string());
+    strcpy(input,fn.arg(0).to_string().c_str());
     int base;
     bool bNegative;
 
@@ -328,7 +328,7 @@
     {
 		log_warning("Invalid call to ASSetPropFlags: "
 			"object argument is not an object: %s",
-			fn.arg(0).to_string());
+			fn.arg(0).to_string().c_str());
 		return as_value();
     }
 

Index: server/asobj/LocalConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LocalConnection.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/LocalConnection.cpp	22 Mar 2007 22:37:45 -0000	1.12
+++ server/asobj/LocalConnection.cpp	15 Apr 2007 10:52:09 -0000	1.13
@@ -139,7 +139,7 @@
     boost::intrusive_ptr<localconnection_as_object> ptr = ensureType<localconnection_as_object>(fn.this_ptr);
     
     if (fn.nargs != 0) {
-        ret = ptr->obj.connect(fn.arg(0).to_string());
+        ret = ptr->obj.connect(fn.arg(0).to_string().c_str());
     } else {
         log_msg("ERROR: No connection name specified to LocalConnection.connect()!\n");
         ret = ptr->obj.connect("localhost"); // FIXME: This should probably

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/MovieClipLoader.cpp	22 Mar 2007 22:37:45 -0000	1.23
+++ server/asobj/MovieClipLoader.cpp	15 Apr 2007 10:52:09 -0000	1.24
@@ -142,7 +142,7 @@
 	Listeners _listeners;
 	bool          _started;
 	bool          _completed;
-	tu_string     _filespec;
+	std::string     _filespec;
 	int           _progress;
 	bool          _error;
 	struct mcl    _mcl;
@@ -318,7 +318,7 @@
 	character* target = fn.env().find_target(fn.arg(1));
 	if ( ! target )
 	{
-		log_error("Could not find target %s", fn.arg(1).to_string());
+		log_error("Could not find target %s", fn.arg(1).to_string().c_str());
 		return as_value(false);
 	}
 	sprite_instance* sprite = dynamic_cast<sprite_instance*>(target);

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/NetConnection.cpp	7 Apr 2007 11:55:50 -0000	1.36
+++ server/asobj/NetConnection.cpp	15 Apr 2007 10:52:09 -0000	1.37
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.cpp,v 1.36 2007/04/07 11:55:50 tgc Exp $ */
+/* $Id: NetConnection.cpp,v 1.37 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -212,7 +212,7 @@
 	boost::intrusive_ptr<NetConnection> ptr = ensureType<NetConnection>(fn.this_ptr); 
     
 	if (fn.nargs > 0) {
-		ptr->addToURL(fn.arg(0).to_string());
+		ptr->addToURL(fn.arg(0).to_string().c_str());
 	}
 	return as_value();
 }

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/NetStream.cpp	14 Apr 2007 15:53:17 -0000	1.35
+++ server/asobj/NetStream.cpp	15 Apr 2007 10:52:09 -0000	1.36
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.35 2007/04/14 15:53:17 bjacques Exp $ */
+/* $Id: NetStream.cpp,v 1.36 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -83,7 +83,7 @@
 				log_aserror("First argument "
 					"to NetStream constructor "
 					"doesn't cast to a NetConnection (%s)",
-					fn.arg(0).to_string());
+					fn.arg(0).to_string().c_str());
 			);
 		}
 	}
@@ -124,7 +124,7 @@
 		return as_value();
 	}
 
-	if (ns->play(fn.arg(0).to_string()) != 0)
+	if (ns->play(fn.arg(0).to_string().c_str()) != 0)
 	{
 		ns->close();
 	};

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/Object.cpp	22 Mar 2007 22:37:46 -0000	1.21
+++ server/asobj/Object.cpp	15 Apr 2007 10:52:09 -0000	1.22
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: Object.cpp,v 1.21 2007/03/22 22:37:46 bjacques Exp $ */
+/* $Id: Object.cpp,v 1.22 2007/04/15 10:52:09 bjacques Exp $ */
 
 // Implementation of ActionScript Object class.
 
@@ -323,7 +323,7 @@
 	if ( arg.is_undefined() || propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.hasOwnProperty('%s')", arg.to_string());
+		log_aserror("Invalid call to Object.hasOwnProperty('%s')", arg.to_string().c_str());
 		);
 		return as_value();
 	}
@@ -346,7 +346,7 @@
 	if ( arg.is_undefined() || propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.isPropertyEnumerable('%s')", arg.to_string());
+		log_aserror("Invalid call to Object.isPropertyEnumerable('%s')", arg.to_string().c_str());
 		);
 		return as_value();
 	}

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/Sound.cpp	14 Apr 2007 15:53:17 -0000	1.12
+++ server/asobj/Sound.cpp	15 Apr 2007 10:52:09 -0000	1.13
@@ -281,7 +281,7 @@
 	int si = -1;
 
 	if (fn.nargs > 0) {
-		const char* name = fn.arg(0).to_string();
+		const char* name = fn.arg(0).to_string().c_str();
 
 		// check the import.
 		movie_definition* def = fn.env().get_target()->get_root_movie()->get_movie_definition();
@@ -327,7 +327,7 @@
 
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
 
-    const char* name = fn.arg(0).to_string();
+    const char* name = fn.arg(0).to_string().c_str();
     if (!name) {
 		IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror("attachSound need a non-null argument");

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/xml.cpp	7 Apr 2007 15:27:16 -0000	1.36
+++ server/asobj/xml.cpp	15 Apr 2007 10:52:09 -0000	1.37
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.36 2007/04/07 15:27:16 strk Exp $ */
+/* $Id: xml.cpp,v 1.37 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -610,7 +610,7 @@
 //    GNASH_REPORT_FUNCTION;
     
     if (fn.nargs > 0) {
-        const char *text = fn.arg(0).to_string();
+        const char *text = fn.arg(0).to_string().c_str();
 	XMLNode *xml_obj = new XMLNode();
 //	cerr << "create new child XMLNode is at " << (void *)xml_obj << endl;
 	xml_obj->nodeNameSet(text);
@@ -643,7 +643,7 @@
     const char *text;
 
     if (fn.nargs > 0) {
-	text = fn.arg(0).to_string(); 
+	text = fn.arg(0).to_string().c_str(); 
 	xml_obj = new XMLNode;
 	xml_obj->nodeValueSet(text);
 	xml_obj->nodeTypeSet(XMLNode::tText);

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/xmlnode.cpp	14 Apr 2007 15:53:17 -0000	1.29
+++ server/asobj/xmlnode.cpp	15 Apr 2007 10:52:09 -0000	1.30
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.29 2007/04/14 15:53:17 bjacques Exp $ */
+/* $Id: xmlnode.cpp,v 1.30 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -596,7 +596,7 @@
     }
     else
     {
-        ptr->nodeNameSet(fn.arg(0).to_string());
+	ptr->nodeNameSet(fn.arg(0).to_string().c_str());
     }
     return rv;
 }

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/vm/ASHandlers.cpp	14 Apr 2007 17:33:16 -0000	1.88
+++ server/vm/ASHandlers.cpp	15 Apr 2007 10:52:09 -0000	1.89
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.88 2007/04/14 17:33:16 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.89 2007/04/15 10:52:09 bjacques Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -826,7 +826,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2);
-    env.top(1).set_bool(env.top(1).to_tu_string() == env.top(0).to_tu_string());
+    env.top(1).set_bool(env.top(1).to_string() == env.top(0).to_string());
     env.drop(1);    
 }
 
@@ -837,7 +837,7 @@
     as_environment& env = thread.env;
     thread.ensureStack(1);
     int version = env.get_version();
-    env.top(0).set_int(env.top(0).to_tu_string_versioned(version).utf8_length());
+    env.top(0).set_int(env.top(0).to_string_versioned(version).size());
 }
 
 void
@@ -865,7 +865,7 @@
 
     int	base = int(base_val.to_number(&env));  
     int version = env.get_version();
-    const tu_string& str = string_val.to_tu_string_versioned(version);
+    const std::string& str = string_val.to_string_versioned(version);
 
     if ( size < 0 )
     {
@@ -923,11 +923,11 @@
     //size = imin(str.length() - base, size);
 
     // TODO: unsafe: use string::substr instead !
-    tu_string	new_string = str.c_str() + base;
+    std::string	new_string = str.c_str() + base; // XXX
     new_string.resize(size);
     
     env.drop(2);
-    env.top(0).set_tu_string(new_string);
+    env.top(0).set_string(new_string);
 }
 
 void
@@ -958,7 +958,7 @@
 	thread.ensureStack(1); // variable name
 
 	as_value& top_value = env.top(0);
-	const char* ptr = top_value.to_string();
+	const char* ptr = top_value.to_string().c_str();
 	if ( ! ptr )
 	{
 		top_value.set_undefined();
@@ -979,7 +979,7 @@
 		} else {
 			log_action("-- get var: %s=%s at %p",
 				var_string.c_str(),
-				top_value.to_tu_string().c_str(),
+				top_value.to_string().c_str(),
 				(void*)obj.get());
 		}
 	);
@@ -998,7 +998,7 @@
 	// stack must be contain at least two items
 	thread.ensureStack(2); 
 
-	assert(env.top(1).to_string());
+	assert(env.top(1).to_string().c_str());
         string name = env.top(1).to_std_string();
 	thread.setVariable(name, env.top(0));
 
@@ -1027,7 +1027,7 @@
 	//Vitaly: env.drop(1) remove object on which refers const char * target_name
 	//strk: shouldn't we use env.pop() instead ? No (see above comment)
 	//const char * target_name = env.top(0).to_string();
-	assert(env.top(0).to_string());
+	assert(env.top(0).to_string().c_str());
 	string target_name = env.top(0).to_string();
 	env.drop(1); // pop the target name off the stack
 
@@ -1044,7 +1044,7 @@
 
     int version = env.get_version();
     env.top(1).convert_to_string_versioned(version);
-    env.top(1).string_concat(env.top(0).to_tu_string_versioned(version));
+    env.top(1).string_concat(env.top(0).to_string_versioned(version));
     env.drop(1);
 }
 
@@ -1305,7 +1305,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2); 
-    env.top(1).set_bool(env.top(1).to_tu_string() < env.top(0).to_tu_string());
+    env.top(1).set_bool(env.top(1).to_string() < env.top(0).to_string());
 }
 
 void
@@ -1772,7 +1772,7 @@
 	const char* target_string = NULL;
 	if ( ! target.is_undefined() && ! target.is_null() )
 	{
-		target_string = target.to_string(&env);
+		target_string = target.to_string(&env).c_str();
 	}
 
 	// If the url starts with "FSCommand:", then this is
@@ -1942,7 +1942,7 @@
 	}
 	else
 	{
-		const char* url = url_val.to_string();
+		const char* url = url_val.to_string().c_str();
 		CommonGetUrl(env, env.top(0), url, method);
 	}
 		  
@@ -2109,7 +2109,7 @@
     thread.setLocalVariable(varname.to_std_string(), value);
 
     IF_VERBOSE_ACTION (
-    log_action("-- set local var: %s = %s", varname.to_string(), value.to_debug_string().c_str());
+    log_action("-- set local var: %s = %s", varname.to_string().c_str(), value.to_debug_string().c_str());
     );
 }
 
@@ -2129,7 +2129,7 @@
 	as_value function = thread.getVariable(env.top(0).to_std_string(&env));
 	if ( ! function.is_object() ) 
 	{
-		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string());
+		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string().c_str());
 	}
 	else if ( ! function.is_function() ) 
 	{
@@ -2473,7 +2473,7 @@
     	int version = env.get_version();
         // modify env.top(1)
         v2.convert_to_string_versioned(version, &env);
-        v2.string_concat(v1.to_tu_string_versioned(version, &env));
+        v2.string_concat(v1.to_string_versioned(version, &env));
     }
     else
     {
@@ -2606,8 +2606,8 @@
     
     // Special case: String has a member "length"
     // @@ FIXME: we shouldn't have all this "special" cases --strk;
-    if (target.is_string() && member_name.to_tu_stringi() == "length") {
-        int len = target.to_tu_string_versioned(version).utf8_length();
+    if (target.is_string() && member_name.to_string_versioned(version) == "length") {
+        int len = target.to_string_versioned(version).size();
         env.top(1).set_int(len); 
     } else {
         if ( ! thread.getObjectMember(*obj, member_name.to_std_string(), env.top(1)) )
@@ -3124,7 +3124,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2); 
-    env.top(1).set_bool(env.top(1).to_tu_string() > env.top(0).to_tu_string());
+    env.top(1).set_bool(env.top(1).to_string() > env.top(0).to_string());
     env.drop(1);
 }
 

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/vm/action.cpp	13 Apr 2007 07:35:56 -0000	1.13
+++ server/vm/action.cpp	15 Apr 2007 10:52:09 -0000	1.14
@@ -436,8 +436,8 @@
     env->drop(nargs);
 
     // Return pointer to static string for return value.
-    static tu_string	s_retval;
-    s_retval = result.to_tu_string();
+    static std::string	s_retval;
+    s_retval = result.to_string();
     return s_retval.c_str();
 }
 



From MAILER-DAEMON Sun Apr 15 10:36:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hd5pw-0005v0-6u
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 10:36:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hd5pu-0005tm-L9
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 10:36:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hd5ps-0005ta-JV
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 10:36:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hd5ps-0005tX-Do
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 10:36:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hd5lM-0000Md-Ei
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 10:31:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hd5lA-0000tU-2H
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 14:31:20 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hd5l9-0000tJ-JR
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 14:31:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hd5l9-0000tJ-JR@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 15 Apr 2007 14:31:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.cpp server/mat...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2007 14:36:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/15 14:31:19

Modified files:
	.              : ChangeLog 
	server         : character.cpp matrix.cpp matrix.h 
	                 sprite_instance.cpp 
	server/vm      : ASHandlers.cpp 
	testsuite/server: MatrixTest.cpp 

Log message:
	        * server/matrix.{cpp,h}: provided setters for canonical
	          parameters.
	        * server/character.cpp: avoid direct access to matrix members.
	        * server/sprite_instance.cpp: avoid direct acces to matrix members.
	        * server/vm/ASHandlers.cpp: fix signedness compiler warnings.
	        * testsuite/server/MatrixTest.cpp: add tests for scale concatenation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2876&r2=1.2877
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.241&r2=1.242
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/MatrixTest.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2876
retrieving revision 1.2877
diff -u -b -r1.2876 -r1.2877
--- ChangeLog	15 Apr 2007 10:52:08 -0000	1.2876
+++ ChangeLog	15 Apr 2007 14:31:18 -0000	1.2877
@@ -1,3 +1,12 @@
+2007-04-15 Sandro Santilli <strk@keybit.net>
+
+	* server/matrix.{cpp,h}: provided setters for canonical 
+	  parameters.
+	* server/character.cpp: avoid direct access to matrix members.
+	* server/sprite_instance.cpp: avoid direct acces to matrix members.
+	* server/vm/ASHandlers.cpp: fix signedness compiler warnings.
+	* testsuite/server/MatrixTest.cpp: add tests for scale concatenation.
+
 2007-04-15 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* libbase/container.{cpp,h}: Remove tu_string{,i}.

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/character.cpp	14 Apr 2007 18:19:49 -0000	1.34
+++ server/character.cpp	15 Apr 2007 14:31:19 -0000	1.35
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.cpp,v 1.34 2007/04/14 18:19:49 strk Exp $ */
+/* $Id: character.cpp,v 1.35 2007/04/15 14:31:19 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -88,8 +88,7 @@
 		    // Place our origin so that it coincides with the mouse coords
 		    // in our parent frame.
 		    matrix	local = get_matrix();
-		    local.m_[0][2] = parent_mouse.m_x;
-		    local.m_[1][2] = parent_mouse.m_y;
+		    local.set_translation( parent_mouse.m_x, parent_mouse.m_y );
 		    set_matrix(local);
 		}
 		else
@@ -245,16 +244,17 @@
 	if ( fn.nargs == 0 ) // getter
 	{
 		matrix m = ptr->get_matrix();
-		rv = as_value(TWIPS_TO_PIXELS(m.m_[0][2]));
+		rv = as_value(TWIPS_TO_PIXELS(m.get_x_translation()));
 	}
 	else // setter
 	{
+		double newx = fn.arg(0).to_number(&(fn.env()));
 		matrix m = ptr->get_matrix();
-		m.m_[0][2] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number(&(fn.env()))));
+		m.set_x_translation(infinite_to_fzero(PIXELS_TO_TWIPS(newx)));
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
 	}
-	return rv;;
+	return rv;
 
 }
 
@@ -267,12 +267,13 @@
 	if ( fn.nargs == 0 ) // getter
 	{
 		matrix m = ptr->get_matrix();
-		rv = as_value(TWIPS_TO_PIXELS(m.m_[1][2]));
+		rv = as_value(TWIPS_TO_PIXELS(m.get_y_translation()));
 	}
 	else // setter
 	{
+		double newy = fn.arg(0).to_number(&(fn.env()));
 		matrix m = ptr->get_matrix();
-		m.m_[1][2] = infinite_to_fzero(PIXELS_TO_TWIPS(fn.arg(0).to_number(&(fn.env()))));
+		m.set_y_translation(infinite_to_fzero(PIXELS_TO_TWIPS(newy)));
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
 	}
@@ -559,12 +560,9 @@
 		// @@ tulrich: is parameter in world-coords or local-coords?
 		matrix m = ptr->get_matrix();
 
-		// Decompose matrix and insert the desired value.
-		float x_scale = m.get_x_scale();
-		float y_scale = m.get_y_scale();
 		// input is in degrees
 		float rotation = (float) fn.arg(0).to_number(&(fn.env())) * float(M_PI) / 180.f;
-		m.set_scale_rotation(x_scale, y_scale, rotation);
+		m.set_rotation(rotation);
 
 		ptr->set_matrix(m);
 		ptr->transformedByScript(); // m_accept_anim_moves = false; 
@@ -718,10 +716,7 @@
 {
 	matrix m = get_matrix();
 
-	// Decompose matrix and insert the desired value.
-	float y_scale = m.get_y_scale();
-	float rotation = m.get_rotation();
-	m.set_scale_rotation(x_scale, y_scale, rotation);
+	m.set_x_scale(x_scale);
 
 	set_matrix(m);
 	transformedByScript(); // m_accept_anim_moves = false; 
@@ -732,10 +727,7 @@
 {
 	matrix m = get_matrix();
 
-	// Decompose matrix and insert the desired value.
-	float x_scale = m.get_x_scale();
-	float rotation = m.get_rotation();
-	m.set_scale_rotation(x_scale, y_scale, rotation);
+	m.set_y_scale(y_scale);
 
 	set_matrix(m);
 	transformedByScript(); // m_accept_anim_moves = false; 

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/matrix.cpp	14 Apr 2007 22:23:05 -0000	1.11
+++ server/matrix.cpp	15 Apr 2007 14:31:19 -0000	1.12
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.11 2007/04/14 22:23:05 strk Exp $ 
+// $Id: matrix.cpp,v 1.12 2007/04/15 14:31:19 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -131,10 +131,16 @@
 matrix::concatenate_scales(float x, float y)
 // Just like concatenate_scale() but with different scales for x/y
 {
+	matrix m2; m2.set_scale_rotation(x, y, 0);
+	concatenate(m2);
+
+#if 0 // the code below only works when x and y scales are equal,
+      // see testsuite/server/MatrixTest.cpp
 	m_[0][0] *= infinite_to_fzero(x);
 	m_[0][1] *= infinite_to_fzero(x);
 	m_[1][0] *= infinite_to_fzero(y);
 	m_[1][1] *= infinite_to_fzero(y);
+#endif
 }
 
 void
@@ -163,6 +169,37 @@
 	m_[1][1] = infinite_to_fzero(y_scale * cos_angle);
 }
 
+void
+matrix::set_x_scale(float xscale)
+{
+	float rotation = get_rotation();
+	float yscale = get_y_scale();
+	set_scale_rotation(xscale, yscale, rotation);
+}
+
+void
+matrix::set_y_scale(float yscale)
+{
+	float rotation = get_rotation();
+	float xscale = get_x_scale();
+	set_scale_rotation(xscale, yscale, rotation);
+}
+
+void
+matrix::set_scale(float xscale, float yscale)
+{
+	float rotation = get_rotation();
+	set_scale_rotation(xscale, yscale, rotation);
+}
+
+void
+matrix::set_rotation(float rotation)
+{
+	float xscale = get_x_scale();
+	float yscale = get_y_scale();
+	set_scale_rotation(xscale, yscale, rotation);
+}
+
 
 void
 matrix::read(stream* in)
@@ -221,10 +258,17 @@
 matrix::transform(point& p) const
 // Transform point 'p' by our matrix.
 {
-	float nx = m_[0][0] * p.m_x + m_[0][1] * p.m_y + m_[0][2];
-	float ny = m_[1][0] * p.m_x + m_[1][1] * p.m_y + m_[1][2];
-	p.m_x = nx;
-	p.m_y = ny;
+	transform(p.m_x, p.m_y);
+}
+
+void
+matrix::transform(float& x, float& y) const
+// Transform point 'x,y' by our matrix.
+{
+	float nx = m_[0][0] * x + m_[0][1] * y + m_[0][2];
+	float ny = m_[1][0] * x + m_[1][1] * y + m_[1][2];
+	x = nx;
+	y = ny;
 }
 
 void

Index: server/matrix.h
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/matrix.h	14 Apr 2007 14:38:28 -0000	1.6
+++ server/matrix.h	15 Apr 2007 14:31:19 -0000	1.7
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.h,v 1.6 2007/04/14 14:38:28 strk Exp $ 
+// $Id: matrix.h,v 1.7 2007/04/15 14:31:19 strk Exp $ 
 //
 
 #ifndef GNASH_MATRIX_H
@@ -112,6 +112,36 @@
 	/// Set the scale & rotation part of the matrix. angle in radians.
 	void	set_scale_rotation(float x_scale, float y_scale, float rotation);
 
+	/// Set the scale part of the matrix, will keep current rotation
+	void	set_scale(float x_scale, float y_scale);
+
+	/// Set the X scale part of the matrix, will keep current rotation and Y scale
+	void	set_x_scale(float scale);
+
+	/// Set the Y scale part of the matrix, will keep current rotation and X scale
+	void	set_y_scale(float scale);
+
+	/// Set the rotation part of the matrix, will keep current scale
+	void	set_rotation(float rotation);
+
+	/// Set x translation
+	void set_x_translation(float x)
+	{
+		m_[0][2] = x;
+	}
+
+	/// Set y translation
+	void set_y_translation(float y)
+	{
+		m_[1][2] = y;
+	}
+
+	void set_translation(float x, float y)
+	{
+		m_[0][2] = x;
+		m_[1][2] = y;
+	}
+
 	/// Initialize from the SWF input stream.
 	void	read(stream* in);
 
@@ -127,6 +157,9 @@
 	/// Transform point 'p' by our matrix. 
 	void	transform(point& p) const;
 
+	/// Transform point 'x,y' by our matrix. 
+	void	transform(float& x, float& y) const;
+
 	/// Transform vector 'v' by our matrix. Doesn't apply translation.
 	//
 	/// Put the result in *result.
@@ -177,6 +210,18 @@
 	/// return our rotation component (in radians)
 	float	get_rotation() const;
 
+	/// return the canonical x translation
+	float	get_x_translation() const
+	{
+		return m_[0][2];
+	}
+
+	/// return the canonical y translation
+	float	get_y_translation() const
+	{
+		return m_[1][2];
+	}
+
 public: // must be switched to private
 
 	/// \brief

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- server/sprite_instance.cpp	15 Apr 2007 10:52:09 -0000	1.241
+++ server/sprite_instance.cpp	15 Apr 2007 14:31:19 -0000	1.242
@@ -1794,22 +1794,20 @@
 	boost::intrusive_ptr<edit_text_character_def> txt = new edit_text_character_def(get_movie_definition());
 	boost::intrusive_ptr<character> txt_char = txt->create_character_instance(this, 0);
 
+	// TODO: where to write width and height info ?
+	UNUSED(width);
+	UNUSED(height);
+
+	// Give name and mark as dynamic
 	txt_char->set_name(name.c_str());
 	txt_char->setDynamic();
 
-	// Here we should set the proper matrix using x,y width and height
-
-	// set _x
-	txt_matrix.m_[0][2] = infinite_to_fzero(PIXELS_TO_TWIPS(x));
-	// set _y
-	txt_matrix.m_[1][2] = infinite_to_fzero(PIXELS_TO_TWIPS(y));
-	// set _width
-	txt_matrix.m_[0][0] = infinite_to_fzero(PIXELS_TO_TWIPS(width));
-	// set _height
-	txt_matrix.m_[1][1] = infinite_to_fzero(PIXELS_TO_TWIPS(height));
+	// Set _x and _y
+	txt_matrix.set_translation(
+			infinite_to_fzero(PIXELS_TO_TWIPS(x)),
+			infinite_to_fzero(PIXELS_TO_TWIPS(y)));
 
 	// Here we add the character to the displayList.
-
 	m_display_list.place_character(
 		txt_char.get(),
 		depth,

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- server/vm/ASHandlers.cpp	15 Apr 2007 10:52:09 -0000	1.89
+++ server/vm/ASHandlers.cpp	15 Apr 2007 14:31:19 -0000	1.90
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.89 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: ASHandlers.cpp,v 1.90 2007/04/15 14:31:19 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -886,7 +886,7 @@
 	base=1;
     }
 
-    else if ( base > str.length() )
+    else if ( unsigned(base) > str.length() )
     {
 	IF_VERBOSE_ASCODING_ERRORS (
     	log_aserror("base goes beyond input string in ActionSubString, "
@@ -900,7 +900,7 @@
     // Base is 1-based, we'll use 0-based from now on...
     base -= 1;
 
-    if ( base+size > str.length() )
+    if ( unsigned(base+size) > str.length() )
     {
 	IF_VERBOSE_ASCODING_ERRORS (
     	log_aserror("base+size goes beyond input string in ActionSubString, "
@@ -911,7 +911,7 @@
 
 
     assert(base >= 0);
-    assert(base < str.length() );
+    assert(unsigned(base) < str.length() );
     assert(size >= 0);
 
     //log_msg("string: %s, size: %d, base: %d", str.c_str(), size, base);

Index: testsuite/server/MatrixTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/MatrixTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/server/MatrixTest.cpp	14 Apr 2007 22:23:05 -0000	1.6
+++ testsuite/server/MatrixTest.cpp	15 Apr 2007 14:31:19 -0000	1.7
@@ -69,6 +69,8 @@
 	check_equals(identity.get_x_scale(), 1);
 	check_equals(identity.get_y_scale(), 1);
 	check_equals(identity.get_rotation(), 0);
+	check_equals(identity.get_x_translation(), 0);
+	check_equals(identity.get_y_translation(), 0);
 	check( ! identity.does_flip() );
 
 	// The inverse of identity is still the identity
@@ -76,37 +78,99 @@
 	invert.set_inverse(identity);
 	check_equals(invert, matrix::identity);
 
-	// Try setting and getting some values
+	//---------------------------------------------
+	// Test canonic parameter setting and getting
+	//---------------------------------------------
+
 	matrix m1;
 	m1.set_scale_rotation(1, 3, 0);
 	check_equals(m1.get_x_scale(), 1);
 	check_equals(m1.get_y_scale(), 3);
 	check_equals(m1.get_rotation(), 0);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
 	check(!m1.does_flip());
 
-	m1.set_scale_rotation(1.5, 2.5, 0);
+	m1.set_scale(1.5, 2.5);
 	check_equals(D(m1.get_x_scale()), 1.5);
 	check_equals(D(m1.get_y_scale()), 2.5);
 	check_equals(D(m1.get_rotation()), 0);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
 
-	m1.set_scale_rotation(34, 4, 0);
+	m1.set_scale(34, 4);
 	check_equals(D(m1.get_x_scale()), 34);
 	check_equals(D(m1.get_y_scale()), 4);
 	check_equals(D(m1.get_rotation()), 0);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
 
 	m1.set_scale_rotation(1, 1, 2);
 	check_equals(D(m1.get_x_scale()), 1);
 	check_equals(D(m1.get_y_scale()), 1);
 	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
 
-	m1.set_scale_rotation(2, 1, 2);
+	m1.set_x_scale(2);
 	check_equals(D(m1.get_x_scale()), 2);
 	check_equals(D(m1.get_y_scale()), 1);
 	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
 
-	m1.set_scale_rotation(1, 2, 2);
+	m1.set_scale(1, 2);
 	check_equals(D(m1.get_x_scale()), 1);
 	check_equals(D(m1.get_y_scale()), 2);
 	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
+
+	m1.set_rotation(0);
+	check_equals(D(m1.get_x_scale()), 1);
+	check_equals(D(m1.get_y_scale()), 2);
+	check_equals(D(m1.get_rotation()), 0);
+	check_equals(m1.get_x_translation(), 0);
+	check_equals(m1.get_y_translation(), 0);
+
+	m1.set_translation(5, 6);
+	check_equals(D(m1.get_x_scale()), 1);
+	check_equals(D(m1.get_y_scale()), 2);
+	check_equals(D(m1.get_rotation()), 0);
+	check_equals(m1.get_x_translation(), 5);
+	check_equals(m1.get_y_translation(), 6);
+
+	m1.set_rotation(2);
+	check_equals(D(m1.get_x_scale()), 1);
+	check_equals(D(m1.get_y_scale()), 2);
+	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 5);
+	check_equals(m1.get_y_translation(), 6);
+
+	//---------------------------------------------
+	// Test concatenation
+	//---------------------------------------------
+
+	m1.concatenate_scale(2);
+	check_equals(D(m1.get_x_scale()), 2);
+	check_equals(D(m1.get_y_scale()), 4);
+	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 5);
+	check_equals(m1.get_y_translation(), 6);
+
+	m1.concatenate_scales(3, 3);
+	check_equals(D(m1.get_x_scale()), 6);
+	check_equals(D(m1.get_y_scale()), 12);
+	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 5);
+	check_equals(m1.get_y_translation(), 6);
+
+	m1.concatenate_scales(2, 1);
+	check_equals(D(m1.get_x_scale()), 12);
+	check_equals(D(m1.get_y_scale()), 12);
+	check_equals(D(m1.get_rotation()), 2);
+	check_equals(m1.get_x_translation(), 5);
+	check_equals(m1.get_y_translation(), 6);
+
 }
 



From MAILER-DAEMON Sun Apr 15 11:31:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hd6hh-0002er-F4
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 11:31:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hd6hf-0002az-FQ
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 11:31:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hd6hd-0002Zv-AN
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 11:31:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hd6hd-0002Zs-6r
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 11:31:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hd6d7-00083u-2Q
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 11:27:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hd6d5-0002lu-Vq
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 15:27:04 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hd6d5-0002lr-NB
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 15:27:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hd6d5-0002lr-NB@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 15 Apr 2007 15:27:03 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/edit_text_character.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2007 15:31:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/15 15:27:03

Modified files:
	.              : ChangeLog 
	server         : edit_text_character.cpp 

Log message:
	        * server/edit_text_character.cpp (display): move text glyphs
	          so to be inside bounds defined for the textfield character.
	          Fixes bug #17954. This is likely not the cleanest way to
	          do this, see comments.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2877&r2=1.2878
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.53&r2=1.54

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2877
retrieving revision 1.2878
diff -u -b -r1.2877 -r1.2878
--- ChangeLog	15 Apr 2007 14:31:18 -0000	1.2877
+++ ChangeLog	15 Apr 2007 15:27:03 -0000	1.2878
@@ -1,5 +1,9 @@
 2007-04-15 Sandro Santilli <strk@keybit.net>
 
+	* server/edit_text_character.cpp (display): move text glyphs
+	  so to be inside bounds defined for the textfield character.
+	  Fixes bug #17954. This is likely not the cleanest way to
+	  do this, see comments.
 	* server/matrix.{cpp,h}: provided setters for canonical 
 	  parameters.
 	* server/character.cpp: avoid direct access to matrix members.

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/edit_text_character.cpp	15 Apr 2007 10:52:09 -0000	1.53
+++ server/edit_text_character.cpp	15 Apr 2007 15:27:03 -0000	1.54
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.53 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: edit_text_character.cpp,v 1.54 2007/04/15 15:27:03 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -389,6 +389,8 @@
 
 	registerTextVariable();
 
+	rect def_bounds = m_def->get_bounds();
+
 	if (m_def->has_border())
 	{
 		matrix	mat = get_world_matrix();
@@ -401,7 +403,6 @@
 		//mat.print();
 
 		point	coords[4];
-		const rect def_bounds = m_def->get_bounds();
 		
 		coords[0] = def_bounds.get_corner(0);
 		coords[1] = def_bounds.get_corner(1);
@@ -443,7 +444,13 @@
 	}
 
 	// Draw our actual text.
-	display_glyph_records(matrix::identity, this, m_text_glyph_records,
+	// Using a matrix to translate to def bounds seems an hack to me.
+	// A cleaner implementation is likely correctly setting the
+	// m_x_offset and m_y_offset memebers in glyph records.
+	// Anyway, see bug #17954 for a testcase.
+	matrix m;
+	m.set_translation(def_bounds.get_x_min(), def_bounds.get_y_min());
+	display_glyph_records(m, this, m_text_glyph_records,
 			      m_def->get_root_def());
 
 	if (m_has_focus)



From MAILER-DAEMON Sun Apr 15 14:55:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hd9sY-0002Ba-L6
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 14:55:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hd9sX-0002BV-Ke
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 14:55:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hd9sW-0002AQ-Kt
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 14:55:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hd9sW-00029w-GU
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 14:55:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hd9nz-0007Yr-EK
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 14:50:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hd9nx-0003XP-HO
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 18:50:29 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hd9nx-0003XM-B2
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 18:50:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hd9nx-0003XM-B2@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 15 Apr 2007 18:50:29 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server edit_text_character.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2007 18:55:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/15 18:50:29

Modified files:
	server         : edit_text_character.cpp 

Log message:
	(display): don't choke when bounds are undefined (dynamic text, for instance)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- edit_text_character.cpp	15 Apr 2007 15:27:03 -0000	1.54
+++ edit_text_character.cpp	15 Apr 2007 18:50:29 -0000	1.55
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.54 2007/04/15 15:27:03 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.55 2007/04/15 18:50:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -449,7 +449,10 @@
 	// m_x_offset and m_y_offset memebers in glyph records.
 	// Anyway, see bug #17954 for a testcase.
 	matrix m;
+	if ( ! def_bounds.is_null() && ! def_bounds.is_world() )
+	{
 	m.set_translation(def_bounds.get_x_min(), def_bounds.get_y_min());
+	}
 	display_glyph_records(m, this, m_text_glyph_records,
 			      m_def->get_root_def());
 



From MAILER-DAEMON Sun Apr 15 21:07:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdFgP-0003M4-G1
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 21:07:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdFgN-0003Lf-37
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 21:07:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdFgL-0003LS-KS
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 21:07:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdFgL-0003LP-EY
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 21:07:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HdFbm-0002w0-Fl
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 21:02:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdFbm-0008Hd-7m
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 01:02:18 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HdFbl-0008Ha-QZ
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 01:02:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdFbl-0008Ha-QZ@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 16 Apr 2007 01:02:17 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 01:07:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/16 01:02:17

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	server/vm      : ASHandlers.cpp 
Added files:
	testsuite/misc-ming.all: frame_label_test.c 

Log message:
	new tests for frame label and fixs

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2878&r2=1.2879
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.242&r2=1.243
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/frame_label_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2878
retrieving revision 1.2879
diff -u -b -r1.2878 -r1.2879
--- ChangeLog	15 Apr 2007 15:27:03 -0000	1.2878
+++ ChangeLog	16 Apr 2007 01:02:17 -0000	1.2879
@@ -1,3 +1,13 @@
+2007-04-16 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/frame_label_test.c:
+	  a new testcase
+	* server/sprite_instance.cpp:
+	  update call_frame_actions();
+	* server/vm/ASHandlers.cpp:
+		properly process frame label in ActionCallFrame() and ActionGotoExpression().
+
+	  
 2007-04-15 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.cpp (display): move text glyphs

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.242
retrieving revision 1.243
diff -u -b -r1.242 -r1.243
--- server/sprite_instance.cpp	15 Apr 2007 14:31:19 -0000	1.242
+++ server/sprite_instance.cpp	16 Apr 2007 01:02:17 -0000	1.243
@@ -1722,13 +1722,7 @@
 		return;
 	}
 
-	// Take not of iterator to last element
-	ActionList::iterator top_iterator = m_action_list.end();
-	--top_iterator; // now points to last element in *current* list
-
-#ifndef NDEBUG
 	size_t original_size = m_action_list.size();
-#endif
 
 	// Set the current sound_stream_id to -1, meaning that no stream are
 	// active. If there are an active stream it will be updated while
@@ -1749,15 +1743,18 @@
 
 	// Execute any new actions triggered by the tag,
 	// leaving existing actions to be executed.
-
-	++top_iterator; // now points to one past last of *previous* list
-	ActionList::const_iterator it = top_iterator;
+	ActionList::iterator it = m_action_list.begin();
+	for(size_t i =0; i<original_size; i++)
+	{
+		it++;
+	}
+	ActionList::iterator previous_end = it;
 	while (it != m_action_list.end())
 	{
 		execute_action(*(*it));
 		++it;
 	}
-	m_action_list.erase(top_iterator, m_action_list.end());
+	m_action_list.erase(previous_end, m_action_list.end());
 
 	assert(m_action_list.size() == original_size);
 }

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/vm/ASHandlers.cpp	15 Apr 2007 14:31:19 -0000	1.90
+++ server/vm/ASHandlers.cpp	16 Apr 2007 01:02:17 -0000	1.91
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.90 2007/04/15 14:31:19 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.91 2007/04/16 01:02:17 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -576,9 +576,7 @@
 	sprite_instance* tgt = env.get_target()->to_movie();
 	assert(tgt);
 
-	// 0-based already?
-	//// Convert from 1-based to 0-based
-	//frame--;
+	// frame number within this tag is hard-coded and 0-based
 	tgt->goto_frame(frame);
 }
 
@@ -1989,10 +1987,34 @@
 
 	thread.ensureStack(1); // frame spec
 
-	// Note: no extra data in this instruction!
-	sprite_instance* tgt = env.get_target()->to_movie();
-	assert(tgt);
-	tgt->call_frame_actions(env.top(0));
+	string target_frame = env.top(0).to_std_string();
+	string target_path;
+	string frame_var;
+	
+	character * target;
+	if( env.parse_path(target_frame, target_path, frame_var) )
+	{
+		target = env.find_target(target_path);
+	}
+	else
+	{
+		frame_var = target_frame;
+		target = env.get_target();
+	}
+	
+	sprite_instance *target_sprite = target->to_movie();
+	if(target_sprite)
+	{
+		target_sprite->call_frame_actions(frame_var);
+	}
+	else
+	{
+		log_aserror(
+			"Couldn't find target_sprite \"%s\" in ActionCallFrame!"
+			" target frame actions will not be called...",
+			target_path.c_str());
+	}
+
 	env.drop(1);
 }
 
@@ -2008,7 +2030,6 @@
 	const action_buffer& code = thread.code;
 	size_t pc = thread.pc;
 
-    //dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
 
 	// From Alexi's SWF ref:
 	//
@@ -2025,31 +2046,45 @@
 	unsigned char play_flag = code[pc + 3];
 	sprite_instance::play_state state = play_flag ? sprite_instance::PLAY : sprite_instance::STOP;
 		  
-	sprite_instance* target = env.get_target()->to_movie();
-	if ( ! target )
+	string target_frame = env.pop().to_std_string();
+	string target_path;
+	string frame_var;
+	
+	character * target;
+	if( env.parse_path(target_frame, target_path, frame_var) )
 	{
-		log_error("environment target is not a sprite_instance while executing ActionGotoExpression");
-		env.drop(1);
-		return;
+		target = env.find_target(target_path);
+	}
+	else
+	{
+		target = env.get_target();
+		frame_var = target_frame;
 	}
 
-	as_value expression = env.pop();
-
+	sprite_instance *target_sprite = target->to_movie();
+	if(target_sprite)
+	{
 	size_t frame_number;
-	if ( ! target->get_frame_number(expression, frame_number) )
+		if ( ! target_sprite->get_frame_number(frame_var, frame_number) )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror("Frame spec found on stack "
 			"at ActionGotoExpression doesn't evaluate "
 		        "to a valid frame: %s",
-			expression.to_debug_string().c_str());
+				target_frame.c_str());
 		);
 		return;
 	}
-
-	target->goto_frame(frame_number);
-	target->set_play_state(state);
-		  
+		target_sprite->goto_frame(frame_number);
+		target_sprite->set_play_state(state);
+	}
+	else
+	{
+		log_aserror(
+			"Couldn't find target_sprite \"%s\" in ActionGotoExpression!"
+			" will not goto taget_frame...",
+			target_frame.c_str());
+	}		  
 }
 
 

Index: testsuite/misc-ming.all/frame_label_test.c
===================================================================
RCS file: testsuite/misc-ming.all/frame_label_test.c
diff -N testsuite/misc-ming.all/frame_label_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/frame_label_test.c	16 Apr 2007 01:02:17 -0000	1.1
@@ -0,0 +1,143 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+    _root
+      |------mc1
+              |------mc11
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 5
+#define OUTPUT_FILENAME  "frame_label_test.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc1, mc11, dejagnuclip;
+  SWFDisplayItem it1, it11;
+  SWFShape  sh_red;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  add_actions(mo, "x1=0; x2=0; x3=0; x4=0; x5=0; x6=0;");
+  SWFMovie_nextFrame(mo); /* 1st frame of _root */
+
+  
+  mc11 = newSWFMovieClip();
+  sh_red = make_fill_square (100, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc11, (SWFBlock)sh_red);  
+  add_clip_actions(mc11, "stop();");
+  SWFMovieClip_nextFrame(mc11); 
+  SWFMovieClip_nextFrame(mc11); 
+  SWFMovieClip_nextFrame(mc11); 
+  
+  add_clip_actions(mc11, "_root.x1 = 'mc11_frame4'; stop(); "); 
+  SWFMovieClip_labelFrame(mc11, "frame4");
+  SWFMovieClip_nextFrame(mc11); 
+  add_clip_actions(mc11, "_root.x2 = 'mc11_frame5'; stop(); ");
+  SWFMovieClip_labelFrame(mc11, "frame5");
+  SWFMovieClip_nextFrame(mc11); 
+  add_clip_actions(mc11, "_root.x3 = 'mc11_frame6'; stop(); ");
+  SWFMovieClip_labelFrame(mc11, "frame6");
+  SWFMovieClip_nextFrame(mc11); 
+  
+    
+  mc1 = newSWFMovieClip();
+  sh_red = make_fill_square (200, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc1, (SWFBlock)sh_red);  
+  add_clip_actions(mc1, "stop();");
+  it11 = SWFMovieClip_add(mc1, (SWFBlock)mc11);  
+  SWFDisplayItem_setDepth(it11, 10); 
+  SWFDisplayItem_setName(it11, "mc11"); 
+  SWFMovieClip_nextFrame(mc1); 
+  SWFMovieClip_nextFrame(mc1); 
+  SWFMovieClip_nextFrame(mc1); 
+  
+  add_clip_actions(mc1, "_root.x4 = 'mc1_frame4'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame4");
+  SWFMovieClip_nextFrame(mc1); 
+  add_clip_actions(mc1, "_root.x5 = 'mc1_frame5'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame5");
+  SWFMovieClip_nextFrame(mc1); 
+  add_clip_actions(mc1, "_root.x6 = 'mc1_frame6'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame6");
+  SWFMovieClip_nextFrame(mc1); 
+  
+    
+  /* place _root.mc1 */
+  it1 = SWFMovie_add(mo, (SWFBlock)mc1); 
+  SWFDisplayItem_setDepth(it1, 20); 
+  SWFDisplayItem_setName(it1, "mc1"); 
+  SWFMovie_nextFrame(mo); /* 2nd frame of _root */
+
+
+  add_actions(mo, " gotoAndPlay('/mc1:frame4'); "   //GotoLabel
+                  " gotoAndPlay('mc1:frame5'); "    //GotoLabel
+                  " gotoAndPlay('/mc1/:6'); "       //GotoLabel
+                  " lable = '/mc1/mc11/:frame4'; "
+                  " gotoAndPlay(lable); "           //GotoExpression
+                  " lable = '/mc1/mc11/:5'; "
+                  " gotoAndPlay(lable); "           
+                  " callFrame('/mc1/mc11/:frame6'); " );      
+  SWFMovie_nextFrame(mo); /* 3rd frame of _root */
+   
+
+  /* checks */
+  /* GotoExpression and callFrame support target_path */
+  check_equals(mo, "_root.x1", "'mc11_frame4'");
+  check_equals(mo, "_root.x2", "'mc11_frame5'");
+  check_equals(mo, "_root.x3", "'mc11_frame6'");
+  /* seems that GotoLabel does not support target_path */
+  check_equals(mo, "_root.x4", "0");
+  check_equals(mo, "_root.x5", "0");
+  check_equals(mo, "_root.x6", "0");
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 4th frame of _root */
+  
+  
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+



From MAILER-DAEMON Sun Apr 15 22:28:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdGwp-00077J-44
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 22:28:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdGwo-000750-CS
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 22:28:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdGwn-00072B-KT
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 22:28:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdGwn-00071u-Gz
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 22:28:05 -0400
Received: from an-out-0708.google.com ([209.85.132.243])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HdGsE-0003pQ-3s
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 22:23:22 -0400
Received: by an-out-0708.google.com with SMTP id b8so1498449ana
	for <gnash-commit@gnu.org>; Sun, 15 Apr 2007 19:23:21 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=cKPWlJFHexRAUhtvcmEOif7JI6/rZOyJn08J3o1XKdUJGF46gKFafDWP7vvokj69stYc8rhOYBH+0ZvPDAPTGJJbYHYEpgH65xwsx92VoVpocP5JUfS7SERHMkTJBLfNr+TCcLbCT8+V9VhHn5w0FGBHLScVSOgzw9SL/W7oMNE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=jLq2/6wgXFC3hLAwHXdTEvddyMKXvlmnkV0deHGKdMbK3LtBtQKfXam3M3PIwB4vehFgCzPOft2FCWKlmCKeqGPVU1X2jS5i04ehlKEKgzbVhYyjjGcWrLtp7dYwdPt5XUJOxFp3ajbtkwqb/LprqFl4GkdIYR4tFKxKtCZ5PT0=
Received: by 10.114.72.1 with SMTP id u1mr615789waa.1176690200552;
	Sun, 15 Apr 2007 19:23:20 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sun, 15 Apr 2007 19:23:20 -0700 (PDT)
Message-ID: <ca4b43ff0704151923p796b26b9nff34787cdbf6201c@mail.gmail.com>
Date: Mon, 16 Apr 2007 10:23:20 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Bastiaan Jacques" <bastiaan@bjacques.org>
Subject: Re: [Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gtksup.h gui/gu...
In-Reply-To: <E1HcHsp-0005lj-89@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HcHsp-0005lj-89@cvs>
X-detected-kernel: Linux 2.6 (newer, 2)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 02:28:06 -0000

-Gui::notify_key_event(gnash::key::code k, bool pressed)
+Gui::notify_key_event(gnash::key::code k, int modifier, bool pressed)

Can you confirm that changing the signature *breaks* other GUI
support. eg. I cann't compile with sdl+agg. And I guess there's
problem with fltk, too.



On 4/13/07, Bastiaan Jacques <bastiaan@bjacques.org> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Bastiaan Jacques <bjacques>     07/04/13 09:15:55
>
> Modified files:
>        .              : ChangeLog
>        gui            : gtk.cpp gtksup.h gui.cpp gui.h kde.cpp
>                         kde_glue.h kdesup.h
>        libbase        : container.h
>        server         : gnash.h
>
> Log message:
>                * server/gnash.h, gui: version two of Antti Ajanki's GUI
>                patches, this time the whole thing.
>                * libbase/container.h: Remove the last pthread.h include
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2868&r2=1.2869
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.86&r2=1.87
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.39&r2=1.40
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.71&r2=1.72
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.49&r2=1.50
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde.cpp?cvsroot=gnash&r1=1.12&r2=1.13
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kde_glue.h?cvsroot=gnash&r1=1.8&r2=1.9
> http://cvs.savannah.gnu.org/viewcvs/gnash/gui/kdesup.h?cvsroot=gnash&r1=1.14&r2=1.15
> http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.52&r2=1.53
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.91&r2=1.92
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2868
> retrieving revision 1.2869
> diff -u -b -r1.2868 -r1.2869
> --- ChangeLog   13 Apr 2007 07:35:55 -0000      1.2868
> +++ ChangeLog   13 Apr 2007 09:15:54 -0000      1.2869
> @@ -11,6 +11,9 @@
>        it is used in another DSO.
>        * all over the place: Remove all inclusions of pthread.h,
>        because we're no longer directly using pthreads.
> +       * server/gnash.h, gui: version two of Antti Ajanki's GUI
> +       patches, this time the whole thing.
> +       * libbase/container.h: Remove the last pthread.h include.
>
>  2007-04-12 Sandro Santilli <strk@keybit.net>
>
>
> Index: gui/gtk.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
> retrieving revision 1.86
> retrieving revision 1.87
> diff -u -b -r1.86 -r1.87
> --- gui/gtk.cpp 12 Apr 2007 09:04:01 -0000      1.86
> +++ gui/gtk.cpp 13 Apr 2007 09:15:54 -0000      1.87
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: gtk.cpp,v 1.86 2007/04/12 09:04:01 bjacques Exp $ */
> +/* $Id: gtk.cpp,v 1.87 2007/04/13 09:15:54 bjacques Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -1154,6 +1154,24 @@
>     return c;
>  }
>
> +int
> +GtkGui::gdk_to_gnash_modifier(int state)
> +{
> +    int modifier = gnash::key::MOD_NONE;
> +
> +    if (state & GDK_SHIFT_MASK) {
> +      modifier = modifier | gnash::key::MOD_SHIFT;
> +    }
> +    if (state & GDK_CONTROL_MASK) {
> +      modifier = modifier | gnash::key::MOD_CONTROL;
> +    }
> +    if (state & GDK_MOD1_MASK) {
> +      modifier = modifier | gnash::key::MOD_ALT;
> +    }
> +
> +    return modifier;
> +}
> +
>  gboolean
>  GtkGui::key_press_event(GtkWidget *const /*widget*/,
>                 GdkEventKey *const event,
> @@ -1165,52 +1183,10 @@
>
>     /* Forward key event to gnash */
>     gnash::key::code   c = gdk_to_gnash_key(event->keyval);
> +    int mod = gdk_to_gnash_modifier(event->state);
>
>     if (c != gnash::key::INVALID) {
> -        gui->notify_key_event(c, true);
> -    }
> -
> -    /* Handle GUI shortcuts */
> -    if (event->length <= 0) {
> -        return true;
> -    }
> -    unsigned int key = gdk_unicode_to_keyval(event->keyval);
> -    if (event->state == GDK_SHIFT_MASK) {
> -        dbglogfile << "Got Shift-key: " << key << endl;
> -    }
> -    if (event->state == GDK_CONTROL_MASK) {
> -        dbglogfile << "Got Control-key: " << key << endl;
> -        switch(key) {
> -          case 'r':
> -              gui->menu_restart();
> -              break;
> -          case 'p':
> -              gui->menu_pause();
> -              break;
> -          case 'q':
> -          case 'w':
> -              gui->menu_quit();
> -              break;
> -          default:
> -              break;
> -        }
> -    } else {
> -#if 0
> -        dbglogfile << "Got key: '" << (char) key
> -                   << "' its name is: " << gdk_keyval_name(key)
> -                   << " it's value is: " << (int)key
> -                   << " hwkeycode: " << event->hardware_keycode << endl;
> -#endif
> -        switch (key) {
> -          case '[':
> -              menuitem_step_forward_callback(NULL, NULL);
> -              break;
> -          case ']':
> -              menuitem_step_backward_callback(NULL, NULL);
> -              break;
> -          default:
> -              break;
> -        }
> +        gui->notify_key_event(c, mod, true);
>     }
>
>     return true;
> @@ -1228,9 +1204,10 @@
>
>     /* Forward key event to gnash */
>     gnash::key::code   c = gdk_to_gnash_key(event->keyval);
> +    int mod = gdk_to_gnash_modifier(event->state);
>
>     if (c != gnash::key::INVALID) {
> -        gui->notify_key_event(c, false);
> +        gui->notify_key_event(c, mod, false);
>     }
>
>     return true;
>
> Index: gui/gtksup.h
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/gtksup.h,v
> retrieving revision 1.39
> retrieving revision 1.40
> diff -u -b -r1.39 -r1.40
> --- gui/gtksup.h        12 Apr 2007 09:04:01 -0000      1.39
> +++ gui/gtksup.h        13 Apr 2007 09:15:54 -0000      1.40
> @@ -158,6 +158,7 @@
>  #endif
>
>     static gnash::key::code gdk_to_gnash_key(guint key);
> +    static int gdk_to_gnash_modifier(int state);
>     static void             open_file(GtkWidget* dialog, gpointer data);
>
>  };
>
> Index: gui/gui.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/gui.cpp,v
> retrieving revision 1.71
> retrieving revision 1.72
> diff -u -b -r1.71 -r1.72
> --- gui/gui.cpp 12 Apr 2007 09:04:01 -0000      1.71
> +++ gui/gui.cpp 13 Apr 2007 09:15:54 -0000      1.72
> @@ -277,17 +277,46 @@
>  }
>
>  void
> -Gui::notify_key_event(gnash::key::code k, bool pressed)
> +Gui::notify_key_event(gnash::key::code k, int modifier, bool pressed)
>  {
>        movie_root* m = get_current_root();
>
> -       //log_msg("mouse @ %d,%d", x, y);
>        if ( m->notify_key_event(k, pressed) )
>        {
>                // any action triggered by the
>                // event required screen refresh
>                display(m);
>        }
> +
> +       /* Handle GUI shortcuts */
> +       if (!pressed) return;
> +       if (modifier & gnash::key::MOD_CONTROL) {
> +               switch(k) {
> +               case gnash::key::R:
> +                       menu_restart();
> +                       break;
> +               case gnash::key::P:
> +                       menu_pause();
> +                       break;
> +               case gnash::key::Q:
> +               case gnash::key::W:
> +                       menu_quit();
> +                       break;
> +               default:
> +                       break;
> +               }
> +       } else {
> +               switch (k) {
> +               case gnash::key::LEFT_BRACKET:
> +                       menu_step_forward();
> +                       break;
> +               case gnash::key::RIGHT_BRACKET:
> +                       menu_step_backward();
> +                       break;
> +               default:
> +                       break;
> +               }
> +       }
>  }
>
>  bool
>
> Index: gui/gui.h
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/gui.h,v
> retrieving revision 1.49
> retrieving revision 1.50
> diff -u -b -r1.49 -r1.50
> --- gui/gui.h   12 Apr 2007 09:04:01 -0000      1.49
> +++ gui/gui.h   13 Apr 2007 09:15:54 -0000      1.50
> @@ -182,11 +182,11 @@
>     /// Key event notification to be called when a key is pressed or depressed
>     //
>     /// @param k The key code.
> -    ///
> +    /// @param modifier Modifier key identifiers from gnash::key::modifier ORed together
>     /// @param pressed Determines whether the key is being
>     ///           pressed (true) or being released (false)
>     ///
> -    void notify_key_event(gnash::key::code k, bool pressed);
> +    void notify_key_event(gnash::key::code k, int modifier, bool pressed);
>
>     /// Resize the client area view and the window accordingly.
>     //
>
> Index: gui/kde.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/kde.cpp,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -b -r1.12 -r1.13
> --- gui/kde.cpp 12 Apr 2007 09:04:01 -0000      1.12
> +++ gui/kde.cpp 13 Apr 2007 09:15:54 -0000      1.13
> @@ -149,6 +149,102 @@
>   return true;
>  }
>
> +gnash::key::code
> +KdeGui::qtToGnashKey(QKeyEvent *event)
> +{
> +    gnash::key::code c = gnash::key::INVALID;
> +    int key = event->key();
> +
> +    if (key >= Qt::Key_0 && key <= Qt::Key_9) {
> +      if (event->state() & Qt::Keypad)
> +          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::KP_0);
> +      else
> +          c = (gnash::key::code) ((key - Qt::Key_0) + gnash::key::_0);
> +    } else if (key >= Qt::Key_A && key <= Qt::Key_Z) {
> +        c = (gnash::key::code) ((key - Qt::Key_A) + gnash::key::A);
> +    } else if (key >= Qt::Key_F1 && key <= Qt::Key_F15) {
> +        c = (gnash::key::code) ((key - Qt::Key_F1) + gnash::key::F1);
> +    } else {
> +        // many keys don't correlate, so just use a look-up table.
> +        struct {
> +            int               qt;
> +            gnash::key::code  gs;
> +        } table[] = {
> +            { Qt::Key_Backspace, gnash::key::BACKSPACE },
> +            { Qt::Key_Tab, gnash::key::TAB },
> +            { Qt::Key_Clear, gnash::key::CLEAR },
> +            { Qt::Key_Return, gnash::key::ENTER },
> +            { Qt::Key_Enter, gnash::key::ENTER },
> +
> +            { Qt::Key_Shift, gnash::key::SHIFT },
> +            { Qt::Key_Control, gnash::key::CONTROL },
> +            { Qt::Key_Alt, gnash::key::ALT },
> +            { Qt::Key_CapsLock, gnash::key::CAPSLOCK },
> +
> +            { Qt::Key_Escape, gnash::key::ESCAPE },
> +            { Qt::Key_Space, gnash::key::SPACE },
> +
> +            { Qt::Key_Next, gnash::key::PGDN },
> +            { Qt::Key_Prior, gnash::key::PGUP },
> +            { Qt::Key_Home, gnash::key::HOME },
> +            { Qt::Key_End, gnash::key::END },
> +            { Qt::Key_Left, gnash::key::LEFT },
> +            { Qt::Key_Up, gnash::key::UP },
> +            { Qt::Key_Right, gnash::key::RIGHT },
> +            { Qt::Key_Down, gnash::key::DOWN },
> +            { Qt::Key_Insert, gnash::key::INSERT },
> +            { Qt::Key_Delete, gnash::key::DELETEKEY },
> +
> +            { Qt::Key_Help, gnash::key::HELP },
> +            { Qt::Key_NumLock, gnash::key::NUM_LOCK },
> +            { Qt::Key_Semicolon, gnash::key::SEMICOLON },
> +            { Qt::Key_Equal, gnash::key::EQUALS },
> +            { Qt::Key_Minus, gnash::key::MINUS },
> +            { Qt::Key_Slash, gnash::key::SLASH },
> +            { Qt::Key_BracketLeft, gnash::key::LEFT_BRACKET },
> +            { Qt::Key_Backslash, gnash::key::BACKSLASH },
> +            { Qt::Key_BracketRight, gnash::key::RIGHT_BRACKET },
> +            { Qt::Key_QuoteDbl, gnash::key::QUOTE },
> +            { 0, gnash::key::INVALID }
> +        };
> +
> +        for (int i = 0; table[i].qt != 0; i++) {
> +            if (key == table[i].qt) {
> +                c = table[i].gs;
> +                break;
> +            }
> +        }
> +    }
> +
> +    return c;
> +}
> +
> +int
> +KdeGui::qtToGnashModifier(Qt::ButtonState state)
> +{
> +    int modifier = gnash::key::MOD_NONE;
> +
> +    if (state & Qt::ShiftButton) {
> +        modifier = modifier | gnash::key::MOD_SHIFT;
> +    }
> +    if (state & Qt::ControlButton) {
> +        modifier = modifier | gnash::key::MOD_CONTROL;
> +    }
> +    if (state & Qt::AltButton) {
> +       modifier = modifier | gnash::key::MOD_ALT;
> +    }
> +
> +    return modifier;
> +}
> +
> +void
> +KdeGui::handleKeyEvent(QKeyEvent *event, bool down)
> +{
> +    gnash::key::code c = qtToGnashKey(event);
> +    int mod = qtToGnashModifier(event->state());
> +    notify_key_event(c, mod, down);
> +}
> +
>
>  /// \brief restart the movie from the beginning
>  void
> @@ -259,6 +355,7 @@
>     _godfather = godfather;
>
>     setMouseTracking(true);
> +    setFocusPolicy(QWidget::StrongFocus);
>  }
>
>  void
> @@ -292,6 +389,17 @@
>     _godfather->notify_mouse_clicked(false, 1);
>  }
>
> +void
> +qwidget::keyPressEvent(QKeyEvent *event)
> +{
> +    _godfather->handleKeyEvent(event, true);
> +}
> +
> +void
> +qwidget::keyReleaseEvent(QKeyEvent *event)
> +{
> +    _godfather->handleKeyEvent(event, false);
> +}
>
>  void
>  qwidget::resizeEvent(QResizeEvent *event)
>
> Index: gui/kde_glue.h
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/kde_glue.h,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -b -r1.8 -r1.9
> --- gui/kde_glue.h      12 Apr 2007 09:04:01 -0000      1.8
> +++ gui/kde_glue.h      13 Apr 2007 09:15:54 -0000      1.9
> @@ -18,7 +18,7 @@
>  //
>
>
> -/* $Id: kde_glue.h,v 1.8 2007/04/12 09:04:01 bjacques Exp $ */
> +/* $Id: kde_glue.h,v 1.9 2007/04/13 09:15:54 bjacques Exp $ */
>
>  #include "gnash.h"
>
> @@ -30,7 +30,7 @@
>  class KdeGlue
>  {
>   public:
> -    virtual ~KdeGlue() { delete _drawing_area; }
> +    virtual ~KdeGlue() { };
>     virtual bool init(int argc, char **argv[]) = 0;
>
>     virtual void prepDrawingArea(QWidget *drawing_area) = 0;
>
> Index: gui/kdesup.h
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/kdesup.h,v
> retrieving revision 1.14
> retrieving revision 1.15
> diff -u -b -r1.14 -r1.15
> --- gui/kdesup.h        12 Apr 2007 09:04:01 -0000      1.14
> +++ gui/kdesup.h        13 Apr 2007 09:15:54 -0000      1.15
> @@ -70,6 +70,8 @@
>     void mousePressEvent(QMouseEvent *event);
>     void mouseReleaseEvent( QMouseEvent * );
>     void mouseMoveEvent(QMouseEvent *event);
> +    void keyPressEvent(QKeyEvent *event);
> +    void keyReleaseEvent(QKeyEvent *event);
>     void timerEvent(QTimerEvent *);
>     void resizeEvent(QResizeEvent *event);
>  public slots:
> @@ -102,12 +104,16 @@
>     virtual void renderBuffer();
>     virtual void setInterval(unsigned int interval);
>     virtual void setTimeout(unsigned int timeout);
> +    virtual void handleKeyEvent(QKeyEvent *event, bool down);
>  private:
>     QApplication*  _qapp;
>     qwidget*       _qwidget;
>     KdeOpenGLGlue  _glue;
>
>     QTimer        *_timer;
> +
> +    gnash::key::code qtToGnashKey(QKeyEvent *event);
> +    int qtToGnashModifier(Qt::ButtonState state);
>  };
>
>  // end of namespace gnash
>
> Index: libbase/container.h
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/container.h,v
> retrieving revision 1.52
> retrieving revision 1.53
> diff -u -b -r1.52 -r1.53
> --- libbase/container.h 11 Apr 2007 17:54:21 -0000      1.52
> +++ libbase/container.h 13 Apr 2007 09:15:54 -0000      1.53
> @@ -14,7 +14,7 @@
>  // along with this program; if not, write to the Free Software
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>
> -/* $Id: container.h,v 1.52 2007/04/11 17:54:21 bjacques Exp $ */
> +/* $Id: container.h,v 1.53 2007/04/13 09:15:54 bjacques Exp $ */
>
>  #ifndef __CONTAINER_H__
>  #define __CONTAINER_H__
> @@ -52,8 +52,8 @@
>  #ifndef _LIB_PTHREAD_TYPES_H
>  # define _LIB_PTHREAD_TYPES_H 1
>  #endif
> +
>  #include <sys/types.h>
> -#include <pthread.h>
>
>  // This screws up MingW
>  #if 0
>
> Index: server/gnash.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/gnash.h,v
> retrieving revision 1.91
> retrieving revision 1.92
> diff -u -b -r1.91 -r1.92
> --- server/gnash.h      11 Apr 2007 14:20:20 -0000      1.91
> +++ server/gnash.h      13 Apr 2007 09:15:54 -0000      1.92
> @@ -17,7 +17,7 @@
>  //
>  //
>
> -/* $Id: gnash.h,v 1.91 2007/04/11 14:20:20 strk Exp $ */
> +/* $Id: gnash.h,v 1.92 2007/04/13 09:15:54 bjacques Exp $ */
>
>  /// \mainpage
>  ///
> @@ -545,6 +545,13 @@
>
>        KEYCOUNT
>  };
> +enum modifier
> +{
> +    MOD_NONE = 0,
> +    MOD_SHIFT = 1,
> +    MOD_CONTROL = 2,
> +    MOD_ALT = 4
> +};
>  }      // end namespace key
>
>  /// Some optional helpers.
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Apr 15 23:16:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdHhe-0008St-6k
	for mharc-gnash-commit@gnu.org; Sun, 15 Apr 2007 23:16:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdHhb-0008Pl-Pg
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 23:16:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdHha-0008PZ-B0
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 23:16:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdHha-0008PW-5s
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 23:16:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HdHd0-0003cW-KN
	for gnash-commit@gnu.org; Sun, 15 Apr 2007 23:11:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdHd0-0008Tl-GG
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:11:42 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HdHd0-0008Tf-8X
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:11:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdHd0-0008Tf-8X@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 16 Apr 2007 03:11:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all frame_label_test.c
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 03:16:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/16 03:11:42

Modified files:
	testsuite/misc-ming.all: frame_label_test.c 

Log message:
	more tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/frame_label_test.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: frame_label_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/frame_label_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- frame_label_test.c	16 Apr 2007 01:02:17 -0000	1.1
+++ frame_label_test.c	16 Apr 2007 03:11:42 -0000	1.2
@@ -56,7 +56,7 @@
 
   dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
-  add_actions(mo, "x1=0; x2=0; x3=0; x4=0; x5=0; x6=0;");
+  add_actions(mo, "x1=0; x2=0; x3=0; x4=0; x5=0; x6=0; x7=0; x8=0;");
   SWFMovie_nextFrame(mo); /* 1st frame of _root */
 
   
@@ -99,6 +99,12 @@
   add_clip_actions(mc1, "_root.x6 = 'mc1_frame6'; stop(); ");
   SWFMovieClip_labelFrame(mc1, "frame6");
   SWFMovieClip_nextFrame(mc1); 
+  add_clip_actions(mc1, "_root.x7 = 'mc1_frame7'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame7");
+  SWFMovieClip_nextFrame(mc1); 
+  add_clip_actions(mc1, "_root.x8 = 'mc1_frame8'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame8");
+  SWFMovieClip_nextFrame(mc1); 
   
     
   /* place _root.mc1 */
@@ -114,8 +120,11 @@
                   " lable = '/mc1/mc11/:frame4'; "
                   " gotoAndPlay(lable); "           //GotoExpression
                   " lable = '/mc1/mc11/:5'; "
-                  " gotoAndPlay(lable); "           
-                  " callFrame('/mc1/mc11/:frame6'); " );      
+                  " gotoAndPlay(lable); "           //GotoExpression
+                  " callFrame('/mc1/mc11/:frame6'); "
+                  " callFrame('mc1:7'); "
+                  " callFrame('mc1/:frame8'); ");      
+                  
   SWFMovie_nextFrame(mo); /* 3rd frame of _root */
    
 
@@ -124,10 +133,16 @@
   check_equals(mo, "_root.x1", "'mc11_frame4'");
   check_equals(mo, "_root.x2", "'mc11_frame5'");
   check_equals(mo, "_root.x3", "'mc11_frame6'");
+  check_equals(mo, "_root.x7", "'mc1_frame7'");
+  check_equals(mo, "_root.x8", "'mc1_frame8'");
   /* seems that GotoLabel does not support target_path */
   check_equals(mo, "_root.x4", "0");
   check_equals(mo, "_root.x5", "0");
   check_equals(mo, "_root.x6", "0");
+  add_actions(mo, " callFrame('/:1'); ");
+  check_equals(mo, "_root.x1", "0");
+  check_equals(mo, "_root.x2", "0");
+  check_equals(mo, "_root.x3", "0");
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); /* 4th frame of _root */
   



From MAILER-DAEMON Mon Apr 16 02:28:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdKhF-000336-E0
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 02:28:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdKhD-00032g-Cd
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 02:28:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdKhB-00032M-U5
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 02:28:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdKhB-00032F-Px
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 02:28:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdKca-0005EA-Oh
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 02:23:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdKcU-0005GV-GA
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 06:23:22 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdKcT-0005GO-UN
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 06:23:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdKcT-0005GO-UN@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 06:23:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 06:28:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 06:23:21

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/misc-ming.all/Makefile.am:
	          Activated get_frame_number and frame_label_test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2879&r2=1.2880
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.91&r2=1.92

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2879
retrieving revision 1.2880
diff -u -b -r1.2879 -r1.2880
--- ChangeLog	16 Apr 2007 01:02:17 -0000	1.2879
+++ ChangeLog	16 Apr 2007 06:23:21 -0000	1.2880
@@ -1,3 +1,8 @@
+2007-04-16 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/Makefile.am:
+	  Activated get_frame_number and frame_label_test.
+
 2007-04-16 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/frame_label_test.c:
@@ -7,7 +12,6 @@
 	* server/vm/ASHandlers.cpp:
 		properly process frame label in ActionCallFrame() and ActionGotoExpression().
 
-	  
 2007-04-15 Sandro Santilli <strk@keybit.net>
 
 	* server/edit_text_character.cpp (display): move text glyphs

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- testsuite/misc-ming.all/Makefile.am	14 Apr 2007 18:19:49 -0000	1.91
+++ testsuite/misc-ming.all/Makefile.am	16 Apr 2007 06:23:21 -0000	1.92
@@ -105,6 +105,7 @@
 	eventSoundTest1-Runner \
 	DrawingApiTestRunner \
 	get_frame_number_test \
+	frame_label_test \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -140,6 +141,7 @@
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \
 	get_frame_number_testrunner \
+	frame_label_testrunner \
 	matrix_testrunner \
 	$(NULL)
 
@@ -401,6 +403,20 @@
 	sh $< -r5 $(top_builddir) get_frame_number_test.swf > $@
 	chmod 755 $@
 
+frame_label_test_SOURCES =	\
+	frame_label_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+frame_label_test_LDADD = $(MING_LIBS)
+
+frame_label_test.swf: frame_label_test
+	./frame_label_test $(top_srcdir)/testsuite/media
+
+frame_label_testrunner: $(srcdir)/../generic-testrunner.sh frame_label_test.swf
+	sh $< -r5 $(top_builddir) frame_label_test.swf > $@
+	chmod 755 $@
+
 attachMovieTest_SOURCES =	\
 	attachMovieTest.c	\
 	ming_utils.h		\
@@ -908,6 +924,8 @@
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \
 	matrix_testrunner \
+	get_frame_number_testrunner \
+	frame_label_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS



From MAILER-DAEMON Mon Apr 16 03:15:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdLRA-0005d7-3f
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 03:15:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdLR8-0005cq-7X
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:15:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdLR5-0005cM-A5
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:15:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdLR4-0005cJ-UW
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:15:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdLMS-0002Q5-JI
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:10:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdLML-0000Lz-UK
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:10:46 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdLML-0000Lw-Hk
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:10:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdLML-0000Lw-Hk@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 07:10:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 07:15:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 07:10:45

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

Log message:
	        * server/vm/ASHandlers.cpp: always pass an as_environment pointer
	          when converting as_value to a string, use to_string rather
	          then to_std_string() when a reference is enough; (ActionDuplicateClip):
	          properly cleanup the stack on error; (ActionGotoFrameExpression):
	          properly handle unknown target.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2880&r2=1.2881
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.91&r2=1.92

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2880
retrieving revision 1.2881
diff -u -b -r1.2880 -r1.2881
--- ChangeLog	16 Apr 2007 06:23:21 -0000	1.2880
+++ ChangeLog	16 Apr 2007 07:10:44 -0000	1.2881
@@ -1,5 +1,10 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp: always pass an as_environment pointer
+	  when converting as_value to a string, use to_string rather 
+	  then to_std_string() when a reference is enough; (ActionDuplicateClip): 
+	  properly cleanup the stack on error; (ActionGotoFrameExpression):
+	  properly handle unknown target.
 	* testsuite/misc-ming.all/Makefile.am:
 	  Activated get_frame_number and frame_label_test.
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/vm/ASHandlers.cpp	16 Apr 2007 01:02:17 -0000	1.91
+++ server/vm/ASHandlers.cpp	16 Apr 2007 07:10:45 -0000	1.92
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.91 2007/04/16 01:02:17 zoulunkai Exp $ */
+/* $Id: ASHandlers.cpp,v 1.92 2007/04/16 07:10:45 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -824,7 +824,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2);
-    env.top(1).set_bool(env.top(1).to_string() == env.top(0).to_string());
+    env.top(1).set_bool(env.top(1).to_string(&env) == env.top(0).to_string(&env));
     env.drop(1);    
 }
 
@@ -956,15 +956,13 @@
 	thread.ensureStack(1); // variable name
 
 	as_value& top_value = env.top(0);
-	const char* ptr = top_value.to_string().c_str();
-	if ( ! ptr )
+	string var_string = top_value.to_string(&env);
+	if ( var_string.empty() )
 	{
 		top_value.set_undefined();
 		return;
 	}
 
-	string var_string(ptr);
-
 	top_value = thread.getVariable(var_string);
 
 	IF_VERBOSE_ACTION
@@ -977,7 +975,7 @@
 		} else {
 			log_action("-- get var: %s=%s at %p",
 				var_string.c_str(),
-				top_value.to_string().c_str(),
+				top_value.to_string(&env).c_str(),
 				(void*)obj.get());
 		}
 	);
@@ -996,8 +994,8 @@
 	// stack must be contain at least two items
 	thread.ensureStack(2); 
 
-	assert(env.top(1).to_string().c_str());
-        string name = env.top(1).to_std_string();
+	assert(env.top(1).to_string(&env).c_str());
+        string name = env.top(1).to_string(&env);
 	thread.setVariable(name, env.top(0));
 
         IF_VERBOSE_ACTION (
@@ -1024,9 +1022,9 @@
 
 	//Vitaly: env.drop(1) remove object on which refers const char * target_name
 	//strk: shouldn't we use env.pop() instead ? No (see above comment)
-	//const char * target_name = env.top(0).to_string();
-	assert(env.top(0).to_string().c_str());
-	string target_name = env.top(0).to_string();
+	//const char * target_name = env.top(0).to_string(&env);
+	assert(env.top(0).to_string(&env).c_str());
+	string target_name = env.top(0).to_string(&env);
 	env.drop(1); // pop the target name off the stack
 
 	CommonSetTarget(env, target_name);
@@ -1145,8 +1143,8 @@
 	thread.ensureStack(3); 
 
 	int depth = int(env.top(0).to_number(&env))+character::staticDepthOffset;
-	std::string newname = env.top(1).to_std_string(&env);
-	std::string path = env.top(2).to_std_string(&env);
+	const std::string& newname = env.top(1).to_string(&env);
+	const std::string& path = env.top(2).to_string(&env);
 
 	character* ch = env.find_target(path);
 	if ( ! ch )
@@ -1155,6 +1153,7 @@
 		log_aserror("Path given to duplicateMovieClip(%s) doesn't point to a character",
 			path.c_str());
 		);
+		env.drop(3);
 		return;
 	}
 
@@ -1165,6 +1164,7 @@
 		log_aserror("Path given to duplicateMovieClip(%s) is not a sprite",
 			path.c_str());
 		);
+		env.drop(3);
 		return;
 	}
 
@@ -1180,7 +1180,7 @@
 
 	thread.ensureStack(1); 
 
-	std::string path = env.pop().to_std_string();
+	std::string path = env.pop().to_string(&env);
 
 	character* ch = env.find_target(path);
 	if ( ! ch )
@@ -1303,7 +1303,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2); 
-    env.top(1).set_bool(env.top(1).to_string() < env.top(0).to_string());
+    env.top(1).set_bool(env.top(1).to_string(&env) < env.top(0).to_string(&env));
 }
 
 void
@@ -1394,7 +1394,15 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1);  
-    env.top(0).set_int(env.top(0).to_string()[0]);
+    string str = env.top(0).to_string(&env);
+    if ( str.empty() )
+    {
+    	env.top(0).set_undefined();
+    }
+    else
+    {
+    	env.top(0).set_int(str.c_str()[0]);
+    }
 }
 
 void
@@ -1767,10 +1775,10 @@
 		sendVarsMethod=0;
 	}
 
-	const char* target_string = NULL;
+	string target_string;
 	if ( ! target.is_undefined() && ! target.is_null() )
 	{
-		target_string = target.to_string(&env).c_str();
+		target_string = target.to_string(&env);
 	}
 
 	// If the url starts with "FSCommand:", then this is
@@ -1780,7 +1788,7 @@
 		if (s_fscommand_handler)
 		{
 			// Call into the app.
-			(*s_fscommand_handler)(env.get_target()->get_root_movie(), url_c + 10, target_string);
+			(*s_fscommand_handler)(env.get_target()->get_root_movie(), url_c + 10, target_string.c_str());
 		}
 
 		return;
@@ -1815,7 +1823,7 @@
 	const URL& baseurl = get_base_url();
 	URL url(url_s, baseurl);
 
-	log_msg("get url: target=%s, url=%s (%s)", target_string,
+	log_msg("get url: target=%s, url=%s (%s)", target_string.c_str(),
 		url.str().c_str(), url_c);
 
 	if ( loadTargetFlag )
@@ -1824,7 +1832,7 @@
 		if ( ! target_ch )
 		{
 			log_error("get url: target %s not found",
-				target_string);
+				target_string.c_str());
 			return;
 		}
 
@@ -1832,7 +1840,7 @@
 		if ( ! target_movie ) 
 		{
 			log_error("get url: target %s is not a sprite",
-				target_string);
+				target_string.c_str());
 			return;
 		}
 
@@ -1840,7 +1848,7 @@
 		{
 			log_msg("getURL2 loadVariable");
 
-			//log_warning("Unhandled GetUrl2 loadVariable flag. loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), target.to_string());
+			//log_warning("Unhandled GetUrl2 loadVariable flag. loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), target.to_string(&env).c_str());
 			target_movie->loadVariables(url, sendVarsMethod);
 		}
 		else
@@ -1877,9 +1885,9 @@
 		string command = "firefox -remote \"openurl(";
 		command += url.str();
 #if 0 // target testing
-		if ( target_string )
+		if ( ! target_string.empty() )
 		{
-			command += ", " + string(target_string);
+			command += ", " + target_string;
 		}
 #endif
 		command += ")\"";
@@ -1940,8 +1948,8 @@
 	}
 	else
 	{
-		const char* url = url_val.to_string().c_str();
-		CommonGetUrl(env, env.top(0), url, method);
+		const string& url = url_val.to_string(&env);
+		CommonGetUrl(env, env.top(0), url.c_str(), method);
 	}
 		  
 	env.drop(2);
@@ -1987,7 +1995,7 @@
 
 	thread.ensureStack(1); // frame spec
 
-	string target_frame = env.top(0).to_std_string();
+	string target_frame = env.top(0).to_string(&env);
 	string target_path;
 	string frame_var;
 	
@@ -2046,11 +2054,11 @@
 	unsigned char play_flag = code[pc + 3];
 	sprite_instance::play_state state = play_flag ? sprite_instance::PLAY : sprite_instance::STOP;
 		  
-	string target_frame = env.pop().to_std_string();
+	string target_frame = env.pop().to_string(&env);
 	string target_path;
 	string frame_var;
 	
-	character * target;
+	character * target = NULL;
 	if( env.parse_path(target_frame, target_path, frame_var) )
 	{
 		target = env.find_target(target_path);
@@ -2061,7 +2069,7 @@
 		frame_var = target_frame;
 	}
 	
-	sprite_instance *target_sprite = target->to_movie();
+	sprite_instance *target_sprite = target ? target->to_movie() : NULL;
 	if(target_sprite)
 	{
 		size_t frame_number;
@@ -2111,7 +2119,7 @@
 
 	as_value var = env.pop();
 
-	bool ret = thread.delVariable(var.to_std_string());
+	bool ret = thread.delVariable(var.to_string(&env));
 	env.push(as_value(ret));
 
 	return;
@@ -2129,7 +2137,7 @@
 	thread.ensureStack(1); // var
 
 	// See bug #18482, this works fine now (assuming the bug report is correct)
-	env.top(0) = thread.delVariable(env.top(0).to_std_string());
+	env.top(0) = thread.delVariable(env.top(0).to_string(&env));
 }
 
 void
@@ -2141,10 +2149,10 @@
 
     as_value value = env.pop();
     as_value varname = env.pop();
-    thread.setLocalVariable(varname.to_std_string(), value);
+    thread.setLocalVariable(varname.to_string(&env), value);
 
     IF_VERBOSE_ACTION (
-    log_action("-- set local var: %s = %s", varname.to_string().c_str(), value.to_debug_string().c_str());
+    log_action("-- set local var: %s = %s", varname.to_string(&env).c_str(), value.to_debug_string().c_str());
     );
 }
 
@@ -2164,7 +2172,7 @@
 	as_value function = thread.getVariable(env.top(0).to_std_string(&env));
 	if ( ! function.is_object() ) 
 	{
-		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string().c_str());
+		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string(&env).c_str());
 	}
 	else if ( ! function.is_function() ) 
 	{
@@ -2198,7 +2206,7 @@
 	as_value result = call_method(function, &env, thread.getThisPointer(),
 				  nargs, env.get_top_index() - 2);
 
-	//log_msg("Function's result: %s", result.to_string());
+	//log_msg("Function's result: %s", result.to_string(&env));
     
 	env.drop(nargs + 1);
 	env.top(0) = result;
@@ -2228,7 +2236,7 @@
 	env.drop(1);
 
 #ifdef USE_DEBUGGER
-//        cerr << "Returning from function: " << env.top(0).to_string() << endl;
+//        cerr << "Returning from function: " << env.top(0).to_string(&env) << endl;
         debugger.callStackPop();
 #endif
 
@@ -2269,7 +2277,7 @@
 	thread.ensureStack(2); // classname, nargs
 
 	as_value val = env.pop();
-	string classname = val.to_std_string();;
+	string classname = val.to_string(&env);;
 
 	IF_VERBOSE_ACTION (
 		log_action("---new object: %s",
@@ -2317,7 +2325,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1); // var name
-    string varname = env.top(0).to_std_string();
+    const string& varname = env.top(0).to_string(&env);
     if ( thread.isFunction() )
     {
        env.declare_local(varname);
@@ -2357,9 +2365,10 @@
     as_value	index_number;
     for (int i = 0; i < array_size; i++) {
         // @@ TODO a set_member that takes an int or as_value?
+	// @@ TODO: don'e use as_value for converting a number to a string !!
         index_number.set_int(i);
-        //ao->set_member(index_number.to_string(), env.pop());
-        thread.setObjectMember(*ao, index_number.to_std_string(), env.pop());
+        //ao->set_member(index_number.to_string(&env), env.pop());
+        thread.setObjectMember(*ao, index_number.to_string(&env), env.pop());
     }
     
     env.push(result);
@@ -2395,7 +2404,7 @@
     // Set provided members
     for (int i=0; i<nmembers; ++i) {
         as_value member_value = env.pop();
-	string member_name = env.pop().to_std_string();
+	string member_name = env.pop().to_string(&env);
         //new_obj_ptr->set_member(member_name, member_value);
 	thread.setObjectMember(*new_obj_ptr, member_name, member_value);
     }
@@ -2500,7 +2509,7 @@
     as_value& v1 = env.top(0);
     as_value& v2 = env.top(1);
 
-    //log_msg("ActionNewAdd(%s[%s],%s[%s]) called", v1.typeOf(), v1.to_string(), v2.typeOf(), v2.to_string());
+    //log_msg("ActionNewAdd(%s, %s) called", v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
 
 
     if (v1.is_string() || v2.is_string() )
@@ -2537,7 +2546,7 @@
 
 	if ( operand1.is_string() && operand2.is_string() )
 	{
-		env.top(1).set_bool(operand1.to_std_string() < operand2.to_std_string());
+		env.top(1).set_bool(operand1.to_string(&env) < operand2.to_string(&env));
 	}
 	else 
 	{
@@ -2628,7 +2637,7 @@
     if (!obj) {
 //         IF_VERBOSE_DEBUG(log_msg("getMember called against "
 //                                  "a value that does not cast "
-//                                  "to an as_object: %s", target.to_string()));
+//                                  "to an as_object: %s", target.to_string(&env).c_str()));
         env.top(1).set_undefined();
         env.drop(1);
         return;
@@ -2645,7 +2654,7 @@
         int len = target.to_string_versioned(version).size();
         env.top(1).set_int(len); 
     } else {
-        if ( ! thread.getObjectMember(*obj, member_name.to_std_string(), env.top(1)) )
+        if ( ! thread.getObjectMember(*obj, member_name.to_string(&env), env.top(1)) )
 	{
             env.top(1).set_undefined();
         }
@@ -2670,7 +2679,7 @@
 	thread.ensureStack(3); // value, member, object
 
 	boost::intrusive_ptr<as_object> obj = env.top(2).to_object();
-	string member_name = env.top(1).to_std_string();
+	const string& member_name = env.top(1).to_string(&env);
 	const as_value& member_value = env.top(0);
 
 	if (obj)
@@ -2757,7 +2766,7 @@
 	log_action(" method nargs: %d", nargs);
 	);
 
-	string method_string = method_name.to_std_string();
+	string method_string = method_name.to_string(&env);
 	as_value method_val;
 	boost::intrusive_ptr<as_object> obj = obj_value.to_object(); 
 	if ( method_name.is_undefined() || method_string.empty() )
@@ -2842,8 +2851,8 @@
 //	// IT IS NOT GUARANTEE WE DO HAVE A METHOD NAME HERE !
 	if ( ! method_name.is_undefined() )
 	{
-		debugger.callStackPush(method_name.to_std_string());
-		debugger.matchBreakPoint(method_name.to_std_string(), true);
+		debugger.callStackPush(method_name.to_string(&env));
+		debugger.matchBreakPoint(method_name.to_string(&env), true);
 	}
 	else
 	{
@@ -2905,7 +2914,7 @@
 		return;
 	}
 
-	string method_string = method_name.to_std_string();
+	string method_string = method_name.to_string(&env);
 	as_value method_val;
 	if ( method_name.is_undefined() || method_string.empty() )
 	{
@@ -2943,8 +2952,8 @@
 	boost::intrusive_ptr<as_object> new_obj = construct_object(method.get(),
 			env, nargs, env.get_top_index());
 
-	//log_msg("%s( [%d args] ) returned %s", method_val.to_string(),
-	//	nargs, new_obj.to_string());
+	//log_msg("%s( [%d args] ) returned %s", method_val.to_string(&env),
+	//	nargs, new_obj.to_string(&env));
 
 
 	env.drop(nargs);
@@ -3134,7 +3143,7 @@
 
 	if ( operand1.is_string() && operand2.is_string() )
 	{
-		env.top(1).set_bool(operand1.to_std_string() > operand2.to_std_string());
+		env.top(1).set_bool(operand1.to_string(&env) > operand2.to_string(&env));
 	}
 	else 
 	{
@@ -3159,7 +3168,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(2); 
-    env.top(1).set_bool(env.top(1).to_string() > env.top(0).to_string());
+    env.top(1).set_bool(env.top(1).to_string(&env) > env.top(0).to_string(&env));
     env.drop(1);
 }
 



From MAILER-DAEMON Mon Apr 16 03:42:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdLqg-00064z-TZ
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 03:42:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdLqf-00064t-23
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:42:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdLqc-00064h-UP
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:42:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdLqc-00064e-Qh
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:42:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdLm0-0005Ui-Mr
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 03:37:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdLlt-0002y5-P3
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:37:09 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdLlt-0002y1-DF
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:37:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdLlt-0002y1-DF@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 07:37:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/debugger.cpp server/debu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 07:42:05 -0000

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

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

Log message:
	        * server/debugger.{cpp,h}: (matchWatchPoint) const-corrected
	        * server/vm/ASHandlers.cpp: (ActionCallFrame): properly handle unknown target;
		  more optimization of stack access and string copies.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2881&r2=1.2882
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.92&r2=1.93

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2881
retrieving revision 1.2882
diff -u -b -r1.2881 -r1.2882
--- ChangeLog	16 Apr 2007 07:10:44 -0000	1.2881
+++ ChangeLog	16 Apr 2007 07:37:08 -0000	1.2882
@@ -1,10 +1,11 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* server/debugger.{cpp,h}: (matchWatchPoint) const-corrected
 	* server/vm/ASHandlers.cpp: always pass an as_environment pointer
 	  when converting as_value to a string, use to_string rather 
 	  then to_std_string() when a reference is enough; (ActionDuplicateClip): 
-	  properly cleanup the stack on error; (ActionGotoFrameExpression):
-	  properly handle unknown target.
+	  properly cleanup the stack on error; (ActionGotoFrameExpression,
+	  ActionCallFrame): properly handle unknown target.
 	* testsuite/misc-ming.all/Makefile.am:
 	  Activated get_frame_number and frame_label_test.
 

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/debugger.cpp	20 Mar 2007 15:01:20 -0000	1.14
+++ server/debugger.cpp	16 Apr 2007 07:37:08 -0000	1.15
@@ -505,7 +505,7 @@
 }
 
 bool
-Debugger::matchWatchPoint(std::string &var, watch_state_e state)
+Debugger::matchWatchPoint(const std::string &var, watch_state_e state)
 {
 //    GNASH_REPORT_FUNCTION;
     std::map<std::string, watch_state_e>::const_iterator it;

Index: server/debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/debugger.h	15 Mar 2007 22:39:53 -0000	1.9
+++ server/debugger.h	16 Apr 2007 07:37:08 -0000	1.10
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: debugger.h,v 1.9 2007/03/15 22:39:53 strk Exp $ */
+/* $Id: debugger.h,v 1.10 2007/04/16 07:37:08 strk Exp $ */
 
 #ifndef __DEBUGGER_H__
 #define __DEBUGGER_H__
@@ -102,7 +102,7 @@
     /// Are there any watchpoints set ?
     int anyWatchPoints() { return _watchpoints.size(); };
     /// Does the variable name match any watchpoints ?
-    bool matchWatchPoint(std::string &var, watch_state_e state);
+    bool matchWatchPoint(const std::string &var, watch_state_e state);
     
     /// Are there any breakpoints set ?
     int anyBreakPoints() { return _breakpoints.size(); };

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- server/vm/ASHandlers.cpp	16 Apr 2007 07:10:45 -0000	1.92
+++ server/vm/ASHandlers.cpp	16 Apr 2007 07:37:08 -0000	1.93
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.92 2007/04/16 07:10:45 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.93 2007/04/16 07:37:08 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -994,8 +994,7 @@
 	// stack must be contain at least two items
 	thread.ensureStack(2); 
 
-	assert(env.top(1).to_string(&env).c_str());
-        string name = env.top(1).to_string(&env);
+        const string& name = env.top(1).to_string(&env);
 	thread.setVariable(name, env.top(0));
 
         IF_VERBOSE_ACTION (
@@ -1020,14 +1019,11 @@
 
 	thread.ensureStack(1);  // target name
 
-	//Vitaly: env.drop(1) remove object on which refers const char * target_name
-	//strk: shouldn't we use env.pop() instead ? No (see above comment)
-	//const char * target_name = env.top(0).to_string(&env);
-	assert(env.top(0).to_string(&env).c_str());
-	string target_name = env.top(0).to_string(&env);
-	env.drop(1); // pop the target name off the stack
+	const string& target_name = env.top(0).to_string(&env);
 
 	CommonSetTarget(env, target_name);
+
+	env.drop(1); // pop the target name off the stack
 }
 
 void
@@ -1995,11 +1991,11 @@
 
 	thread.ensureStack(1); // frame spec
 
-	string target_frame = env.top(0).to_string(&env);
+	const string& target_frame = env.top(0).to_string(&env);
 	string target_path;
 	string frame_var;
 	
-	character * target;
+	character * target = NULL;
 	if( env.parse_path(target_frame, target_path, frame_var) )
 	{
 		target = env.find_target(target_path);
@@ -2010,7 +2006,7 @@
 		target = env.get_target();
 	}
 	
-	sprite_instance *target_sprite = target->to_movie();
+	sprite_instance *target_sprite = target ? target->to_movie() : NULL;
 	if(target_sprite)
 	{
 		target_sprite->call_frame_actions(frame_var);
@@ -2117,12 +2113,8 @@
 		return;
 	}
 
-	as_value var = env.pop();
-
-	bool ret = thread.delVariable(var.to_string(&env));
-	env.push(as_value(ret));
-
-	return;
+	// What's the difference between this and ActionDelete2 ??
+	env.top(0) = thread.delVariable(env.top(0).to_string(&env));
 }
 
 void
@@ -2147,13 +2139,15 @@
     as_environment& env = thread.env;
     thread.ensureStack(2); // value, var
 
-    as_value value = env.pop();
-    as_value varname = env.pop();
+    as_value& value = env.top(0);
+    as_value& varname = env.top(1);
     thread.setLocalVariable(varname.to_string(&env), value);
 
     IF_VERBOSE_ACTION (
     log_action("-- set local var: %s = %s", varname.to_string(&env).c_str(), value.to_debug_string().c_str());
     );
+
+    env.drop(2);
 }
 
 void
@@ -2169,7 +2163,7 @@
 	//env.dump_stack();
 
 	// Let's consider it a as a string and lookup the function.
-	as_value function = thread.getVariable(env.top(0).to_std_string(&env));
+	as_value function = thread.getVariable(env.top(0).to_string(&env));
 	if ( ! function.is_object() ) 
 	{
 		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string(&env).c_str());
@@ -2277,7 +2271,7 @@
 	thread.ensureStack(2); // classname, nargs
 
 	as_value val = env.pop();
-	string classname = val.to_string(&env);;
+	const string& classname = val.to_string(&env);
 
 	IF_VERBOSE_ACTION (
 		log_action("---new object: %s",
@@ -2397,16 +2391,17 @@
     
     int nmembers = (int) env.pop().to_number(&env);
 
-    thread.ensureStack(nmembers); // members
+    thread.ensureStack(nmembers*2); // name, value for each member
     
     boost::intrusive_ptr<as_object> new_obj_ptr(init_object_instance().release()); 
     
     // Set provided members
     for (int i=0; i<nmembers; ++i) {
-        as_value member_value = env.pop();
-	string member_name = env.pop().to_string(&env);
+        as_value member_value = env.top(0);
+	string member_name = env.top(1).to_string(&env);
         //new_obj_ptr->set_member(member_name, member_value);
 	thread.setObjectMember(*new_obj_ptr, member_name, member_value);
+	env.drop(2);
     }
     
     // @@ TODO



From MAILER-DAEMON Mon Apr 16 04:12:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdMKX-0008UZ-1q
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 04:12:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdMKV-0008Tt-Iq
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 04:12:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdMKT-0008T2-B2
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 04:12:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdMKT-0008Sp-3R
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 04:12:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdMFr-0002J5-GC
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 04:08:07 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdMFh-0004NX-Rq
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 08:07:58 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdMFh-0004NU-FS
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 08:07:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdMFh-0004NU-FS@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 08:07:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/matrix_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 08:12:55 -0000

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

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: matrix_test.c 

Log message:
	        * testsuite/misc-ming.all/matrix_test.c: add test for skewX() matrix
	          (failures are just precision-related).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2882&r2=1.2883
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2882
retrieving revision 1.2883
diff -u -b -r1.2882 -r1.2883
--- ChangeLog	16 Apr 2007 07:37:08 -0000	1.2882
+++ ChangeLog	16 Apr 2007 08:07:56 -0000	1.2883
@@ -1,5 +1,7 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/matrix_test.c: add test for skewX() matrix
+	  (failures are just precision-related).
 	* server/debugger.{cpp,h}: (matchWatchPoint) const-corrected
 	* server/vm/ASHandlers.cpp: always pass an as_environment pointer
 	  when converting as_value to a string, use to_string rather 

Index: testsuite/misc-ming.all/matrix_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/matrix_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/matrix_test.c	14 Apr 2007 22:23:05 -0000	1.2
+++ testsuite/misc-ming.all/matrix_test.c	16 Apr 2007 08:07:56 -0000	1.3
@@ -136,6 +136,20 @@
 	check_equals(mo, "staticmc._width", "212.5");
 	check_equals(mo, "staticmc._height", "212.5");
 
+	SWFMovie_nextFrame(mo);        
+
+	SWFDisplayItem_skewX(it, 2);
+
+	check_equals(mo, "staticmc._x", "50");
+	check_equals(mo, "staticmc._y", "300");
+	check_equals(mo, "Math.round(staticmc._xscale)", "447");
+	check_equals(mo, "Math.round(staticmc._yscale)", "300");
+	check_equals(mo, "Math.round(staticmc._rotation*1000)", "18435");
+	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
+	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'-141.25,193.75 241.25,406.25'");
+	xcheck_equals(mo, "staticmc._width", "382.5");
+	check_equals(mo, "staticmc._height", "212.5");
+
 	// TODO:
 	// - test more rotations and scales (corner cases too!)
 	// - test 'skew' (since Ming supports it)



From MAILER-DAEMON Mon Apr 16 05:13:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdNH8-000100-0v
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 05:13:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdNH5-0000xj-9s
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:13:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdNH3-0000xX-Lf
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:13:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdNH3-0000xU-DB
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:13:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdNCS-0002wt-4G
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:08:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdNCR-0000GB-9b
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:08:39 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdNCQ-0000G8-Tf
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:08:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdNCQ-0000G8-Tf@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 09:08:38 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 09:13:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 09:08:38

Modified files:
	.              : ChangeLog 
	libbase        : log.h 

Log message:
	* libbase/log.h: draft documentation for the log_* functions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2883&r2=1.2884
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2883
retrieving revision 1.2884
diff -u -b -r1.2883 -r1.2884
--- ChangeLog	16 Apr 2007 08:07:56 -0000	1.2883
+++ ChangeLog	16 Apr 2007 09:08:38 -0000	1.2884
@@ -1,5 +1,6 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* libbase/log.h: draft documentation for the log_* functions.
 	* testsuite/misc-ming.all/matrix_test.c: add test for skewX() matrix
 	  (failures are just precision-related).
 	* server/debugger.{cpp,h}: (matchWatchPoint) const-corrected

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- libbase/log.h	10 Apr 2007 18:06:37 -0000	1.45
+++ libbase/log.h	16 Apr 2007 09:08:38 -0000	1.46
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.45 2007/04/10 18:06:37 strk Exp $ */
+/* $Id: log.h,v 1.46 2007/04/16 09:08:38 strk Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -163,30 +163,81 @@
 DSOEXPORT unsigned char *hexify(unsigned char *p, const unsigned char *s, int length, bool ascii);
 
 #ifdef __GNUC__
-DSOEXPORT void log_msg(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_error(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_warning(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_trace(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_debug(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_action(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_parse(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_security(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_swferror(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-DSOEXPORT void log_aserror(const char* fmt, ...) __attribute__((format (printf, 1, 2)));
-#else
-// Printf-style interfaces.
-DSOEXPORT void log_msg(const char* fmt, ...);
-DSOEXPORT void log_error(const char* fmt, ...);
-DSOEXPORT void log_warning(const char* fmt, ...);
-DSOEXPORT void log_trace(const char* fmt, ...);
-DSOEXPORT void log_debug(const char* fmt, ...);
-DSOEXPORT void log_action(const char* fmt, ...);
-DSOEXPORT void log_parse(const char* fmt, ...);
-DSOEXPORT void log_security(const char* fmt, ...);
-DSOEXPORT void log_swferror(const char* fmt, ...);
-DSOEXPORT void log_aserror(const char* fmt, ...);
+#define GNUC_LOG_ATTRS __attribute__((format (printf, 1, 2)))
 #endif
 
+/// Log a generic message. This is usually used for debugging, so I guess
+/// should be log_debug instead.
+//
+DSOEXPORT void log_msg(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log a error
+//
+/// Errors have to be used to warn user about missing Gnash features.
+///
+/// NOTE: it has to be decided what difference this makes with
+///       log_warning...
+///
+DSOEXPORT void log_error(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log a warning
+//
+/// Warnings have to be used to warn user about missing Gnash features.
+///
+/// NOTE: it has to be decided what difference this makes with
+///       log_error...
+///
+DSOEXPORT void log_warning(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Use only for explicit user traces
+//
+/// Current users are Global.cpp for _global.trace() and
+/// ASHandlers.cpp for ActionTrace
+///
+DSOEXPORT void log_trace(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log debug info (unused! deprecated?)
+DSOEXPORT void log_debug(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log action execution info
+//
+/// Wrap all calls to this function (and other related statements)
+/// into an IF_VERBOSE_ACTION macro, so to allow completely
+/// removing all the overhead at compile time and reduce it
+/// at runtime.
+///
+DSOEXPORT void log_action(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log parsing information
+//
+/// Wrap all calls to this function (and other related statements)
+/// into an IF_VERBOSE_PARSE macro, so to allow completely
+/// removing all the overhead at compile time and reduce it
+/// at runtime.
+///
+DSOEXPORT void log_parse(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log security information
+DSOEXPORT void log_security(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log a malformed SWF error
+//
+/// Wrap all calls to this function (and other related statements)
+/// into an IF_VERBOSE_MALFORMED_SWF macro, so to allow completely
+/// removing all the overhead at compile time and reduce it
+/// at runtime.
+///
+DSOEXPORT void log_swferror(const char* fmt, ...) GNUC_LOG_ATTRS;
+
+/// Log an ActionScript error
+//
+/// Wrap all calls to this function (and other related statements)
+/// into an IF_VERBOSE_ASCODING_ERRORS macro, so to allow completely
+/// removing all the overhead at compile time and reduce it
+/// at runtime.
+///
+DSOEXPORT void log_aserror(const char* fmt, ...) GNUC_LOG_ATTRS;
+
 // Define to 0 to completely remove parse debugging at compile-time
 #ifndef VERBOSE_PARSE
 #define VERBOSE_PARSE 1



From MAILER-DAEMON Mon Apr 16 05:48:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdNoY-0001l1-Nw
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 05:48:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdNoW-0001ja-LX
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:48:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdNoV-0001jI-Ax
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:47:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdNoV-0001jF-5C
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:47:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HdNjt-0007fE-P9
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 05:43:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdNju-0004AL-3t
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:43:14 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HdNjt-0004AI-U5
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:43:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdNjt-0004AI-U5@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 16 Apr 2007 09:43:13 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/get_fra...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 09:48:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/16 09:43:13

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: get_frame_number_test.c 

Log message:
	more tests about frame labels

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2884&r2=1.2885
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2884
retrieving revision 1.2885
diff -u -b -r1.2884 -r1.2885
--- ChangeLog	16 Apr 2007 09:08:38 -0000	1.2884
+++ ChangeLog	16 Apr 2007 09:43:13 -0000	1.2885
@@ -15,7 +15,9 @@
 2007-04-16 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/frame_label_test.c:
-	  a new testcase
+	  a new testcase.
+	* testsuite/misc-ming.all/get_frame_number_test.c:
+	  more tests.
 	* server/sprite_instance.cpp:
 	  update call_frame_actions();
 	* server/vm/ASHandlers.cpp:

Index: testsuite/misc-ming.all/get_frame_number_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/get_frame_number_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/get_frame_number_test.c	8 Apr 2007 08:37:07 -0000	1.1
+++ testsuite/misc-ming.all/get_frame_number_test.c	16 Apr 2007 09:43:13 -0000	1.2
@@ -64,7 +64,10 @@
   SWFMovie_labelFrame(mo, "aa");
   SWFMovie_nextFrame(mo); /* 4th frame*/
   
-  check_equals(mo, "_currentframe", "5");
+  SWFMovie_labelFrame(mo, "4.8");
+  SWFMovie_nextFrame(mo); /* 5th frame*/
+  
+  check_equals(mo, "_currentframe", "6");
   add_actions(mo, " gotoAndStop('8'); ");         // ActionGotoLabel
   check_equals(mo, "_currentframe", "2");
   add_actions(mo, " gotoAndStop('xxxxxxxx'); ");  // ActionGotoLabel
@@ -79,8 +82,14 @@
   add_actions(mo, " x = -1; "
                   " gotoAndStop(x); ");         // ActionGotoExpression
   check_equals(mo, "_currentframe", "2");             
-  add_actions(mo, " gotoAndStop(6); ");         // ActionGotoFrame
-  SWFMovie_nextFrame(mo); /* 5th frame */
+  add_actions(mo, " x = 4.8; "  // valid frame label                   
+                  " gotoAndStop(x); ");         // ActionGotoExpression  
+  xcheck_equals(mo, "_currentframe", "5");          
+  add_actions(mo, " x = 6.1; "  // invalid frame number                   
+                  " gotoAndStop(x); ");         // ActionGotoExpression  
+  xcheck_equals(mo, "_currentframe", "5"); 
+  add_actions(mo, " gotoAndStop(7); ");         // ActionGotoFrame
+  SWFMovie_nextFrame(mo); /* 6th frame */
   
   add_actions(mo, "function func1() {}"
                   "func1.prototype.toString = function() { return '8'; };"
@@ -93,11 +102,17 @@
                   "function func3() {}"
                   "func3.prototype.toString = function() { return '8'; }; "
                   "func3.prototype.valueOf = function() { return 8;};"
-                  "x3 = new func3();" );
+                  "x3 = new func3();" 
+                  
+                  "function func4() {}"
+                  "func4.prototype.toString = function() { return '4.8'; }; "
+                  "func4.prototype.valueOf = function() { return '4.8';};"
+                  "x4 = new func4();");
                   
                   
   add_actions(mo, " x = '8'; gotoAndStop(x); ");     // ActionGotoExpression
-  check_equals(mo, "_currentframe", "6");
+  /* reach the last frame */
+  check_equals(mo, "_currentframe", "7");
   
   add_actions(mo, " x = '8a'; gotoAndStop(x); ");    // ActionGotoExpression
   check_equals(mo, "_currentframe", "3");
@@ -106,20 +121,25 @@
   check_equals(mo, "_currentframe", "4");
   
   add_actions(mo, " gotoAndStop(x1); ");             // ActionGotoExpression
-  /* reach the last frame */
-  check_equals(mo, "_currentframe", "6"); 
+  /* reach the last frame, toString invoked */
+  check_equals(mo, "_currentframe", "7"); 
   
   /* reset _currentframe to 1 */
   add_actions(mo, " gotoAndStop(1); ");  
+  
   add_actions(mo, " gotoAndStop(x2); ");             // ActionGotoExpression
   check_equals(mo, "_currentframe", "1"); 
   
   add_actions(mo, " gotoAndStop(x3); ");             // ActionGotoExpression
   /* reach the last frame */
-  check_equals(mo, "_currentframe", "6");
+  check_equals(mo, "_currentframe", "7");
+  
+  add_actions(mo, " gotoAndStop(x4); ");             // ActionGotoExpression
+  /* "4.8" is a valid frame label, toString() invoked */
+  xcheck_equals(mo, "_currentframe", "5");
   
   add_actions(mo, " _root.totals(); stop(); ");
-  SWFMovie_nextFrame(mo); /* 6th frame */
+  SWFMovie_nextFrame(mo); /* 7th frame */
 
   //Output movie
   puts("Saving " OUTPUT_FILENAME );



From MAILER-DAEMON Mon Apr 16 06:31:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdOUx-000135-Eu
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 06:31:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdOUu-00012P-TB
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 06:31:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdOUt-000127-5N
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 06:31:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdOUs-000123-TP
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 06:31:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HdOQG-000531-U8
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 06:27:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdOQG-0006zH-G8
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 10:27:00 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HdOQG-0006zE-0T
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 10:27:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdOQG-0006zE-0T@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Mon, 16 Apr 2007 10:27:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/log.cpp libbase/log.h s...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 10:31:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/16 10:26:59

Modified files:
	.              : ChangeLog 
	libbase        : log.cpp log.h 
	server         : gnash.h 

Log message:
	* libbase/log.h: Update documentation for log_* functions; rename
	  log_warning to log_unimpl (with temporary #define for a few days);
	  move gettext and _ definitions from gnash.h to log.h.
	* libbase/log.cpp:  Update log_* functions as above.
	* server/gnash.h:  Move gettext and _ to log.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2885&r2=1.2886
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2885
retrieving revision 1.2886
diff -u -b -r1.2885 -r1.2886
--- ChangeLog	16 Apr 2007 09:43:13 -0000	1.2885
+++ ChangeLog	16 Apr 2007 10:26:59 -0000	1.2886
@@ -1,3 +1,11 @@
+2007-04-16  John Gilmore  <gnu@quiet.toad.com>
+
+	* libbase/log.h: Update documentation for log_* functions; rename
+	  log_warning to log_unimpl (with temporary #define for a few days);
+	  move gettext and _ definitions from gnash.h to log.h.
+	* libbase/log.cpp:  Update log_* functions as above.
+	* server/gnash.h:  Move gettext and _ to log.h.
+
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
 	* libbase/log.h: draft documentation for the log_* functions.

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- libbase/log.cpp	10 Apr 2007 14:17:15 -0000	1.45
+++ libbase/log.cpp	16 Apr 2007 10:26:59 -0000	1.46
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.cpp,v 1.45 2007/04/10 14:17:15 strk Exp $ */
+/* $Id: log.cpp,v 1.46 2007/04/16 10:26:59 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -136,7 +136,7 @@
     return x << buf;
 }
 
-// This is a bit of a hack. We impleemnt wrappers for the old
+// This is a bit of a hack. We implement wrappers for the old
 // functions so we don't have to change files everywhere, but get the
 // new behaviours, like logging to disk.
 // THIS IS DANGEROUS AS TIME OF INITIALIZATION IS UNPREDICTABLE,
@@ -151,7 +151,7 @@
 	return o;
 }
 
-// Printf-style informational log.
+// Printf-style log for debugging info.
 void
 log_msg(const char* fmt, ...)
 {
@@ -272,7 +272,7 @@
 }
 
 void
-log_warning(const char* fmt, ...)
+log_unimpl(const char* fmt, ...)
 {
     LogFile& dbglogfile = LogFile::getDefaultInstance();
 
@@ -283,7 +283,7 @@
     vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "WARNING: " << tmp << endl;
+    dbglogfile << "ERROR: Unimplemented: " << tmp << endl;
     
     va_end (ap);    
 }

Index: libbase/log.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- libbase/log.h	16 Apr 2007 09:08:38 -0000	1.46
+++ libbase/log.h	16 Apr 2007 10:26:59 -0000	1.47
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: log.h,v 1.46 2007/04/16 09:08:38 strk Exp $ */
+/* $Id: log.h,v 1.47 2007/04/16 10:26:59 jgilmore Exp $ */
 
 #ifndef GNASH_LOG_H
 #define GNASH_LOG_H
@@ -23,6 +23,11 @@
 #include "config.h"
 #endif
 
+// Support compilation with (or without) native language support
+#include "gettext.h"	// for internationalization (GNU gettext)
+#define	_(String) gettext (String)
+#define N_(String) gettext_noop (String)
+
 #include "rc.h" // for IF_VERBOSE_* implementation
 //#include "tu_config.h"
 
@@ -166,28 +171,33 @@
 #define GNUC_LOG_ATTRS __attribute__((format (printf, 1, 2)))
 #endif
 
-/// Log a generic message. This is usually used for debugging, so I guess
-/// should be log_debug instead.
+/// Log a generic message
 //
+/// This is usually used for debugging, so most
+/// such calls should be in comments, unless you're actively debugging
+/// that piece of code right now.
+///
 DSOEXPORT void log_msg(const char* fmt, ...) GNUC_LOG_ATTRS;
 
-/// Log a error
+/// Log a runtime error
 //
-/// Errors have to be used to warn user about missing Gnash features.
-///
-/// NOTE: it has to be decided what difference this makes with
-///       log_warning...
+/// Runtime errors, such as un-openable files, un-allocatable memory,
+/// etc, are logged (for convenience of the user or debugger) this way.
+/// This function is not used to report coding errors; use log_aserror
+/// or log_swferror for that.
 ///
 DSOEXPORT void log_error(const char* fmt, ...) GNUC_LOG_ATTRS;
 
-/// Log a warning
+// Temporary expedient til the other source files are converted.  --gnu
+#define log_warning	log_unimpl
+
+/// Log a message about unimplemented features.
 //
-/// Warnings have to be used to warn user about missing Gnash features.
-///
-/// NOTE: it has to be decided what difference this makes with
-///       log_error...
+/// This function must be used to warn user about missing Gnash features.
+/// We expect all calls to this function to disappear over time, as we
+/// implement those features of Flash.
 ///
-DSOEXPORT void log_warning(const char* fmt, ...) GNUC_LOG_ATTRS;
+DSOEXPORT void log_unimpl(const char* fmt, ...) GNUC_LOG_ATTRS;
 
 /// Use only for explicit user traces
 //
@@ -196,7 +206,10 @@
 ///
 DSOEXPORT void log_trace(const char* fmt, ...) GNUC_LOG_ATTRS;
 
-/// Log debug info (unused! deprecated?)
+/// Log debug info
+//
+/// Used for function entry/exit tracing.
+///
 DSOEXPORT void log_debug(const char* fmt, ...) GNUC_LOG_ATTRS;
 
 /// Log action execution info
@@ -222,6 +235,9 @@
 
 /// Log a malformed SWF error
 //
+/// This indicates an error in how the binary SWF file was constructed, i.e.
+/// probably a bug in the tools used to build the SWF file.
+///
 /// Wrap all calls to this function (and other related statements)
 /// into an IF_VERBOSE_MALFORMED_SWF macro, so to allow completely
 /// removing all the overhead at compile time and reduce it
@@ -231,6 +247,9 @@
 
 /// Log an ActionScript error
 //
+/// This indicates an error by the programmer who wrote the ActionScript
+/// code, such as too few or too many arguments to a function.
+///
 /// Wrap all calls to this function (and other related statements)
 /// into an IF_VERBOSE_ASCODING_ERRORS macro, so to allow completely
 /// removing all the overhead at compile time and reduce it
@@ -238,6 +257,8 @@
 ///
 DSOEXPORT void log_aserror(const char* fmt, ...) GNUC_LOG_ATTRS;
 
+
+
 // Define to 0 to completely remove parse debugging at compile-time
 #ifndef VERBOSE_PARSE
 #define VERBOSE_PARSE 1
@@ -289,7 +310,7 @@
 public:
     const char *func;
 
-    // Only print function tracing messages when tmultiplewo -v
+    // Only print function tracing messages when multiple -v
     // options have been supplied. 
     __Host_Function_Report__(void) {
 	log_debug("entering");

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/gnash.h	15 Apr 2007 10:52:09 -0000	1.93
+++ server/gnash.h	16 Apr 2007 10:26:59 -0000	1.94
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.93 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: gnash.h,v 1.94 2007/04/16 10:26:59 jgilmore Exp $ */
 
 /// \mainpage
 ///
@@ -39,11 +39,6 @@
 
 #include "as_value.h" // FIXME: for as_c_function_ptr typedef (register_component)
 
-// Support compilation with (or without) native language support
-#include "gettext.h"	// for internationalization (GNU gettext)
-#define	_(String) gettext (String)
-#define N_(String) gettext_noop (String)
-
 // FIXME: The local usage of these constants should probably be renamed in this
 // file because they conflict with definitions in the system header files. Luckily
 // they are used in files we don't need, so we should be able to safely redefine



From MAILER-DAEMON Mon Apr 16 07:24:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdPK1-0007Z6-O8
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 07:24:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdPK0-0007Z1-7w
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:24:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdPJz-0007Yl-8A
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:24:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdPJz-0007Yh-5Y
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:24:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdPFN-0004I0-AB
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:19:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdPFN-0002P1-I1
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 11:19:49 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdPFN-0002Oy-89
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 11:19:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdPFN-0002Oy-89@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 11:19:49 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp serv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 11:24:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 11:19:49

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

Log message:
	        * server/sprite_instance.cpp (get_frame_number): check frame labels
	          also when convertion to number gives a non-integer value.
	        * server/vm/ASHandlers.cpp (ActionGotoExpression): don't pretend
	          any path-looking string is necessarely a path, it can still be
	          a floating number or a frame label.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2886&r2=1.2887
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.243&r2=1.244
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.93&r2=1.94

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2886
retrieving revision 1.2887
diff -u -b -r1.2886 -r1.2887
--- ChangeLog	16 Apr 2007 10:26:59 -0000	1.2886
+++ ChangeLog	16 Apr 2007 11:19:48 -0000	1.2887
@@ -1,3 +1,11 @@
+2007-04-16 Sandro Santilli <strk@keybit.net>
+
+	* server/sprite_instance.cpp (get_frame_number): check frame labels
+	  also when convertion to number gives a non-integer value.
+	* server/vm/ASHandlers.cpp (ActionGotoExpression): don't pretend
+	  any path-looking string is necessarely a path, it can still be
+	  a floating number or a frame label.
+
 2007-04-16  John Gilmore  <gnu@quiet.toad.com>
 
 	* libbase/log.h: Update documentation for log_* functions; rename

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.243
retrieving revision 1.244
diff -u -b -r1.243 -r1.244
--- server/sprite_instance.cpp	16 Apr 2007 01:02:17 -0000	1.243
+++ server/sprite_instance.cpp	16 Apr 2007 11:19:48 -0000	1.244
@@ -1691,7 +1691,7 @@
 
 	double num =  str.to_number(env);
 
-	if ( isnan(num) || isinf(num))
+	if ( ! isfinite(num) || int(num) != num )
 	{
 		return m_def->get_labeled_frame(frame_spec.to_std_string(env), frameno);
 	}

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/vm/ASHandlers.cpp	16 Apr 2007 07:37:08 -0000	1.93
+++ server/vm/ASHandlers.cpp	16 Apr 2007 11:19:48 -0000	1.94
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.93 2007/04/16 07:37:08 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.94 2007/04/16 11:19:48 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2059,7 +2059,10 @@
 	{
 		target = env.find_target(target_path);
 	}
-	else
+
+	if ( ! target ) // 4.11 would make parse_path above return true, 
+	                // we should check if a sprite named '4' is supposed to work
+	                // in that case 
 	{
 		target = env.get_target();
 		frame_var = target_frame;



From MAILER-DAEMON Mon Apr 16 07:26:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdPLk-0007vt-0T
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 07:26:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdPLi-0007uw-3c
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:26:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdPLf-0007uK-Vc
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:26:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdPLf-0007uG-N5
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:26:19 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HdPH3-0004ax-F2
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 07:21:33 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3GBLSn61413;
	Mon, 16 Apr 2007 13:21:28 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 16 Apr 2007 13:21:28 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
Message-ID: <20070416112128.GC43881@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1043777274.20070411174506@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 11:26:22 -0000

On Wed, Apr 11, 2007 at 05:45:06PM +0200, Udo Giacomozzi wrote:
> Tuesday, March 27, 2007, 4:52:07 PM, you wrote:
> SS> +#include <boost/ptr_container/ptr_list.hpp>
> 
> Just want to point out that this requires Boost 1.33 while 1.32
> (default in Debian Woody AFAIK) was enough previously.

I'd agree on dropping use of ptr_list, by replacing it with a custom
class with equivalent semantic (possibly even extracted from boost
header if easy).

I think supporting Debian Woody is important.

--strk;



From MAILER-DAEMON Mon Apr 16 08:35:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdQR2-00071U-K1
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 08:35:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdQR0-000715-QN
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 08:35:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdQQy-00070W-Sc
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 08:35:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdQQy-00070T-K0
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 08:35:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdQMM-0007pG-CI
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 08:31:06 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdQML-0006Fp-0k
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:31:05 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdQMJ-0006Fg-Vn
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:31:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdQMJ-0006Fg-Vn@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 12:31:04 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/internals.xml testsuite/g...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 12:35:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 12:31:03

Modified files:
	.              : ChangeLog 
	doc/C          : internals.xml 
	testsuite      : generic-testrunner.sh 
	testsuite/misc-ming.all: Makefile.am get_frame_number_test.c 
	testsuite/server: Makefile.am 

Log message:
	        * testsuite/server/Makefile.am: add libgnashamf.la to GNASH libs.
	        * testsuite/generic-testrunner.sh, doc/C/internals.xml:
	          Add -f switch to specify the maximum number of frame advancements.
	        * testsuite/misc-ming.all/Makefile.am: update
	          get_frame_number_testrunner to advance at most 20 times.
	        * testsuite/misc-ming.all/get_frame_number_test.c: no more failures
	          expected.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2887&r2=1.2888
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/internals.xml?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/generic-testrunner.sh?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.92&r2=1.93
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2887
retrieving revision 1.2888
diff -u -b -r1.2887 -r1.2888
--- ChangeLog	16 Apr 2007 11:19:48 -0000	1.2887
+++ ChangeLog	16 Apr 2007 12:31:01 -0000	1.2888
@@ -1,5 +1,12 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/server/Makefile.am: add libgnashamf.la to GNASH libs.
+	* testsuite/generic-testrunner.sh, doc/C/internals.xml:
+	  Add -f switch to specify the maximum number of frame advancements.
+	* testsuite/misc-ming.all/Makefile.am: update
+	  get_frame_number_testrunner to advance at most 20 times.
+	* testsuite/misc-ming.all/get_frame_number_test.c: no more failures
+	  expected.
 	* server/sprite_instance.cpp (get_frame_number): check frame labels
 	  also when convertion to number gives a non-integer value.
 	* server/vm/ASHandlers.cpp (ActionGotoExpression): don't pretend

Index: doc/C/internals.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/internals.xml,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- doc/C/internals.xml	12 Apr 2007 08:55:53 -0000	1.62
+++ doc/C/internals.xml	16 Apr 2007 12:31:02 -0000	1.63
@@ -1031,6 +1031,18 @@
 	</programlisting>
 	</para>
 
+	<para>
+	In case your test movie stops before the last frame, or you want to control the
+	exact number of times to call the frame advancement routine, you can use the 
+	-f switch to control that.
+	<programlisting>
+MyTest-Runner: $(srcdir)/../generic-testrunner.sh MyTest.swf
+        sh $(srcdir)/../generic-testrunner.sh -f10 $(top_builddir) MyTest.swf > $@
+        chmod +x $@
+	</programlisting>
+	When both -f and -r are given, the first exit condition reached will take effect.
+	</para>
+
 	</sect4>
 	
 	<sect4 id="writing_movie_testers">

Index: testsuite/generic-testrunner.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/generic-testrunner.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/generic-testrunner.sh	23 Jan 2007 18:02:45 -0000	1.6
+++ testsuite/generic-testrunner.sh	16 Apr 2007 12:31:02 -0000	1.7
@@ -18,11 +18,13 @@
 # 
 
 runs=1
+advances=0
 
-while getopts r: name; do
+while getopts r:f: name; do
 	case $name in
 		r) runs="$OPTARG" ;;
-		?) echo "Usage: $0 [-r <runs>] <swf> ..." >&2;
+		f) advances="$OPTARG" ;;
+		?) echo "Usage: $0 [-r <runs>] [-f <advances>] <swf> ..." >&2;
 		   exit 1;;
 	esac
 done
@@ -36,6 +38,6 @@
 #!/bin/sh
 for t in ${testfiles}; do
 	echo "NOTE: Running test \${t}"
-	${top_builddir}/utilities/gprocessor -r${runs} -v \${t} || echo "FAILED: gprocessor returned an error while playing '\${t}'"
+	${top_builddir}/utilities/gprocessor -r${runs} -f${advances} -v \${t} || echo "FAILED: gprocessor returned an error while playing '\${t}'"
 done
 EOF

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -b -r1.92 -r1.93
--- testsuite/misc-ming.all/Makefile.am	16 Apr 2007 06:23:21 -0000	1.92
+++ testsuite/misc-ming.all/Makefile.am	16 Apr 2007 12:31:02 -0000	1.93
@@ -400,7 +400,7 @@
 	./get_frame_number_test $(top_srcdir)/testsuite/media
 
 get_frame_number_testrunner: $(srcdir)/../generic-testrunner.sh get_frame_number_test.swf
-	sh $< -r5 $(top_builddir) get_frame_number_test.swf > $@
+	sh $< -f20 $(top_builddir) get_frame_number_test.swf > $@
 	chmod 755 $@
 
 frame_label_test_SOURCES =	\

Index: testsuite/misc-ming.all/get_frame_number_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/get_frame_number_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/get_frame_number_test.c	16 Apr 2007 09:43:13 -0000	1.2
+++ testsuite/misc-ming.all/get_frame_number_test.c	16 Apr 2007 12:31:02 -0000	1.3
@@ -84,10 +84,10 @@
   check_equals(mo, "_currentframe", "2");  
   add_actions(mo, " x = 4.8; "  // valid frame label                   
                   " gotoAndStop(x); ");         // ActionGotoExpression  
-  xcheck_equals(mo, "_currentframe", "5");          
+  check_equals(mo, "_currentframe", "5");          
   add_actions(mo, " x = 6.1; "  // invalid frame number                   
                   " gotoAndStop(x); ");         // ActionGotoExpression  
-  xcheck_equals(mo, "_currentframe", "5"); 
+  check_equals(mo, "_currentframe", "5"); 
   add_actions(mo, " gotoAndStop(7); ");         // ActionGotoFrame
   SWFMovie_nextFrame(mo); /* 6th frame */
   
@@ -136,7 +136,7 @@
   
   add_actions(mo, " gotoAndStop(x4); ");             // ActionGotoExpression
   /* "4.8" is a valid frame label, toString() invoked */
-  xcheck_equals(mo, "_currentframe", "5");
+  check_equals(mo, "_currentframe", "5");
   
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); /* 7th frame */

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/server/Makefile.am	31 Mar 2007 21:16:49 -0000	1.25
+++ testsuite/server/Makefile.am	16 Apr 2007 12:31:02 -0000	1.26
@@ -48,49 +48,38 @@
 	gnash-dbg.log \
 	$(NULL)
 
-MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = \
+GNASH_LIBS = \
 	$(top_builddir)/server/libgnashserver.la \
 	$(top_builddir)/server/parser/libgnashparser.la \
 	$(top_builddir)/server/asobj/libgnashasobjs.la \
 	$(top_builddir)/server/vm/libgnashvm.la \
 	$(top_builddir)/libbase/libgnashbase.la \
+	$(top_builddir)/libamf/libgnashamf.la \
+	$(NULL)
+
+MatrixTest_SOURCES = MatrixTest.cpp
+MatrixTest_LDADD = \
+	$(GNASH_LIBS) \
 	$(NULL)
 
 PropertyListTest_SOURCES = PropertyListTest.cpp
 PropertyListTest_LDADD = \
-	$(top_builddir)/server/libgnashserver.la \
-	$(top_builddir)/server/parser/libgnashparser.la \
-	$(top_builddir)/server/asobj/libgnashasobjs.la \
-	$(top_builddir)/server/vm/libgnashvm.la \
-	$(top_builddir)/libbase/libgnashbase.la \
+	$(GNASH_LIBS) \
 	$(NULL)
 
 GetterSetterTest_SOURCES = GetterSetterTest.cpp
 GetterSetterTest_LDADD = \
-	$(top_builddir)/server/libgnashserver.la \
-	$(top_builddir)/server/parser/libgnashparser.la \
-	$(top_builddir)/server/asobj/libgnashasobjs.la \
-	$(top_builddir)/server/vm/libgnashvm.la \
-	$(top_builddir)/libbase/libgnashbase.la \
+	$(GNASH_LIBS) \
 	$(NULL)
 
 as_prop_flagsTest_SOURCES = as_prop_flagsTest.cpp
 as_prop_flagsTest_LDADD = \
-	$(top_builddir)/server/libgnashserver.la \
-	$(top_builddir)/server/asobj/libgnashasobjs.la \
-	$(top_builddir)/server/parser/libgnashparser.la \
-	$(top_builddir)/server/vm/libgnashvm.la \
-	$(top_builddir)/libbase/libgnashbase.la \
+	$(GNASH_LIBS) \
 	$(NULL)
 
 DisplayListTest_SOURCES = DisplayListTest.cpp
 DisplayListTest_LDADD = \
-	$(top_builddir)/server/libgnashserver.la \
-	$(top_builddir)/server/asobj/libgnashasobjs.la \
-	$(top_builddir)/server/parser/libgnashparser.la \
-	$(top_builddir)/server/vm/libgnashvm.la \
-	$(top_builddir)/libbase/libgnashbase.la \
+	$(GNASH_LIBS) \
 	$(NULL)
 
 TEST_DRIVERS = ../simple.exp



From MAILER-DAEMON Mon Apr 16 09:07:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdQvj-0001ly-SM
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 09:07:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdQvi-0001lk-2Y
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:07:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdQvh-0001lY-B7
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:07:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdQvh-0001lV-7d
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:07:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdQr4-0004Xh-Qn
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:02:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdQr3-0000h9-Tz
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 13:02:50 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdQr3-0000h6-Jl
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 13:02:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdQr3-0000h6-Jl@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 13:02:49 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/getv...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 13:07:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 13:02:49

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: getvariable.as 

Log message:
	        * testsuite/actionscript.all/getvariable.as: check 'this' pointer when
	          calling a function trough a path.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2888&r2=1.2889
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2888
retrieving revision 1.2889
diff -u -b -r1.2888 -r1.2889
--- ChangeLog	16 Apr 2007 12:31:01 -0000	1.2888
+++ ChangeLog	16 Apr 2007 13:02:49 -0000	1.2889
@@ -1,5 +1,7 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/getvariable.as: check 'this' pointer when
+	  calling a function trough a path.
 	* testsuite/server/Makefile.am: add libgnashamf.la to GNASH libs.
 	* testsuite/generic-testrunner.sh, doc/C/internals.xml:
 	  Add -f switch to specify the maximum number of frame advancements.

Index: testsuite/actionscript.all/getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/getvariable.as	11 Apr 2007 07:31:53 -0000	1.10
+++ testsuite/actionscript.all/getvariable.as	16 Apr 2007 13:02:49 -0000	1.11
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.10 2007/04/11 07:31:53 zoulunkai Exp $";
+rcsid="$Id: getvariable.as,v 1.11 2007/04/16 13:02:49 strk Exp $";
 
 #include "check.as"
 
@@ -331,6 +331,24 @@
 func = new func_obj();
 func();
 
+//---------------------------------------------------------------------
+// Check scope of function called trough a path
+//---------------------------------------------------------------------
+
+num = 7;
+func = function() { return this.num; };
+o = new Object;
+o.func = func;
+o.num = 5;
+asm {
+        push 'checkpoint'
+	push 0
+	push '_root.o.func'
+	callfunction
+        setvariable
+};
+xcheck_equals(checkpoint, 5);
+
 
 //-----------------------------------------------------------------------
 // TODO: try use of 'with' stack



From MAILER-DAEMON Mon Apr 16 09:39:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdRQw-0002N9-26
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 09:39:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdRQt-0002Mk-R1
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:39:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdRQs-0002MW-6C
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:39:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdRQr-0002MT-VV
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:39:50 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HdRMF-0000UD-Bv
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 09:35:03 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3GDYtU4027361;
	Mon, 16 Apr 2007 15:34:59 +0200
Date: Mon, 16 Apr 2007 15:34:52 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <914847331.20070416153452@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <20070416112128.GC43881@keybit.net>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070416112128.GC43881@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 13:39:52 -0000

Hello Sandro,

Monday, April 16, 2007, 1:21:28 PM, you wrote:
SS> I'd agree on dropping use of ptr_list, by replacing it with a custom
SS> class with equivalent semantic (possibly even extracted from boost
SS> header if easy).

SS> I think supporting Debian Woody is important.

Ok, can you do that since you apparently know what it does?

As I wrote in IRC I don't feel doing that myself but I can do all the
testing...

Udo




From MAILER-DAEMON Mon Apr 16 12:11:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdTna-00049B-2H
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 12:11:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdTnY-00047I-Ma
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:11:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdTnW-00045B-7q
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:11:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdTnW-00044j-29
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:11:22 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HdTiq-0002vs-P1
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:06:34 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3GG67Q66135;
	Mon, 16 Apr 2007 18:06:07 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 16 Apr 2007 18:06:07 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
Message-ID: <20070416160607.GA63150@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070416112128.GC43881@keybit.net>
	<914847331.20070416153452@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <914847331.20070416153452@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 16:11:25 -0000

On Mon, Apr 16, 2007 at 03:34:52PM +0200, Udo Giacomozzi wrote:
> Hello Sandro,
> 
> Monday, April 16, 2007, 1:21:28 PM, you wrote:
> SS> I'd agree on dropping use of ptr_list, by replacing it with a custom
> SS> class with equivalent semantic (possibly even extracted from boost
> SS> header if easy).
> 
> SS> I think supporting Debian Woody is important.
> 
> Ok, can you do that since you apparently know what it does?

I won't be able to verify it works.
ptr_list is basically a std::list with ownership of it's elements.
When copied it clones underlying pointers.
Did you try extracting ptr_list from boost for inclusion in Gnash ?

--strk;



From MAILER-DAEMON Mon Apr 16 12:52:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdURI-0001mZ-TR
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 12:52:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdURG-0001mK-LG
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:52:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdURE-0001kA-3A
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:52:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdURD-0001k7-WA
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:52:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdUMZ-0004kz-6H
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 12:47:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdUMU-0000up-UV
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 16:47:31 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdUMU-0000ul-ES
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 16:47:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdUMU-0000ul-ES@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 16:47:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 16:52:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 16:47:30

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_environment.h 
	server/vm      : ASHandlers.cpp 
	testsuite/actionscript.all: getvariable.as 

Log message:
	        * server/as_environment.{cpp,h}: add a parse_path method to
	          return an actual object when the given parameter is actually
	          a path.
	        * server/vm/ASHandlers.cpp (ActionCallFunction): set 'this'
	          pointer to the object containing the function if the function
	          name is a path. Fixes bug #18698.
	        * testsuite/actionscript.all/getvariable.as: success in
	          callFunction(path.to_function), a few more tests of that kind.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2889&r2=1.2890
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/getvariable.as?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2889
retrieving revision 1.2890
diff -u -b -r1.2889 -r1.2890
--- ChangeLog	16 Apr 2007 13:02:49 -0000	1.2889
+++ ChangeLog	16 Apr 2007 16:47:29 -0000	1.2890
@@ -1,5 +1,16 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.{cpp,h}: add a parse_path method to
+	  return an actual object when the given parameter is actually
+	  a path.
+	* server/vm/ASHandlers.cpp (ActionCallFunction): set 'this'
+	  pointer to the object containing the function if the function
+	  name is a path. Fixes bug #18698.
+	* testsuite/actionscript.all/getvariable.as: success in
+	  callFunction(path.to_function), a few more tests of that kind.
+
+2007-04-16 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/getvariable.as: check 'this' pointer when
 	  calling a function trough a path.
 	* testsuite/server/Makefile.am: add libgnashamf.la to GNASH libs.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/as_environment.cpp	11 Apr 2007 05:04:14 -0000	1.67
+++ server/as_environment.cpp	16 Apr 2007 16:47:29 -0000	1.68
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.67 2007/04/11 05:04:14 zoulunkai Exp $ */
+/* $Id: as_environment.cpp,v 1.68 2007/04/16 16:47:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -408,6 +408,22 @@
     return true;
 }
 
+bool
+as_environment::parse_path(const std::string& var_path,
+		as_object** target, as_value& val)
+{
+	string path;
+	string var;
+	bool is_slash_based;
+	if( ! parse_path(var_path, path, var, &is_slash_based) ) return false;
+        as_object* target_ptr = is_slash_based ? find_object_slashsyntax(path) : find_object_dotsyntax(path); 
+	if ( ! target_ptr ) return false;
+
+	target_ptr->get_member(var, &val);
+	*target = target_ptr;
+	return true;
+}
+
 character*
 as_environment::find_target(const as_value& val) const
 {

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/as_environment.h	10 Apr 2007 17:41:42 -0000	1.44
+++ server/as_environment.h	16 Apr 2007 16:47:29 -0000	1.45
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_environment.h,v 1.44 2007/04/10 17:41:42 strk Exp $ */
+/* $Id: as_environment.h,v 1.45 2007/04/16 16:47:29 strk Exp $ */
 
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
@@ -415,6 +415,28 @@
 	static bool parse_path(const std::string& var_path, std::string& path,
 		std::string& var, bool* is_slash_based=NULL);
 
+	/// \brief
+	/// Try to parse a string as a variable path
+	//
+	/// Variable paths come in the form:
+	///
+	/// 	/path/to/some/sprite/:varname
+	///
+	/// (or same thing, without the last '/')
+	///
+	/// or
+	///	path.to.some.var
+	///
+	/// If there's no dot nor comma, or if the 'path' part
+	/// does not resolve to an object, this function returns false.
+	/// Otherwise, true is returned and 'target' and 'val'
+	/// parameters are appropriaterly set.
+	///
+	/// Note that if the parser variable name doesn't exist in the found
+	/// target, the 'val' will be undefined, but no other way to tell whether
+	/// the variable existed or not from the caller...
+	///
+	bool parse_path(const std::string& var_path, as_object** target, as_value& val);
 
 	/// The variables container (case-insensitive)
 	typedef std::map<std::string, as_value, StringNoCaseLessThen> Variables;

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/vm/ASHandlers.cpp	16 Apr 2007 11:19:48 -0000	1.94
+++ server/vm/ASHandlers.cpp	16 Apr 2007 16:47:30 -0000	1.95
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.94 2007/04/16 11:19:48 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.95 2007/04/16 16:47:30 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2166,7 +2166,16 @@
 	//env.dump_stack();
 
 	// Let's consider it a as a string and lookup the function.
-	as_value function = thread.getVariable(env.top(0).to_string(&env));
+        const std::string& funcname = env.top(0).to_string(&env);
+
+        as_value function;
+
+        as_object* this_ptr = thread.getThisPointer();
+        if ( ! env.parse_path(funcname, &this_ptr, function) )
+        {
+                function = thread.getVariable(funcname);
+        }
+
 	if ( ! function.is_object() ) 
 	{
 		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string(&env).c_str());
@@ -2200,7 +2209,7 @@
         debugger.callStackPush(function_name);
 	debugger.matchBreakPoint(function_name, true);
 #endif
-	as_value result = call_method(function, &env, thread.getThisPointer(),
+	as_value result = call_method(function, &env, this_ptr,
 				  nargs, env.get_top_index() - 2);
 
 	//log_msg("Function's result: %s", result.to_string(&env));

Index: testsuite/actionscript.all/getvariable.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/getvariable.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/actionscript.all/getvariable.as	16 Apr 2007 13:02:49 -0000	1.11
+++ testsuite/actionscript.all/getvariable.as	16 Apr 2007 16:47:30 -0000	1.12
@@ -19,7 +19,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: getvariable.as,v 1.11 2007/04/16 13:02:49 strk Exp $";
+rcsid="$Id: getvariable.as,v 1.12 2007/04/16 16:47:30 strk Exp $";
 
 #include "check.as"
 
@@ -333,6 +333,8 @@
 
 //---------------------------------------------------------------------
 // Check scope of function called trough a path
+// nothing to do with GetVariable, but I didnt' feel like adding another
+// file for testing this.. it's still related to tags and variable names
 //---------------------------------------------------------------------
 
 num = 7;
@@ -347,8 +349,44 @@
 	callfunction
         setvariable
 };
-xcheck_equals(checkpoint, 5);
+check_equals(checkpoint, 5);
 
+o2 = new Object;
+o2.m = new Object;
+o2.m.func = func;
+o2.num = 3;
+o2.m.num = 4;
+with (o2.m) {
+asm {
+        push 'checkpoint'
+	push 0
+	push 'func'
+	callfunction
+        setvariable
+};
+};
+check_equals(checkpoint, 4);
+
+_global.func = func;
+_global.num = 9;
+asm {
+        push 'checkpoint'
+	push 0
+	push 'func'
+	callfunction
+        setvariable
+};
+check_equals(checkpoint, 7);
+
+this["o2.m.func"] = function() { return 19; };
+asm {
+        push 'checkpoint'
+	push 0
+	push 'o2.m.func'
+	callfunction
+        setvariable
+};
+check_equals(checkpoint, 4);
 
 //-----------------------------------------------------------------------
 // TODO: try use of 'with' stack



From MAILER-DAEMON Mon Apr 16 14:28:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdVvl-0001yk-VM
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 14:28:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdVvk-0001yf-JN
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 14:28:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdVvi-0001yS-NU
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 14:27:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdVvi-0001yP-I5
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 14:27:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdVr4-0003je-DF
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 14:23:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdVr1-0007HQ-6c
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 18:23:07 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdVr0-0007HM-PC
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 18:23:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdVr0-0007HM-PC@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 16 Apr 2007 18:23:06 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Apr 2007 18:28:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/16 18:23:06

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_value.cpp as_value.h 
	                 debugger.cpp debugger.h edit_text_character.cpp 
	                 movie_root.h sprite_instance.cpp 
	                 sprite_instance.h timers.cpp 
	server/asobj   : LoadVars.cpp Object.cpp Sound.cpp Sound.h 
	                 Stage.cpp string.cpp xml.cpp xmlnode.cpp 
	                 xmlsocket.cpp 
	server/vm      : ASHandlers.cpp 
	testsuite/server: GetterSetterTest.cpp 

Log message:
	         Drop as_value::to_std_string() - update all callers.
	         Deprecated sprite_instance::get_variable.
	         Cost-corrected debugger interfaces.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2890&r2=1.2891
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.244&r2=1.245
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/GetterSetterTest.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2890
retrieving revision 1.2891
diff -u -b -r1.2890 -r1.2891
--- ChangeLog	16 Apr 2007 16:47:29 -0000	1.2890
+++ ChangeLog	16 Apr 2007 18:23:05 -0000	1.2891
@@ -1,5 +1,21 @@
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.cpp, server/as_value.cpp,
+	server/as_value.h, server/debugger.cpp, server/debugger.h,
+	server/edit_text_character.cpp, server/movie_root.h,
+	server/sprite_instance.cpp, server/sprite_instance.h,
+	server/timers.cpp, server/asobj/LoadVars.cpp,
+	server/asobj/Object.cpp, server/asobj/Sound.cpp,
+	server/asobj/Sound.h, server/asobj/Stage.cpp,
+	server/asobj/string.cpp, server/asobj/xml.cpp,
+	server/asobj/xmlnode.cpp, server/asobj/xmlsocket.cpp,
+	server/vm/ASHandlers.cpp, testsuite/server/GetterSetterTest.cpp:
+	 Drop as_value::to_std_string() - update all callers.
+	 Deprecated sprite_instance::get_variable.
+	 Cost-corrected debugger interfaces.
+
+2007-04-16 Sandro Santilli <strk@keybit.net>
+
 	* server/as_environment.{cpp,h}: add a parse_path method to
 	  return an actual object when the given parameter is actually
 	  a path.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/as_environment.cpp	16 Apr 2007 16:47:29 -0000	1.68
+++ server/as_environment.cpp	16 Apr 2007 18:23:05 -0000	1.69
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.68 2007/04/16 16:47:29 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.69 2007/04/16 18:23:05 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -444,7 +444,7 @@
 	}
 	else if ( val.is_string() )
 	{
-		return find_target(val.to_std_string());
+		return find_target(val.to_string());
 	}
 	else
 	{

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/as_value.cpp	15 Apr 2007 10:52:09 -0000	1.36
+++ server/as_value.cpp	16 Apr 2007 18:23:05 -0000	1.37
@@ -66,11 +66,13 @@
     }
 }
 
+#if 0
 std::string
 as_value::to_std_string(as_environment* env) const
 {
     return to_string(env);
 }
+#endif
 
 // Conversion to const std::string&.
 const std::string&

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/as_value.h	15 Apr 2007 10:52:09 -0000	1.43
+++ server/as_value.h	16 Apr 2007 18:23:05 -0000	1.44
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.43 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: as_value.h,v 1.44 2007/04/16 18:23:05 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -282,7 +282,7 @@
 	///	for object values. If NULL, toString() won't be run.
 	///
 	const std::string& to_string(as_environment* env=NULL) const;
-	std::string to_std_string(as_environment* env=NULL) const;
+	//std::string to_std_string(as_environment* env=NULL) const;
 
 	std::string to_debug_string() const;
 

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/debugger.cpp	16 Apr 2007 07:37:08 -0000	1.15
+++ server/debugger.cpp	16 Apr 2007 18:23:05 -0000	1.16
@@ -464,7 +464,7 @@
 }
 
 void
-Debugger::setWatchPoint(std::string &var, watch_state_e state)
+Debugger::setWatchPoint(const std::string &var, watch_state_e state)
 {
 //    GNASH_REPORT_FUNCTION;
     _watchpoints[var] = state;
@@ -472,7 +472,7 @@
 }
 
 void
-Debugger::removeWatchPoint(std::string &var)
+Debugger::removeWatchPoint(const std::string &var)
 {
 //    GNASH_REPORT_FUNCTION;
     
@@ -578,7 +578,7 @@
 // 		    cerr << name << " ";
 // 		}
 // 	    }
-            cerr << env.m_stack[i].to_string();
+            cerr << env.m_stack[i].to_debug_string();
 	    if (val.is_object()) {
 		boost::intrusive_ptr<as_object> o = val.to_object();
 		string name = lookupSymbol(o.get());
@@ -629,21 +629,21 @@
     dbglogfile << "Global Registers Dump:" << endl;
     for (unsigned int i=0; i<4; ++i) {
 	ss << "\treg #" << i << ": \"";
-	ss << env.global_register(i).to_std_string() << "\"" << endl;
+	ss << env.global_register(i).to_debug_string() << "\"" << endl;
     }
     cerr << ss.str().c_str() << endl;
 }
 
     // Change the value of a local variable
 void
-Debugger::changeLocalVariable(std::string &var, as_value &val)
+Debugger::changeLocalVariable(const std::string &var, as_value &val)
 {
 //    GNASH_REPORT_FUNCTION;
     changeLocalVariable(*_env, var, val);
 }
 
 void
-Debugger::changeLocalVariable(as_environment &env, std::string &var, as_value &val)
+Debugger::changeLocalVariable(as_environment &env, const std::string &var, as_value &val)
 {
 //    GNASH_REPORT_FUNCTION;
     env.set_local(var, val);

Index: server/debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/debugger.h	16 Apr 2007 07:37:08 -0000	1.10
+++ server/debugger.h	16 Apr 2007 18:23:05 -0000	1.11
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: debugger.h,v 1.10 2007/04/16 07:37:08 strk Exp $ */
+/* $Id: debugger.h,v 1.11 2007/04/16 18:23:05 strk Exp $ */
 
 #ifndef __DEBUGGER_H__
 #define __DEBUGGER_H__
@@ -58,8 +58,8 @@
 
     /// Set a watchpoint of a variable. Gnash stops and generates a
     /// command prompt when there is a match.
-    void setWatchPoint(std::string &var, watch_state_e state);
-    void removeWatchPoint(std::string &var);
+    void setWatchPoint(const std::string &var, watch_state_e state);
+    void removeWatchPoint(const std::string &var);
     void dumpWatchPoints();
 
     /// What to do when we've hit a breakpoint
@@ -118,8 +118,8 @@
     void changeStackValue(as_environment &env, int index, as_value &val);
     
     // Change the value of a local variable
-    void changeLocalVariable(std::string &var, as_value &val);
-    void changeLocalVariable(as_environment &env, std::string &var, as_value &val);
+    void changeLocalVariable(const std::string &var, as_value &val);
+    void changeLocalVariable(as_environment &env, const std::string &var, as_value &val);
     
     // Change the value of a local variable
     void changeLocalRegister(unsigned index, as_value &val);

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- server/edit_text_character.cpp	15 Apr 2007 18:50:29 -0000	1.55
+++ server/edit_text_character.cpp	16 Apr 2007 18:23:05 -0000	1.56
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.55 2007/04/15 18:50:29 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.56 2007/04/16 18:23:05 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -79,7 +79,7 @@
 	boost::intrusive_ptr<edit_text_character> text = ensureType<edit_text_character>(fn.this_ptr);
 
 	assert ( fn.nargs > 0 );
-	std::string newname = fn.arg(0).to_std_string();
+	const std::string& newname = fn.arg(0).to_string(&fn.env());
 
 	text->set_variable_name(newname);
 

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/movie_root.h	11 Apr 2007 14:20:20 -0000	1.47
+++ server/movie_root.h	16 Apr 2007 18:23:05 -0000	1.48
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.47 2007/04/11 14:20:20 strk Exp $ */
+/* $Id: movie_root.h,v 1.48 2007/04/16 18:23:05 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -348,12 +348,6 @@
 		_movie->set_variable(path_to_var, new_value);
 	}
 
-	/// Delegate to wrapped movie_instance
-	const char* get_variable(const char* path_to_var) const
-	{
-		return _movie->get_variable(path_to_var);
-	}
-
 	/// For ActionScript interfacing convenience.
 	const char* call_method(const char* method_name,
 			const char* method_arg_fmt, ...);

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -b -r1.244 -r1.245
--- server/sprite_instance.cpp	16 Apr 2007 11:19:48 -0000	1.244
+++ server/sprite_instance.cpp	16 Apr 2007 18:23:05 -0000	1.245
@@ -145,7 +145,7 @@
 	}
 
 	// Get exported resource 
-	std::string id_name = fn.arg(0).to_std_string();
+	const std::string& id_name = fn.arg(0).to_string(&fn.env());
 
 	boost::intrusive_ptr<resource> exported = sprite->get_movie_definition()->get_exported_resource(id_name.c_str());
 	if ( exported == NULL )
@@ -170,7 +170,7 @@
 		return rv;
 	}
 
-	std::string newname = fn.arg(1).to_std_string();
+	const std::string& newname = fn.arg(1).to_string(&fn.env());
 
 	// should we support negative depths ? YES !
 	int depth_val = uint16_t(fn.arg(2).to_number());
@@ -394,7 +394,7 @@
 		return as_value();
 	}
 
-	std::string newname = fn.arg(0).to_std_string(&(fn.env()));
+	const std::string& newname = fn.arg(0).to_string(&fn.env());
 	int depth = int(fn.arg(1).to_number());
 
 	boost::intrusive_ptr<sprite_instance> ch;
@@ -510,7 +510,7 @@
 		return as_value();
 	}
 
-	std::string urlstr = fn.arg(0).to_std_string();
+	const std::string& urlstr = fn.arg(0).to_string(&fn.env());
 	if (urlstr.empty())
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
@@ -558,7 +558,7 @@
 		return as_value();
 	}
 
-	std::string urlstr = fn.arg(0).to_std_string();
+	const std::string& urlstr = fn.arg(0).to_string(&fn.env());
 	if (urlstr.empty())
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
@@ -577,7 +577,7 @@
 
 	if (fn.nargs > 1)
 	{
-		std::string methodstring = fn.arg(1).to_std_string();
+		const std::string& methodstring = fn.arg(1).to_string(&fn.env());
 		// Should we be case-insensitive in comparing these ?
 		if ( methodstring == "GET" ) method = 1;
 		else if ( methodstring == "POST" ) method = 2;
@@ -1687,13 +1687,13 @@
 
 	as_environment* env = const_cast<as_environment*>(&m_as_environment);
 
-	as_value str(frame_spec.to_std_string(env));
+	as_value str(frame_spec.to_string(env));
 
 	double num =  str.to_number(env);
 
 	if ( ! isfinite(num) || int(num) != num )
 	{
-		return m_def->get_labeled_frame(frame_spec.to_std_string(env), frameno);
+		return m_def->get_labeled_frame(frame_spec.to_string(env), frameno);
 	}
 
 	// TODO: are we sure we shouldn't check for frames labeled with negative numbers ?
@@ -1988,7 +1988,7 @@
 		const as_value& val)
 {
 #ifdef DEBUG_DYNTEXT_VARIABLES
-log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_string().c_str());
+log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_debug_string().c_str());
 #endif
 
 	if ( val.is_function() )
@@ -2011,7 +2011,8 @@
 #ifdef DEBUG_DYNTEXT_VARIABLES
 		log_msg(" it's a Text Variable!");
 #endif
-		etc->set_text_value(val.to_string().c_str());
+		as_environment* env = const_cast<as_environment*>(&m_as_environment);
+		etc->set_text_value(val.to_string(env).c_str());
 	}
 #ifdef DEBUG_DYNTEXT_VARIABLES
 	else
@@ -2025,23 +2026,6 @@
 
 }
 
-const char* sprite_instance::get_variable(const char* path_to_var) const
-{
-    assert(m_parent == NULL);	// should only be called on the root movie.
-
-    std::string path(path_to_var);
-
-    // NOTE: this is static so that the string
-    // value won't go away after we return!!!
-    // It'll go away during the next call to this
-    // function though!!!  NOT THREAD SAFE!
-    static as_value	val;
-
-    val = m_as_environment.get_variable(path);
-
-    return val.to_string().c_str();	// ack!
-}
-
 void sprite_instance::set_variable(const char* path_to_var,
 		const wchar_t* new_value)
 {

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/sprite_instance.h	15 Apr 2007 10:52:09 -0000	1.97
+++ server/sprite_instance.h	16 Apr 2007 18:23:06 -0000	1.98
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.97 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: sprite_instance.h,v 1.98 2007/04/16 18:23:06 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -502,12 +502,11 @@
 		const char* new_value);
 
 	/// Set the named variable to the wide value
+	//
+	/// TODO: check if worth deprecating
 	virtual void set_variable(const char* path_to_var,
 		const wchar_t* new_value);
 
-	/// Returns address to static buffer. NOT THREAD SAFE!
-	virtual const char* get_variable(const char* path_to_var) const;
-
 	// See dox in as_object.h
 	bool get_member(const std::string& name, as_value* val);
 

Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/timers.cpp	11 Apr 2007 17:54:21 -0000	1.29
+++ server/timers.cpp	16 Apr 2007 18:23:06 -0000	1.30
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: timers.cpp,v 1.29 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: timers.cpp,v 1.30 2007/04/16 18:23:06 strk Exp $ */
 
 #include "timers.h"
 #include "as_function.h" // for class as_function
@@ -170,7 +170,7 @@
 	if ( ! as_func )
 	{
 		as_value method;
-		std::string method_name = fn.arg(1).to_std_string();
+		const std::string& method_name = fn.arg(1).to_string(&fn.env());
 		if ( ! obj->get_member(method_name, &method) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/LoadVars.cpp	14 Apr 2007 15:53:17 -0000	1.20
+++ server/asobj/LoadVars.cpp	16 Apr 2007 18:23:06 -0000	1.21
@@ -529,7 +529,7 @@
 		return as_value(false);
 	}
 
-	std::string urlstr = fn.arg(0).to_std_string();
+	const std::string& urlstr = fn.arg(0).to_string();
 	if ( urlstr.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
@@ -565,7 +565,7 @@
 		return as_value(false);
 	}
 
-	std::string urlstr = fn.arg(0).to_std_string();
+	const std::string& urlstr = fn.arg(0).to_string();
 	if ( urlstr.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
@@ -585,7 +585,7 @@
 
 	// Post by default, override by ActionScript third argument
 	bool post = true;
-	if ( fn.nargs > 2 && fn.arg(2).to_std_string() == "GET" ) post = false;
+	if ( fn.nargs > 2 && fn.arg(2).to_string() == "GET" ) post = false;
 
 	//log_msg("LoadVars.sendAndLoad(%s, %p) called, and returning TRUE", urlstr.c_str(), target.get());
 

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/Object.cpp	15 Apr 2007 10:52:09 -0000	1.22
+++ server/asobj/Object.cpp	16 Apr 2007 18:23:06 -0000	1.23
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: Object.cpp,v 1.22 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: Object.cpp,v 1.23 2007/04/16 18:23:06 strk Exp $ */
 
 // Implementation of ActionScript Object class.
 
@@ -182,7 +182,7 @@
 		}
 	}
 
-	std::string propname = fn.arg(0).to_string();
+	const std::string& propname = fn.arg(0).to_string(&(fn.env()));
 	if ( propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
@@ -246,7 +246,7 @@
 		}
 	}
 
-	std::string symbolid = fn.arg(0).to_std_string();
+	const std::string& symbolid = fn.arg(0).to_string(&(fn.env()));
 	if ( symbolid.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
@@ -319,11 +319,11 @@
 		return as_value();
 	}
 	as_value& arg = fn.arg(0);
-	std::string propname = arg.to_std_string();
+	const std::string& propname = arg.to_string(&(fn.env()));
 	if ( arg.is_undefined() || propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.hasOwnProperty('%s')", arg.to_string().c_str());
+		log_aserror("Invalid call to Object.hasOwnProperty('%s')", arg.to_debug_string().c_str());
 		);
 		return as_value();
 	}
@@ -342,11 +342,11 @@
 		return as_value();
 	}
 	as_value& arg = fn.arg(0);
-	std::string propname = arg.to_std_string();
+	const std::string& propname = arg.to_string(&(fn.env()));
 	if ( arg.is_undefined() || propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.isPropertyEnumerable('%s')", arg.to_string().c_str());
+		log_aserror("Invalid call to Object.isPropertyEnumerable('%s')", arg.to_debug_string().c_str());
 		);
 		return as_value();
 	}

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/Sound.cpp	15 Apr 2007 10:52:09 -0000	1.13
+++ server/asobj/Sound.cpp	16 Apr 2007 18:23:06 -0000	1.14
@@ -71,7 +71,7 @@
 
 
 void
-Sound::attachSound(int si, const char* name)
+Sound::attachSound(int si, const std::string& name)
 {
 	soundId = si;
 	soundName = name;
@@ -281,7 +281,7 @@
 	int si = -1;
 
 	if (fn.nargs > 0) {
-		const char* name = fn.arg(0).to_string().c_str();
+		const std::string& name = fn.arg(0).to_string(&(fn.env()));
 
 		// check the import.
 		movie_definition* def = fn.env().get_target()->get_root_movie()->get_movie_definition();
@@ -290,7 +290,7 @@
 		if (res == NULL)
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-		    log_swferror("import error: resource '%s' is not exported", name);
+		    log_swferror("import error: resource '%s' is not exported", name.c_str());
 		    	);
 		    return as_value();
 		}
@@ -327,10 +327,10 @@
 
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
 
-    const char* name = fn.arg(0).to_string().c_str();
-    if (!name) {
+    const std::string& name = fn.arg(0).to_string(&(fn.env()));
+    if (name.empty()) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("attachSound need a non-null argument");
+		log_aserror("attachSound need a non-empty string");
 		);
 		return as_value();
 	}
@@ -342,7 +342,7 @@
 	if (res == NULL)
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("import error: resource '%s' is not exported", name);
+		log_swferror("import error: resource '%s' is not exported", name.c_str());
 			);
 		return as_value();
 	}
@@ -437,7 +437,7 @@
 	}
 
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
-	so->loadSound(fn.arg(0).to_std_string(), fn.arg(1).to_bool());
+	so->loadSound(fn.arg(0).to_string(&(fn.env())), fn.arg(1).to_bool());
 
 	return as_value();
 }

Index: server/asobj/Sound.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/Sound.h	9 Mar 2007 14:38:29 -0000	1.3
+++ server/asobj/Sound.h	16 Apr 2007 18:23:06 -0000	1.4
@@ -40,7 +40,7 @@
 public:
 	Sound();
 	~Sound();
-	virtual void attachSound(int si, const char* name);
+	virtual void attachSound(int si, const std::string& name);
 	virtual void getBytesLoaded();
 	virtual void getBytesTotal();
 	virtual void getPan();

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/asobj/Stage.cpp	29 Mar 2007 12:42:32 -0000	1.10
+++ server/asobj/Stage.cpp	16 Apr 2007 18:23:06 -0000	1.11
@@ -59,7 +59,7 @@
 Stage::onResize(as_environment* env)
 {
 	as_value v;
-	if ( get_member("scaleMode", &v) && v.to_std_string(env) == std::string("noScale") )
+	if ( get_member("scaleMode", &v) && v.to_string(env) == "noScale" )
 	{
 		notifyResize(env);
 	}
@@ -218,7 +218,7 @@
 	{
 		Stage::ScaleMode mode = Stage::showAll;
 
-		std::string str = fn.arg(0).to_std_string(&(fn.env()));
+		const std::string& str = fn.arg(0).to_string(&(fn.env()));
 		if ( str == "noScale" ) mode = Stage::noScale;
 		else if ( str == "exactFill" ) mode = Stage::exactFill;
 		else if ( str == "noBorder" ) mode = Stage::noBorder;

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/string.cpp	12 Apr 2007 16:31:41 -0000	1.27
+++ server/asobj/string.cpp	16 Apr 2007 18:23:06 -0000	1.28
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.27 2007/04/12 16:31:41 strk Exp $ */
+/* $Id: string.cpp,v 1.28 2007/04/16 18:23:06 strk Exp $ */
 
 // Implementation of ActionScript String class.
 
@@ -153,7 +153,7 @@
     std::string str = obj->str();
 
     for (unsigned int i = 0; i < fn.nargs; i++) {
-        str += fn.arg(i).to_std_string();
+        str += fn.arg(i).to_string(&(fn.env()));
     }
 
     return as_value(str);
@@ -226,7 +226,7 @@
         return as_value(array.get());
     }
 
-    std::string delim = fn.arg(0).to_std_string();
+    const std::string& delim = fn.arg(0).to_string(&(fn.env()));
 
     // SWF5 didn't support multichar or empty delimiter
     if ( fn.env().get_version() < 6 )
@@ -287,7 +287,7 @@
 
     ENSURE_FN_ARGS(1, 2, -1);
 
-    std::string toFind = fn.arg(0).to_std_string();
+    const std::string& toFind = fn.arg(0).to_string(&(fn.env()));
 
     size_t start = str.size();
 
@@ -383,7 +383,7 @@
 
     ENSURE_FN_ARGS(1, 2, -1);
 
-    std::string toFind = fn.arg(0).to_std_string();
+    const std::string& toFind = fn.arg(0).to_string(&(fn.env()));
 
     size_t start = 0;
 
@@ -513,7 +513,7 @@
     std::string& str = obj->str();
 
     if (fn.nargs > 0) {
-        str = fn.arg(0).to_std_string();
+        str = fn.arg(0).to_string(&(fn.env()));
     }
 
     // this shouldn't be needed

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/xml.cpp	15 Apr 2007 10:52:09 -0000	1.37
+++ server/asobj/xml.cpp	16 Apr 2007 18:23:06 -0000	1.38
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.37 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: xml.cpp,v 1.38 2007/04/16 18:23:06 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -484,7 +484,7 @@
   
     boost::intrusive_ptr<XML> xml_obj = ensureType<XML>(fn.this_ptr);
   
-    std::string filespec = fn.arg(0).to_string(); 
+    const std::string& filespec = fn.arg(0).to_string(&(fn.env()));
 
     URL url(filespec, get_base_url());
 
@@ -558,7 +558,7 @@
             }
         }
 
-        std::string xml_in = fn.arg(0).to_std_string();
+        const std::string& xml_in = fn.arg(0).to_string(&(fn.env()));
         if ( xml_in.empty() )
         {
             IF_VERBOSE_ASCODING_ERRORS(
@@ -610,7 +610,7 @@
 //    GNASH_REPORT_FUNCTION;
     
     if (fn.nargs > 0) {
-        const char *text = fn.arg(0).to_string().c_str();
+        const std::string& text = fn.arg(0).to_string(&(fn.env()));
 	XMLNode *xml_obj = new XMLNode();
 //	cerr << "create new child XMLNode is at " << (void *)xml_obj << endl;
 	xml_obj->nodeNameSet(text);
@@ -640,10 +640,9 @@
 //    GNASH_REPORT_FUNCTION;
 
     XMLNode *xml_obj;
-    const char *text;
 
     if (fn.nargs > 0) {
-	text = fn.arg(0).to_string().c_str(); 
+	const std::string& text = fn.arg(0).to_string(&(fn.env()));
 	xml_obj = new XMLNode;
 	xml_obj->nodeValueSet(text);
 	xml_obj->nodeTypeSet(XMLNode::tText);
@@ -690,7 +689,7 @@
 
     if (fn.nargs > 0)
     {
-        std::string text = fn.arg(0).to_std_string(&(fn.env()));
+        const std::string& text = fn.arg(0).to_string(&(fn.env()));
         ptr->parseXML(text);
     }
     

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/xmlnode.cpp	15 Apr 2007 10:52:09 -0000	1.30
+++ server/asobj/xmlnode.cpp	16 Apr 2007 18:23:06 -0000	1.31
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.30 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: xmlnode.cpp,v 1.31 2007/04/16 18:23:06 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -424,10 +424,10 @@
     XMLNode *xml_obj = new XMLNode;
     if ( fn.nargs > 0 )
     {
-        xml_obj->nodeTypeSet(XMLNode::NodeType(int(fn.arg(0).to_number())));
+        xml_obj->nodeTypeSet(XMLNode::NodeType(int(fn.arg(0).to_number(&(fn.env())))));
         if (fn.nargs > 1)
         {
-            xml_obj->nodeValueSet(fn.arg(1).to_std_string(&(fn.env())));
+            xml_obj->nodeValueSet(fn.arg(1).to_string(&(fn.env())));
         }
     }
     
@@ -575,8 +575,7 @@
     }
     else
     {
-        //log_msg(" arg(0) == '%s'", fn.arg(0).to_string());
-        ptr->nodeValueSet(fn.arg(0).to_std_string(&(fn.env())));
+        ptr->nodeValueSet(fn.arg(0).to_string(&(fn.env())));
     }
     return rv;
 }
@@ -596,7 +595,7 @@
     }
     else
     {
-	ptr->nodeNameSet(fn.arg(0).to_string().c_str());
+	ptr->nodeNameSet(fn.arg(0).to_string(&(fn.env())));
     }
     return rv;
 }

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/xmlsocket.cpp	10 Apr 2007 20:24:23 -0000	1.24
+++ server/asobj/xmlsocket.cpp	16 Apr 2007 18:23:06 -0000	1.25
@@ -435,7 +435,7 @@
     }
     
     as_value hostval = fn.arg(0);
-    std::string host = hostval.to_std_string(&fn.env());
+    const std::string& host = hostval.to_string(&fn.env());
     int port = int(fn.arg(1).to_number(&fn.env()));
     
     bool success = ptr->obj.connect(host.c_str(), port);
@@ -479,7 +479,7 @@
     GNASH_REPORT_FUNCTION;
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
-    std::string object = fn.arg(0).to_std_string(&fn.env());
+    const std::string& object = fn.arg(0).to_string(&fn.env());
     //  log_msg("%s: host=%s, port=%g\n", __FUNCTION__, host, port);
     return as_value(ptr->obj.send(object));
 }
@@ -564,7 +564,7 @@
     }
 
     as_environment& env = fn.env();
-    std::string xmlin = fn.arg(0).to_std_string(&env);
+    const std::string& xmlin = fn.arg(0).to_string(&env);
 
     if ( xmlin.empty() )
     {

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- server/vm/ASHandlers.cpp	16 Apr 2007 16:47:30 -0000	1.95
+++ server/vm/ASHandlers.cpp	16 Apr 2007 18:23:06 -0000	1.96
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.95 2007/04/16 16:47:30 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.96 2007/04/16 18:23:06 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1049,7 +1049,7 @@
 	thread.ensureStack(2); // prop num, target
 
 	as_value& tgt_val = env.top(1);
-	std::string tgt_str = tgt_val.to_std_string(&env);
+	std::string tgt_str = tgt_val.to_string(&env);
 	character *target = NULL;
 	if ( tgt_str.empty() )
 	{
@@ -1210,8 +1210,8 @@
 
     thread.ensureStack(1); 
 
-    //std::string val = env.pop().to_std_string_versioned(VM::get().getSWFVersion(), &env);
-    std::string val = env.pop().to_std_string(&env);
+    //std::string val = env.pop().to_string_versioned(VM::get().getSWFVersion(), &env);
+    std::string val = env.pop().to_string(&env);
     log_trace(val.c_str());
 }
 
@@ -2484,7 +2484,7 @@
 
 	// Get the object
 	as_value& var_name = env.top(0);
-	string var_string = var_name.to_std_string(&env);
+	string var_string = var_name.to_string(&env);
 
 	as_value variable = thread.getVariable(var_string);
 

Index: testsuite/server/GetterSetterTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/GetterSetterTest.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/server/GetterSetterTest.cpp	20 Mar 2007 15:01:20 -0000	1.9
+++ testsuite/server/GetterSetterTest.cpp	16 Apr 2007 18:23:06 -0000	1.10
@@ -52,7 +52,7 @@
 	boost::intrusive_ptr<as_object> o = fn.this_ptr;
 	assert(fn.nargs == 1);
 	as_value& val = fn.arg(0);
-	o->set_member(val.to_std_string(), val);
+	o->set_member(val.to_string(&fn.env()), val);
 	return as_value();
 }
 



From MAILER-DAEMON Mon Apr 16 21:30:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdcX4-00006P-JW
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 21:30:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdcX2-0008WN-CD
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:30:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdcX0-0008Vj-UT
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:30:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdcX0-0008Vg-Pn
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:30:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HdcSK-00014V-Qx
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:26:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdcSJ-0000DO-U7
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 01:26:04 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HdcSJ-0000DL-Gx
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 01:26:03 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdcSJ-0000DL-Gx@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 17 Apr 2007 01:26:03 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/get_fra...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 01:30:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/17 01:26:03

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: get_frame_number_test.c 

Log message:
	more insane tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2891&r2=1.2892
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2891
retrieving revision 1.2892
diff -u -b -r1.2891 -r1.2892
--- ChangeLog	16 Apr 2007 18:23:05 -0000	1.2891
+++ ChangeLog	17 Apr 2007 01:26:03 -0000	1.2892
@@ -1,3 +1,8 @@
+2007-04-17 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/get_frame_number_test.c:
+	  more tests.
+	  
 2007-04-16 Sandro Santilli <strk@keybit.net>
 
 	* server/as_environment.cpp, server/as_value.cpp,

Index: testsuite/misc-ming.all/get_frame_number_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/get_frame_number_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/get_frame_number_test.c	16 Apr 2007 12:31:02 -0000	1.3
+++ testsuite/misc-ming.all/get_frame_number_test.c	17 Apr 2007 01:26:03 -0000	1.4
@@ -107,7 +107,13 @@
                   "function func4() {}"
                   "func4.prototype.toString = function() { return '4.8'; }; "
                   "func4.prototype.valueOf = function() { return '4.8';};"
-                  "x4 = new func4();");
+                  "x4 = new func4();"
+                  
+                  "x5 = new Number(3);"
+                  "Number.prototype.toString =  function () { return '4'; }; "
+                  
+                  "x6 = new String('3');"
+                  "String.prototype.toString =  function () { return '4'; }; " );
                   
                   
   add_actions(mo, " x = '8'; gotoAndStop(x); ");     // ActionGotoExpression
@@ -121,7 +127,7 @@
   check_equals(mo, "_currentframe", "4");
   
   add_actions(mo, " gotoAndStop(x1); ");             // ActionGotoExpression
-  /* reach the last frame, toString invoked */
+  /* reach the last frame, toString() invoked */
   check_equals(mo, "_currentframe", "7"); 
   
   /* reset _currentframe to 1 */
@@ -131,13 +137,35 @@
   check_equals(mo, "_currentframe", "1"); 
   
   add_actions(mo, " gotoAndStop(x3); ");             // ActionGotoExpression
-  /* reach the last frame */
+  /* reach the last frame, toString() invoked */
   check_equals(mo, "_currentframe", "7");
   
   add_actions(mo, " gotoAndStop(x4); ");             // ActionGotoExpression
   /* "4.8" is a valid frame label, toString() invoked */
   check_equals(mo, "_currentframe", "5");
   
+  check_equals(mo, "_root.x5", "3");
+  check_equals(mo, "_root.x5.toString()", "'4'");
+  check_equals(mo, "_root.x5.toString()", "4");
+  add_actions(mo, " gotoAndStop(x5); ");  // ActionGotoExpression
+  /* toString() invoked again for Number Object */
+  check_equals(mo, "_currentframe", "4");
+  
+  /* reset _currentframe to 1 */
+  add_actions(mo, " gotoAndStop(1); "); 
+  
+  check_equals(mo, "_root.x6", "'3'");
+  check_equals(mo, "_root.x6.toString()", "'4'");
+  check_equals(mo, "_root.x6.toString()", "4");
+  add_actions(mo, " gotoAndStop(x6); ");  // ActionGotoExpression
+  /* toString() not invoked for String Object ??? */
+  xcheck_equals(mo, "_currentframe", "3");
+  
+  /* This ensure the movie stop at the last frame,
+   * and the actions in last frame will not be pushed again 
+   */
+  add_actions(mo, " gotoAndStop(10000); ");  // ActionGotoFrame
+  check_equals(mo, "_currentframe", "7");
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); /* 7th frame */
 



From MAILER-DAEMON Mon Apr 16 21:44:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdckQ-0004eF-Bf
	for mharc-gnash-commit@gnu.org; Mon, 16 Apr 2007 21:44:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdckO-0004ds-5i
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:44:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdckM-0004dB-LD
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:44:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdckM-0004d7-Gu
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:44:42 -0400
Received: from nz-out-0506.google.com ([64.233.162.232])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hdcfg-00033D-G9
	for gnash-commit@gnu.org; Mon, 16 Apr 2007 21:39:52 -0400
Received: by nz-out-0506.google.com with SMTP id s1so1320395nze
	for <gnash-commit@gnu.org>; Mon, 16 Apr 2007 18:39:51 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=fhZK9+tFIbmT7yaQ44r11ieVaEBZ7IarUaSOGedjyqN4z95I7QP4CFPmF+cAj/iZvjQIJCYBp+V7U1ijE0iDW9ixmrp21cvPW9STXyp0/mks0oAJ1xwj/CVL1+8UtWLWz0YNF44b1rY0MIrnWVsr/b1BKKu5T5n+rPkmm4cz49s=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=t+G6GtZpfBDpracgH+sBIMRjRi2Hc9arfkdLiqvf0dfZZ+cdAP0GE6onUWURmO5WTIjou+UN5AHCi+0oGadFlAMXyQpoL62u3/2y3a8mWhWLelxDvVvZfLfxOxPNG9pqh5muOA1fXZFQPCW9qI2cEdBOPWgDUlxoRo38woHyYtw=
Received: by 10.114.25.3 with SMTP id 3mr2183095way.1176773991298;
	Mon, 16 Apr 2007 18:39:51 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Mon, 16 Apr 2007 18:39:51 -0700 (PDT)
Message-ID: <ca4b43ff0704161839p503e9139md25232cf35e18175@mail.gmail.com>
Date: Tue, 17 Apr 2007 09:39:51 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/get_fra...
In-Reply-To: <E1HdcSJ-0000DL-Gx@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HdcSJ-0000DL-Gx@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 01:44:44 -0000

+  /* This ensure the movie stop at the last frame,
+   * and the actions in last frame will not be pushed again
+   */   [1]
+  add_actions(mo, " gotoAndStop(10000); ");  // ActionGotoFrame
   add_actions(mo, " _root.totals(); stop(); ");

but [1] does not ensure  "stop();"  is the last action to be executed.
There are other actions(target frame actions pushed by gotoFrame...)
appended after it.  Is this bad for gprocessor?



On 4/17/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/17 01:26:03
>
> Modified files:
>        .              : ChangeLog
>        testsuite/misc-ming.all: get_frame_number_test.c
>
> Log message:
>        more insane tests
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2891&r2=1.2892
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/get_frame_number_test.c?cvsroot=gnash&r1=1.3&r2=1.4
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2891
> retrieving revision 1.2892
> diff -u -b -r1.2891 -r1.2892
> --- ChangeLog   16 Apr 2007 18:23:05 -0000      1.2891
> +++ ChangeLog   17 Apr 2007 01:26:03 -0000      1.2892
> @@ -1,3 +1,8 @@
> +2007-04-17 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * testsuite/misc-ming.all/get_frame_number_test.c:
> +         more tests.
> +
>  2007-04-16 Sandro Santilli <strk@keybit.net>
>
>        * server/as_environment.cpp, server/as_value.cpp,
>
> Index: testsuite/misc-ming.all/get_frame_number_test.c
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/get_frame_number_test.c,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -b -r1.3 -r1.4
> --- testsuite/misc-ming.all/get_frame_number_test.c     16 Apr 2007 12:31:02 -0000      1.3
> +++ testsuite/misc-ming.all/get_frame_number_test.c     17 Apr 2007 01:26:03 -0000      1.4
> @@ -107,7 +107,13 @@
>                   "function func4() {}"
>                   "func4.prototype.toString = function() { return '4.8'; }; "
>                   "func4.prototype.valueOf = function() { return '4.8';};"
> -                  "x4 = new func4();");
> +                  "x4 = new func4();"
> +
> +                  "x5 = new Number(3);"
> +                  "Number.prototype.toString =  function () { return '4'; }; "
> +
> +                  "x6 = new String('3');"
> +                  "String.prototype.toString =  function () { return '4'; }; " );
>
>
>   add_actions(mo, " x = '8'; gotoAndStop(x); ");     // ActionGotoExpression
> @@ -121,7 +127,7 @@
>   check_equals(mo, "_currentframe", "4");
>
>   add_actions(mo, " gotoAndStop(x1); ");             // ActionGotoExpression
> -  /* reach the last frame, toString invoked */
> +  /* reach the last frame, toString() invoked */
>   check_equals(mo, "_currentframe", "7");
>
>   /* reset _currentframe to 1 */
> @@ -131,13 +137,35 @@
>   check_equals(mo, "_currentframe", "1");
>
>   add_actions(mo, " gotoAndStop(x3); ");             // ActionGotoExpression
> -  /* reach the last frame */
> +  /* reach the last frame, toString() invoked */
>   check_equals(mo, "_currentframe", "7");
>
>   add_actions(mo, " gotoAndStop(x4); ");             // ActionGotoExpression
>   /* "4.8" is a valid frame label, toString() invoked */
>   check_equals(mo, "_currentframe", "5");
>
> +  check_equals(mo, "_root.x5", "3");
> +  check_equals(mo, "_root.x5.toString()", "'4'");
> +  check_equals(mo, "_root.x5.toString()", "4");
> +  add_actions(mo, " gotoAndStop(x5); ");  // ActionGotoExpression
> +  /* toString() invoked again for Number Object */
> +  check_equals(mo, "_currentframe", "4");
> +
> +  /* reset _currentframe to 1 */
> +  add_actions(mo, " gotoAndStop(1); ");
> +
> +  check_equals(mo, "_root.x6", "'3'");
> +  check_equals(mo, "_root.x6.toString()", "'4'");
> +  check_equals(mo, "_root.x6.toString()", "4");
> +  add_actions(mo, " gotoAndStop(x6); ");  // ActionGotoExpression
> +  /* toString() not invoked for String Object ??? */
> +  xcheck_equals(mo, "_currentframe", "3");
> +
> +  /* This ensure the movie stop at the last frame,
> +   * and the actions in last frame will not be pushed again
> +   */
> +  add_actions(mo, " gotoAndStop(10000); ");  // ActionGotoFrame
> +  check_equals(mo, "_currentframe", "7");
>   add_actions(mo, " _root.totals(); stop(); ");
>   SWFMovie_nextFrame(mo); /* 7th frame */
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Tue Apr 17 02:00:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdgjr-0002gW-2X
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 02:00:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdgjp-0002f1-9x
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 02:00:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdgjo-0002eI-AC
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 02:00:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdgjo-0002eF-2n
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 02:00:24 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hdgf6-000129-D4
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 01:55:32 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3H5tRG78950;
	Tue, 17 Apr 2007 07:55:27 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Tue, 17 Apr 2007 07:55:27 +0200
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/get_fra...
Message-ID: <20070417055527.GB63150@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1HdcSJ-0000DL-Gx@cvs>
	<ca4b43ff0704161839p503e9139md25232cf35e18175@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704161839p503e9139md25232cf35e18175@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 06:00:25 -0000

On Tue, Apr 17, 2007 at 09:39:51AM +0800, zou lunkai wrote:
> +  /* This ensure the movie stop at the last frame,
> +   * and the actions in last frame will not be pushed again
> +   */   [1]
> +  add_actions(mo, " gotoAndStop(10000); ");  // ActionGotoFrame
>   add_actions(mo, " _root.totals(); stop(); ");
> 
> but [1] does not ensure  "stop();"  is the last action to be executed.
> There are other actions(target frame actions pushed by gotoFrame...)
> appended after it.  Is this bad for gprocessor?

I fixed the problem in another way: changing the test *runner* to limit
the number of frame advancement. See the Makefile.am.
Haven't tested your last commit yet, but worked before that.

--strk;



From MAILER-DAEMON Tue Apr 17 03:03:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdhis-0006Rh-IM
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 03:03:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdhir-0006RW-DV
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:03:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdhir-0006RK-08
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:03:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdhiq-0006RH-TU
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:03:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hdhe9-00024S-Eo
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 02:58:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdhe8-0000yD-PW
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:58:36 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hdhe8-0000yA-Cd
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:58:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdhe8-0000yA-Cd@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 17 Apr 2007 06:58:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 07:03:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/17 06:58:36

Modified files:
	.              : ChangeLog 

Log message:
	testcase for path format

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2892&r2=1.2893

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2892
retrieving revision 1.2893
diff -u -b -r1.2892 -r1.2893
--- ChangeLog	17 Apr 2007 01:26:03 -0000	1.2892
+++ ChangeLog	17 Apr 2007 06:58:36 -0000	1.2893
@@ -2,6 +2,8 @@
 
 	* testsuite/misc-ming.all/get_frame_number_test.c:
 	  more tests.
+	* testsuite/misc-ming.all/path_format_test.c:
+	  testcase to verify valid path format
 	  
 2007-04-16 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Tue Apr 17 03:06:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdhlr-0006nw-0a
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 03:06:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdhln-0006m7-IF
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:06:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdhlm-0006le-IJ
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:06:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdhlm-0006lb-E4
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:06:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hdhh4-0002OT-OE
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:01:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdhh4-0001HC-0F
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:01:38 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hdhh3-0001H9-PM
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:01:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdhh3-0001H9-PM@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 17 Apr 2007 07:01:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all path_format_test.c
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 07:06:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/17 07:01:37

Added files:
	testsuite/misc-ming.all: path_format_test.c 

Log message:
	testcase for path format

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/path_format_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: path_format_test.c
===================================================================
RCS file: path_format_test.c
diff -N path_format_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ path_format_test.c	17 Apr 2007 07:01:37 -0000	1.1
@@ -0,0 +1,327 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+    _root
+      |------mc1
+      |       |------mc11
+      |-------3 (mvoieClip with a integral number name)
+      |       |-------1(mvoieClip with a integral number name)
+      |-------4.1 (movieClip with a float number name )
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME  "path_format_test.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  
+  SWFMovie mo;
+  
+  SWFMovieClip mc1, mc11;
+  SWFMovieClip int_named_parent, int_named_child;
+  SWFMovieClip float_named_mc;
+  SWFMovieClip dejagnuclip;
+  
+  SWFDisplayItem it1, it11;
+  SWFDisplayItem int_named_parent_it, int_named_child_it;
+  SWFDisplayItem float_named_it;
+  
+  SWFShape  sh_red;
+
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  add_actions(mo, " x1=0; x2=0; x3=0; x4=0; x5=0; x6=0; x7=0; x8=0; x9=0; x10=0; ");
+  SWFMovie_nextFrame(mo); /* 1st frame of _root */
+
+  
+  mc11 = newSWFMovieClip();
+  sh_red = make_fill_square (400, 200, 30, 30, 0, 0, 0, 0, 0, 0);
+  SWFMovieClip_add(mc11, (SWFBlock)sh_red);  
+  add_clip_actions(mc11, "stop();");
+  SWFMovieClip_nextFrame(mc11); 
+  SWFMovieClip_nextFrame(mc11); 
+  SWFMovieClip_nextFrame(mc11); 
+  
+  add_clip_actions(mc11, "_root.x1 = 'mc11_frame4'; stop(); "); 
+  SWFMovieClip_labelFrame(mc11, "frame4");
+  SWFMovieClip_nextFrame(mc11); 
+  add_clip_actions(mc11, "_root.x2 = 'mc11_frame5'; stop(); ");
+  SWFMovieClip_labelFrame(mc11, "frame5");
+  SWFMovieClip_nextFrame(mc11); 
+  add_clip_actions(mc11, "_root.x3 = 'mc11_frame6'; stop(); ");
+  SWFMovieClip_labelFrame(mc11, "frame6");
+  SWFMovieClip_nextFrame(mc11); 
+  
+    
+  mc1 = newSWFMovieClip();
+  sh_red = make_fill_square (300, 200, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc1, (SWFBlock)sh_red);  
+  add_clip_actions(mc1, "stop();");
+  it11 = SWFMovieClip_add(mc1, (SWFBlock)mc11);  
+  SWFDisplayItem_setDepth(it11, 10); 
+  SWFDisplayItem_setName(it11, "mc11"); 
+  SWFMovieClip_nextFrame(mc1); 
+  SWFMovieClip_nextFrame(mc1); 
+  SWFMovieClip_nextFrame(mc1); 
+  
+  add_clip_actions(mc1, "_root.x4 = 'mc1_frame4'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame4");
+  SWFMovieClip_nextFrame(mc1); 
+  add_clip_actions(mc1, "_root.x5 = 'mc1_frame5'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame5");
+  SWFMovieClip_nextFrame(mc1); 
+  add_clip_actions(mc1, "_root.x6 = 'mc1_frame6'; stop(); ");
+  SWFMovieClip_labelFrame(mc1, "frame6");
+  SWFMovieClip_nextFrame(mc1); 
+
+
+  /* construct a movieClip named by a integral number 1 */
+  int_named_child = newSWFMovieClip();
+  sh_red = make_fill_square (400, 300, 30, 30, 0, 0, 0, 0, 0, 0);
+  SWFMovieClip_add(int_named_child, (SWFBlock)sh_red); 
+  add_clip_actions(int_named_child, " stop(); "
+                                     " _root.x9 = this._name; " );
+  SWFMovieClip_nextFrame(int_named_child);   
+    
+  /* construct a movieClip named by a integral number 3 */
+  int_named_parent = newSWFMovieClip();
+  sh_red = make_fill_square (300, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(int_named_parent, (SWFBlock)sh_red);  
+  add_clip_actions(int_named_parent, " stop(); "
+                                     " _root.x7 = this._name; " );
+  SWFMovieClip_nextFrame(int_named_parent); 
+   
+  /* add movieClip "1" to movieClip "3" */                             
+  int_named_child_it = SWFMovieClip_add(int_named_parent, (SWFBlock)int_named_child); 
+  SWFDisplayItem_setDepth(int_named_child_it, 3);
+  SWFDisplayItem_setName(int_named_child_it, "1");
+
+  
+  /* construct a movieClip named by a float number */
+  float_named_mc = newSWFMovieClip();
+  sh_red = make_fill_square (300, 400, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(float_named_mc, (SWFBlock)sh_red);  
+  add_clip_actions(float_named_mc, " stop(); "
+                                   " _root.x8 = this._name; " );
+  SWFMovieClip_nextFrame(float_named_mc); 
+  
+    
+  /* place _root.mc1, give it a name "mc1" */
+  it1 = SWFMovie_add(mo, (SWFBlock)mc1); 
+  SWFDisplayItem_setDepth(it1, 20); 
+  SWFDisplayItem_setName(it1, "mc1"); 
+  
+  /* place _root.int_named_parent, give it a name "3" */
+  int_named_parent_it = SWFMovie_add(mo, (SWFBlock)int_named_parent); 
+  SWFDisplayItem_setDepth(int_named_parent_it, 21); 
+  SWFDisplayItem_setName(int_named_parent_it, "3"); 
+  
+  /* place _root.float_named_mc, give it a name "4.1" */
+  float_named_it = SWFMovie_add(mo, (SWFBlock)float_named_mc); 
+  SWFDisplayItem_setDepth(float_named_it, 21); 
+  SWFDisplayItem_setName(float_named_it, "4.1"); 
+  
+  SWFMovie_nextFrame(mo); /* 2nd frame of _root */
+
+  check_equals(mo, "typeOf(_root.mc1)", "'movieclip'");
+  check_equals(mo, "typeOf(_root.mc1.mc11)", "'movieclip'");
+  check_equals(mo, "_root.x7", "'3'"); // check for movieClip "3"
+  check_equals(mo, "_root.x9", "0"); // check for movieClip "3"."1"
+  if( OUTPUT_VERSION == 5)
+  {
+    xcheck_equals(mo, "_root.x8", "'4.1'"); //check for moveiClip "4.1"
+  }
+  else
+  {
+    check_equals(mo, "_root.x8", "0");
+  }
+  
+  if(OUTPUT_VERSION == 5)
+  {
+    xcheck_equals(mo, "_root.x8", "'4.1'");
+  }
+  else if(OUTPUT_VERSION >= 6)
+  {
+    check_equals(mo, "_root.x8", "0");
+  }
+  
+ 
+  add_actions(mo, "asm{"
+                       " push 'x10' "
+                       " push '_root.3' "
+                       " getvariable "
+                       " typeof "
+                       " setvariable "
+                   " }; ");
+  /* seems we could access _root.3(movieClip) successfully!!! */
+  check_equals(mo, "_root.x10", "'movieclip'" );
+  
+  add_actions(mo, "asm{"
+                       " push 'x10' "
+                       " push '_root.4.1' "
+                       " getvariable "
+                       " typeof "
+                       " setvariable "
+                   " }; ");
+  /* accessing _root.4.1 failed */
+  check_equals(mo, "_root.x10", "'undefined'" ); 
+ 
+  add_actions(mo, "asm{"
+                       " push 'x10' "
+                       " push '/4.1' "
+                       " getvariable "
+                       " typeof "
+                       " setvariable "
+                   " }; ");
+  /* accessing _root.4.1 failed */
+  check_equals(mo, "_root.x10", "'undefined'" ); 
+   
+  add_actions(mo, "asm{"
+                       " push 'x10' "
+                       " push '_root.3.1' "
+                       " getvariable "
+                       " typeof "
+                       " setvariable "
+                   " }; ");
+  /* Notice that _root.3.1 is not even displayed on screen 
+     with all versions. accessing _root.3.1 failed!  */
+  check_equals(mo, "_root.x10", "'undefined'" ); 
+
+
+  add_actions(mo, "asm{"
+                       " push 'x10' "
+                       " push '/3/1' "
+                       " getvariable "
+                       " typeof "
+                       " setvariable "
+                   " }; ");
+  /* Notice that _root.3.1 is not even displayed on screen 
+     with all versions. accessing _root.3.1 failed! */
+  check_equals(mo, "_root.x10", "'undefined'" ); 
+  
+  add_actions(mo, "callFrame('/mc1/mc11/:4');");
+  /* the above path format is supported */
+  check_equals(mo, "_root.x1", "'mc11_frame4'" ); 
+  
+  /* reset _root.x1 to 0*/
+  add_actions(mo, "_root.x1 = 0;");
+  add_actions(mo, "callFrame('_root.mc1.mc11.4');");
+  /* the above path format is supported */
+  check_equals(mo, "_root.x1", "'mc11_frame4'" ); 
+
+  /* reset _root.x1 to 0*/
+  add_actions(mo, "_root.x1 = 0;");
+  add_actions(mo, "callFrame('_root.mc1.mc11:4');");
+  /* the above path format is supported */
+  check_equals(mo, "_root.x1", "'mc11_frame4'" ); 
+  
+  /* reset _root.x1 to 0*/
+  add_actions(mo, "_root.x1 = 0;");
+  add_actions(mo, "callFrame('/mc1/mc11/4');");
+  /* the above path format is not supported */
+  check_equals(mo, "_root.x1", "0" ); 
+
+  /* reset _root.x1~10 to 0 */
+  add_actions(mo, "callFrame('/:1');");
+ 
+  /* test valid path format for ActionGotoExpression */
+  add_actions(mo, " path = '/mc1/mc11/4'; "        // not supported
+                  " gotoAndStop(path); " 
+                  " path = '/mc1/mc11/frame5'; "   // not supported
+                  " gotoAndStop(path); "
+                  " path = '/mc1/mc11/:frame6'; "  // supported format
+                  " gotoAndStop(path); "
+                  " path = '_root.mc1.4';"         // supported format
+                  " gotoAndStop(path);"
+                  " path = '_root.mc1.frame5'; "   // supported format
+                  " gotoAndStop(path); " 
+                  " path = '_root.mc1:frame6'; "   // supported format
+                  " gotoAndStop(path); " );
+  SWFMovie_nextFrame(mo); /* 3rd frame of _root */
+   
+   
+  /* checks */
+  check_equals(mo, "_root.x1", "0");
+  check_equals(mo, "_root.x2", "0");
+  check_equals(mo, "_root.x3", "'mc11_frame6'");
+  check_equals(mo, "_root.x4", "'mc1_frame4'");
+  check_equals(mo, "_root.x5", "'mc1_frame5'");
+  check_equals(mo, "_root.x6", "'mc1_frame6'");
+  
+  add_actions(mo,  " checkpoint = 100;"
+                     "asm{"
+                          " push 'checkpoint' "
+                          " push '/_root/x1' "  // not supported
+                          " getvariable "
+                          " setvariable "
+                     "};");
+  check_equals(mo, "checkpoint", "undefined");                
+  
+  add_actions(mo,  " checkpoint = 100;"
+                     "asm{"
+                          " push 'checkpoint' "
+                          " push '_root.x1' " 
+                          " getvariable "
+                          " setvariable "
+                     "};");
+  check_equals(mo, "checkpoint", "0"); 
+  
+  add_actions(mo,  " checkpoint = 100;"
+                     "asm{"
+                          " push 'checkpoint' "
+                          " push '_root:x1' "
+                          " getvariable "
+                          " setvariable "
+                     "};");
+  check_equals(mo, "checkpoint", "0"); 
+   
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 4th frame of _root */
+  
+  
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+



From MAILER-DAEMON Tue Apr 17 03:16:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdhvX-0002vd-JI
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 03:16:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdhvV-0002u2-6T
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:16:33 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdhvT-0002tH-K3
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:16:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdhvT-0002sz-0O
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:16:31 -0400
Received: from wr-out-0506.google.com ([64.233.184.237])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hdhql-0003eG-5r
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 03:11:39 -0400
Received: by wr-out-0506.google.com with SMTP id i23so1709085wra
	for <gnash-commit@gnu.org>; Tue, 17 Apr 2007 00:11:38 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=H2mbAOQWxpQwOwE3ek8kjnY+ittGH3P/XgcgpCEWW7Xnc1vDJPU8nXeMMXRuWs/Tfw0yxUhgJ37Fk4AvpGh4QwUuonwikfB/N9BRiCZBC0KDxRQ6tEdvUWxALi54fm2MGkZFd/bYkFmPPcq0XZINedHDFgAZdV+4o0hypFZiWuw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Em1N6LwvP8XsMT5Iy2VE4ikUACwjVT+xGB96tIbRIdKTUyQxzYkrI3xHwzu5zQ1XQ0yFpg4OrlSVNSI7ibZmvj+UqcUhbh5VmyFIULA0uSDGGhfKiy8f5Nbo+ellT/A2+AMYq1HUdHjyLELA6MulGevkoCxBjw6ueLUBGesihcg=
Received: by 10.114.127.1 with SMTP id z1mr2285950wac.1176793898011;
	Tue, 17 Apr 2007 00:11:38 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Tue, 17 Apr 2007 00:11:37 -0700 (PDT)
Message-ID: <ca4b43ff0704170011u18fab25ci824da074326b001f@mail.gmail.com>
Date: Tue, 17 Apr 2007 15:11:37 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/testsuite/misc-ming.all path_format_test.c
In-Reply-To: <E1Hdhh3-0001H9-PM@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hdhh3-0001H9-PM@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 07:16:33 -0000

good to see that Gnash passed all with swf-version >= 6.   Still two
expected failure with swf-version = 5, but maybe it's not a big deal.

On 4/17/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/17 07:01:37
>
> Added files:
>        testsuite/misc-ming.all: path_format_test.c
>
> Log message:
>        testcase for path format
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/path_format_test.c?cvsroot=gnash&rev=1.1
>
> Patches:
> Index: path_format_test.c
> ===================================================================
> RCS file: path_format_test.c
> diff -N path_format_test.c
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ path_format_test.c  17 Apr 2007 07:01:37 -0000      1.1
> @@ -0,0 +1,327 @@
> +/*
> + *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> + *
> + */
> +
> +/*
> +    _root
> +      |------mc1
> +      |       |------mc11
> +      |-------3 (mvoieClip with a integral number name)
> +      |       |-------1(mvoieClip with a integral number name)
> +      |-------4.1 (movieClip with a float number name )
> +*/
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <ming.h>
> +
> +#include "ming_utils.h"
> +
> +#define OUTPUT_VERSION 6
> +#define OUTPUT_FILENAME  "path_format_test.swf"
> +
> +
> +int
> +main(int argc, char** argv)
> +{
> +
> +  SWFMovie mo;
> +
> +  SWFMovieClip mc1, mc11;
> +  SWFMovieClip int_named_parent, int_named_child;
> +  SWFMovieClip float_named_mc;
> +  SWFMovieClip dejagnuclip;
> +
> +  SWFDisplayItem it1, it11;
> +  SWFDisplayItem int_named_parent_it, int_named_child_it;
> +  SWFDisplayItem float_named_it;
> +
> +  SWFShape  sh_red;
> +
> +
> +  const char *srcdir=".";
> +  if ( argc>1 )
> +    srcdir=argv[1];
> +  else
> +  {
> +      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
> +      return 1;
> +  }
> +
> +  Ming_init();
> +  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
> +  SWFMovie_setDimension(mo, 800, 600);
> +  SWFMovie_setRate (mo, 12.0);
> +
> +  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
> +  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
> +  add_actions(mo, " x1=0; x2=0; x3=0; x4=0; x5=0; x6=0; x7=0; x8=0; x9=0; x10=0; ");
> +  SWFMovie_nextFrame(mo); /* 1st frame of _root */
> +
> +
> +  mc11 = newSWFMovieClip();
> +  sh_red = make_fill_square (400, 200, 30, 30, 0, 0, 0, 0, 0, 0);
> +  SWFMovieClip_add(mc11, (SWFBlock)sh_red);
> +  add_clip_actions(mc11, "stop();");
> +  SWFMovieClip_nextFrame(mc11);
> +  SWFMovieClip_nextFrame(mc11);
> +  SWFMovieClip_nextFrame(mc11);
> +
> +  add_clip_actions(mc11, "_root.x1 = 'mc11_frame4'; stop(); ");
> +  SWFMovieClip_labelFrame(mc11, "frame4");
> +  SWFMovieClip_nextFrame(mc11);
> +  add_clip_actions(mc11, "_root.x2 = 'mc11_frame5'; stop(); ");
> +  SWFMovieClip_labelFrame(mc11, "frame5");
> +  SWFMovieClip_nextFrame(mc11);
> +  add_clip_actions(mc11, "_root.x3 = 'mc11_frame6'; stop(); ");
> +  SWFMovieClip_labelFrame(mc11, "frame6");
> +  SWFMovieClip_nextFrame(mc11);
> +
> +
> +  mc1 = newSWFMovieClip();
> +  sh_red = make_fill_square (300, 200, 60, 60, 255, 0, 0, 255, 0, 0);
> +  SWFMovieClip_add(mc1, (SWFBlock)sh_red);
> +  add_clip_actions(mc1, "stop();");
> +  it11 = SWFMovieClip_add(mc1, (SWFBlock)mc11);
> +  SWFDisplayItem_setDepth(it11, 10);
> +  SWFDisplayItem_setName(it11, "mc11");
> +  SWFMovieClip_nextFrame(mc1);
> +  SWFMovieClip_nextFrame(mc1);
> +  SWFMovieClip_nextFrame(mc1);
> +
> +  add_clip_actions(mc1, "_root.x4 = 'mc1_frame4'; stop(); ");
> +  SWFMovieClip_labelFrame(mc1, "frame4");
> +  SWFMovieClip_nextFrame(mc1);
> +  add_clip_actions(mc1, "_root.x5 = 'mc1_frame5'; stop(); ");
> +  SWFMovieClip_labelFrame(mc1, "frame5");
> +  SWFMovieClip_nextFrame(mc1);
> +  add_clip_actions(mc1, "_root.x6 = 'mc1_frame6'; stop(); ");
> +  SWFMovieClip_labelFrame(mc1, "frame6");
> +  SWFMovieClip_nextFrame(mc1);
> +
> +
> +  /* construct a movieClip named by a integral number 1 */
> +  int_named_child = newSWFMovieClip();
> +  sh_red = make_fill_square (400, 300, 30, 30, 0, 0, 0, 0, 0, 0);
> +  SWFMovieClip_add(int_named_child, (SWFBlock)sh_red);
> +  add_clip_actions(int_named_child, " stop(); "
> +                                     " _root.x9 = this._name; " );
> +  SWFMovieClip_nextFrame(int_named_child);
> +
> +  /* construct a movieClip named by a integral number 3 */
> +  int_named_parent = newSWFMovieClip();
> +  sh_red = make_fill_square (300, 300, 60, 60, 255, 0, 0, 255, 0, 0);
> +  SWFMovieClip_add(int_named_parent, (SWFBlock)sh_red);
> +  add_clip_actions(int_named_parent, " stop(); "
> +                                     " _root.x7 = this._name; " );
> +  SWFMovieClip_nextFrame(int_named_parent);
> +
> +  /* add movieClip "1" to movieClip "3" */
> +  int_named_child_it = SWFMovieClip_add(int_named_parent, (SWFBlock)int_named_child);
> +  SWFDisplayItem_setDepth(int_named_child_it, 3);
> +  SWFDisplayItem_setName(int_named_child_it, "1");
> +
> +
> +  /* construct a movieClip named by a float number */
> +  float_named_mc = newSWFMovieClip();
> +  sh_red = make_fill_square (300, 400, 60, 60, 255, 0, 0, 255, 0, 0);
> +  SWFMovieClip_add(float_named_mc, (SWFBlock)sh_red);
> +  add_clip_actions(float_named_mc, " stop(); "
> +                                   " _root.x8 = this._name; " );
> +  SWFMovieClip_nextFrame(float_named_mc);
> +
> +
> +  /* place _root.mc1, give it a name "mc1" */
> +  it1 = SWFMovie_add(mo, (SWFBlock)mc1);
> +  SWFDisplayItem_setDepth(it1, 20);
> +  SWFDisplayItem_setName(it1, "mc1");
> +
> +  /* place _root.int_named_parent, give it a name "3" */
> +  int_named_parent_it = SWFMovie_add(mo, (SWFBlock)int_named_parent);
> +  SWFDisplayItem_setDepth(int_named_parent_it, 21);
> +  SWFDisplayItem_setName(int_named_parent_it, "3");
> +
> +  /* place _root.float_named_mc, give it a name "4.1" */
> +  float_named_it = SWFMovie_add(mo, (SWFBlock)float_named_mc);
> +  SWFDisplayItem_setDepth(float_named_it, 21);
> +  SWFDisplayItem_setName(float_named_it, "4.1");
> +
> +  SWFMovie_nextFrame(mo); /* 2nd frame of _root */
> +
> +  check_equals(mo, "typeOf(_root.mc1)", "'movieclip'");
> +  check_equals(mo, "typeOf(_root.mc1.mc11)", "'movieclip'");
> +  check_equals(mo, "_root.x7", "'3'"); // check for movieClip "3"
> +  check_equals(mo, "_root.x9", "0"); // check for movieClip "3"."1"
> +  if( OUTPUT_VERSION == 5)
> +  {
> +    xcheck_equals(mo, "_root.x8", "'4.1'"); //check for moveiClip "4.1"
> +  }
> +  else
> +  {
> +    check_equals(mo, "_root.x8", "0");
> +  }
> +
> +  if(OUTPUT_VERSION == 5)
> +  {
> +    xcheck_equals(mo, "_root.x8", "'4.1'");
> +  }
> +  else if(OUTPUT_VERSION >= 6)
> +  {
> +    check_equals(mo, "_root.x8", "0");
> +  }
> +
> +
> +  add_actions(mo, "asm{"
> +                       " push 'x10' "
> +                       " push '_root.3' "
> +                       " getvariable "
> +                       " typeof "
> +                       " setvariable "
> +                   " }; ");
> +  /* seems we could access _root.3(movieClip) successfully!!! */
> +  check_equals(mo, "_root.x10", "'movieclip'" );
> +
> +  add_actions(mo, "asm{"
> +                       " push 'x10' "
> +                       " push '_root.4.1' "
> +                       " getvariable "
> +                       " typeof "
> +                       " setvariable "
> +                   " }; ");
> +  /* accessing _root.4.1 failed */
> +  check_equals(mo, "_root.x10", "'undefined'" );
> +
> +  add_actions(mo, "asm{"
> +                       " push 'x10' "
> +                       " push '/4.1' "
> +                       " getvariable "
> +                       " typeof "
> +                       " setvariable "
> +                   " }; ");
> +  /* accessing _root.4.1 failed */
> +  check_equals(mo, "_root.x10", "'undefined'" );
> +
> +  add_actions(mo, "asm{"
> +                       " push 'x10' "
> +                       " push '_root.3.1' "
> +                       " getvariable "
> +                       " typeof "
> +                       " setvariable "
> +                   " }; ");
> +  /* Notice that _root.3.1 is not even displayed on screen
> +     with all versions. accessing _root.3.1 failed!  */
> +  check_equals(mo, "_root.x10", "'undefined'" );
> +
> +
> +  add_actions(mo, "asm{"
> +                       " push 'x10' "
> +                       " push '/3/1' "
> +                       " getvariable "
> +                       " typeof "
> +                       " setvariable "
> +                   " }; ");
> +  /* Notice that _root.3.1 is not even displayed on screen
> +     with all versions. accessing _root.3.1 failed! */
> +  check_equals(mo, "_root.x10", "'undefined'" );
> +
> +  add_actions(mo, "callFrame('/mc1/mc11/:4');");
> +  /* the above path format is supported */
> +  check_equals(mo, "_root.x1", "'mc11_frame4'" );
> +
> +  /* reset _root.x1 to 0*/
> +  add_actions(mo, "_root.x1 = 0;");
> +  add_actions(mo, "callFrame('_root.mc1.mc11.4');");
> +  /* the above path format is supported */
> +  check_equals(mo, "_root.x1", "'mc11_frame4'" );
> +
> +  /* reset _root.x1 to 0*/
> +  add_actions(mo, "_root.x1 = 0;");
> +  add_actions(mo, "callFrame('_root.mc1.mc11:4');");
> +  /* the above path format is supported */
> +  check_equals(mo, "_root.x1", "'mc11_frame4'" );
> +
> +  /* reset _root.x1 to 0*/
> +  add_actions(mo, "_root.x1 = 0;");
> +  add_actions(mo, "callFrame('/mc1/mc11/4');");
> +  /* the above path format is not supported */
> +  check_equals(mo, "_root.x1", "0" );
> +
> +  /* reset _root.x1~10 to 0 */
> +  add_actions(mo, "callFrame('/:1');");
> +
> +  /* test valid path format for ActionGotoExpression */
> +  add_actions(mo, " path = '/mc1/mc11/4'; "        // not supported
> +                  " gotoAndStop(path); "
> +                  " path = '/mc1/mc11/frame5'; "   // not supported
> +                  " gotoAndStop(path); "
> +                  " path = '/mc1/mc11/:frame6'; "  // supported format
> +                  " gotoAndStop(path); "
> +                  " path = '_root.mc1.4';"         // supported format
> +                  " gotoAndStop(path);"
> +                  " path = '_root.mc1.frame5'; "   // supported format
> +                  " gotoAndStop(path); "
> +                  " path = '_root.mc1:frame6'; "   // supported format
> +                  " gotoAndStop(path); " );
> +  SWFMovie_nextFrame(mo); /* 3rd frame of _root */
> +
> +
> +  /* checks */
> +  check_equals(mo, "_root.x1", "0");
> +  check_equals(mo, "_root.x2", "0");
> +  check_equals(mo, "_root.x3", "'mc11_frame6'");
> +  check_equals(mo, "_root.x4", "'mc1_frame4'");
> +  check_equals(mo, "_root.x5", "'mc1_frame5'");
> +  check_equals(mo, "_root.x6", "'mc1_frame6'");
> +
> +  add_actions(mo,  " checkpoint = 100;"
> +                     "asm{"
> +                          " push 'checkpoint' "
> +                          " push '/_root/x1' "  // not supported
> +                          " getvariable "
> +                          " setvariable "
> +                     "};");
> +  check_equals(mo, "checkpoint", "undefined");
> +
> +  add_actions(mo,  " checkpoint = 100;"
> +                     "asm{"
> +                          " push 'checkpoint' "
> +                          " push '_root.x1' "
> +                          " getvariable "
> +                          " setvariable "
> +                     "};");
> +  check_equals(mo, "checkpoint", "0");
> +
> +  add_actions(mo,  " checkpoint = 100;"
> +                     "asm{"
> +                          " push 'checkpoint' "
> +                          " push '_root:x1' "
> +                          " getvariable "
> +                          " setvariable "
> +                     "};");
> +  check_equals(mo, "checkpoint", "0");
> +
> +  add_actions(mo, " _root.totals(); stop(); ");
> +  SWFMovie_nextFrame(mo); /* 4th frame of _root */
> +
> +
> +  //Output movie
> +  puts("Saving " OUTPUT_FILENAME );
> +  SWFMovie_save(mo, OUTPUT_FILENAME);
> +
> +  return 0;
> +}
> +
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Tue Apr 17 04:37:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdjC1-00060U-K3
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 04:37:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdjBy-0005zJ-KZ
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:37:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdjBw-0005y0-Mv
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:37:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdjBw-0005xe-J7
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:37:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hdj7E-0007p3-G5
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:32:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdj7D-0000F7-Fa
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:32:43 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hdj7D-0000Es-1o
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:32:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdj7D-0000Es-1o@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 17 Apr 2007 08:32:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 08:37:39 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/17 08:32:43

Modified files:
	backend        : render_handler.h 

Log message:
	better description for drawVideoFrame()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: render_handler.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- render_handler.h	1 Mar 2007 11:06:32 -0000	1.30
+++ render_handler.h	17 Apr 2007 08:32:42 -0000	1.31
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.30 2007/03/01 11:06:32 udog Exp $ */
+/* $Id: render_handler.h,v 1.31 2007/04/17 08:32:42 udog Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -259,7 +259,26 @@
 	/// Returns the format the current renderer wants videoframes in.
 	virtual int videoFrameFormat() = 0;
 	
-	/// Draws the video frames
+	/** \brief Draws a video frame. 
+	  *
+	  * The frame has already been decoded and is available in the format
+	  * specified by videoFrameFormat().	  
+	  *     	  
+	  * @param baseframe The RGB or YUV video buffer frame.
+	  *
+	  * @param mat The matrix with world coordinates used to retrieve the x
+	  *   and y coordinate of the video object. The scaling of the matrix only
+	  *   refers to the Flash instance, *not* to the video inside that instance.
+	  *   When a video object is placed on the stage and the loaded video is
+	  *   smaller, then the matrix is still an "identity matrix". However, if
+	  *   the video object is scaled via ActionScript, for example, then the
+	  *   matrix will change. This means the renderer has to find the correct
+	  *   scaling for the video inside the bounds.                             	  
+	  *
+	  * @param bounds The minX/minY fields of this rect are always zero. 
+	  *   The width and height determine the size of the Flash video instance
+	  *   on the stage (in TWIPS) prior to matrix transformations.         
+	  */
 	virtual void drawVideoFrame(image::image_base* frame, const matrix* mat, const rect* bounds) = 0;
 
 	/// Sets the update region (called prior to begin_display). The renderer 



From MAILER-DAEMON Tue Apr 17 04:42:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdjGP-0007Kp-Bk
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 04:42:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdjGN-0007K1-2H
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:42:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdjGL-0007JD-Bq
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:42:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdjGL-0007J1-18
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:42:09 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HdjBc-00005x-6M
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 04:37:16 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3H8b8U4023472;
	Tue, 17 Apr 2007 10:37:11 +0200
Date: Tue, 17 Apr 2007 10:37:05 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <674742699.20070417103705@nova-sys.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash/backend render_handler.h
In-Reply-To: <E1Hdj7D-0000Es-1o@cvs>
References: <E1Hdj7D-0000Es-1o@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 08:42:11 -0000

UG>         better description for drawVideoFrame()

Regarding the drawVideoFrame() parameters list it mostly makes sense
but it seems rather strange to me to use a Range2d to just pass width
and height. In video_frame_instance it is created like this:

  rect bounds(0.0f, 0.0f, PIXELS_TO_TWIPS(m_def->m_width), PIXELS_TO_TWIPS(m_def->m_height));

I suggest we just pass width and height as normal "double" parameters.
What do you think?

Udo




From MAILER-DAEMON Tue Apr 17 05:05:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdjct-0008Ig-1X
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 05:05:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdjcp-0008FU-2i
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:05:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdjcn-0008E1-5V
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:05:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdjcm-0008Dc-S2
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:05:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdjY4-0003be-5o
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:00:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdjY2-0002t6-FR
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:00:26 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdjY2-0002t3-9n
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:00:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdjY2-0002t3-9n@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 17 Apr 2007 09:00:26 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 09:05:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/17 09:00:26

Modified files:
	backend        : render_handler.h 

Log message:
	just style

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.31&r2=1.32

Patches:
Index: render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- render_handler.h	17 Apr 2007 08:32:42 -0000	1.31
+++ render_handler.h	17 Apr 2007 09:00:26 -0000	1.32
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.31 2007/04/17 08:32:42 udog Exp $ */
+/* $Id: render_handler.h,v 1.32 2007/04/17 09:00:26 strk Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -198,6 +198,7 @@
 public:
   //Virtual dtor, removes compiler warning.
   virtual ~render_cache_manager(){}
+
   /// Clears the cache completely (necessary for runtime shapes / drawing API)
   virtual void clear() 
   {
@@ -259,34 +260,36 @@
 	/// Returns the format the current renderer wants videoframes in.
 	virtual int videoFrameFormat() = 0;
 	
-	/** \brief Draws a video frame. 
-	  *
-	  * The frame has already been decoded and is available in the format
-	  * specified by videoFrameFormat().	  
-	  *     	  
-	  * @param baseframe The RGB or YUV video buffer frame.
-	  *
-	  * @param mat The matrix with world coordinates used to retrieve the x
-	  *   and y coordinate of the video object. The scaling of the matrix only
-	  *   refers to the Flash instance, *not* to the video inside that instance.
-	  *   When a video object is placed on the stage and the loaded video is
-	  *   smaller, then the matrix is still an "identity matrix". However, if
-	  *   the video object is scaled via ActionScript, for example, then the
-	  *   matrix will change. This means the renderer has to find the correct
-	  *   scaling for the video inside the bounds.                             	  
-	  *
-	  * @param bounds The minX/minY fields of this rect are always zero. 
-	  *   The width and height determine the size of the Flash video instance
-	  *   on the stage (in TWIPS) prior to matrix transformations.         
-	  */
+	/// Draws a video frame. 
+	//
+	/// The frame has already been decoded and is available in the format
+	/// specified by videoFrameFormat().	  
+	///     	  
+	/// @param baseframe The RGB or YUV video buffer frame.
+	///
+	/// @param mat The matrix with world coordinates used to retrieve the x
+	///   and y coordinate of the video object. The scaling of the matrix only
+	///   refers to the Flash instance, *not* to the video inside that instance.
+	///   When a video object is placed on the stage and the loaded video is
+	///   smaller, then the matrix is still an "identity matrix". However, if
+	///   the video object is scaled via ActionScript, for example, then the
+	///   matrix will change. This means the renderer has to find the correct
+	///   scaling for the video inside the bounds.                             	  
+	///
+	/// @param bounds The minX/minY fields of this rect are always zero. 
+	///   The width and height determine the size of the Flash video instance
+	///   on the stage (in TWIPS) prior to matrix transformations.         
+	///
 	virtual void drawVideoFrame(image::image_base* frame, const matrix* mat, const rect* bounds) = 0;
 
-	/// Sets the update region (called prior to begin_display). The renderer 
+	/// Sets the update region (called prior to begin_display).
+	//
+	/// The renderer 
 	/// might do clipping and leave the region outside these bounds unchanged,
 	/// but he is allowed to change them if that makes sense. After rendering
 	/// a frame the area outside the invalidated region can be undefined and 
 	/// is not used. 
-	//
+	///
 	/// It is not required for all renderers.
 	/// Parameters are world coordinates (TWIPS).
 	///
@@ -303,7 +306,8 @@
   /// Converts world coordinates to pixel coordinates
   virtual geometry::Range2d<int> world_to_pixel(const rect& worldbounds) = 0;
   
-  virtual geometry::Range2d<int> world_to_pixel(const geometry::Range2d<float>& worldbounds) {
+	virtual geometry::Range2d<int> world_to_pixel(const geometry::Range2d<float>& worldbounds)
+	{
   	if ((worldbounds.isNull() || worldbounds.isWorld())) 	
   		return worldbounds;
 
@@ -386,7 +390,8 @@
 	/// character instance.
 	///
 	virtual void draw_shape_character(shape_character_def *def, 
-    character *inst) {
+		character *inst)
+	{
     
     // check if the character needs to be rendered at all
     rect cur_bounds;
@@ -394,7 +399,8 @@
     cur_bounds.expand_to_transformed_rect(inst->get_world_matrix(), 
 			def->get_bound());
 			
-		if (!bounds_in_clipping_area(cur_bounds)) {
+		if (!bounds_in_clipping_area(cur_bounds))
+		{
 		  return; // no need to draw
 		}
 		
@@ -432,10 +438,13 @@
     return bounds_in_clipping_area(bounds.getRange());
   }
   
-  virtual bool bounds_in_clipping_area(const InvalidatedRanges& ranges) {
+	virtual bool bounds_in_clipping_area(const InvalidatedRanges& ranges)
+	{
   	for (unsigned int rno=0; rno<ranges.size(); rno++) 
+		{
   		if (bounds_in_clipping_area(ranges.getRange(rno)))
   			return true;
+		}
   			
   	return false;
 	}
@@ -469,10 +478,8 @@
   ///
   /// @param pixel_scale
   ///
-  virtual void draw_glyph(shape_character_def *def,
-    const matrix& mat,
-    rgba color,
-    float pixel_scale) = 0;
+	virtual void draw_glyph(shape_character_def *def, const matrix& mat,
+		rgba color, float pixel_scale) = 0;
     
   /// The render handler can choose if it wishes to use textured glyphs 
   /// (pre-computed bitmaps which are used for small text sizes) or if 
@@ -486,7 +493,8 @@
   /// world_x and world_y are world coordinates (twips) and the color of the
   /// nearest pixel is returned.
   virtual void get_pixel(rgba& /*color_return*/, float /*world_x*/, 
-    float /*world_y*/) {
+		float /*world_y*/)
+	{
     
     log_msg("get_pixel() not implemented for this renderer");
     assert(0);    
@@ -503,27 +511,28 @@
     
 protected:
 
-  // Cached fill style list with just one entry used for font rendering
+	/// Cached fill style list with just one entry used for font rendering
   std::vector<fill_style>	m_single_fill_styles;
   
-  // Dummy line styles list without entries (do not add anything!!)
+	/// Dummy line styles list without entries (do not add anything!!)
   std::vector<line_style>	m_dummy_line_styles;
   
-  // Dummy, neutral color transformation (do not change!!)
+	/// Dummy, neutral color transformation (do not change!!)
   cxform m_neutral_cxform;
   
-  // Sets m_single_fill_styles to one solid fill with the given color 
-  void need_single_fill_style(const rgba& color){
+	/// Sets m_single_fill_styles to one solid fill with the given color 
+	void need_single_fill_style(const rgba& color)
+	{
   
-    if (m_single_fill_styles.size() == 0) {  
+		if (m_single_fill_styles.size() == 0)
+		{	
       fill_style dummy;
-    
       m_single_fill_styles.push_back(dummy);
     }
     
     m_single_fill_styles[0].set_color(color);
   
-  } //need_single_fill_style
+	} 
 
 }; // class render_handler
 



From MAILER-DAEMON Tue Apr 17 05:23:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdjuQ-00070z-Kb
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 05:23:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdjuO-0006xs-Eg
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:23:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdjuN-0006xY-A6
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:23:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdjuN-0006xV-4N
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:23:31 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hdjpe-0005pU-L3
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:18:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdjpd-0003k3-QD
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:18:37 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hdjpd-0003k0-EW
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:18:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdjpd-0003k0-EW@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 17 Apr 2007 09:18:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 09:23:33 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/17 09:18:37

Modified files:
	.              : ChangeLog 

Log message:
	replaced drawVideoFrame() with a native AGG version

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2893&r2=1.2894

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2893
retrieving revision 1.2894
diff -u -b -r1.2893 -r1.2894
--- ChangeLog	17 Apr 2007 06:58:36 -0000	1.2893
+++ ChangeLog	17 Apr 2007 09:18:37 -0000	1.2894
@@ -1,3 +1,9 @@
+2007-04-17 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg: Replaced drawVideoFrame() to use AGG
+	  functions, implemented nearest neighbor transformations, 
+	  implemented masked video playback
+	  
 2007-04-17 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/get_frame_number_test.c:



From MAILER-DAEMON Tue Apr 17 05:24:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdjvG-0007IZ-Os
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 05:24:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdjvF-0007Gn-Iu
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:24:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdjvF-0007GI-03
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:24:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdjvE-0007G8-Qs
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:24:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HdjqW-0005w5-66
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:19:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdjqV-0003nq-H8
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:19:31 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HdjqV-0003nn-8L
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:19:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdjqV-0003nn-8L@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 17 Apr 2007 09:19:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 09:24:26 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/17 09:19:31

Modified files:
	backend        : render_handler_agg.cpp 

Log message:
	replaced drawVideoFrame() with a native AGG version

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.69&r2=1.70

Patches:
Index: render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- render_handler_agg.cpp	11 Apr 2007 14:54:26 -0000	1.69
+++ render_handler_agg.cpp	17 Apr 2007 09:19:31 -0000	1.70
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.69 2007/04/11 14:54:26 bjacques Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.70 2007/04/17 09:19:31 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -64,7 +64,7 @@
   
   caching             NONE IMPLEMENTED
   
-  video               NOT IMPLEMENTED, only stubs
+  video               COMPLETE
   
   Currently the renderer should be able to render everything correctly,
   except videos.
@@ -422,67 +422,138 @@
 		return RGB;
 	}
 	
-	/** \brief Draws the video frames
-	  * This implementation blits (copies) the RGB buffer provided by the caller
-	  * directly into the Agg render buffer.
-	  *
-	  * @param baseframe The RGB video buffer frame.
-	  *
-	  * @param mat The matrix with world coordinates used to retrieve the x
-	  * and y coordinate of the video object.
-	  *
-	  * @param bounds the width and height fields of this rect are used to
-	  * determine the width and height of the RGB image to be drawn. The x and y
-	  * members of this field are ignored.
-	  */
-   void drawVideoFrame(image::image_base* baseframe, const matrix* mat, const rect* bounds)
-	{
-	  point a;
-	  mat->transform(&a, point(bounds->get_x_min(), bounds->get_y_min()));
 
-	  int xpos = (int)round( TWIPS_TO_PIXELS(a.m_x) );
-	  int ypos = (int)round( TWIPS_TO_PIXELS(a.m_y) );
+  void drawVideoFrame(image::image_base* baseframe, const matrix* mat, const rect* bounds) {
 
-	  // TODO: handle this by only blitting part of the source RGB image.
-	  if (xpos < 0) {
-	    xpos = 0;
-	  }
-	  if (ypos < 0) {
-    	    ypos = 0;
-	  }
+    // NOTE: Assuming that the source image is RGB 8:8:8
+    
+    // TODO: Currently only nearest-neighbor scaling is implemented here, since
+    // it's the fastest and Flash apparently uses this method most of the time.
+    // It would be easy to add other scaling methods (bilinear, bicubic, 
+    // whatever), but we'd need some way to tell the renderer the desired
+    // quality.
+    
+    // TODO: Test this with a rotated video. Maybe the image accessor
+    // will insert some ugly pixels (even if I don't think so) - Udo
+
+    // TODO: keep heavy instances alive accross frames for performance!
+    
+    // TODO: Maybe implement specialization for 1:1 scaled videos
+    
+      
+    typedef agg::pixfmt_rgb24_pre baseformat;
+    //typedef agg::renderer_base<baseformat> renderer_base_pre;
 	
-	  int bytes_per_pixel = 3;		
 	  image::rgb* frame = static_cast<image::rgb*>(baseframe);
 
-	  unsigned int frame_width = frame->m_width * bytes_per_pixel;
+    // compute video scaling relative to video obejct size
+    double vscaleX = TWIPS_TO_PIXELS(bounds->width())  / frame->m_width;
+    double vscaleY = TWIPS_TO_PIXELS(bounds->height()) / frame->m_height;
+    
+    // convert Gnash matrix to AGG matrix and scale down to pixel coordinates
+    // while we're at it 
+    agg::trans_affine img_mtx(
+      mat->m_[0][0]*20.0*vscaleX, mat->m_[1][0], 
+      mat->m_[0][1],              mat->m_[1][1]*20.0*vscaleY, 
+      mat->m_[0][2],              mat->m_[1][2]
+    );
+    
+    // apply global movie scaling
+    img_mtx *= agg::trans_affine_scaling((xscale+yscale) * 0.5);
+    
+    // invert matrix since this is used for the image source
+    img_mtx.invert();
+    
+    // span allocator is used to apply the matrix
+    agg::span_allocator<agg::rgba8> sa;
+        
+    typedef agg::span_interpolator_linear<> interpolator_type;
+    interpolator_type interpolator(img_mtx);
+    
+    // clipping image accessor is used to avoid repeating of the image
+    typedef agg::image_accessor_clip<baseformat> img_source_type;
+    
+    // rendering buffer is used to access the frame pixels here        
+    agg::rendering_buffer img_buf(frame->m_data, frame->m_width, frame->m_height,
+      frame->m_width*3);
+         
+    baseformat img_pixf(img_buf);
+    
+    // The second parameter passed to the constructor is the color (R,G,B,A) 
+    // used for pixels outside the source image (ie. when the movie aspect 
+    // ratio does not match the video instance). 
+    img_source_type img_src(img_pixf, agg::rgba_pre(255,0,0,0));
+    
+    // renderer base for the stage buffer (not the frame image!)
+    renderer_base rbase(*m_pixf);
+        
+    // nearest neighbor method for scaling
+    typedef agg::span_image_filter_rgb_nn<img_source_type, interpolator_type>
+      span_gen_type;
+    span_gen_type sg(img_src, interpolator);
+      
+    typedef agg::rasterizer_scanline_aa<> ras_type;
+    ras_type ras;
+    
+    // make a path for the video outline
+ 		point a, b, c, d;
+		mat->transform(&a, point(bounds->get_x_min(), bounds->get_y_min()));
+		mat->transform(&b, point(bounds->get_x_max(), bounds->get_y_min()));
+		mat->transform(&c, point(bounds->get_x_max(), bounds->get_y_max()));
+		mat->transform(&d, point(bounds->get_x_min(), bounds->get_y_max()));
 
-	  if (frame_width + xpos * bytes_per_pixel  > m_rbuf.width() * bytes_per_pixel) {
-	    // the movie was placed too far to the right. let's cut it off at
-	    // the far right corner. (This is also how "that other player"
-	    // handles it, I'm told.)
-	    frame_width = (m_rbuf.width() * bytes_per_pixel - xpos * bytes_per_pixel);
-	  }
-
-	  unsigned char* rgbbuf_ptr = frame->m_data;
-	  unsigned char* rgbbuf_end = rgbbuf_ptr + frame->m_pitch *
-				      frame->m_height;
-	
-	  unsigned char* aggbuf_ptr = memaddr;
-	  unsigned char* aggbuf_end = memaddr + memsize;  
-	
-	  // Skip the first ypos rows.
-	  aggbuf_ptr += ypos * m_rbuf.stride();
-	  // Move xpos pixels to the right.
-	  aggbuf_ptr += xpos * bytes_per_pixel;		
-
-	  while(rgbbuf_ptr < rgbbuf_end && aggbuf_ptr < aggbuf_end) {
-    	    memcpy(aggbuf_ptr, rgbbuf_ptr, frame_width);
-	    aggbuf_ptr += m_rbuf.stride();
-	    rgbbuf_ptr += frame->m_pitch; 
+    agg::path_storage path;
+    path.move_to(a.m_x*xscale, a.m_y*yscale);
+    path.line_to(b.m_x*xscale, b.m_y*yscale);
+    path.line_to(c.m_x*xscale, c.m_y*yscale);
+    path.line_to(d.m_x*xscale, d.m_y*yscale);
+    path.line_to(a.m_x*xscale, a.m_y*yscale);
+
+    if (m_alpha_mask.empty()) {
+    
+      // No mask active
+
+      agg::scanline_u8 sl;
+  
+      for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {    
+      
+        const geometry::Range2d<int>& cbounds = _clipbounds[cno];
+        apply_clip_box<ras_type> (ras, cbounds);
+  
+        // <Udo>: AFAIK add_path() rewinds the vertex list (clears previous
+        // path), so there should be no problem with multiple clipbounds.      
+        ras.add_path(path);			
+  			   
+        agg::render_scanlines_aa(ras, sl, rbase, sa, sg);
 	  }
+      
+    } else {
+    
+      // Mask is active!
+      
+      // **** UNTESTED!!! ****
+      
+      typedef agg::scanline_u8_am<agg::alpha_mask_gray8> scanline_type;
+      scanline_type sl(m_alpha_mask.back()->get_amask());
+  
+      for (unsigned int cno=0; cno<_clipbounds.size(); cno++) {    
+      
+        const geometry::Range2d<int>& cbounds = _clipbounds[cno];
+        apply_clip_box<ras_type> (ras, cbounds);
+  
+        // <Udo>: AFAIK add_path() rewinds the vertex list (clears previous
+        // path), so there should be no problem with multiple clipbounds.      
+        ras.add_path(path);			
+  			   
+        agg::render_scanlines_aa(ras, sl, rbase, sa, sg);
 	}
 
 
+    } // if alpha mask
+    
+  } // drawVideoFrame
+  
+
   // Constructor
   render_handler_agg(int bits_per_pixel)
       :



From MAILER-DAEMON Tue Apr 17 05:25:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdjwO-0007kq-G8
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 05:25:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdjwN-0007k4-OF
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:25:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdjwN-0007jV-9W
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:25:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdjwN-0007jO-7B
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:25:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hdjre-00065h-F6
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 05:20:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdjrd-0003ry-MJ
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:20:41 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hdjrd-0003rv-Dc
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:20:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdjrd-0003rv-Dc@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 17 Apr 2007 09:20:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 09:25:35 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/17 09:20:41

Modified files:
	backend        : render_handler_agg.cpp 

Log message:
	just a little cleanup

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.70&r2=1.71

Patches:
Index: render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- render_handler_agg.cpp	17 Apr 2007 09:19:31 -0000	1.70
+++ render_handler_agg.cpp	17 Apr 2007 09:20:41 -0000	1.71
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.70 2007/04/17 09:19:31 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.71 2007/04/17 09:20:41 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -442,7 +442,6 @@
     
       
     typedef agg::pixfmt_rgb24_pre baseformat;
-    //typedef agg::renderer_base<baseformat> renderer_base_pre;
   
     image::rgb* frame = static_cast<image::rgb*>(baseframe);
     



From MAILER-DAEMON Tue Apr 17 06:08:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdkbX-0004I2-9C
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 06:08:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdkbV-0004Fy-MX
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:08:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdkbU-0004Cx-3W
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:08:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdkbU-0004Cs-0u
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:08:04 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HdkWk-0002pc-Kq
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:03:11 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3HA35G82416;
	Tue, 17 Apr 2007 12:03:05 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Tue, 17 Apr 2007 12:03:05 +0200
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash/backend render_handler.h
Message-ID: <20070417100305.GC63150@keybit.net>
Mail-Followup-To: gnash-commit@gnu.org
References: <E1Hdj7D-0000Es-1o@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1Hdj7D-0000Es-1o@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 10:08:05 -0000

On Tue, Apr 17, 2007 at 08:32:43AM +0000, Udo Giacomozzi wrote:

> +	  * @param bounds The minX/minY fields of this rect are always zero. 
> +	  *   The width and height determine the size of the Flash video instance
> +	  *   on the stage (in TWIPS) prior to matrix transformations.         
> +	  */

Is width/height intended to be used for *clipping* the video to the desired size ?
In this case we likely also want xmin/ymin for clipping an arbitrary window.

--strk;



From MAILER-DAEMON Tue Apr 17 06:43:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdl9a-0003Yj-Fz
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 06:43:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdl9X-0003Xq-Ve
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:43:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdl9V-0003X1-96
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:43:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdl9V-0003Ww-2Q
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:43:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hdl4m-00072d-90
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 06:38:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdl4j-0002GZ-BN
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 10:38:17 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hdl4i-0002GU-Ua
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 10:38:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdl4i-0002GU-Ua@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 17 Apr 2007 10:38:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/curl_adapter.cpp libbas...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 10:43:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/17 10:38:16

Modified files:
	.              : ChangeLog 
	libbase        : curl_adapter.cpp noseek_fd_adapter.cpp 
	                 tu_file.cpp tu_file.h zlib_adapter.cpp 
	server/asobj   : xml.cpp 

Log message:
	        * libbase/: tu_file.{cpp,h}, curl_adapter.cpp, zlib_adapter.cpp,
	          noseek_fd_adapter.cpp:
	          Add another callback for getting stream error. First pass at
	          documenting the tu_file interfaces (needs more work).
	          Updated implementations to provide the new error getter.
	        * server/asobj/xml.cpp (XML::load): check stream status after
	          call to xmlReadIO. The libxml2 function seems immune to
	          stream errors, but we can handle them and avoid parsing
	          anything if a stream error occurs (404 will be a stream error).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2894&r2=1.2895
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/noseek_fd_adapter.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/zlib_adapter.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2894
retrieving revision 1.2895
diff -u -b -r1.2894 -r1.2895
--- ChangeLog	17 Apr 2007 09:18:37 -0000	1.2894
+++ ChangeLog	17 Apr 2007 10:38:16 -0000	1.2895
@@ -1,3 +1,15 @@
+2007-04-17 Sandro Santilli <strk@keybit.net>
+
+	* libbase/: tu_file.{cpp,h}, curl_adapter.cpp, zlib_adapter.cpp,
+	  noseek_fd_adapter.cpp:
+	  Add another callback for getting stream error. First pass at
+	  documenting the tu_file interfaces (needs more work).
+	  Updated implementations to provide the new error getter.
+	* server/asobj/xml.cpp (XML::load): check stream status after
+	  call to xmlReadIO. The libxml2 function seems immune to 
+	  stream errors, but we can handle them and avoid parsing
+	  anything if a stream error occurs (404 will be a stream error).
+
 2007-04-17 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_agg: Replaced drawVideoFrame() to use AGG

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libbase/curl_adapter.cpp	8 Apr 2007 23:06:17 -0000	1.25
+++ libbase/curl_adapter.cpp	17 Apr 2007 10:38:16 -0000	1.26
@@ -16,7 +16,7 @@
 
 // 
 
-/* $Id: curl_adapter.cpp,v 1.25 2007/04/08 23:06:17 rsavoye Exp $ */
+/* $Id: curl_adapter.cpp,v 1.26 2007/04/17 10:38:16 strk Exp $ */
 
 #if defined(_WIN32) || defined(WIN32)
 #define snprintf _snprintf
@@ -112,6 +112,11 @@
 	/// Return true if EOF has been reached
 	bool eof();
 
+	/// Return the error condition of current stream
+	int err() const {
+		return _error;
+	}
+
 	/// Report global position within the file
 	size_t tell();
 
@@ -148,6 +153,13 @@
 	// transfer in progress
 	int _running;
 
+	// stream error 
+	// 0 on no error.
+	// Example of errors would be:
+	//	404 - file not found
+	//	timeout occurred
+	int _error;
+
 	// Post data. Empty if no POST has been requested
 	std::string _postdata;
 
@@ -257,6 +269,16 @@
 			throw gnash::GnashException(curl_multi_strerror(mcode));
 		}
 
+                long code;
+                curl_easy_getinfo(_handle, CURLINFO_RESPONSE_CODE, &code);
+                if ( code == 404 ) // file not found!
+                {
+                        gnash::log_warning("404 response from url %s", _url.c_str());
+                        _error = TU_FILE_OPEN_ERROR;
+			_running = false;
+                        return;
+                }
+
 		// we already have that much data
 		fstat(_cachefd, &statbuf);
 		if ( statbuf.st_size >= size ) 
@@ -289,6 +311,7 @@
 
 	_url = url;
 	_running = 1;
+	_error = 0;
 
 	_cached = -1;
 
@@ -413,13 +436,14 @@
 size_t
 CurlStreamFile::read(void *dst, size_t bytes)
 {
-	if ( eof() ) return 0;
+	if ( eof() || _error ) return 0;
 
 #ifdef GNASH_CURL_VERBOSE
 	fprintf(stderr, "read(%d) called\n", bytes);
 #endif
 
 	fill_cache(tell()+bytes);
+	if ( _error ) return 0; // error can be set by fill_cache
 
 #ifdef GNASH_CURL_VERBOSE
 	printInfo();
@@ -469,6 +493,7 @@
 #endif
 
 	fill_cache(pos);
+	if ( _error ) return false; // error can be set by fill_cache
 
 	if ( fseek(_cache, pos, SEEK_SET) == -1 ) {
 		fprintf(stderr, "Warning: fseek failed\n");
@@ -495,6 +520,16 @@
 		{
 			throw gnash::GnashException(curl_multi_strerror(mcode));
 		}
+
+                long code;
+                curl_easy_getinfo(_handle, CURLINFO_RESPONSE_CODE, &code);
+                if ( code == 404 ) // file not found!
+                {
+                        gnash::log_warning("404 response from url %s", _url.c_str());
+                        _error = TU_FILE_OPEN_ERROR;
+			_running = false;
+                        return false;
+                }
 	}
 
 	if ( fseek(_cache, 0, SEEK_END) == -1 ) {
@@ -538,6 +573,13 @@
 	return stream->read(dst, bytes);
 }
 
+static int
+err(void* appdata)
+{
+	CurlStreamFile* stream = (CurlStreamFile*) appdata;
+	return stream->err();
+}
+
 static bool
 eof(void* appdata)
 {
@@ -625,6 +667,7 @@
 		seek_to_end, // seek_to_end
 		tell, // tell
 		eof, // get eof
+		err, // get error
 		get_stream_size, // size of stream 
 		close);
 }
@@ -656,6 +699,7 @@
 		seek_to_end, // seek_to_end
 		tell, // tell
 		eof, // get eof
+		err, // get error
 		get_stream_size, // size of stream 
 		close);
 }

Index: libbase/noseek_fd_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/noseek_fd_adapter.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/noseek_fd_adapter.cpp	8 Apr 2007 23:06:17 -0000	1.15
+++ libbase/noseek_fd_adapter.cpp	17 Apr 2007 10:38:16 -0000	1.16
@@ -16,7 +16,7 @@
 
 // 
 
-/* $Id: noseek_fd_adapter.cpp,v 1.15 2007/04/08 23:06:17 rsavoye Exp $ */
+/* $Id: noseek_fd_adapter.cpp,v 1.16 2007/04/17 10:38:16 strk Exp $ */
 
 #if defined(_WIN32) || defined(WIN32)
 #define snprintf _snprintf
@@ -93,6 +93,9 @@
 	/// Return true if EOF has been reached
 	bool eof();
 
+	/// Return zero if everything is fine (?)
+	int err() { return 0; }
+
 	/// Report global position within the file
 	size_t tell();
 
@@ -420,6 +423,14 @@
 }
 
 static int
+err(void* appdata)
+{
+	NoSeekFile* stream = (NoSeekFile*) appdata;
+	if ( ! stream ) return TU_FILE_OPEN_ERROR;
+	return stream->err();
+}
+
+static int
 write(const void* /*src*/, int /*bytes*/, void* /*appdata*/)
 {
 	assert(0); // not supported
@@ -485,6 +496,7 @@
 		seek_to_end, // seek_to_end
 		tell, // tell
 		eof, // get eof
+		err, // get error
 		NULL, // get stream size
 		close);
 }

Index: libbase/tu_file.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- libbase/tu_file.cpp	29 Mar 2007 10:32:04 -0000	1.14
+++ libbase/tu_file.cpp	17 Apr 2007 10:38:16 -0000	1.15
@@ -87,6 +87,14 @@
     }
 }
 
+static int
+std_get_err_func(void *appdata)
+// Return true if we're at EOF.
+{
+    if ( ! appdata ) return TU_FILE_OPEN_ERROR;
+    return (ferror((FILE*) appdata));
+}
+
 static long
 std_get_stream_size_func(void *appdata)
 // Return -1 on failure, or the size
@@ -286,6 +294,14 @@
     return buf->m_position >= buf->m_.size();
 }
 
+static int
+mem_get_err_func(void* appdata)
+// Return true if we're positioned at the end of the buffer.
+{
+    filebuf* buf = (filebuf*) appdata;
+    return buf->is_valid();
+}
+
 static long
 mem_get_stream_size(void* appdata)
 // Return the file size, or -1 on failure.
@@ -319,7 +335,7 @@
 // Create a file using the custom callbacks.
 tu_file::tu_file(void * appdata, read_func rf, write_func wf,
 		 seek_func sf, seek_to_end_func ef, tell_func tf,
-		 get_eof_func gef, get_stream_size_func gss, close_func cf)
+		 get_eof_func gef, get_err_func ger, get_stream_size_func gss, close_func cf)
 {
     m_data = appdata;
     m_read = rf;
@@ -328,9 +344,9 @@
     m_seek_to_end = ef;
     m_tell = tf;
     m_get_eof = gef;
+    m_get_err = ger;
     m_get_stream_size = gss;
     m_close = cf;
-    m_error = TU_FILE_NO_ERROR;
 }
 
 // Create a file from a standard file pointer.
@@ -345,9 +361,9 @@
     m_seek_to_end = std_seek_to_end_func;
     m_tell = std_tell_func;
     m_get_eof = std_get_eof_func;
+    m_get_err = std_get_err_func;
     m_get_stream_size = std_get_stream_size_func;
     m_close = autoclose ? std_close_func : NULL;
-    m_error = TU_FILE_NO_ERROR;
 }
 
 // Create a file from the given name and the given mode.
@@ -357,27 +373,15 @@
 
     m_data = fopen(name, mode);
     
-    if (m_data) {
 	m_read = std_read_func;
 	m_write = std_write_func;
 	m_seek = std_seek_func;
 	m_seek_to_end = std_seek_to_end_func;
 	m_tell = std_tell_func;
 	m_get_eof = std_get_eof_func;
+	m_get_err = std_get_err_func;
     m_get_stream_size = std_get_stream_size_func;
 	m_close = std_close_func;
-	m_error = TU_FILE_NO_ERROR;
-    } else {
-	m_read = NULL;
-	m_write = NULL;
-	m_seek = NULL;
-	m_seek_to_end = NULL;
-	m_tell = NULL;
-	m_get_eof = NULL;
-    m_get_stream_size = NULL;
-	m_close = NULL;
-	m_error = TU_FILE_OPEN_ERROR;
-    }
 }
 
 tu_file::tu_file(memory_buffer_enum /* m */)
@@ -391,9 +395,9 @@
     m_seek_to_end = mem_seek_to_end_func;
     m_tell = mem_tell_func;
     m_get_eof = mem_get_eof_func;
+    m_get_err = mem_get_err_func;
     m_get_stream_size = mem_get_stream_size;
     m_close = mem_close_func;
-    m_error = TU_FILE_NO_ERROR;
 }
 
 
@@ -408,9 +412,9 @@
     m_seek_to_end = mem_seek_to_end_func;
     m_tell = mem_tell_func;
     m_get_eof = mem_get_eof_func;
+    m_get_err = mem_get_err_func;
     m_get_stream_size = mem_get_stream_size;
     m_close = mem_close_func;
-    m_error = TU_FILE_NO_ERROR;
 }
 
 tu_file::~tu_file()
@@ -423,7 +427,7 @@
 tu_file::close() 
 // Close this file.
 { 
-    if (m_close) {
+    if (m_close && m_data) {
 	m_close(m_data);
     }
     m_data = NULL; 

Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libbase/tu_file.h	11 Apr 2007 17:54:21 -0000	1.12
+++ libbase/tu_file.h	17 Apr 2007 10:38:16 -0000	1.13
@@ -43,6 +43,7 @@
     typedef int (* seek_to_end_func)(void* appdata);
     typedef int (* tell_func)(void* appdata);
     typedef bool (* get_eof_func)(void* appdata);
+    typedef int (* get_err_func)(void* appdata);
     typedef long (* get_stream_size_func)(void* appdata);
     typedef int (* close_func)(void* appdata);
     
@@ -55,6 +56,7 @@
 	seek_to_end_func ef,
 	tell_func tf,
 	get_eof_func gef,
+	get_err_func ger,
 	get_stream_size_func gss,
 	close_func cf=NULL);
     
@@ -78,61 +80,209 @@
     
     ~tu_file();
     
-    // Copy remaining contents of *in into *this.
+    /// Copy remaining contents of *in into *this.
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void copy_from(tu_file* in);
-    // Copy remaining contents of *this into *out.
+
+    /// Copy remaining contents of *this into *out.
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void copy_to(membuf* out);
     
-    // Copy a fixed number of bytes from *in to *this.
-    // Returns number of bytes copied.
+    /// Copy a fixed number of bytes from *in to *this.
+    //
+    /// Returns number of bytes copied.
+    ///
+    /// TODO: define what happens when either one of the streams
+    ///       is in error condition, see get_error().
+    ///
     int	copy_bytes(tu_file* in, int bytes);
     
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint64_t	read_le64();
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint32_t 	read_le32();
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint16_t 	read_le16();
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint64_t 	read_be64();
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint32_t 	read_be32();
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint16_t 	read_be16();
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void 	write_le64(uint64_t u);
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void 	write_le32(uint32_t u);
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void 	write_le16(uint16_t u);
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void	write_be64(uint64_t u);
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void 	write_be32(uint32_t u);
+
+    /// \brief
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void 	write_be16(uint16_t u);
     
-    // read/write a single byte
+    /// Read a single byte from the stream
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     uint8_t 	read_byte() { return read8(); }
+
+    /// write a single byte to the stream
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     void	write_byte(uint8_t u) { write8(u); }
     
-    // Read/write a byte buffer.
-    // Returns number of bytes read/written.
+    /// Read the given number of bytes from the stream
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     int 	read_bytes(void* dst, int num) { return m_read(dst, num, m_data); }
+
+    /// Write the given number of bytes to the stream
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
     int 	write_bytes(const void* src, int num) { return m_write(src, num, m_data); }
     
-    // write a 0-terminated string.
+    /// Write a 0-terminated string.
+    //
+    /// TODO: define what happens when the stream
+    ///       is in error condition, see get_error().
+    ///
 	void 	write_string(const char* src);
     
-    // Read up to max_length characters, returns the number of characters 
-    // read, or -1 if the string length is longer than max_length.
+    /// \brief
+    /// Read up to max_length characters, returns the number of characters 
+    /// read, or -1 if the string length is longer than max_length.
     //
-    // Stops at the first \0 character if it comes before max_length.
-    //
-    // Guarantees termination of the string.
+    /// Stops at the first \0 character if it comes before max_length.
+    ///
+    /// Guarantees termination of the string.
+    ///
+    /// @return ??
+    ///
+    /// TODO: define what to return when the stream
+    ///       is in error condition, see get_error().
+    ///
     int	read_string(char* dst, int max_length);
     
-    // float/double IO
+    /// \brief
+    /// TODO: define what to return when the stream
+    ///       is in error condition, see get_error().
     void	write_float32(float value);
+
+    /// \brief
+    /// TODO: define what to return when the stream
+    ///       is in error condition, see get_error().
     void	write_double64(double value);
+
+    /// \brief
+    /// TODO: define what to return when the stream
+    ///       is in error condition, see get_error().
     float	read_float32();
+
+    /// \brief
+    /// TODO: define what to return when the stream
+    ///       is in error condition, see get_error().
     double	read_double64();
     
-    // get/set pos
+    /// Return current stream position
+    //
+    /// TODO: define what to return when the stream
+    ///       is in error condition, see get_error().
+    ///
     int	get_position() const { return m_tell(m_data); }
+
+    /// Seek to the specified position
+    //
+    /// 
+    /// TODO: define what happens when an error occurs, or
+    ///       when we're already in an error condition
+    ///
     void 	set_position(int p) { m_seek(p, m_data); }
+
+    /// Seek to the end of the stream
+    //
+    /// TODO: define what happens when an error occurs
+    ///
     void	go_to_end() { m_seek_to_end(m_data); }
+
+    /// Return true if the end of the stream has been reached.
+    //
+    /// TODO: define what to return when in error condition
+    /// see get_error().
+    ///
     bool	get_eof() { return m_get_eof(m_data); }
     
-    int	get_error() { return m_error; }
+    /// Return non-zero if the stream is in an error state
+    //
+    /// When the stream is in an error state there's nothing
+    /// you can do about it, just delete it and log the error.
+    ///
+    /// There are some rough meaning for possible returned values
+    /// but I don't think they make much sense currently.
+    ///
+    int	get_error() { return m_get_err(m_data); }
     
 
 	// get the size of the stream
@@ -189,9 +339,9 @@
     seek_to_end_func 	m_seek_to_end;
     tell_func		m_tell;
     get_eof_func	m_get_eof;
+    get_err_func	m_get_err;
     get_stream_size_func	m_get_stream_size;
     close_func		m_close;
-    int		m_error;
 };
 
 

Index: libbase/zlib_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/zlib_adapter.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libbase/zlib_adapter.cpp	9 Mar 2007 14:38:29 -0000	1.13
+++ libbase/zlib_adapter.cpp	17 Apr 2007 10:38:16 -0000	1.14
@@ -290,6 +290,12 @@
 		return inf->m_at_eof;
 	}
 
+	inline int inflate_get_err(void* appdata)
+	{
+		inflater_impl*	inf = (inflater_impl*) appdata;
+		return inf->m_error;
+	}
+
 	inline int inflate_close(void* appdata)
 	{
 		inflater_impl*	inf = (inflater_impl*) appdata;
@@ -322,6 +328,7 @@
 				inflate_seek_to_end,
 				inflate_tell,
 				inflate_get_eof,
+				inflate_get_err,
 				NULL, // get stream size
 				inflate_close)
 			);

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/xml.cpp	16 Apr 2007 18:23:06 -0000	1.38
+++ server/asobj/xml.cpp	17 Apr 2007 10:38:16 -0000	1.39
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xml.cpp,v 1.38 2007/04/16 18:23:06 strk Exp $ */
+/* $Id: xml.cpp,v 1.39 2007/04/17 10:38:16 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -380,13 +380,23 @@
         return false;
     }
 
-    log_msg("Load XML file from url: %s", url.str().c_str());
+    log_msg("Loading XML file from url: '%s'", url.str().c_str());
 
     initParser();
 
     /// see: http://xmlsoft.org/html/libxml-parser.html#xmlParserOption
     int options = XML_PARSE_RECOVER | XML_PARSE_NOWARNING | XML_PARSE_NOERROR;
     _doc = xmlReadIO(readFromTuFile, closeTuFile, str.get(), url.str().c_str(), NULL, options);
+    if ( str->get_error() )
+    {
+	xmlFreeDoc(_doc);
+        _doc = 0;
+        log_error("Can't read XML file %s (stream error %d)!", url.str().c_str(), str->get_error());
+        _loaded = 0;
+        onLoadEvent(false);
+        return false;
+    }
+
     _bytes_total = str->get_size();
 
     if (_doc == 0)



From MAILER-DAEMON Tue Apr 17 07:25:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdloG-0002os-HU
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 07:25:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdloE-0002lU-J2
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:25:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdloD-0002kX-Sq
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:25:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdloD-0002kK-O8
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:25:17 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HdljU-00045o-L2
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:20:24 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3HBKHU4009144;
	Tue, 17 Apr 2007 13:20:22 +0200
Date: Tue, 17 Apr 2007 13:20:15 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <916176819.20070417132015@nova-sys.net>
To: strk <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash/backend render_handler.h
In-Reply-To: <20070417100305.GC63150@keybit.net>
References: <E1Hdj7D-0000Es-1o@cvs> <20070417100305.GC63150@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 11:25:19 -0000

Hello strk,

Tuesday, April 17, 2007, 12:03:05 PM, you wrote:
>> +       * @param bounds The minX/minY fields of this rect are always zero.
>> +       *   The width and height determine the size of the Flash video instance
>> +       *   on the stage (in TWIPS) prior to matrix transformations.         
>> +       */

s> Is width/height intended to be used for *clipping* the video to the desired size ?
s> In this case we likely also want xmin/ymin for clipping an arbitrary window.

AFAIK it defines the size of the video instance (doesn't matter how
the video itself looks at this point), which can be of any size.

The video is streched (*apparently* regardless of aspect ratio!) to
that size, so no crop is necessary.

Keep in mind that a video instance can load any video file it desires
and that those files may be of different pixel sizes.

Udo




From MAILER-DAEMON Tue Apr 17 08:01:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdmMp-0008Ct-Hb
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 08:01:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdmMk-000896-3c
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:00:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdmMd-00085H-9F
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:00:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdmMc-00085C-P3
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:00:50 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HdmHr-0008CM-Tb
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 07:55:57 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3HBtcW84149;
	Tue, 17 Apr 2007 13:55:38 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Tue, 17 Apr 2007 13:55:38 +0200
From: strk <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash/backend render_handler.h
Message-ID: <20070417115538.GD63150@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1Hdj7D-0000Es-1o@cvs> <20070417100305.GC63150@keybit.net>
	<916176819.20070417132015@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <916176819.20070417132015@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 12:01:01 -0000

On Tue, Apr 17, 2007 at 01:20:15PM +0200, Udo Giacomozzi wrote:
> Hello strk,
> 
> Tuesday, April 17, 2007, 12:03:05 PM, you wrote:
> >> +       * @param bounds The minX/minY fields of this rect are always zero.
> >> +       *   The width and height determine the size of the Flash video instance
> >> +       *   on the stage (in TWIPS) prior to matrix transformations.         
> >> +       */
> 
> s> Is width/height intended to be used for *clipping* the video to the desired size ?
> s> In this case we likely also want xmin/ymin for clipping an arbitrary window.
> 
> AFAIK it defines the size of the video instance (doesn't matter how
> the video itself looks at this point), which can be of any size.
> 
> The video is streched (*apparently* regardless of aspect ratio!) to
> that size, so no crop is necessary.

If this is the case I agree with you, it is completely unecessarly to have
that argument, as the scale can be concatenated with the matrix parameter, right ?

--strk;



From MAILER-DAEMON Tue Apr 17 08:20:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdmg6-00016A-AC
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 08:20:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdmg4-00015x-Td
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:20:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdmg3-00015k-EG
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:20:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdmg3-00015h-7c
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:20:55 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HdmbJ-0003CD-TI
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:16:02 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3HCFuU4026652;
	Tue, 17 Apr 2007 14:16:00 +0200
Date: Tue, 17 Apr 2007 14:15:53 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1455727173.20070417141553@nova-sys.net>
To: strk <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash/backend render_handler.h
In-Reply-To: <20070417115538.GD63150@keybit.net>
References: <E1Hdj7D-0000Es-1o@cvs> <20070417100305.GC63150@keybit.net>
	<916176819.20070417132015@nova-sys.net>
	<20070417115538.GD63150@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 12:20:57 -0000

Hello strk,

Tuesday, April 17, 2007, 1:55:38 PM, you wrote:
>> The video is streched (*apparently* regardless of aspect ratio!) to
>> that size, so no crop is necessary.

s> If this is the case I agree with you, it is completely unecessarly to have
s> that argument, as the scale can be concatenated with the matrix parameter, right ?

No, there are *two* scales: one for the video container (I called it
"video instance"), and one for the video itself.

Example:

You have a SWF with a 320x240 pixel (6400x4800 TWIPS) video
*container* that loads a video (FLV) which is sized 160x120. This
means that the renderer has to double the video frames (in size),
however the matrix is still an "identity".

Now say the video *container* is scaled by 150% using _xscale/_yscale
in ActionScript. Now the matrix will have it's scale fields to 1.5 but
the video needs to be scaled by 300%.

You need

- the untransformed bounds to know the *outline* of the video
  *container*
  
- the matrix to:
  - move, scale and rotate that outline (applied to "bounds")
  - move, scale and rotate the video (matrix is changed before being
    applied)
    
- the frame size of the video itself so that it can be streched to the
  container outline

When you concatenate the video-to-container scale to the matrix you
will also scale the container, which is not what you want.

Think like the FLV video is a child of the container.

So the information contained in "bounds" *is* important, but it's
overkill to use Range2d for that since minX and minY will *always* be
zero and Range2d instance does nothing but carrying two "double"
values.

Udo
  




From MAILER-DAEMON Tue Apr 17 09:03:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdnL4-0004Qy-7T
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 09:03:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdnL2-0004QX-Gl
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:03:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdnL1-0004QK-Sh
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:03:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdnL1-0004QH-NN
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:03:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdnGI-0000YM-GD
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 08:58:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HdnGH-0001NP-CB
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 12:58:21 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HdnGH-0001NL-1a
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 12:58:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HdnGH-0001NL-1a@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 17 Apr 2007 12:58:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/xmlnode.cpp server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 13:03:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/17 12:58:20

Modified files:
	.              : ChangeLog 
	server/asobj   : xmlnode.cpp xmlnode.h 
	testsuite/actionscript.all: XML.as 

Log message:
	        * testsuite/actionscript.all/XML.as: add test
	          showing that removeNode doesn't recurse to
	          childrens.
	        * server/asobj/xmlnode.{cpp,h}: fix removeNode
	          to not delete all childrens.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2895&r2=1.2896
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2895
retrieving revision 1.2896
diff -u -b -r1.2895 -r1.2896
--- ChangeLog	17 Apr 2007 10:38:16 -0000	1.2895
+++ ChangeLog	17 Apr 2007 12:58:20 -0000	1.2896
@@ -1,5 +1,13 @@
 2007-04-17 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/XML.as: add test
+	  showing that removeNode doesn't recurse to
+	  childrens.
+	* server/asobj/xmlnode.{cpp,h}: fix removeNode
+	  to not delete all childrens.
+
+2007-04-17 Sandro Santilli <strk@keybit.net>
+
 	* libbase/: tu_file.{cpp,h}, curl_adapter.cpp, zlib_adapter.cpp,
 	  noseek_fd_adapter.cpp:
 	  Add another callback for getting stream error. First pass at

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/asobj/xmlnode.cpp	16 Apr 2007 18:23:06 -0000	1.31
+++ server/asobj/xmlnode.cpp	17 Apr 2007 12:58:20 -0000	1.32
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.31 2007/04/16 18:23:06 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.32 2007/04/17 12:58:20 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -121,7 +121,6 @@
 #ifdef DEBUG_MEMORY_ALLOCATION
     log_msg("\tDeleting XMLNode data %s at %p", this->_name.c_str(), this);
 #endif
-  
 }
 
 bool
@@ -173,8 +172,8 @@
 boost::intrusive_ptr<XMLNode> 
 XMLNode::cloneNode(bool deep)
 {
-    GNASH_REPORT_FUNCTION;
-    log_msg("%s: deep is %d\n", __PRETTY_FUNCTION__, deep);
+    //GNASH_REPORT_FUNCTION;
+    //log_msg("%s: deep is %d", __PRETTY_FUNCTION__, deep);
 
     boost::intrusive_ptr<XMLNode> newnode = new XMLNode(*this, deep);
 
@@ -185,8 +184,6 @@
 XMLNode::insertBefore(boost::intrusive_ptr<XMLNode> newnode, boost::intrusive_ptr<XMLNode> pos)
 {
     // find iterator for positional parameter
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
-
     ChildList::iterator it = find(_children.begin(), _children.end(), pos);
     if ( it == _children.end() )
     {
@@ -216,8 +213,6 @@
     {
         oldparent->_children.remove(this);
     }
-    _children.clear();
-    _attributes.clear();
     _parent = NULL;
     assert(get_ref_count() > 0);
 }
@@ -466,7 +461,7 @@
 static as_value
 xmlnode_clonenode(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 //    log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
 
@@ -480,7 +475,7 @@
 static as_value
 xmlnode_insertbefore(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+	//GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
 
 	if ( fn.nargs < 2 )
@@ -526,7 +521,7 @@
 static as_value
 xmlnode_removenode(const fn_call& fn)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
     
     ptr->removeNode();

Index: server/asobj/xmlnode.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/xmlnode.h	10 Apr 2007 10:46:19 -0000	1.12
+++ server/asobj/xmlnode.h	17 Apr 2007 12:58:20 -0000	1.13
@@ -225,7 +225,7 @@
 
     void toString(std::ostream& str) const;
 
-    void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
+    //void  change_stack_frame(int frame, gnash::as_object *xml, gnash::as_environment *env);
 
     // We might turn this back to a dumb pointer, as long
     // as we'll make sure in the XMLNode destructor and

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/actionscript.all/XML.as	10 Apr 2007 10:46:19 -0000	1.27
+++ testsuite/actionscript.all/XML.as	17 Apr 2007 12:58:20 -0000	1.28
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.27 2007/04/10 10:46:19 strk Exp $";
+rcsid="$Id: XML.as,v 1.28 2007/04/17 12:58:20 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -487,6 +487,18 @@
 check_equals(deepcln_node.parentNode, null);
 
 
+xml1 = new XML("<X1T><X1C1><X1C1C1></X1C1C1></X1C1><X1C2></X1C2></X1T>");
+check_equals(xml1.firstChild.childNodes.length, 2);
+fc = xml1.firstChild.firstChild;
+check_equals(fc.nodeName, 'X1C1');
+check_equals(fc.childNodes.length, 1);
+check_equals(fc.parentNode, xml1.firstChild);
+fc.removeNode(); // removes xml1.firstChild.firstChil (X1C1)
+check_equals(xml1.firstChild.childNodes.length, 1);
+check_equals(fc.parentNode, null);
+check_equals(fc.nodeName, 'X1C1');
+check_equals(fc.childNodes.length, 1); // childs of the removed child are still alive !
+check_equals(fc.childNodes[0].parentNode, fc); // and still point to the removed child !
 
 //------------------------------------------------
 // Other tests..



From MAILER-DAEMON Tue Apr 17 09:39:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdntx-0000YX-Ao
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 09:39:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdntv-0000YK-Qs
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:39:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdntu-0000Y5-Hq
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:39:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdntu-0000Y2-CP
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:39:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdnpA-0005Ir-Vh
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 09:34:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdnp9-0003j5-Uv
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 13:34:24 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hdnp9-0003iy-Mn
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 13:34:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdnp9-0003iy-Mn@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 17 Apr 2007 13:34:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/sdl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 13:39:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/17 13:34:23

Modified files:
	.              : ChangeLog 
	gui            : sdl.cpp 

Log message:
	        * gui/sdl.cpp (key_event): update call to notify_key_event
	          to provide no modifiers always (bogus, but at least compiles).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2896&r2=1.2897
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2896
retrieving revision 1.2897
diff -u -b -r1.2896 -r1.2897
--- ChangeLog	17 Apr 2007 12:58:20 -0000	1.2896
+++ ChangeLog	17 Apr 2007 13:34:23 -0000	1.2897
@@ -1,5 +1,7 @@
 2007-04-17 Sandro Santilli <strk@keybit.net>
 
+	* gui/sdl.cpp (key_event): update call to notify_key_event
+	  to provide no modifiers always (bogus, but at least compiles).
 	* testsuite/actionscript.all/XML.as: add test
 	  showing that removeNode doesn't recurse to
 	  childrens.

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- gui/sdl.cpp	2 Apr 2007 15:54:08 -0000	1.52
+++ gui/sdl.cpp	17 Apr 2007 13:34:23 -0000	1.53
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.52 2007/04/02 15:54:08 strk Exp $ */
+/* $Id: sdl.cpp,v 1.53 2007/04/17 13:34:23 strk Exp $ */
 
 // XXXbjacques: Screw up the indentation in this file, and you're dead. And by
 //              screw up, I mean not adhering the indentation used throughout
@@ -311,7 +311,9 @@
     }
     
     if (c != gnash::key::INVALID) {
-        notify_key_event(c, down);
+	// 0 should be any modifier instead..
+	// see Gui::notify_key_event in gui.h
+        notify_key_event(c, 0, down);
     }
 }
 



From MAILER-DAEMON Tue Apr 17 11:02:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HdpCH-0000w2-Id
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 11:02:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HdpCG-0000vJ-NO
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 11:02:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HdpCF-0000tG-7B
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 11:02:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HdpCF-0000t8-54
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 11:02:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hdp7V-0002sH-9i
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 10:57:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdp7S-00019s-Ui
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 14:57:23 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hdp7S-00019p-Ax
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 14:57:22 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdp7S-00019p-Ax@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 17 Apr 2007 14:57:22 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash backend/render_handler_agg_style.h ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 15:02:20 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/17 14:57:21

Modified files:
	backend        : render_handler_agg_style.h 
	.              : ChangeLog 

Log message:
	DEBUG_LIMIT_COLOR_ALPHA to debug YouTube

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg_style.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2897&r2=1.2898

Patches:
Index: backend/render_handler_agg_style.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg_style.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- backend/render_handler_agg_style.h	4 Apr 2007 20:30:45 -0000	1.13
+++ backend/render_handler_agg_style.h	17 Apr 2007 14:57:20 -0000	1.14
@@ -27,6 +27,12 @@
 // be cached somewhere. 
 
 
+// Enable this DEFINE to limit the alpha value of all colors to 50% at most.
+// This works only with solid and gradient fills (not bitmaps) and is used
+// for debugging hidden characters.
+//#define DEBUG_LIMIT_COLOR_ALPHA 
+
+
 using namespace gnash;
 
 namespace gnash {
@@ -62,6 +68,10 @@
   agg_style_solid(const agg::rgba8 color) {
     m_is_solid = true;
     m_color = color;
+    
+#ifdef DEBUG_LIMIT_COLOR_ALPHA
+    m_color.a = m_color.a>127 ? 127 : m_color.a;
+#endif    
   }
 
   void generate_span(agg::rgba8* /*span*/, int /*x*/, int /*y*/, unsigned /*len*/)
@@ -212,6 +222,10 @@
       const gradient_record gr = fs.get_color_stop(i); 
       rgba trans_color = m_cx.transform(gr.m_color);
       
+#ifdef DEBUG_LIMIT_COLOR_ALPHA
+      trans_color.m_a = trans_color.m_a>127 ? 127 : trans_color.m_a;
+#endif    
+      
       m_gradient_lut.add_color(gr.m_ratio/255.0, agg::rgba8_pre(trans_color.m_r, 
         trans_color.m_g, trans_color.m_b, trans_color.m_a));
         

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2897
retrieving revision 1.2898
diff -u -b -r1.2897 -r1.2898
--- ChangeLog	17 Apr 2007 13:34:23 -0000	1.2897
+++ ChangeLog	17 Apr 2007 14:57:20 -0000	1.2898
@@ -1,3 +1,7 @@
+2007-04-17 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler_agg_style.h: Added DEBUG_LIMIT_COLOR_ALPHA 
+	
 2007-04-17 Sandro Santilli <strk@keybit.net>
 
 	* gui/sdl.cpp (key_event): update call to notify_key_event



From MAILER-DAEMON Tue Apr 17 13:51:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdrpw-0006bN-FE
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 13:51:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdrpu-0006Yf-Kj
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 13:51:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdrps-0006X2-7j
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 13:51:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdrps-0006Wz-1u
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 13:51:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1Hdrl7-0005FQ-4N
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 13:46:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdrl0-0004cC-8A
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 17:46:22 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1Hdrkz-0004c8-D3
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 17:46:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdrkz-0004c8-D3@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Tue, 17 Apr 2007 17:46:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/URL.cpp testsuite/libba...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 17:51:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/17 17:46:21

Modified files:
	.              : ChangeLog 
	libbase        : URL.cpp 
	testsuite/libbase: URLTest.cpp 

Log message:
	        * libbase/URL.cpp: Don't attempt to remove an item from the vector
	        of strings if the vector is empty.
	        * testsuite/libbase/URLTest.cpp: Add a test which shouldn't crash
	        anymore.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2898&r2=1.2899
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/URL.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/URLTest.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2898
retrieving revision 1.2899
diff -u -b -r1.2898 -r1.2899
--- ChangeLog	17 Apr 2007 14:57:20 -0000	1.2898
+++ ChangeLog	17 Apr 2007 17:46:19 -0000	1.2899
@@ -1,3 +1,10 @@
+2004-04-17 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* libbase/URL.cpp: Don't attempt to remove an item from the vector
+	of strings if the vector is empty.
+	* testsuite/libbase/URLTest.cpp: Add a test which shouldn't crash
+	anymore.
+
 2007-04-17 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler_agg_style.h: Added DEBUG_LIMIT_COLOR_ALPHA 

Index: libbase/URL.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/URL.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- libbase/URL.cpp	25 Feb 2007 20:48:41 -0000	1.34
+++ libbase/URL.cpp	17 Apr 2007 17:46:20 -0000	1.35
@@ -170,7 +170,8 @@
 			prev = curr;
 
 			if ( comp == "" || comp == "." ) continue;
-			if ( comp == ".." ) components.pop_back();
+			if ( comp == ".." && components.size() )
+				 components.pop_back();
 			else components.push_back(comp);
 		}
 	}

Index: testsuite/libbase/URLTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/URLTest.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/libbase/URLTest.cpp	5 Nov 2006 00:45:27 -0000	1.12
+++ testsuite/libbase/URLTest.cpp	17 Apr 2007 17:46:20 -0000	1.13
@@ -150,6 +150,10 @@
 	check_equals (u17.str() , "file:///test?.swf" );
 	check_equals (u17.querystring() , "" );
 
+	// Test that this doesn't crash.
+	URL u18("file:///loadMovieTest.swf");
+	URL u19("file://../../test.swf", u18);
+
 
 	// Test query_string parsing
 	map<string, string> qs;



From MAILER-DAEMON Tue Apr 17 15:12:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hdt6T-0002IG-VS
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 15:12:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdt6S-0002Ft-5l
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 15:12:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdt6Q-0002EB-KG
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 15:12:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdt6Q-0002E5-IO
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 15:12:34 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hdt1e-0000ew-CS
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 15:07:39 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3HJ7AT92329;
	Tue, 17 Apr 2007 21:07:10 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Tue, 17 Apr 2007 21:07:10 +0200
To: Bastiaan Jacques <bastiaan@bjacques.org>
Subject: Re: [Gnash-commit] gnash ChangeLog libbase/URL.cpp testsuite/libba...
Message-ID: <20070417190710.GA87615@keybit.net>
Mail-Followup-To: Bastiaan Jacques <bastiaan@bjacques.org>,
	gnash-commit@gnu.org
References: <E1Hdrkz-0004c8-D3@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1Hdrkz-0004c8-D3@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 19:12:36 -0000

On Tue, Apr 17, 2007 at 05:46:21PM +0000, Bastiaan Jacques wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Bastiaan Jacques <bjacques>	07/04/17 17:46:21
> 
> Modified files:
> 	.              : ChangeLog 
> 	libbase        : URL.cpp 
> 	testsuite/libbase: URLTest.cpp 
> 
> Log message:
> 	        * libbase/URL.cpp: Don't attempt to remove an item from the vector
> 	        of strings if the vector is empty.
> 	        * testsuite/libbase/URLTest.cpp: Add a test which shouldn't crash
> 	        anymore.

Thanks a lot.
I guess next step would be updating the loadMovieTest.c file to stop using
the file://prefix.

--strk;



From MAILER-DAEMON Tue Apr 17 16:58:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hduky-0007PR-VZ
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 16:58:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hdukx-0007P7-HJ
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 16:58:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hdukw-0007Oj-4J
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 16:58:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hdukv-0007Oa-WA
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 16:58:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HdugA-0001yM-EV
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 16:53:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hdug6-000775-76
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 20:53:30 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hdug5-000770-PT
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 20:53:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hdug5-000770-PT@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 17 Apr 2007 20:53:29 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/loadMov...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Apr 2007 20:58:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/17 20:53:29

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: loadMovieTest.c loadMovieTestRunner.cpp 

Log message:
	        * testsuite/misc-ming.all/loadMovieTest.c: stop prepending
	          'file://' to srcdir as it might be relative and file://
	          should not be used with relative uris.
	        * testsuite/misc-ming.all/loadMovieTestRunner.cpp:
	          Don't cheat, run the test !

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2899&r2=1.2900
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTest.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2899
retrieving revision 1.2900
diff -u -b -r1.2899 -r1.2900
--- ChangeLog	17 Apr 2007 17:46:19 -0000	1.2899
+++ ChangeLog	17 Apr 2007 20:53:29 -0000	1.2900
@@ -1,3 +1,11 @@
+2007-04-17 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/loadMovieTest.c: stop prepending
+	  'file://' to srcdir as it might be relative and file://
+	  should not be used with relative uris.
+	* testsuite/misc-ming.all/loadMovieTestRunner.cpp:
+	  Don't cheat, run the test !
+
 2004-04-17 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* libbase/URL.cpp: Don't attempt to remove an item from the vector

Index: testsuite/misc-ming.all/loadMovieTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTest.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/loadMovieTest.c	8 Feb 2007 15:57:06 -0000	1.1
+++ testsuite/misc-ming.all/loadMovieTest.c	17 Apr 2007 20:53:29 -0000	1.2
@@ -120,11 +120,12 @@
 	sprintf(file_offspring, "%s/offspring.jpg", srcdir);
 
 	/*
-	 * Test urls with and w/out 'file://' prefix.
 	 * Test both jpeg and swf loading.
+	 * NOTE: testing of urls with and w/out 'file://' prefix
+	 *       disabled to reduce test complexity.
 	 */
-	sprintf(url_lynch, "file://%s/lynch.swf", srcdir);
-	sprintf(url_green, "file://%s/green.jpg", srcdir);
+	sprintf(url_lynch, "%s/lynch.swf", srcdir);
+	sprintf(url_green, "%s/green.jpg", srcdir);
 	sprintf(url_offspring, "%s/offspring.swf", srcdir);
 
 

Index: testsuite/misc-ming.all/loadMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/loadMovieTestRunner.cpp	14 Apr 2007 15:53:18 -0000	1.5
+++ testsuite/misc-ming.all/loadMovieTestRunner.cpp	17 Apr 2007 20:53:29 -0000	1.6
@@ -38,7 +38,6 @@
 int
 main(int /*argc*/, char** /*argv*/)
 {
-return 0;
 	gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 	dbglogfile.setVerbosity(1);
 



From MAILER-DAEMON Tue Apr 17 23:36:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He0yE-0005Gk-Ob
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 23:36:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He0yC-0005Gf-RD
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:36:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He0yB-0005GT-Gt
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:36:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He0yB-0005GQ-BZ
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:36:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1He0tN-0008S1-Qc
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:31:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He0tM-0005S8-Rc
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:31:36 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1He0tM-0005S2-Gs
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:31:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He0tM-0005S2-Gs@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 18 Apr 2007 03:31:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 03:36:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/18 03:31:36

Modified files:
	.              : ChangeLog 

Log message:
	activate testcase path_format_test.c

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2900&r2=1.2901

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2900
retrieving revision 1.2901
diff -u -b -r1.2900 -r1.2901
--- ChangeLog	17 Apr 2007 20:53:29 -0000	1.2900
+++ ChangeLog	18 Apr 2007 03:31:36 -0000	1.2901
@@ -1,3 +1,8 @@
+2007-04-18 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/Makefile.am:
+	  activate testcast path_format_test.c
+	  
 2007-04-17 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/loadMovieTest.c: stop prepending



From MAILER-DAEMON Tue Apr 17 23:39:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He10o-0005p5-2y
	for mharc-gnash-commit@gnu.org; Tue, 17 Apr 2007 23:39:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He10m-0005oT-FP
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:39:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He10m-0005o1-07
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:39:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He10l-0005ny-OU
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:39:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1He0vy-0000If-7R
	for gnash-commit@gnu.org; Tue, 17 Apr 2007 23:34:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He0vx-00069M-Be
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:34:17 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1He0vw-00069F-UL
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:34:17 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He0vw-00069F-UL@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 18 Apr 2007 03:34:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 03:39:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/18 03:34:16

Modified files:
	testsuite/misc-ming.all: Makefile.am 

Log message:
	activate testcase path_format_test.c

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.93&r2=1.94

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- Makefile.am	16 Apr 2007 12:31:02 -0000	1.93
+++ Makefile.am	18 Apr 2007 03:34:16 -0000	1.94
@@ -106,6 +106,7 @@
 	DrawingApiTestRunner \
 	get_frame_number_test \
 	frame_label_test \
+	path_format_test \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -142,6 +143,7 @@
 	displaylist_depths_testrunner \
 	get_frame_number_testrunner \
 	frame_label_testrunner \
+	path_format_testrunner \
 	matrix_testrunner \
 	$(NULL)
 
@@ -417,6 +419,20 @@
 	sh $< -r5 $(top_builddir) frame_label_test.swf > $@
 	chmod 755 $@
 
+path_format_test_SOURCES =	\
+	path_format_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+path_format_test_LDADD = $(MING_LIBS)
+
+path_format_test.swf: path_format_test
+	./path_format_test $(top_srcdir)/testsuite/media
+
+path_format_testrunner: $(srcdir)/../generic-testrunner.sh path_format_test.swf
+	sh $< -r5 $(top_builddir) path_format_test.swf > $@
+	chmod 755 $@
+
 attachMovieTest_SOURCES =	\
 	attachMovieTest.c	\
 	ming_utils.h		\
@@ -926,6 +942,7 @@
 	matrix_testrunner \
 	get_frame_number_testrunner \
 	frame_label_testrunner \
+	path_format_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS



From MAILER-DAEMON Wed Apr 18 03:22:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He4Ua-0007Uw-5q
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 03:22:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He4UX-0007UW-TB
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:22:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He4UW-0007Sr-Ob
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:22:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He4UW-0007So-JP
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:22:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1He4Ph-0000OF-TB
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 03:17:14 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He4Pg-00026J-GJ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 07:17:12 +0000
Received: from strk by cvs with local (Exim 4.50) id 1He4Pf-00026F-V5
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 07:17:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He4Pf-00026F-V5@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 07:17:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/BitmapMovieInstance.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 07:22:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 07:17:11

Modified files:
	.              : ChangeLog 
	server         : BitmapMovieInstance.h 

Log message:
	        * server/BitmapMovieInstance.h:
	          Override restart() to avoid cleaning up
	          the displaylist (since no frame tags will
	          recreate it).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2901&r2=1.2902
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2901
retrieving revision 1.2902
diff -u -b -r1.2901 -r1.2902
--- ChangeLog	18 Apr 2007 03:31:36 -0000	1.2901
+++ ChangeLog	18 Apr 2007 07:17:11 -0000	1.2902
@@ -1,3 +1,10 @@
+2007-04-18 Sandro Santilli <strk@keybit.net>
+
+	* server/BitmapMovieInstance.h:
+	  Override restart() to avoid cleaning up
+	  the displaylist (since no frame tags will
+	  recreate it).
+
 2007-04-18 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/Makefile.am:

Index: server/BitmapMovieInstance.h
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapMovieInstance.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/BitmapMovieInstance.h	14 Feb 2007 09:03:53 -0000	1.2
+++ server/BitmapMovieInstance.h	18 Apr 2007 07:17:11 -0000	1.3
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: BitmapMovieInstance.h,v 1.2 2007/02/14 09:03:53 strk Exp $ */
+/* $Id: BitmapMovieInstance.h,v 1.3 2007/04/18 07:17:11 strk Exp $ */
 
 #ifndef GNASH_BITMAPMOVIEINSTANCE_H
 #define GNASH_BITMAPMOVIEINSTANCE_H
@@ -48,6 +48,16 @@
 
 	virtual ~BitmapMovieInstance() {}
 
+	/// Do nothing on restart. Especially don't trash the DisplayList 
+	//
+	/// TODO: this is needed due to the implementation detail of 
+	///       using the DisplayList to store our bitmap-filled
+	///       shape. Using the _drawable instead, or overriding
+	///       ::display to simply display our definition is likely
+	///	  the best way to go instead (we'd also reuse the same
+	///       bitmap info rather then creating new instances..)
+	void restart() {}
+
 };
 
 } // end of namespace gnash



From MAILER-DAEMON Wed Apr 18 04:18:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He5NI-0006ab-Um
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 04:18:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He5NH-0006a6-7S
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:18:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He5NG-0006Zu-BE
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:18:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He5NG-0006Zr-5d
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:18:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1He5IQ-0006lm-Tr
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:13:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He5IQ-00052F-84
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:13:46 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1He5IP-00052C-TV
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:13:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He5IP-00052C-TV@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Wed, 18 Apr 2007 08:13:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 08:18:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/18 08:13:45

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 
Added files:
	testsuite/misc-ming.all: duplicate_movie_clip_test.c 

Log message:
	new testcase for duplicateMovieClip(), user defined events should not be duplicated

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2902&r2=1.2903
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/duplicate_movie_clip_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2902
retrieving revision 1.2903
diff -u -b -r1.2902 -r1.2903
--- ChangeLog	18 Apr 2007 07:17:11 -0000	1.2902
+++ ChangeLog	18 Apr 2007 08:13:45 -0000	1.2903
@@ -9,6 +9,8 @@
 
 	* testsuite/misc-ming.all/Makefile.am:
 	  activate testcast path_format_test.c
+	* testsuite/misc-ming.all/duplicate_movie_clip_test.c
+	  new testcase for duplicateMovieClip().
 	  
 2007-04-17 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- testsuite/misc-ming.all/Makefile.am	18 Apr 2007 03:34:16 -0000	1.94
+++ testsuite/misc-ming.all/Makefile.am	18 Apr 2007 08:13:45 -0000	1.95
@@ -107,6 +107,7 @@
 	get_frame_number_test \
 	frame_label_test \
 	path_format_test \
+	duplicate_movie_clip_test \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -144,6 +145,7 @@
 	get_frame_number_testrunner \
 	frame_label_testrunner \
 	path_format_testrunner \
+	duplicate_movie_clip_testrunner \
 	matrix_testrunner \
 	$(NULL)
 
@@ -433,6 +435,20 @@
 	sh $< -r5 $(top_builddir) path_format_test.swf > $@
 	chmod 755 $@
 
+duplicate_movie_clip_test_SOURCES =	\
+	duplicate_movie_clip_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+duplicate_movie_clip_test_LDADD = $(MING_LIBS)
+
+duplicate_movie_clip_test.swf: duplicate_movie_clip_test
+	./duplicate_movie_clip_test $(top_srcdir)/testsuite/media
+
+duplicate_movie_clip_testrunner: $(srcdir)/../generic-testrunner.sh duplicate_movie_clip_test.swf
+	sh $< -r5 $(top_builddir) duplicate_movie_clip_test.swf > $@
+	chmod 755 $@
+	
 attachMovieTest_SOURCES =	\
 	attachMovieTest.c	\
 	ming_utils.h		\
@@ -943,6 +959,7 @@
 	get_frame_number_testrunner \
 	frame_label_testrunner \
 	path_format_testrunner \
+	duplicate_movie_clip_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/duplicate_movie_clip_test.c
===================================================================
RCS file: testsuite/misc-ming.all/duplicate_movie_clip_test.c
diff -N testsuite/misc-ming.all/duplicate_movie_clip_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/duplicate_movie_clip_test.c	18 Apr 2007 08:13:45 -0000	1.1
@@ -0,0 +1,93 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION  6
+#define OUTPUT_FILENAME  "duplicate_movie_clip_test.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc, dejagnuclip;
+  SWFDisplayItem it;
+  SWFShape  sh_red;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  add_actions(mo, "x1=0; x2=0; x3=0;");
+  SWFMovie_nextFrame(mo); 
+
+  
+  mc = newSWFMovieClip();
+  sh_red = make_fill_square (100, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc, (SWFBlock)sh_red);  
+  add_clip_actions(mc, "stop();");
+  SWFMovieClip_nextFrame(mc);
+
+
+  it = SWFMovie_add(mo, (SWFBlock)mc); 
+  SWFDisplayItem_setDepth(it, 10); 
+  SWFDisplayItem_setName(it, "mc"); 
+  
+  add_actions(mo, " mc.onLoad = function () {};"
+                  " mc.prop1 = 10; "
+                  " duplicateMovieClip('mc', 'dup', 1); ");
+  SWFMovie_nextFrame(mo); 
+  
+  
+  check_equals(mo, "mc.prop1", "10");
+  check_equals(mo, "typeof(mc.onLoad)", "'function'");
+  check_equals(mo, "mc.getDepth()", "-16374");
+  check_equals(mo, "dup.prop1", "undefined");  // user defined property will not be duplicated
+  xcheck_equals(mo, "typeof(dup.onLoad)", "'undefined'"); //user defined event will not be duplicated
+  check_equals(mo, "dup.getDepth()", "1");
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); 
+  
+  
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+



From MAILER-DAEMON Wed Apr 18 04:48:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He5qC-00066e-T8
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 04:48:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He5q9-000652-WF
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:48:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He5q8-00063w-0w
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:48:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He5q7-00063l-8Z
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:48:35 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1He5lI-0001jb-5d
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:43:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He5lG-00073P-MP
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:43:34 +0000
Received: from strk by cvs with local (Exim 4.50) id 1He5lG-00073M-5w
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:43:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He5lG-00073M-5w@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 08:43:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/loadMov...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 08:48:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 08:43:34

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: loadMovieTest.c 

Log message:
	        * testsuite/misc-ming.all/loadMovieTest.c: add
	          a couple of "buttons" to scribble on and clear
	          the loaded movies. Checks for this in the
	          test runner should follow.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2903&r2=1.2904
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTest.c?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2903
retrieving revision 1.2904
diff -u -b -r1.2903 -r1.2904
--- ChangeLog	18 Apr 2007 08:13:45 -0000	1.2903
+++ ChangeLog	18 Apr 2007 08:43:33 -0000	1.2904
@@ -1,5 +1,9 @@
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/loadMovieTest.c: add
+	  a couple of "buttons" to scribble on and clear
+	  the loaded movies. Checks for this in the 
+	  test runner should follow.
 	* server/BitmapMovieInstance.h:
 	  Override restart() to avoid cleaning up
 	  the displaylist (since no frame tags will

Index: testsuite/misc-ming.all/loadMovieTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTest.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/loadMovieTest.c	17 Apr 2007 20:53:29 -0000	1.2
+++ testsuite/misc-ming.all/loadMovieTest.c	18 Apr 2007 08:43:33 -0000	1.3
@@ -43,6 +43,12 @@
 #define OUTPUT_FILENAME "loadMovieTest.swf"
 
 void add_clip(SWFMovie mo, char* file, char* name, char* url, int x, int y);
+void add_button(SWFMovie mo, int x, int y, const char* label, SWFAction ac);
+void add_coverart(SWFMovie mo, int x, int y);
+SWFTextField get_label(const char* label, SWFFont font);
+
+
+const char* mediadir=".";
 
 void
 add_clip(SWFMovie mo, char* file, char* name,
@@ -51,7 +57,7 @@
 	FILE *fd;
 	SWFJpegBitmap bm;
 	SWFShape sh;
-	SWFMovieClip mc, mct;
+	SWFMovieClip mc;
 	SWFDisplayItem it;
 	SWFAction ac;
 	char action[1024];
@@ -77,13 +83,64 @@
 %s.onPress = function () { \
 	coverart.loadMovie('%s'); \
 }; \
-", name, url, url);
+", name, url);
 
 	ac = compileSWFActionCode(action);
 
 	SWFMovie_add(mo, (SWFBlock)ac);
 }
 
+void
+add_coverart(SWFMovie mo, int x, int y)
+{
+	SWFShape sh_coverart;
+	SWFFillStyle fstyle;
+	SWFMovieClip mc_coverart;
+	SWFDisplayItem it;
+
+	sh_coverart = newSWFShape();
+	fstyle = SWFShape_addSolidFillStyle(sh_coverart, 0,0,0,255);
+	SWFShape_setRightFillStyle(sh_coverart, fstyle);
+	SWFShape_movePenTo(sh_coverart, 170, 170);
+	SWFShape_drawLine(sh_coverart, -170, 0);
+	SWFShape_drawLine(sh_coverart, 0, -170);
+	SWFShape_drawLine(sh_coverart, 170, 0);
+	SWFShape_drawLine(sh_coverart, 0, 170);
+
+	mc_coverart = newSWFMovieClip();
+	SWFMovieClip_add(mc_coverart, (SWFBlock)sh_coverart);
+	SWFMovieClip_nextFrame(mc_coverart); /* showFrame */
+	it = SWFMovie_add(mo, (SWFBlock)mc_coverart);
+	SWFDisplayItem_setName(it, "coverart"); 
+	SWFDisplayItem_moveTo(it, x, y);
+}
+
+SWFTextField
+get_label(const char* label, SWFFont font)
+{
+	SWFTextField tf = newSWFTextField();
+	SWFTextField_setFont(tf, (void*)font);
+	SWFTextField_addChars(tf, " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ012345689:.,/\\#@?!");
+	SWFTextField_addString(tf, label);
+	return tf;
+}
+
+void
+add_button(SWFMovie mo, int x, int y, const char* label, SWFAction ac)
+{
+	SWFMovieClip btnclip = newSWFMovieClip();
+	SWFFont font = get_default_font(mediadir);
+	SWFDisplayItem it;
+	SWFTextField tf = get_label(label, font);
+
+	SWFMovieClip_add(btnclip, (SWFBlock)tf);
+	SWFMovieClip_nextFrame(btnclip);
+
+	it = SWFMovie_add(mo, (SWFBlock)btnclip);
+	SWFDisplayItem_moveTo(it, x, y);
+	SWFDisplayItem_addAction(it, ac, SWFACTION_PRESS);
+}
+
 int
 main(int argc, char** argv)
 {
@@ -95,12 +152,6 @@
 	char url_lynch[256];
 	char url_green[256];
 	char url_offspring[256];
-	const char *srcdir=".";
-	SWFShape sh_coverart;
-	SWFMovieClip mc_coverart;
-	SWFFillStyle fstyle;
-	SWFDisplayItem it;
-	SWFAction ac;
 
 	/*********************************************
 	 *
@@ -108,25 +159,25 @@
 	 *
 	 *********************************************/
 
-	if ( argc>1 ) srcdir=argv[1];
+	if ( argc>1 ) mediadir=argv[1];
 	else
 	{
 		fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
 		return 1;
 	}
 
-	sprintf(file_lynch, "%s/lynch.jpg", srcdir);
-	sprintf(file_green, "%s/green.jpg", srcdir);
-	sprintf(file_offspring, "%s/offspring.jpg", srcdir);
+	sprintf(file_lynch, "%s/lynch.jpg", mediadir);
+	sprintf(file_green, "%s/green.jpg", mediadir);
+	sprintf(file_offspring, "%s/offspring.jpg", mediadir);
 
 	/*
 	 * Test both jpeg and swf loading.
 	 * NOTE: testing of urls with and w/out 'file://' prefix
 	 *       disabled to reduce test complexity.
 	 */
-	sprintf(url_lynch, "%s/lynch.swf", srcdir);
-	sprintf(url_green, "%s/green.jpg", srcdir);
-	sprintf(url_offspring, "%s/offspring.swf", srcdir);
+	sprintf(url_lynch, "%s/lynch.swf", mediadir);
+	sprintf(url_green, "%s/green.jpg", mediadir);
+	sprintf(url_offspring, "%s/offspring.swf", mediadir);
 
 
 	puts("Setting things up");
@@ -146,7 +197,7 @@
 	 *
 	 *****************************************************/
 
-	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(mediadir), 10, 0, 0, 800, 600);
 	//it = SWFMovie_add(mo, (SWFBlock)dejagnuclip);
 	//SWFDisplayItem_moveTo(it, 0, 200);
 	//SWFMovie_nextFrame(mo); 
@@ -166,6 +217,38 @@
 	/* Add the OFFSPRING  clip */
 	add_clip(mo, file_offspring, "offspring", url_offspring, 400, 0);
 
+	/* Add the "shaker" button */
+	add_button(mo, 50, 200, "Scribble", newSWFAction(
+				//" for (i=0; i<96; ++i) {"
+				" depth=++_root.coverart.lastdepth;"
+				" id=depth-1;"
+				" _root.coverart.createEmptyMovieClip('child'+id, depth); "
+				" width = 170;"
+				" height = 170;"
+				" size=10;"
+				" with (_root.coverart['child'+id]) {"
+				"   lineStyle(2, 0xFF0000, 100);"
+				"   moveTo(0, 0); "
+				"   lineTo(size, 0); "
+				"   lineTo(size, size); "
+				"   lineTo(0, size); "
+				"   lineTo(0, 0); "
+				"   _x = (size*id)%width;"
+				"   _y = (parseInt(id*size/width)*size)%height;"
+				" }"
+				//"}"
+				));
+
+	add_button(mo, 50, 220, "Clear", newSWFAction(
+				" art=_root.coverart;"
+				" for (i=0; i<art.lastdepth; ++i) {"
+				"  art['child'+i].clear();"
+				//"  art.removeMovieClip('child'+i);" // doesn't work !
+				" }"
+				" art.lastdepth=0;"
+				" art.clear(); "
+				));
+
 	/*****************************************************
 	 *
 	 * Add the coverart clip
@@ -174,21 +257,7 @@
 
 	puts("Adding coverart");
 
-	sh_coverart = newSWFShape();
-	fstyle = SWFShape_addSolidFillStyle(sh_coverart, 0,0,0,255);
-	SWFShape_setRightFillStyle(sh_coverart, fstyle);
-	SWFShape_movePenTo(sh_coverart, 170, 170);
-	SWFShape_drawLine(sh_coverart, -170, 0);
-	SWFShape_drawLine(sh_coverart, 0, -170);
-	SWFShape_drawLine(sh_coverart, 170, 0);
-	SWFShape_drawLine(sh_coverart, 0, 170);
-
-	mc_coverart = newSWFMovieClip();
-	SWFMovieClip_add(mc_coverart, (SWFBlock)sh_coverart);
-	SWFMovieClip_nextFrame(mc_coverart); /* showFrame */
-	it = SWFMovie_add(mo, (SWFBlock)mc_coverart);
-	SWFDisplayItem_setName(it, "coverart"); 
-	SWFDisplayItem_moveTo(it, 500, 200);
+	add_coverart(mo, 500, 200);
 
 	add_actions(mo, "stop();");
 	SWFMovie_nextFrame(mo); /* showFrame */



From MAILER-DAEMON Wed Apr 18 04:56:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He5xY-00081b-DQ
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 04:56:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He5xW-00081L-N5
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:56:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He5xT-00080a-Eu
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:56:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He5xT-00080V-4P
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:56:11 -0400
Received: from nz-out-0506.google.com ([64.233.162.232])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1He5se-0002lu-0v
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 04:51:12 -0400
Received: by nz-out-0506.google.com with SMTP id s1so64678nze
	for <gnash-commit@gnu.org>; Wed, 18 Apr 2007 01:51:11 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=L71Q3rZCSF9Ie5+yO33IKlcHe4JcHb4iQTX4NVrwbbFfa2QpnblY/AGqrBLCHro5K6/NmwcR6ASugStr7coEOCo2wbW/gSGs3J3pyL3xu6UI+Wc3+bgdPdxOEXrxfv5Xg1ppGVTipfOYAntL/MNEHoJhSTCV+42GhFU/K1Q0YEk=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=XDpMYIC+llU9PpPwONXPkxG0MPaoXGRP29Y5PiKFxpgTYT6GbHZDdnkwIUnYG62hBXqctB4OXWaLQcJHP/IZ6Q/UgsF1p0qTvDsVTPdufi2/lZgJxyS9ZAYqs+wpDiXLy5bkcM65qR1MOOzDsbUxIn0Y53mAPnroBXKI3Ai0s10=
Received: by 10.115.16.1 with SMTP id t1mr95238wai.1176886270893;
	Wed, 18 Apr 2007 01:51:10 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Wed, 18 Apr 2007 01:51:10 -0700 (PDT)
Message-ID: <ca4b43ff0704180151g353c27a2wbd6809617f0cf25e@mail.gmail.com>
Date: Wed, 18 Apr 2007 16:51:10 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/character.cpp testsuite/...
In-Reply-To: <E1Hcmqk-0003sH-0x@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hcmqk-0003sH-0x@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 08:56:15 -0000

>> -     w = TWIPS_TO_PIXELS(int(bounds.width()));
>> +    w = TWIPS_TO_PIXELS(rint(bounds.width()));

Does this fix any testcase?   This is the reference I get from
internet. "rint" is implementation-dependent, either identical to
ceil() or floor(). Then why not just using ceil()  or  floor()
instead?

original link:
http://www.opengroup.org/onlinepubs/7990989775/xsh/rint.html



double rint(double x);

 DESCRIPTION
The rint() function returns the integral value (represented as a
double) nearest x in the direction of the current rounding mode. The
current rounding mode is implementation-dependent.
If the current rounding mode rounds toward negative infinity, then
rint() is identical to floor(). If the current rounding mode rounds
toward positive infinity, then rint() is identical to ceil().





On 4/15/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/04/14 18:19:49
>
> Modified files:
>        .              : ChangeLog
>        server         : character.cpp
>        testsuite/swfdec: PASSING
>        testsuite/misc-ming.all: Makefile.am
> Added files:
>        testsuite/misc-ming.all: matrix_test.c
>
> Log message:
>                * server/character.cpp (height_getset, width_getset): round
>                  width and heights to nearest integer twip.
>                * testsuite/swfdec/PASSING: height4.swf succeeds.
>                * testsuite/misc-ming.all: Makefile.am, matrix_test.c: new test
>                  for statically-defined matrix interpretation (just started, needs
>                  many more tests).
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2873&r2=1.2874
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.33&r2=1.34
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.15&r2=1.16
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.90&r2=1.91
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&rev=1.1
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2873
> retrieving revision 1.2874
> diff -u -b -r1.2873 -r1.2874
> --- ChangeLog   14 Apr 2007 16:27:22 -0000      1.2873
> +++ ChangeLog   14 Apr 2007 18:19:49 -0000      1.2874
> @@ -1,5 +1,14 @@
>  2007-04-14 Sandro Santilli <strk@keybit.net>
>
> +       * server/character.cpp (height_getset, width_getset): round
> +         width and heights to nearest integer twip.
> +       * testsuite/swfdec/PASSING: height4.swf succeeds.
> +       * testsuite/misc-ming.all: Makefile.am, matrix_test.c: new test
> +         for statically-defined matrix interpretation (just started, needs
> +         many more tests).
> +
> +2007-04-14 Sandro Santilli <strk@keybit.net>
> +
>        * server/sprite_instance.cpp (sprite_getBounds): round bounds
>          to twips.
>        * testsuite/actionscript.all/MovieClip.as: more successes.
>
> Index: server/character.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/character.cpp,v
> retrieving revision 1.33
> retrieving revision 1.34
> diff -u -b -r1.33 -r1.34
> --- server/character.cpp        12 Apr 2007 16:29:14 -0000      1.33
> +++ server/character.cpp        14 Apr 2007 18:19:49 -0000      1.34
> @@ -18,7 +18,7 @@
>  //
>  //
>
> -/* $Id: character.cpp,v 1.33 2007/04/12 16:29:14 strk Exp $ */
> +/* $Id: character.cpp,v 1.34 2007/04/14 18:19:49 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -458,13 +458,13 @@
>        as_value rv;
>        if ( fn.nargs == 0 ) // getter
>        {
> -               float w = 0;
> +               double w = 0;
>                if ( bounds.isFinite() )
>                {
>                        matrix m = ptr->get_matrix();
>                        m.transform(bounds);
>                        assert(bounds.isFinite());
> -                       w = TWIPS_TO_PIXELS(int(bounds.width()));
> +                       w = TWIPS_TO_PIXELS(rint(bounds.width()));
>                }
>                rv = as_value(w);
>        }
> @@ -503,13 +503,13 @@
>        as_value rv;
>        if ( fn.nargs == 0 ) // getter
>        {
> -               float h = 0;
> +               double h = 0;
>                if ( bounds.isFinite() )
>                {
>                        matrix m = ptr->get_matrix();
>                        m.transform(bounds);
>                        assert(bounds.isFinite());
> -                       h = TWIPS_TO_PIXELS(int(bounds.height()));
> +                       h = TWIPS_TO_PIXELS(rint(bounds.height()));
>                }
>                rv = as_value(h);
>        }
>
> Index: testsuite/swfdec/PASSING
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
> retrieving revision 1.15
> retrieving revision 1.16
> diff -u -b -r1.15 -r1.16
> --- testsuite/swfdec/PASSING    12 Apr 2007 09:14:37 -0000      1.15
> +++ testsuite/swfdec/PASSING    14 Apr 2007 18:19:49 -0000      1.16
> @@ -52,3 +52,4 @@
>  undefined2-7.swf
>  height1.swf
>  height3.swf
> +height4.swf
>
> Index: testsuite/misc-ming.all/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
> retrieving revision 1.90
> retrieving revision 1.91
> diff -u -b -r1.90 -r1.91
> --- testsuite/misc-ming.all/Makefile.am 9 Apr 2007 09:04:09 -0000       1.90
> +++ testsuite/misc-ming.all/Makefile.am 14 Apr 2007 18:19:49 -0000      1.91
> @@ -52,7 +52,6 @@
>        -DMING_VERSION_CODE=$(MING_VERSION_CODE) \
>        $(NULL)
>
> -
>  check_PROGRAMS = \
>        ButtonEventsTest \
>        ButtonEventsTest-Runner \
> @@ -86,6 +85,7 @@
>        registerClassTestRunner \
>        goto_frame_test \
>        consecutive_goto_frame_test \
> +       matrix_test \
>        multi_doactions_and_goto_frame_test \
>        simple_loop_test \
>        simple_loop_testrunner \
> @@ -140,6 +140,7 @@
>        reverse_execute_PlaceObject2_test2runner \
>        displaylist_depths_testrunner \
>        get_frame_number_testrunner \
> +       matrix_testrunner \
>        $(NULL)
>
>  if MAKESWF_SUPPORTS_PREBUILT_CLIPS
> @@ -372,6 +373,20 @@
>        sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
>        chmod 755 $@
>
> +matrix_test_SOURCES =  \
> +       matrix_test.c   \
> +       ming_utils.h            \
> +       ming_utils.c            \
> +       $(NULL)
> +matrix_test_LDADD = $(MING_LIBS)
> +
> +matrix_test.swf: matrix_test
> +       ./matrix_test $(top_srcdir)/testsuite/media
> +
> +matrix_testrunner: $(srcdir)/../generic-testrunner.sh matrix_test.swf
> +       sh $< -r5 $(top_builddir) matrix_test.swf > $@
> +       chmod 755 $@
> +
>  get_frame_number_test_SOURCES =        \
>        get_frame_number_test.c \
>        ming_utils.h            \
> @@ -892,6 +907,7 @@
>        reverse_execute_PlaceObject2_test1runner \
>        reverse_execute_PlaceObject2_test2runner \
>        displaylist_depths_testrunner \
> +       matrix_testrunner \
>        $(NULL)
>
>  if MAKESWF_SUPPORTS_PREBUILT_CLIPS
>
> Index: testsuite/misc-ming.all/matrix_test.c
> ===================================================================
> RCS file: testsuite/misc-ming.all/matrix_test.c
> diff -N testsuite/misc-ming.all/matrix_test.c
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ testsuite/misc-ming.all/matrix_test.c       14 Apr 2007 18:19:49 -0000      1.1
> @@ -0,0 +1,138 @@
> +/*
> + *   Copyright (C) 2007 Free Software Foundation, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> + *
> + */
> +
> +/*
> + * Sandro Santilli, strk@keybit.net
> + *
> + * Test extracting _width, _height, _xscale, _yscale, _x, _y and _rotation
> + * from hard-coded matrices.
> + *
> + * run as ./matrix_test
> + */
> +
> +#include "ming_utils.h"
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <ming.h>
> +
> +#define OUTPUT_VERSION 6
> +#define OUTPUT_FILENAME "matrix_test.swf"
> +
> +SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
> +
> +SWFDisplayItem
> +add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
> +{
> +       SWFShape sh;
> +       SWFMovieClip mc, mc2;
> +       SWFDisplayItem it;
> +
> +       sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 255, 0, 0);
> +       mc = newSWFMovieClip();
> +       SWFMovieClip_add(mc, (SWFBlock)sh);
> +
> +       sh = make_square (-(width/2)+5, -(height/2)+5, width-10, height-10, 0, 0, 0);
> +       mc2 = newSWFMovieClip(); // child
> +       SWFMovieClip_add(mc2, (SWFBlock)sh);
> +       SWFMovieClip_nextFrame(mc2);
> +
> +       it = SWFMovieClip_add(mc, (SWFBlock)mc2);
> +       SWFDisplayItem_setName(it, "child");
> +       SWFMovieClip_nextFrame(mc);
> +
> +       it = SWFMovie_add(mo, (SWFBlock)mc);
> +       SWFDisplayItem_setDepth(it, depth);
> +       SWFDisplayItem_moveTo(it, x, y);
> +       SWFDisplayItem_setName(it, name);
> +
> +       return it;
> +}
> +
> +
> +int
> +main(int argc, char** argv)
> +{
> +       SWFMovie mo;
> +       SWFMovieClip dejagnuclip;
> +       SWFDisplayItem it;
> +       int i;
> +
> +       const char *srcdir=".";
> +       if ( argc>1 )
> +               srcdir=argv[1];
> +       else
> +       {
> +               //fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
> +               //return 1;
> +       }
> +
> +       Ming_init();
> +       mo = newSWFMovieWithVersion(OUTPUT_VERSION);
> +       SWFMovie_setDimension(mo, 800, 600);
> +       SWFMovie_setRate (mo, 1);
> +
> +       dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
> +       SWFMovie_add(mo, (SWFBlock)dejagnuclip);
> +
> +       add_actions(mo, "printBounds = function(b) { return ''+b.xMin+','+b.yMin+' '+b.xMax+','+b.yMax; };");
> +
> +       SWFMovie_nextFrame(mo);
> +
> +
> +       // Static 60x60 movieclip
> +       it = add_static_mc(mo, "staticmc", 3, 50, 300, 60, 60);
> +
> +       // Check if we cleaned them all now
> +       check_equals(mo, "typeof(staticmc)", "'movieclip'");
> +       check_equals(mo, "staticmc._x", "50");
> +       check_equals(mo, "staticmc._y", "300");
> +       check_equals(mo, "staticmc._xscale", "100");
> +       check_equals(mo, "staticmc._yscale", "100");
> +       check_equals(mo, "staticmc._rotation", "0");
> +       check_equals(mo, "Math.round(staticmc._width)", "60");
> +       check_equals(mo, "Math.round(staticmc._height)", "60");
> +
> +       SWFMovie_nextFrame(mo);
> +
> +       SWFDisplayItem_rotate(it, -45);
> +
> +       check_equals(mo, "staticmc._x", "50");
> +       check_equals(mo, "staticmc._y", "300");
> +       check_equals(mo, "Math.round(staticmc._xscale)", "100");
> +       check_equals(mo, "Math.round(staticmc._yscale)", "100");
> +       check_equals(mo, "staticmc._rotation", "45");
> +       check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
> +       check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'7.5,257.5 92.5,342.5'");
> +       check_equals(mo, "staticmc._width", "85");
> +       check_equals(mo, "staticmc._height", "85");
> +
> +       // TODO:
> +       // - test mixing rotation and scale !
> +
> +
> +
> +       add_actions(mo, "_root.totals(); stop();");
> +       SWFMovie_nextFrame(mo);
> +
> +       //Output movie
> +       puts("Saving " OUTPUT_FILENAME );
> +       SWFMovie_save(mo, OUTPUT_FILENAME);
> +
> +       return 0;
> +}
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Wed Apr 18 05:40:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He6eh-0004bR-RV
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 05:40:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He6ee-0004bG-V1
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 05:40:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He6ec-0004b3-62
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 05:40:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He6ec-0004b0-00
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 05:40:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1He6Zl-0007o1-Hg
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 05:35:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He6Zj-00011a-DN
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:35:43 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1He6Zi-00011X-RX
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:35:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He6Zi-00011X-RX@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Wed, 18 Apr 2007 09:35:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp e...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 09:40:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/18 09:35:42

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_sdl.cpp 
	extensions/mysql: mysql_db.cpp 
	gui            : Player.cpp gnash.cpp gui.cpp 
	plugin/klash   : klash.cpp 
	plugin/win32   : plugin.cpp 
	server         : PropertyList.cpp StreamProvider.cpp array.cpp 
	                 as_environment.cpp as_function.cpp 
	                 as_object.cpp as_value.cpp 
	                 button_character_instance.cpp character.cpp 
	                 dlist.cpp edit_text_character.cpp 
	                 fill_style.cpp font.cpp generic_character.cpp 
	                 impl.cpp 

Log message:
	* Internationalization, phase 2.
	
	* These modules have had their printed messages passed through
	  _(...).  Those messages have also been cleaned up, thusly:
	    *  Stray \n's removed
	    *  Exclamation points and periods removed at ends of messages
	    *  Typos corrected, and English language wording adjusted.
	    *  Misplaced UPPER CASE shouting removed.
	    *  Many complaints about unknown types, values, etc, now include
	       the offending value, for ease of remote diagnosis.
	    *  C++-style << printouts converted to log_xxx calls.
	    *  Direct accesses to dbglogfile converted to log_xxx calls.
	  These changes should also make the messages easier to	translate.
	* Commented-out messages were also cleaned up as above.
	* Many modules have also had log_warning calls changed to
	  log_error, log_aserror, log_swferror, or log_unimp, according to
	  the documentation checked in earlier by strk and gnu.
	  IF_VERBOSE_xxx macros were inserted around some calls that
	  lacked them.
	* Header comments (at the top of the file) added or adjusted, to
	  describe each file in its initial line, and to correct whitespace
	  in the copyright notices.
	
	* The list of files affected by the above changes:
	  backend/sound_handler_sdl.cpp
	  extensions/mysql/mysql_db.cpp
	  gui/Player.cpp
	  gui/gnash.cpp
	  gui/gui.cpp
	  plugin/klash/klash.cpp
	  plugin/win32/plugin.cpp
	  server/PropertyList.cpp
	  server/StreamProvider.cpp
	  server/array.cpp
	  server/as_environment.cpp
	  server/as_function.cpp
	  server/as_object.cpp
	  server/as_value.cpp
	  server/button_character_instance.cpp
	  server/character.cpp
	  server/dlist.cpp
	  server/edit_text_character.cpp
	  server/fill_style.cpp
	  server/font.cpp
	  server/generic_character.cpp
	  server/impl.cpp
	  
	* 2007 copyright notices were inserted in:
	  backend/sound_handler_sdl.cpp
	  extensions/mysql/mysql_db.cpp
	  gui/gnash.cpp
	  plugin/klash/klash.cpp
	  plugin/win32/plugin.cpp
	  server/generic_character.cpp
	
	* New 2006, 2007 Free Software Foundation copyrights applied (to
	  formerly public domain code):
	  server/font.cpp
	 
	* backend/sound_handler_sdl.cpp: Move stray FORMAT_VORBIS comment.
	* gui/gui.cpp: Commented out "Resize request when no movie" error
	  that appears every time gnash is run.
	* plugins/klash/klash.cpp:  Translated pop-up menu items, about-box,
	  and updated copyright notice printed by --version and --help.
	* server/array.cpp (as_array_object::index_requested):  Avoid
	  c_str accessor when converting string to number.
	* server/dlist.{h,cpp}:  Change API of DisplayList::dump debug
	  function, so it can use log_xxx functions.
	
	I'm sure that I've missed some messages that ought to get 
	translated (with _(...)).  Those will be fixed over time.
	All new messages should be created with _(...) so they can
	be translated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2904&r2=1.2905
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/mysql_db.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gnash.cpp?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/win32/plugin.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/PropertyList.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fill_style.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.103&r2=1.104

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2904
retrieving revision 1.2905
diff -u -b -r1.2904 -r1.2905
--- ChangeLog	18 Apr 2007 08:43:33 -0000	1.2904
+++ ChangeLog	18 Apr 2007 09:35:41 -0000	1.2905
@@ -1,3 +1,79 @@
+2007-04-18  John Gilmore  <gnu@quiet.toad.com>
+
+	* Internationalization, phase 2.
+	
+	* These modules have had their printed messages passed through
+	  _(...).  Those messages have also been cleaned up, thusly:
+	    *  Stray \n's removed
+	    *  Exclamation points and periods removed at ends of messages
+	    *  Typos corrected, and English language wording adjusted.
+	    *  Misplaced UPPER CASE shouting removed.
+	    *  Many complaints about unknown types, values, etc, now include
+	       the offending value, for ease of remote diagnosis.
+	    *  C++-style << printouts converted to log_xxx calls.
+	    *  Direct accesses to dbglogfile converted to log_xxx calls.
+	  These changes should also make the messages easier to	translate.
+	* Commented-out messages were also cleaned up as above.
+	* Many modules have also had log_warning calls changed to
+	  log_error, log_aserror, log_swferror, or log_unimp, according to
+	  the documentation checked in earlier by strk and gnu.
+	  IF_VERBOSE_xxx macros were inserted around some calls that
+	  lacked them.
+	* Header comments (at the top of the file) added or adjusted, to
+	  describe each file in its initial line, and to correct whitespace
+	  in the copyright notices.
+	
+	* The list of files affected by the above changes:
+	  backend/sound_handler_sdl.cpp
+	  extensions/mysql/mysql_db.cpp
+	  gui/Player.cpp
+	  gui/gnash.cpp
+	  gui/gui.cpp
+	  plugin/klash/klash.cpp
+	  plugin/win32/plugin.cpp
+	  server/PropertyList.cpp
+	  server/StreamProvider.cpp
+	  server/array.cpp
+	  server/as_environment.cpp
+	  server/as_function.cpp
+	  server/as_object.cpp
+	  server/as_value.cpp
+	  server/button_character_instance.cpp
+	  server/character.cpp
+	  server/dlist.cpp
+	  server/edit_text_character.cpp
+	  server/fill_style.cpp
+	  server/font.cpp
+	  server/generic_character.cpp
+	  server/impl.cpp
+	  
+	* 2007 copyright notices were inserted in:
+	  backend/sound_handler_sdl.cpp
+	  extensions/mysql/mysql_db.cpp
+	  gui/gnash.cpp
+	  plugin/klash/klash.cpp
+	  plugin/win32/plugin.cpp
+	  server/generic_character.cpp
+	
+	* New 2006, 2007 Free Software Foundation copyrights applied (to
+	  formerly public domain code):
+	  server/font.cpp
+	 
+	* backend/sound_handler_sdl.cpp: Move stray FORMAT_VORBIS comment.
+	* gui/gui.cpp: Commented out "Resize request when no movie" error
+	  that appears every time gnash is run.
+	* plugins/klash/klash.cpp:  Translated pop-up menu items, about-box,
+	  and updated copyright notice printed by --version and --help.
+	* server/array.cpp (as_array_object::index_requested):  Avoid
+	  c_str accessor when converting string to number.
+	* server/dlist.{h,cpp}:  Change API of DisplayList::dump debug
+	  function, so it can use log_xxx functions.
+	
+	I'm sure that I've missed some messages that ought to get 
+	translated (with _(...)).  Those will be fixed over time.
+	All new messages should be created with _(...) so they can
+	be translated.
+
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/loadMovieTest.c: add

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- backend/sound_handler_sdl.cpp	13 Apr 2007 07:35:55 -0000	1.50
+++ backend/sound_handler_sdl.cpp	18 Apr 2007 09:35:41 -0000	1.51
@@ -1,4 +1,4 @@
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.50 2007/04/13 07:35:55 bjacques Exp $
+// $Id: sound_handler_sdl.cpp,v 1.51 2007/04/18 09:35:41 jgilmore Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -73,7 +73,7 @@
 
 	sound_data *sounddata = new sound_data;
 	if (!sounddata) {
-		gnash::log_error("could not allocate memory for sounddata !");
+		gnash::log_error(_("could not allocate memory for sound data"));
 		return -1;
 	}
 
@@ -96,7 +96,7 @@
 		if (data_bytes > 0) {
 			convert_raw_data(&adjusted_data, &adjusted_size, data, sample_count, 1, sample_rate, stereo);
 			if (!adjusted_data) {
-				gnash::log_error("Some kind of error with raw sound data.");
+				gnash::log_error(_("Some kind of error occurred with raw sound data"));
 				return -1;
 			}
 			sounddata->data_size = adjusted_size;
@@ -109,7 +109,7 @@
 		if (data_bytes > 0) {
 			convert_raw_data(&adjusted_data, &adjusted_size, data, sample_count, 2, sample_rate, stereo);
 			if (!adjusted_data) {
-				gnash::log_error("Some kind of error with adpcm sound data.");
+				gnash::log_error(_("Some kind of error occurred with adpcm sound data"));
 				return -1;
 			}
 			sounddata->data_size = adjusted_size;
@@ -118,24 +118,24 @@
 		break;
 
 	case FORMAT_MP3:
-	//case FORMAT_VORBIS:
 #ifndef USE_FFMPEG
 #ifndef USE_MAD
-		gnash::log_warning("gnash has not been compiled to handle mp3 audio.");
+		gnash::log_error(_("gnash has not been compiled to handle mp3 audio"));
 		return -1;
 #endif
 #endif
 		sounddata->data = new Uint8[data_bytes];
 		if (!sounddata->data) {
-			gnash::log_error("could not allocate space for data in soundhandler.");
+			gnash::log_error(_("could not allocate space for data in sound handler"));
 			return -1;
 		}
 		memcpy(sounddata->data, data, data_bytes);
 
 		break;
+	//case FORMAT_VORBIS:
 	default:
 		// Unhandled format.
-		gnash::log_error("unknown format sound requested; gnash does not handle it.");
+		gnash::log_error(_("unknown sound format %d requested; gnash does not handle it"), (int)format);
 		return -1; // Unhandled format, set to NULL.
 	}
 
@@ -167,7 +167,7 @@
 
 		convert_raw_data(&adjusted_data, &adjusted_size, data, sample_count, 2, sounddata->sample_rate, sounddata->stereo);
 		if (!adjusted_data || adjusted_size < 1) {
-			gnash::log_error("Some kind of error with resampling sound data.");
+			gnash::log_error(_("Some kind of error with resampling sound data"));
 			return -1;
 		}
 		adjusted_data = static_cast<int16_t*>(data);
@@ -212,7 +212,7 @@
 		}
 
 	} else {
-		gnash::log_error("Behavior for this audio codec is unknown. Please send this SWF to the developers!");
+		gnash::log_error(_("Behavior for this audio codec %d is unknown.  Please send this SWF to the developers"), (int)(sounddata->format));
 	}
 
 	return start_size;
@@ -273,7 +273,7 @@
 		sound->parser = av_parser_init(CODEC_ID_MP3);
 
 		if (!sound->codec) {
-			gnash::log_error("Your FFMPEG can't decode MP3?!");
+			gnash::log_error(_("Your FFMPEG can't decode MP3?!"));
 			return;
 		}
 
@@ -301,7 +301,7 @@
 
 	if (!soundOpened) {
 		if (SDL_OpenAudio(&audioSpec, NULL) < 0 ) {
-			gnash::log_error("Unable to START SOUND: %s.", SDL_GetError());
+			gnash::log_error(_("Unable to start SDL sound: %s"), SDL_GetError());
 			return;
 		}
 		soundOpened = true;
@@ -493,7 +493,7 @@
 
 	if (!soundOpened) {
 		if (SDL_OpenAudio(&audioSpec, NULL) < 0 ) {
-			gnash::log_error("Unable to START SOUND: %s.", SDL_GetError());
+			gnash::log_error(_("Unable to start aux SDL sound: %s"), SDL_GetError());
 			return;
 		}
 		soundOpened = true;
@@ -726,7 +726,7 @@
 {
 	if ( buffer_length_in < 0 )
 	{
-		gnash::log_error("Negative buffer length in sdl_audio_callback (%d)", buffer_length_in);
+		gnash::log_error(_("Negative buffer length in sdl_audio_callback (%d)"), buffer_length_in);
 		return;
 	}
 
@@ -843,7 +843,7 @@
 #endif
 
 						if (bytes_decoded < 0 || tmp < 0 || outsize < 0) {
-							gnash::log_error("Error while decoding MP3-stream. Upgrading ffmpeg/libavcodec might fix this issue.");
+							gnash::log_error(_("Error while decoding MP3-stream.  Upgrading ffmpeg/libavcodec might fix this issue."));
 							// Setting data position to data size will get the sound removed
 							// from the active sound list later on.
 							sound->position = sound->data_size;
@@ -873,7 +873,7 @@
 						// Error handling is done by relooping (max. 8 times) and just hooping that it will work...
 						if (loops > 8) break;
 						if (ret == -1 && sound->stream.error != MAD_ERROR_BUFLEN && MAD_RECOVERABLE(sound->stream.error)) {
-							gnash::log_warning("Recoverable error while decoding MP3-stream, MAD error: %s", mad_stream_errorstr (&sound->stream));
+							gnash::log_error(_("Recoverable error while decoding MP3-stream, MAD error: %s"), mad_stream_errorstr (&sound->stream));
 							continue;
 						}
 						
@@ -881,7 +881,7 @@
 					}
 
 					if (ret == -1 && sound->stream.error != MAD_ERROR_BUFLEN) {
-						gnash::log_error("Unrecoverable error while decoding MP3-stream, MAD error: %s", mad_stream_errorstr (&sound->stream));
+						gnash::log_error(_("Unrecoverable error while decoding MP3-stream, MAD error: %s"), mad_stream_errorstr (&sound->stream));
 						sound->position = sound->data_size;
 						continue;
 					} else if (ret == -1 && sound->stream.error == MAD_ERROR_BUFLEN) {
@@ -938,7 +938,7 @@
 
 						// Hopefully this wont happen
 						if (!adjusted_data) {
-							gnash::log_warning("Error in sound sample convertion");
+							gnash::log_error(_("Error in sound sample conversion"));
 							continue;
 						}
 

Index: extensions/mysql/mysql_db.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/mysql_db.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/mysql/mysql_db.cpp	22 Mar 2007 22:37:45 -0000	1.7
+++ extensions/mysql/mysql_db.cpp	18 Apr 2007 09:35:41 -0000	1.8
@@ -1,5 +1,6 @@
+// mysql_db.cpp:  MySQL database interface ActionScript objects, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,6 +11,7 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -181,12 +183,12 @@
     disconnect();
     
     if ((_db = mysql_init(NULL)) == NULL ) {
-	log_error("Couldn't initialize Database!");
+	log_error(_("Couldn't initialize database"));
 	return false;
     }
     
     if (mysql_real_connect(_db, host, user, passwd, dbname, 0, NULL, 0) == NULL) {
-	log_error("Couldn't connect to Database!");
+	log_error(_("Couldn't connect to database"));
 	return false;
     }
     
@@ -212,16 +214,15 @@
       case CR_SERVER_LOST:
       case CR_COMMANDS_OUT_OF_SYNC:
       case CR_SERVER_GONE_ERROR:
-	  dbglogfile << "MySQL connection error: " << mysql_error(_db) << endl;
+	  log_error (_("MySQL connection error: %s"), mysql_error(_db));
 	  // Try to reconnect to the database
 // 	  closeDB();
 // 	  openDB();
 	  break;
       case -1:
       case CR_UNKNOWN_ERROR:
-	  dbglogfile << "MySQL error on query for:\n\t " <<
-	      mysql_error(_db) << endl;
-	  dbglogfile << "Query was: " << sql << endl;
+	  log_error (_("MySQL error on query for:\n\t%s\nQuery was: %s"),
+		     mysql_error(_db), sql); 
 	  return false;
 	  break;            
        default:
@@ -240,16 +241,15 @@
       case CR_SERVER_LOST:
       case CR_COMMANDS_OUT_OF_SYNC:
       case CR_SERVER_GONE_ERROR:
-	  dbglogfile << "MySQL connection error: " << mysql_error(_db) << endl;
+	  log_error(_("MySQL connection error: %s", mysql_error(_db));
 	  // Try to reconnect to the database
 // 	  closeDB();
 // 	  openDB();
 	  break;
       case -1:
       case CR_UNKNOWN_ERROR:
-	  dbglogfile << "MySQL error on query for:\n\t " <<
-	      mysql_error(_db) << endl;
-	  dbglogfile << "Query was: " << sql << endl;
+	  log_error (_("MySQL error on query for:\n\t%s\nQuery was: %s"),
+		     mysql_error(_db), sql); 
 //	  return false;
 	  break;            
 //       default:
@@ -262,7 +262,7 @@
 #if 0
     for (size_t i=0; i<mysql_num_fields(_result); i++) {
 	MYSQL_FIELD *fields = mysql_fetch_fields(_result);
-	log_msg("Field name is: %s: ", fields->name);
+	log_msg(_("Field name is: %s: "), fields->name);
     }
 #endif
     

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- gui/Player.cpp	28 Mar 2007 08:40:44 -0000	1.45
+++ gui/Player.cpp	18 Apr 2007 09:35:41 -0000	1.46
@@ -1,3 +1,4 @@
+// Player.cpp:  Top level flash player, for gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-
-// 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -185,7 +184,7 @@
 #elif defined(SOUND_GST)
         _sound_handler.reset( gnash::create_sound_handler_gst() );
 #else
-        log_error("Sound requested but no sound support compiled in");
+        log_error(_("Sound requested but no sound support compiled in"));
         return;
 #endif
         
@@ -326,7 +325,7 @@
 	}
 
 	// too much noise...
-        //log_warning("Unused parameter %s = %s",
+        //log_warning(_("Unused parameter %s = %s"),
 	//	it->first.c_str(), it->second.c_str());
     }
 
@@ -362,6 +361,5 @@
 Player::fs_callback(gnash::sprite_instance* movie, const char* command, const char* args)
 // For handling notification callbacks from ActionScript.
 {
-    log_msg("fs_callback(%p): %s %s'", (void*)movie, command, args);
+    log_msg(_("fs_callback(%p): %s %s"), (void*)movie, command, args);
 }
-

Index: gui/gnash.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gnash.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- gui/gnash.cpp	6 Apr 2007 07:58:15 -0000	1.68
+++ gui/gnash.cpp	18 Apr 2007 09:35:41 -0000	1.69
@@ -1,5 +1,6 @@
+// gnash.cpp:  Main routine for top-level flash player, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,17 +11,18 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "Player.h"
-#include "log.h" // for dbglogfile (I hate this)
+#include "log.h"
 #include "rc.h" // for use of rcfile
 #include "debugger.h"
 
@@ -67,35 +69,43 @@
 static void
 usage()
 {
-    printf(
+    printf("%s%s%s%s%s%s%s%s", _(
         "usage: gnash [options] movie_file.swf\n"
         "\n"
         "Plays a SWF (Shockwave Flash) movie\n"
         "options:\n"
-        "\n"
+        "\n"), _(
         "  -h, --help  Print this info.\n"
         "  -s <factor> Scale the movie up/down by the specified factor\n"
         "  -c          Produce a core file instead of letting SDL trap it\n"
         "  -d num      Number of milliseconds to delay in main loop\n"
         "  -v          Be verbose; i.e. print log messages to stdout\n"
+		),
 #if VERBOSE_ACTION
-        "  -va         Be verbose about movie Actions\n"
+      _("  -va         Be verbose about movie Actions\n"),
+#else
+	"",
 #endif
 #if VERBOSE_PARSE
-        "  -vp         Be verbose about parsing the movie\n"
+      _("  -vp         Be verbose about parsing the movie\n"),
+#else
+	"",
 #endif
+		  _(
         "  -m <bias>   Specify the texture LOD bias (float, default is -1.0)\n"
         "  -x <ID>     X11 Window ID for display\n"
         "  -w          Produce the disk based debug log\n"
 	"  -j <width>  Set window width\n"
 	"  -k <height> Set window height\n"
         "  -1          Play once; exit when/if movie reaches the last frame\n"
+		), _(
         "  -g          Turn on the Flash debugger\n"
         "  -r <0|1|2|3>\n"
 	"              0 disables both rendering & sound (good for batch tests)\n"
         "              1 enables rendering & disables sound\n"
         "              2 enables sound & disables rendering\n"
         "              3 enables both rendering & sound (default)\n"
+		), _(
         "  -t <sec>    Timeout and exit after the specified number of seconds\n"
         "  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
         "  -u <url>    Set \"real\" url of the movie\n"
@@ -104,6 +114,7 @@
 	"              (used to resolve relative urls, defaults to movie url)\n"
         "  -P <param>  Set parameter (ie. \"FlashVars=A=1&b=2\")\n"
         "  --version   Print gnash's version number and exit\n"
+		), _(
         "\n"
         "keys:\n"
         "  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
@@ -111,35 +122,35 @@
         "  CTRL-R          Restart the movie\n"
         "  CTRL-[ or kp-   Step back one frame\n"
         "  CTRL-] or kp+   Step forward one frame\n"
+        "  CTRL-B          Toggle background color\n"
 #if 0
         "  CTRL-A          Toggle antialiasing (doesn't work)\n"
         "  CTRL-T          Debug.  Test the set_variable() function\n"
         "  CTRL-G          Debug.  Test the get_variable() function\n"
         "  CTRL-M          Debug.  Test the call_method() function\n"
 #endif
-        "  CTRL-B          Toggle background color\n"
-        );
+        ));
 }
 
 static void version_and_copyright()
 {
-    printf (
+    printf (_(
 "Gnash " VERSION "\n"
 "Copyright (C) 2005-2007 Free Software Foundation, Inc.\n"
 "Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute copies of Gnash under the terms of the GNU General\n"
 "Public License.  For more information, see the file named COPYING.\n"
-	);
+	));
 }
 
+
 static void build_options()
 {
-    cout << "Build options " << VERSION << endl
-         << "   Target: " << TARGET_CONFIG << endl
-         << "   Renderer: " << RENDERER_CONFIG
-         << "   GUI: " << GUI_CONFIG
-         << "   Media handler: " << MEDIA_CONFIG
-         << endl;
+    printf (_("Build options %s\n"
+              "   Target: %s\n"
+              "   Renderer: %s   GUI: %s   Media handler: %s\n"),
+		VERSION, TARGET_CONFIG, RENDERER_CONFIG, GUI_CONFIG,
+		MEDIA_CONFIG);
 }
 
 
@@ -176,24 +187,24 @@
               exit(0);
 	  case 'v':
               dbglogfile.setVerbosity();
-	      dbglogfile << "Verbose output turned on" << std::endl;
+	      log_msg (_("Verbose output turned on"));
 	      break;
 	  case 'w':
               dbglogfile.setWriteDisk(true);
-	      dbglogfile << "Logging to disk enabled." << std::endl;
+	      log_msg (_("Logging to disk enabled"));
 	      break;
 	  case 'a':
 #if VERBOSE_ACTION
 	      dbglogfile.setActionDump(true); //gnash::set_verbose_action(true);
 #else
-              dbglogfile << "Verbose actions disabled at compile time" << std::endl;
+              log_error (_("No verbose actions; disabled at compile time"));
 #endif
 	      break;
 	  case 'p':
 #if VERBOSE_PARSE
 	      dbglogfile.setParserDump(true); // gnash::set_verbose_parse(true);
 #else
-              dbglogfile << "Verbose parsing disabled at compile time" << std::endl;
+              log_error (_("No verbose parsing; disabled at compile time"));
 #endif
 	      break;
           case 's':
@@ -204,32 +215,32 @@
               break;
           case 'u':
               url = optarg;
-              dbglogfile << "Setting root URL to: " << url << std::endl;
+              log_msg (_("Setting root URL to %s"), url);
               break;
           case 'U':
 	  {
 		const char* baseurl = optarg;
 		player.setBaseUrl(baseurl);
-		dbglogfile << "Setting base URL to: " << baseurl << std::endl;
+		log_msg (_("Setting base URL to %s"), baseurl);
 		break;
 	  }
           case 'j':
               player.setWidth ( strtol(optarg, NULL, 0) );
-              dbglogfile << "Setting width to: " << player.getWidth() << std::endl;
+              log_msg (_("Setting width to %d"), player.getWidth());
               break;
           case 'g':
 #ifdef USE_DEBUGGER
-              dbglogfile << "Setting debugger ON" << std::endl;
+              log_msg (_("Setting debugger ON"));
               debugger.enabled(true);
 //              debugger.startServer(&debugger);
               debugger.console();
 #else
-              dbglogfile << "WARNING: The debugger has been disabled at configuration time" << std::endl;
+              log_error (_("No debugger; disabled at compile time"));
 #endif
               break;
           case 'k':
               player.setHeight ( strtol(optarg, NULL, 0) );
-              dbglogfile << "Setting height to: " << player.getHeight() << std::endl;
+              log_msg (_("Setting height to %d"), player.getHeight());
               break;
           case 'x':
 	      called_by_plugin=true;
@@ -265,8 +276,8 @@
                     player.setDoSound(true);
                     break;
                 default:
-                    cerr << "-r must be followed by 0, 1, 2 or 3 (" << 
-                        render_arg << ") is invalid" << std::endl;
+                    log_error (_("-r must be followed by 0, 1, 2 or 3 "
+			"(%ld is invalid)"), render_arg);
                     break;
               }
               break;
@@ -300,7 +311,7 @@
     }
 
     if ( ! specified_rendering_flag ) {
-	gnash::log_msg("no rendering flags specified, using rcfile");
+	log_msg (_("No rendering flags specified, using rcfile"));
         if ( called_by_plugin ) {
             player.setDoSound( rcfile.usePluginSound() );
         } else {
@@ -314,7 +325,8 @@
 #if 0 // Options setting variables should use the getopt style!
       // Some options set variables, like ip=127.0.0.1
       if (argc > 2 && strchr(argv[optind], '=')) {
-	  dbglogfile << "Got variable option on command line!" << std::endl;
+	  log_error (_("Got variable option (%s) on command line"),
+			 argv[optind]);
       } else {
 #endif
 	  infile = argv[optind];
@@ -351,4 +363,3 @@
 
 	return player.run(argc, argv, infile, url);
 }
-

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- gui/gui.cpp	13 Apr 2007 09:15:54 -0000	1.72
+++ gui/gui.cpp	18 Apr 2007 09:35:41 -0000	1.73
@@ -1,3 +1,4 @@
+// gui.cpp:  Top level GUI for flash player, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -136,8 +136,8 @@
 	}
 	else
 	{
-		log_warning("Resize request received while there's still"
-			" no movie loaded, can't correctly set movie scale");
+		//log_msg(_("Resize request received while there's still"
+		//	" no movie loaded, can't correctly set movie scale"));
 	}
 	
 	// trigger redraw
@@ -147,8 +147,7 @@
 	_width = width;
 	_height = height;
 	_validbounds.setTo(0, 0, _width, _height);
-	//log_msg("new size (in twips) is: %dx%d", _width*20, _height*20); 
-
+	//log_msg(_("new size (in twips) is: %dx%d"), _width*20, _height*20); 
 }
 
 void
@@ -246,7 +245,7 @@
 {
 	movie_root* m = get_current_root();
 
-	//log_msg("mouse @ %d,%d", x, y);
+	//log_msg(_("mouse @ %d,%d"), x, y);
 	if ( m->notify_mouse_moved(x, y) )
 	{
 		// any action triggered by the
@@ -458,7 +457,7 @@
 	m->get_movie_definition()->ensure_frame_loaded(tot_frames);
 	m->goto_frame(cur_frame+1);
     	m->set_play_state(gnash::sprite_instance::PLAY);
-	log_msg("Frame %d", m->get_current_frame());
+	log_msg(_("Frame %d"), m->get_current_frame());
 #endif
 
 	gui->display(m);

Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- plugin/klash/klash.cpp	23 Jan 2007 22:50:32 -0000	1.26
+++ plugin/klash/klash.cpp	18 Apr 2007 09:35:41 -0000	1.27
@@ -1,5 +1,6 @@
+// klash.cpp:  KDE flash player plugin, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: klash.cpp,v 1.26 2007/01/23 22:50:32 martinwguy Exp $ */
+/* $Id: klash.cpp,v 1.27 2007/04/18 09:35:41 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -95,15 +98,15 @@
         create (embed);
         qwidget = this;
         qmenu = new QPopupMenu(this);
-        qmenu->insertItem("Play Movie", this, SLOT(menuitem_play_callback()));
-        qmenu->insertItem("Pause Movie", this, SLOT(menuitem_pause_callback()));
-        qmenu->insertItem("Stop Movie", this, SLOT(menuitem_stop_callback()));
-        qmenu->insertItem("Restart Movie", this, SLOT(menuitem_restart_callback()));
-        qmenu->insertItem("Step Forward", this, SLOT(menuitem_step_forward_callback()));
-        qmenu->insertItem("Step Backward", this, SLOT( menuitem_step_backward_callback()));
-        qmenu->insertItem("Jump Forward", this, SLOT(menuitem_jump_forward_callback()));
-        qmenu->insertItem("Jump Backward", this, SLOT(menuitem_jump_backward_callback()));
-        qmenu->insertItem("Quit Gnash", this, SLOT(menuitem_quit_callback()));
+        qmenu->insertItem(_("Play Movie"), this, SLOT(menuitem_play_callback()));
+        qmenu->insertItem(_("Pause Movie"), this, SLOT(menuitem_pause_callback()));
+        qmenu->insertItem(_("Stop Movie"), this, SLOT(menuitem_stop_callback()));
+        qmenu->insertItem(_("Restart Movie"), this, SLOT(menuitem_restart_callback()));
+        qmenu->insertItem(_("Step Forward"), this, SLOT(menuitem_step_forward_callback()));
+        qmenu->insertItem(_("Step Backward"), this, SLOT( menuitem_step_backward_callback()));
+        qmenu->insertItem(_("Jump Forward"), this, SLOT(menuitem_jump_forward_callback()));
+        qmenu->insertItem(_("Jump Backward"), this, SLOT(menuitem_jump_backward_callback()));
+        qmenu->insertItem(_("Quit Gnash"), this, SLOT(menuitem_quit_callback()));
         
 //        qmenu->insertItem("&About", this, SLOT(about()), CTRL+Key_H);
     }
@@ -141,8 +144,8 @@
 
 void EmbedWidget::about()
 {
-    QMessageBox::about( this, "Klash",
-                        "The Gnash Flash player for KDE.\n");
+    QMessageBox::about( this, _("Klash"),
+                        _("The Gnash Flash player for KDE.\n"));
 }
 
 void 
@@ -303,7 +306,7 @@
     
     if (rcfile.getTimerDelay() > 0) {
         delay = rcfile.getTimerDelay();
-        dbglogfile << "Timer delay set to " << delay << "milliseconds" << endl;
+        log_msg (_("Timer delay set to %d milliseconds"), delay);
     }
 
     while ((c = getopt (argc, argv, "hvaps:cd:m:x:r:t:b:1wj:k:u:")) != -1) {
@@ -313,11 +316,11 @@
 	      break;
 	  case 'v':
               dbglogfile.setVerbosity();
-	      dbglogfile << "Verbose output turned on" << endl;
+	      log_msg (_("Verbose output turned on"));
 	      break;
 	  case 'w':
               dbglogfile.setWriteDisk(true);
-	      dbglogfile << "Logging to disk enabled." << endl;
+	      log_msg (_("Logging to disk enabled."));
 	      break;
 	  case 'a':
 	      dbglogfile.setActionDump(true);              
@@ -336,15 +339,15 @@
               break;
           case 'u':
               url = optarg;
-              dbglogfile << "Setting root URL to: " << width << endl;
+              log_msg(_("Setting root URL to: %s"), url);
               break;
           case 'j':
               width = strtol(optarg, NULL, 0);
-              dbglogfile << "Setting width to: " << width << endl;
+              log_msg (_("Setting width to: %d", width);
               break;
           case 'k':
               height = strtol(optarg, NULL, 0);
-              dbglogfile << "Setting height to: " << height << endl;
+              log_msg (_("Setting height to: %d", height);
               break;
           case 'x':
               windowid = strtol(optarg, NULL, 0);
@@ -374,9 +377,9 @@
                     do_sound = false;
                     break;
                 default:
-                    cerr << "-r must be followed by 0, 1 or 2 (" << 
-                        render_arg << " is invalid" << endl;
-                    
+                    log_error (
+		        _("-r must be followed by 0, 1 or 2 (%d is invalid)"),
+                        render_arg);
                     break;
               };
               break;
@@ -393,7 +396,7 @@
     while (optind < argc) {
         // Some options set variables, like ip=127.0.0.1
         if (strchr(argv[optind], '=')) {
-            dbglogfile << "Got variable option on command line!" << endl;
+            log_error (_("Got variable option on command line!");
         } else {
             infiles.push_back(argv[optind]);
         }
@@ -408,7 +411,7 @@
 
     // No file names were supplied
     if (infiles.size() == 0) {
-	printf("no input files\n");
+	printf(_("No input files"));
 	usage();
 	exit(1);
     }
@@ -442,7 +445,7 @@
     gnash::get_movie_info(URL(infiles[0]), &movie_version, &movie_width,
                           &movie_height, &movie_fps, NULL, NULL);
     if (movie_version == 0) {
-        fprintf(stderr, "error: can't get info about %s\n", infiles[0]);
+        fprintf(stderr, _("error: can't get info about %s\n"), infiles[0]);
         exit(1);
     }
 
@@ -502,12 +505,12 @@
     // Load the actual movie.
     gnash::movie_definition*	md = gnash::create_library_movie(URL(infiles[0]));
     if (md == NULL) {
-        fprintf(stderr, "error: can't create a movie from '%s'\n", infiles[0]);
+        fprintf(stderr, _("error: can't create a movie from '%s'\n"), infiles[0]);
         exit(1);
     }
     gnash::sprite_instance* m = create_library_movie_inst(md);
     if (m == NULL) {
-        fprintf(stderr, "error: can't create movie instance\n");
+        fprintf(stderr, _("error: can't create movie instance\n"));
         exit(1);
     }
     gnash::set_current_root(m);
@@ -653,20 +656,20 @@
 void
 version_and_copyright()
 {
-    printf (
+    printf (_(
 "Gnash " VERSION "\n"
-"Copyright (C) 2006 Free Software Foundation, Inc.\n"
+"Copyright (C) 2006, 2007 Free Software Foundation, Inc.\n"
 "Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
 "You may redistribute copies of Gnash under the terms of the GNU General\n"
 "Public License.  For more information, see the file named COPYING.\n"
-	);
+	));
 }
 
 
 void
 usage()
 {
-    printf(
+    printf("%s%s%s", _(
         "usage: gnash [options] movie_file.swf\n"
         "\n"
         "Plays a SWF (Shockwave Flash) movie\n"
@@ -678,7 +681,7 @@
         "  -d num      Number of milliseconds to delay in main loop\n"
         "  -v          Be verbose; i.e. print log messages to stdout\n"
         "  -va         Be verbose about movie Actions\n"
-        "  -vp         Be verbose about parsing the movie\n"
+        "  -vp         Be verbose about parsing the movie\n"), _(
         "  -m <bias>   Specify the texture LOD bias (float, default is -1)\n"
         "  -x <ID>     X11 Window ID for display\n"
         "  -w          Produce the disk based debug log\n"
@@ -689,7 +692,7 @@
         "  -t <sec>    Timeout and exit after the specified number of seconds\n"
         "  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
         "  --version   Print gnash's version number and exit\n"
-        "\n"
+        "\n"), _(
         "keys:\n"
         "  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
         "  CTRL-P          Toggle Pause\n"
@@ -701,5 +704,5 @@
 //        "  CTRL-G          Debug.  Test the get_variable() function\n"
 //        "  CTRL-M          Debug.  Test the call_method() function\n"
         "  CTRL-B          Toggle background color\n"
-        );
+        ));
 }

Index: plugin/win32/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/win32/plugin.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- plugin/win32/plugin.cpp	11 Apr 2007 17:54:21 -0000	1.6
+++ plugin/win32/plugin.cpp	18 Apr 2007 09:35:42 -0000	1.7
@@ -1,5 +1,6 @@
+// plugin.cpp:  Windows "win32" flash player Mozilla plugin, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
 #define NO_NSPR_10_SUPPORT
@@ -257,10 +256,10 @@
 	gnash::get_movie_info(URL(getFilename()), &movie_version, &movie_width, &movie_height, &movie_fps, NULL, NULL);
 	if (movie_version == 0)
 	{
-		dbglogfile << "error: can't get info about " << getFilename() << endl;
+		log_error (_("can't get info about %s"), getFilename());
     return;
 	}
-	log_msg("Movie %s: width is %d, height is %d, version is %d\n", getFilename(),
+	log_msg(_("Movie %s: width is %d, height is %d, version is %d\n"), getFilename(),
 	movie_width, movie_height, movie_version);
 
 	// new thread must have own movie instance
@@ -270,7 +269,7 @@
 	gnash::movie_definition*	md = gnash::create_movie(URL(getFilename()));
 	if (md == NULL)
 	{
-		dbglogfile << "error: can't create a movie from " << getFilename() << endl;
+		log_error (_("can't create a movie from %s"), getFilename());
 		return;
 	}
 
@@ -278,7 +277,7 @@
 	gnash::movie_interface*	m = md->create_instance();
 	if (m == NULL)
 	{
-		dbglogfile << "error: can't create movie instance" << endl;
+		log_error (_("can't create movie instance"));
 		return;
 	}
 
@@ -346,7 +345,7 @@
 		// nsPluginInstance::shut() has been called for this instance.
 		if (getShutdown())
 		{
-			dbglogfile << "player: Shutting down as requested..." << endl;
+			log_msg (_("player: Shutting down as requested..."));
 	    break;
 		}
 	

Index: server/PropertyList.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/PropertyList.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/PropertyList.cpp	15 Apr 2007 10:52:09 -0000	1.13
+++ server/PropertyList.cpp	18 Apr 2007 09:35:42 -0000	1.14
@@ -1,3 +1,4 @@
+// PropertyList.cpp:  ActionScript property lists, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
 #ifdef HAVE_CONFIG_H
@@ -70,7 +69,7 @@
 
 	val=found->second->getValue(this_ptr);
 
-	//log_msg("Property %s found, assigning to return (%s)", key.c_str(), val.to_string());
+	//log_msg(_("Property %s found, value is (%s)"), key.c_str(), val.to_string());
 
 	return true;
 }
@@ -91,11 +90,11 @@
 
 	if ( prop->isReadOnly() )
 	{
-		log_warning("Property %s is read-only, not setting it", key.c_str());
+		log_error(_("Property %s is read-only, not setting it to %s"), key.c_str(), val.to_string().c_str());
 		return false;
 	}
 
-	//log_msg("Property %s set to value %s", key.c_str(), val.to_string());
+	//log_msg(_("Property %s set to value %s"), key.c_str(), val.to_string());
 	prop->setValue(this_ptr, val);
 	return true;
 }

Index: server/StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/StreamProvider.cpp	10 Apr 2007 18:18:45 -0000	1.16
+++ server/StreamProvider.cpp	18 Apr 2007 09:35:42 -0000	1.17
@@ -1,5 +1,6 @@
+// StreamProvider.cpp:  ActionScript file: or http: stream reader, for Gnash.
 // 
-//   Copyright (C) 2005, 2006. 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,9 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -85,7 +88,8 @@
 			return NULL;
 		}
 #else
-		log_error("Unsupported network connections");
+		log_error(_("Unsupported network connection %s"),
+				 url.str().c_str());
 		return NULL;
 #endif
 	}
@@ -98,7 +102,7 @@
 
 	if (url.protocol() == "file")
 	{
-		log_warning("POST data discarded while getting a stream from non-http uri");
+		log_error(_("POST data discarded while getting a stream from file: uri"));
 		std::string path = url.path();
 		if ( path == "-" )
 		{
@@ -125,7 +129,8 @@
 			return NULL;
 		}
 #else
-		log_error("Unsupported network connections");
+		log_error(_("Unsupported network connection %s"),
+				url.str().c_str();
 		return NULL;
 #endif
 	}

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/array.cpp	15 Apr 2007 10:52:09 -0000	1.59
+++ server/array.cpp	18 Apr 2007 09:35:42 -0000	1.60
@@ -1,3 +1,4 @@
+// array.cpp:  ActionScript array class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
 #ifdef HAVE_CONFIG_H
@@ -149,7 +148,9 @@
 	as_object(getArrayInterface()), // pass Array inheritance
 	elements(0)
 {
-	//log_action("%s : %p\n", __FUNCTION__, (void*)this);
+	//IF_VERBOSE_ACTION (
+	//log_action("%s: %p", __FUNCTION__, (void*)this);
+	//)
 	attachArrayProperties(*this);
 }
 
@@ -158,14 +159,16 @@
 	as_object(other),
 	elements(other.elements)
 {
-    //log_action("%s : %p\n", __FUNCTION__, (void*)this);
+    //IF_VERBOSE_ACTION (
+    //log_action("%s: %p", __FUNCTION__, (void*)this);
+    //)
 }
 
 int
 as_array_object::index_requested(const std::string& name)
 {
 	as_value temp;
-	temp.set_string(name.c_str());
+	temp.set_string(name);
 	double value = temp.to_number();
 
 	// if we were sent a string that can't convert like "asdf", it returns as NaN. -1 means invalid index
@@ -197,7 +200,7 @@
 	// If the array is empty, report an error and return undefined!
 	if (elements.size() <= 0)
 	{
-	    log_warning("tried to pop element from back of empty array, returning undef!\n");
+	    log_error(_("tried to pop element from back of empty array, returning undef"));
 		return as_value(); // undefined
 	}
 
@@ -213,7 +216,7 @@
 	// If the array is empty, report an error and return undefined!
 	if (elements.size() <= 0)
 	{
-		log_warning("tried to shift element from front of empty array, returning undef!\n");
+		log_error(_("tried to shift element from front of empty array, returning undef"));
 		return as_value(); // undefined
 	}
 
@@ -307,7 +310,7 @@
 	std::auto_ptr<as_array_object> newarray(new as_array_object);
 
 #ifdef GNASH_DEBUG
-	log_msg("Array.slice(%u, %u) called", start, one_past_end);
+	log_msg(_("Array.slice(%u, %u) called"), start, one_past_end);
 #endif
 
 	size_t newsize = one_past_end - start;
@@ -337,7 +340,7 @@
 	std::copy(replace.begin(), replace.end(), ostrIter);
         ss << ") called";
 	log_msg("%s", ss.str().c_str());
-	log_msg("Current array is %s", toString().c_str());
+	log_msg(_("Current array is %s"), toString().c_str());
 #endif
 
 	container::iterator itStart = elements.begin()+start;
@@ -415,7 +418,7 @@
 as_array_object::sorted_indexes(uint8_t flags)
 {
 	assert(flags & as_array_object::fReturnIndexedArray);
-	log_error("Array.sorted_index() method not implemented yet!\n");
+	log_unimpl("Array.sorted_index");
 	return std::auto_ptr<as_array_object>(NULL);
 }
 
@@ -434,43 +437,43 @@
 	switch ( flags )
 	{
 		case 0: // default sorting
-			//log_msg("Default sorting");
+			//log_msg(_("Default sorting"));
 			std::sort(elements.begin(), elements.end(),
 				AsValueLessThen());
 			break;
 
 		case as_array_object::fDescending:
-			//log_msg("Default descending");
+			//log_msg(_("Default descending"));
 			std::sort(elements.begin(), elements.end(),
 				AsValueLessThenDesc());
 			break;
 
 		case as_array_object::fCaseInsensitive: 
-			//log_msg("case insensitive");
+			//log_msg(_("case insensitive"));
 			std::sort(elements.begin(), elements.end(),
 				AsValueLessThenNoCase());
 			break;
 
 		case as_array_object::fCaseInsensitive | as_array_object::fDescending:
-			//log_msg("case insensitive descending");
+			//log_msg(_("case insensitive descending"));
 			std::sort(elements.begin(), elements.end(),
 				AsValueLessThenDescNoCase());
 			break;
 
 		case as_array_object::fNumeric: 
-			//log_msg("numeric");
+			//log_msg(_("numeric"));
 			std::sort(elements.begin(), elements.end(),
 				AsValueLessThenNumeric());
 			break;
 
 		case as_array_object::fNumeric | as_array_object::fDescending:
-			//log_msg("numeric descending");
+			//log_msg(_("numeric descending"));
 			std::sort(elements.begin(), elements.end(),
 				AsValueLessThenDescNumeric());
 			break;
 
 		default:
-			log_error("Unhandled sort flags: %d (0x%X)", flags, flags);
+			log_error(_("Unhandled sort flags: %d (0x%X)"), flags, flags);
 			break;
 	}
 
@@ -480,7 +483,7 @@
 	// to either use std::sort or std::uniq or similar
 	if ( do_unique )
 	{
-		log_msg("Should unique now");
+		log_unimpl(_("array.sort with unique flag"));
 	}
 }
 
@@ -506,13 +509,13 @@
 #ifdef GNASH_DEBUG
 	std::stringstream ss;
 	fn.dump_args(ss);
-	log_msg("Array(%s).splice(%s) called", array->toString().c_str(), ss.str().c_str());
+	log_msg(_("Array(%s).splice(%s) called"), array->toString().c_str(), ss.str().c_str());
 #endif
 
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Array.splice() needs at least 1 argument, call ignored");
+		log_aserror(_("Array.splice() needs at least 1 argument, call ignored"));
 		);
 		return as_value();
 	}
@@ -527,7 +530,8 @@
 	if ( start < 0 ) start = array->size()+start; // start is negative, so + means -abs()
 	startoffset = iclamp(start, 0, origlen);
 #ifdef GNASH_DEBUG
-	if ( startoffset != start ) log_msg("Array.splice: start:%d became %u", start, startoffset);
+	if ( startoffset != start )
+		log_msg(_("Array.splice: start:%d became %u"), start, startoffset);
 #endif
 
 	//----------------
@@ -540,7 +544,7 @@
 		if ( lenval < 0 )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Array.splice(%d,%d): negative length given, call ignored",
+			log_aserror(_("Array.splice(%d,%d): negative length given, call ignored"),
 				start, lenval);
 			);
 			return as_value();
@@ -581,7 +585,7 @@
 	}
 	else
 	{
-		log_error("Array.sort(comparator) method not implemented!\n");
+		log_unimpl("Array.sort(comparator)");
 		return as_value();
 	}
 
@@ -596,7 +600,7 @@
 	boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
 	UNUSED(array);
 
-	log_error("FIXME: Array.sortOn() method not implemented yet!");
+	log_unimpl("Array.sortOn()");
 	return as_value();
 }
 
@@ -607,7 +611,7 @@
 	boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
 
 		IF_VERBOSE_ACTION (
-	log_action("calling array push, pushing %d values onto back of array",fn.nargs);
+	log_action(_("calling array push, pushing %d values onto back of array"),fn.nargs);
 		);
 
 	for (unsigned int i=0;i<fn.nargs;i++)
@@ -623,7 +627,7 @@
 	boost::intrusive_ptr<as_array_object> array = ensureType<as_array_object>(fn.this_ptr);
 
 		IF_VERBOSE_ACTION (
-	log_action("calling array unshift, pushing %d values onto front of array",fn.nargs);
+	log_action(_("calling array unshift, pushing %d values onto front of array"), fn.nargs);
 		);
 
 	for (int i=fn.nargs-1; i>=0; i--)
@@ -642,7 +646,7 @@
 	as_value rv = array->pop();
 
 	IF_VERBOSE_ACTION (
-	log_action("calling array pop, result:%s, new array size:%d",
+	log_action(_("calling array pop, result:%s, new array size:%d"),
 		rv.to_string().c_str(), array->size());
 	);
         return rv;
@@ -658,7 +662,7 @@
 	as_value rv = array->shift();
 
 	IF_VERBOSE_ACTION (
-	log_action("calling array shift, result:%s, new array size:%d",
+	log_action(_("calling array shift, result:%s, new array size:%d"),
 		rv.to_string().c_str(), array->size());
 	);
 	return rv;
@@ -675,7 +679,7 @@
 	as_value rv(array.get()); 
 
 	IF_VERBOSE_ACTION (
-	log_action("called array reverse, result:%s, new array size:%d",
+	log_action(_("called array reverse, result:%s, new array size:%d"),
 		rv.to_string().c_str(), array->size());
 	);
 	return rv;
@@ -716,10 +720,10 @@
 
 		IF_VERBOSE_ACTION
 		(
-	log_action("array_to_string called, nargs = %d, "
-			"this_ptr = %p",
+	log_action(_("array_to_string called, nargs = %d, "
+			"this_ptr = %p"),
 			fn.nargs, (void*)fn.this_ptr.get());
-	log_action("to_string result is: %s", ret.c_str());
+	log_action(_("to_string result is: %s"), ret.c_str());
 		);
 
 	return as_value(ret.c_str());
@@ -768,9 +772,9 @@
 	if (fn.nargs > 2)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_warning("More than 2 arguments sent to slice, "
-			"and I don't know what to do with them!\n"
-			"Ignoring them as we continue...\n");
+		log_aserror(_("More than 2 arguments to Array.slice, "
+			"and I don't know what to do with them.  "
+			"Ignoring them"));
 		);
 	}
 
@@ -838,7 +842,7 @@
 array_new(const fn_call& fn)
 {
 	IF_VERBOSE_ACTION (
-		log_action("array_new called, nargs = %d", fn.nargs);
+		log_action(_("array_new called, nargs = %d"), fn.nargs);
 	);
 
 	boost::intrusive_ptr<as_array_object>	ao = new as_array_object;
@@ -871,7 +875,7 @@
 	}
 
 	IF_VERBOSE_ACTION (
-		log_action("array_new setting object %p in result", (void*)ao.get());
+		log_action(_("array_new setting object %p in result"), (void*)ao.get());
 	);
 
 	return as_value(ao.get());

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/as_environment.cpp	16 Apr 2007 18:23:05 -0000	1.69
+++ server/as_environment.cpp	18 Apr 2007 09:35:42 -0000	1.70
@@ -1,3 +1,4 @@
+// as_environment.cpp:  Variable, Sprite, and Movie locators, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,13 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 //
 
-/* $Id: as_environment.cpp,v 1.69 2007/04/16 18:23:05 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.70 2007/04/18 09:35:42 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,7 +48,7 @@
     // Path lookup rigamarole.
     std::string	path;
     std::string	var;
-    //log_msg("get_variable(%s)", varname.c_str());
+    //log_msg(_("get_variable(%s)"), varname.c_str());
     bool is_slash_based;
     if (parse_path(varname, path, var, &is_slash_based)) {
 	//as_value target_val = get_variable_raw(path, with_stack);
@@ -64,7 +65,7 @@
 	} else {
 
 	    IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("find_object%s(\"%s\") [ varname = '%s' - current target = '%s' ] failed",
+	    log_aserror(_("find_object%s(\"%s\") [ varname = '%s' - current target = '%s' ] failed"),
 			    is_slash_based ? "_slashsyntax" : "_dotsyntax",
 			    path.c_str(),
 			    varname.c_str(),
@@ -75,9 +76,9 @@
 	    as_value tmp = get_variable_raw(path, with_stack);
 	    if ( ! tmp.is_undefined() )
 	    {
-#ifdef DEBUG_GET_VARIABLE
-		    log_msg("But get_variable_raw(%s, <with_stack>) succeeded!", path.c_str());
-#endif
+	    IF_VERBOSE_ASCODING_ERRORS(
+		    log_aserror(_("...but get_variable_raw(%s, <with_stack>) succeeded!"), path.c_str());
+	    )
 	    }
 	    return as_value();
 	}
@@ -151,8 +152,9 @@
     }
     
     // Fallback.
+    // FIXME, should this be log_error?  or log_swferror?
 	IF_VERBOSE_ACTION (
-    log_action("get_variable_raw(\"%s\" failed, returning UNDEFINED.)",
+    log_action(_("get_variable_raw(\"%s\") failed, returning UNDEFINED"),
 	       varname.c_str());
 	);
 
@@ -229,10 +231,10 @@
     as_object* target = m_target;
     std::string	path;
     std::string	var;
-    //log_msg("set_variable(%s, %s)", varname.c_str(), val.to_debug_string().c_str());
+    //log_msg(_("set_variable(%s, %s)"), varname.c_str(), val.to_debug_string().c_str());
     bool is_slash_based;
     if (parse_path(varname, path, var, &is_slash_based)) {
-    	//log_msg("Variable '%s' parsed into path='%s', var='%s'", varname.c_str(), path.c_str(), var.c_str());
+    	//log_msg(_("Variable '%s' parsed into path='%s', var='%s'"), varname.c_str(), path.c_str(), var.c_str());
 	//target = find_target(path);
         target = is_slash_based ? find_object_slashsyntax(path) : find_object_dotsyntax(path); 
 	if (target)
@@ -242,7 +244,7 @@
 	else
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Path target '%s' not found while setting %s=%s",
+		log_aserror(_("Path target '%s' not found while setting %s=%s"),
 			path.c_str(), varname.c_str(), val.to_debug_string().c_str());
 		);
 	}
@@ -366,7 +368,7 @@
 as_environment::parse_path(const std::string& var_path,
 		std::string& path, std::string& var, bool* is_slash_based) 
 {
-//log_msg("parse_path(%s)", var_path.c_str());
+//log_msg(_("parse_path(%s)"), var_path.c_str());
     // Search for colon.
     int	colon_index = 0;
     int	var_path_length = var_path.length();
@@ -389,7 +391,7 @@
 	    }
 	}
 	if (colon_index < 0) {
-//log_msg(" no colon index");
+//log_msg(_(" no colon index"));
 	    return false;
 	}
     }
@@ -403,7 +405,7 @@
     path = var_path;
     path.resize(colon_index);
     
-//log_msg(" path=%s var=%s", path.c_str(), var.c_str());
+//log_msg(_(" path=%s var=%s"), path.c_str(), var.c_str());
 
     return true;
 }
@@ -439,7 +441,7 @@
 		assert (obj);
 		character* s=dynamic_cast<character*>(obj.get());
 		assert(s->get_ref_count() > 1); // or the intrusive_ptr above going out-of-scope will kill it
-		//log_msg("find_target is a character, returning it");
+		//log_msg(_("find_target is a character, returning it"));
 		return s; // might be NULL
 	}
 	else if ( val.is_string() )
@@ -450,8 +452,8 @@
 	{
 		// TODO: should we *force* string conversion above instead ?
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("as_environment::find_target: '%s': "
-			"invalid path; neither string nor object",
+		log_aserror(_("as_environment::find_target: '%s': "
+			"invalid path; neither string nor object"),
 			val.to_debug_string().c_str() );
 		);
 		return NULL;
@@ -506,12 +508,12 @@
 as_environment::find_target(const std::string& path) const
 {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("find_target(%s) called", path.c_str());
+	log_msg(_("find_target(%s) called"), path.c_str());
 #endif
 
     if (path.length() <= 0) {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Returning m_target (empty path)");
+	log_msg(_("Returning m_target (empty path)"));
 #endif
 	return m_target;
     }
@@ -528,14 +530,14 @@
 	// Absolute path.  Start at the root.
 	env = env->get_root_movie();
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Absolute path, start at the root (%p)", (void*)env);
+	log_msg(_("Absolute path, start at the root (%p)"), (void*)env);
 #endif
 	p++;
     }
     
     if (*p == '\0') {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Null path, returning m_target");
+	log_msg(_("Null path, returning m_target"));
 #endif
 	return env;
     }
@@ -546,7 +548,7 @@
 	subpart = p;
 	if (next_slash == p) {
             IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("invalid path '%s'", path.c_str());
+	    log_aserror(_("invalid path '%s'"), path.c_str());
 	    );
 	    return NULL;
 	    //break;
@@ -559,13 +561,13 @@
 	if ( subpart.empty() )
 	{
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("No more subparts, env is %p", (void*)env);
+	log_msg(_("No more subparts, env is %p"), (void*)env);
 #endif
 		break;
 	}
 
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Invoking get_relative_target(%s) on object %p (%s)", subpart.c_str(), (void *)env, env->get_name().c_str());
+	log_msg(_("Invoking get_relative_target(%s) on object %p (%s)"), subpart.c_str(), (void *)env, env->get_name().c_str());
 #endif
 	env = env->get_relative_target(subpart);
 	//@@   _level0 --> root, .. --> parent, . --> this, other == character
@@ -583,12 +585,12 @@
 as_environment::find_object_dotsyntax(const std::string& path) const
 {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("find_object_dotsyntax(%s) called", path.c_str());
+	log_msg(_("find_object_dotsyntax(%s) called"), path.c_str());
 #endif
 
     if (path.length() <= 0) {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Returning m_target (empty path)");
+	log_msg(_("Returning m_target (empty path)"));
 #endif
 	return m_target;
     }
@@ -601,7 +603,7 @@
     
     if ( path.empty() ) {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Null path, returning m_target");
+	log_msg(_("Null path, returning m_target"));
 #endif
 	return env;
     }
@@ -614,7 +616,7 @@
     	std::string subpart = p;
 	if (next_dot == p) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("invalid path '%s'", path.c_str());
+	    log_aserror(_("invalid path '%s'"), path.c_str());
 	    );
 	    return NULL; // TODO: check me
 	    //break;
@@ -624,20 +626,20 @@
 	}
 
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Subpart ==  %s", subpart.c_str());
+	log_msg(_("Subpart ==  %s"), subpart.c_str());
 #endif
 	
 	// No more components to scan
 	if ( subpart.empty() )
 	{
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("No more subparts, env is %p", (void*)env);
+	log_msg(_("No more subparts, env is %p"), (void*)env);
 #endif
 		break;
 	}
 
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Invoking get_member(%s) on object %p", subpart.c_str(), (void *)env);
+	log_msg(_("Invoking get_member(%s) on object %p"), subpart.c_str(), (void *)env);
 #endif
 	as_value tmp;
 	// TODO: make sure sprite_instances know about ".."
@@ -647,7 +649,7 @@
 		if ( depth > 0 ) 
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Member %s for object %p not found (dotsyntax). Path was %s.",
+			log_aserror(_("Member %s for object %p not found (dotsyntax).  Path was %s"),
 				subpart.c_str(), env, path.c_str());
 			);
 			return NULL;
@@ -656,7 +658,7 @@
 		if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Element '%s' of variable '%s' not found in object %p nor in _global (dotsyntax)",
+			log_aserror(_("Element '%s' of variable '%s' not found in object %p nor in _global (dotsyntax)"),
 				subpart.c_str(), path.c_str(), env);
 			);
 			return NULL;
@@ -666,8 +668,8 @@
 	// Debugging only:
 	if ( ! tmp.is_object() ) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Member %s of object %p doesn't cast to an Object (%s) "
-			"evaluating target path %s (dotsyntax)",
+		log_aserror(_("Member %s of object %p doesn't cast to an Object (%s) "
+			"evaluating target path %s (dotsyntax)"),
 			subpart.c_str(), env, tmp.to_debug_string().c_str(), path.c_str());
 		);
 		return NULL;
@@ -693,12 +695,12 @@
 as_environment::find_object_slashsyntax(const std::string& path) const
 {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("find_object_slashsyntax(%s) called", path.c_str());
+	log_msg(_("find_object_slashsyntax(%s) called"), path.c_str());
 #endif
 
     if (path.length() <= 0) {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Returning m_target (empty path)");
+	log_msg(_("Returning m_target (empty path)"));
 #endif
 	return m_target;
     }
@@ -716,14 +718,14 @@
 	// TODO: should this be VM::get().getRoot().get_root_movie() ?
 	env = m_target->get_root_movie();
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Absolute path, start at the root (%p)", (void*)env);
+	log_msg(_("Absolute path, start at the root (%p)"), (void*)env);
 #endif
 	p++;
     }
     
     if (*p == '\0') {
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Null path, returning m_target");
+	log_msg(_("Null path, returning m_target"));
 #endif
 	return env;
     }
@@ -735,7 +737,7 @@
 	subpart = p;
 	if (next_slash == p) {
             IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("invalid path '%s'", path.c_str());
+	    log_aserror(_("invalid path '%s'"), path.c_str());
 	    );
 	    return NULL; // TODO: check me
 	    //break;
@@ -745,14 +747,14 @@
 	}
 
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("Subpart ==  %s", subpart.c_str());
+	log_msg(_("Subpart ==  %s"), subpart.c_str());
 #endif
 	
 	// No more components to scan
 	if ( subpart.empty() )
 	{
 #ifdef DEBUG_TARGET_FINDING 
-	log_msg("No more subparts, env is %p", (void*)env);
+	log_msg(_("No more subparts, env is %p"), (void*)env);
 #endif
 		break;
 	}
@@ -762,7 +764,7 @@
 		character* ch = dynamic_cast<character*>(env);
 		if ( ! ch ) {
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("'..' element in path '%s' follows a non-character object %p",
+			log_aserror(_("'..' element in path '%s' follows a non-character object %p"),
 					path.c_str(), env);
 			);
 			return NULL;
@@ -771,7 +773,7 @@
 		if ( ! env ) // root movie doesn't have a parent
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("'..' in path '%s' follows a character with no parent (%s : %p) (root is %p)",
+			log_aserror(_("'..' in path '%s' follows a character with no parent (%s : %p) (root is %p)"),
 					path.c_str(), ch->get_text_value(), ch, VM::get().getRoot().get_root_movie());
 			);
 			// if we override env, getvariable.as fails [line 57]
@@ -782,7 +784,7 @@
 	{
 
 #ifdef DEBUG_TARGET_FINDING 
-		log_msg("Invoking get_member(%s) on object %p", subpart.c_str(), (void *)env);
+		log_msg(_("Invoking get_member(%s) on object %p"), subpart.c_str(), (void *)env);
 #endif
 		as_value tmp;
 		// TODO: make sure sprite_instances know about ".."
@@ -792,7 +794,7 @@
 			if ( depth > 0 ) 
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("Member %s for object %p not found (slashsytax). Path was %s",
+				log_aserror(_("Member %s for object %p not found (slashsyntax). Path was %s"),
 					subpart.c_str(), env, path.c_str());
 				);
 				return NULL;
@@ -801,7 +803,7 @@
 			if ( ! VM::get().getGlobal()->get_member(subpart.c_str(), &tmp) )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("Element '%s' of variable '%s' not found in object %p nor in _global (slashsyntax)",
+				log_aserror(_("Element '%s' of variable '%s' not found in object %p nor in _global (slashsyntax)"),
 					subpart.c_str(), path.c_str(), env);
 				);
 				return NULL;
@@ -811,8 +813,8 @@
 		// Debugging only:
 		if ( ! tmp.is_object() ) {
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Member %s of object %p doesn't cast to an Object (%s) "
-				"evaluating target path %s (slashsyntax)",
+			log_aserror(_("Member %s of object %p doesn't cast to an Object (%s) "
+				"evaluating target path %s (slashsyntax)"),
 				subpart.c_str(), env, tmp.to_debug_string().c_str(), path.c_str());
 				);
 			return NULL;
@@ -1036,7 +1038,7 @@
 
 	if ( _localFrames.size() == maxstacksize )
 	{
-		log_warning("Max stack count reached (%u) - should abort execution",
+		log_error(_("Max stack count reached (%u) - should abort execution"),
 				maxstacksize);
 		// throw something
 		throw ActionLimitException("Call stack limit exceeded");

Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/as_function.cpp	15 Apr 2007 10:52:09 -0000	1.29
+++ server/as_function.cpp	18 Apr 2007 09:35:42 -0000	1.30
@@ -1,3 +1,4 @@
+// as_function.cpp:  ActionScript Functions, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
 #ifdef HAVE_CONFIG_H
@@ -94,7 +93,7 @@
 function_ctor(const fn_call& /* fn */)
 {
 	boost::intrusive_ptr<as_object> func = new as_object(getFunctionPrototype());
-	//log_msg("User tried to invoke new Function()");
+	//log_msg(_("User tried to invoke new Function()"));
 	return as_value(func.get());
 }
 
@@ -146,8 +145,8 @@
 	get_member("prototype", &proto);
 	if ( proto.to_object() != _properties.get() )
 	{
-		log_warning("Exported interface of function %p "
-				"has been overwritten (from %p to %p)!",
+		log_warning(_("Exported interface of function %p "
+				"has been overwritten (from %p to %p)"),
 				this, _properties.get(),
 				(void*)proto.to_object().get());
 		_properties = proto.to_object();
@@ -195,7 +194,7 @@
 	if ( ! fn.nargs )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror ("Function.apply() called with no args");
+		log_aserror (_("Function.apply() called with no args"));
 		);
 	}
 	else
@@ -215,10 +214,10 @@
 			IF_VERBOSE_ASCODING_ERRORS(
 				if ( fn.nargs > 2 )
 				{
-					log_aserror("Function.apply() got %d"
+					log_aserror(_("Function.apply() got %d"
 						" args, expected at most 2"
 						" -- discarding the ones in"
-						" excess",
+						" excess"),
 						fn.nargs);
 				}
 			);
@@ -227,9 +226,9 @@
 			if ( ! arg1 )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-					log_aserror("Second arg of Function.apply"
+					log_aserror(_("Second arg of Function.apply"
 						" is %s (expected array)"
-						" - considering as call with no args",
+						" - considering as call with no args"),
 						fn.arg(1).to_debug_string().c_str());
 				);
 				goto call_it;
@@ -241,10 +240,10 @@
 			if ( ! arg_array )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-					log_aserror("Second arg of Function.apply"
+					log_aserror(_("Second arg of Function.apply"
 						" is of type %s, with value %s"
 						" (expected array)"
-						" - considering as call with no args",
+						" - considering as call with no args"),
 						fn.arg(1).typeOf(),
 						fn.arg(1).to_string().c_str());
 				);
@@ -253,7 +252,7 @@
 
 			unsigned int nelems = arg_array->size();
 
-			//log_error("Function.apply(this_ref, array[%d])\n", nelems);
+			//log_error(_("Function.apply(this_ref, array[%d])\n"), nelems);
 			as_value index, value;
 			for (unsigned int i=nelems; i; i--)
 			{
@@ -306,9 +305,9 @@
 	// Call the function 
 	return (*function_obj)(new_fn_call);
 
-	//log_msg("at function_call exit, stack: \n"); fn.env->dump_stack();
+	//log_msg(_("at function_call exit, stack: \n")); fn.env->dump_stack();
 
-	//log_msg("%s: tocheck \n", __FUNCTION__);
+	//log_msg(_("%s: tocheck \n"), __FUNCTION__);
 }
 
 boost::intrusive_ptr<as_object>
@@ -329,7 +328,7 @@
 	{
 
 		IF_VERBOSE_ACTION (
-		log_action("it's a built-in class");
+		log_action(_("it's a built-in class"));
 		);
 
 		fn_call fn(NULL, &env, nargs, first_arg_index);
@@ -362,7 +361,7 @@
 		assert(func_has_prototype);
 
 		IF_VERBOSE_ACTION (
-		log_action("constructor prototype is %s", proto.to_debug_string().c_str());
+		log_action(_("constructor prototype is %s"), proto.to_debug_string().c_str());
 		);
 
 		// Create an empty object, with a ref to the constructor's prototype.

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/as_object.cpp	3 Apr 2007 16:13:07 -0000	1.47
+++ server/as_object.cpp	18 Apr 2007 09:35:42 -0000	1.48
@@ -1,3 +1,4 @@
+// as_object.cpp:  ActionScript Object class and its properties, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -62,7 +63,7 @@
 	///
 	void operator() (const std::string& name, const as_value& val)
 	{
-		//log_msg("Setting member '%s' to value '%s'", name.c_str(), val.to_string());
+		//log_msg(_("Setting member '%s' to value '%s'"), name.c_str(), val.to_string());
 		_tgt.set_member(name, val);
 	}
 };
@@ -94,7 +95,7 @@
 {
 	assert(val);
 
-	//log_msg("Getting member %s (SWF version:%d)", name.c_str(), vm.getSWFVersion());
+	//log_msg(_("Getting member %s (SWF version:%d)"), name.c_str(), vm.getSWFVersion());
 
 	// TODO: inspect wheter it is possible to make __proto__ a
 	//       getter/setter property instead, to take this into account
@@ -117,7 +118,7 @@
 	}
 	catch (ActionException& exc)
 	{
-		log_warning("%s", exc.what());
+		log_error(_("Caught exception: %s"), exc.what());
 		return false;
 	}
 	
@@ -181,9 +182,9 @@
 as_object::set_member_default(const std::string& key, const as_value& val )
 {
 
-	//log_msg("set_member_default( %s ) ", key.c_str() );
+	//log_msg(_("set_member_default(%s)"), key.c_str());
 
-	// TODO: make __proto__ a getter/setter ?
+	// TODO: make __proto__ a getter/setter?
 	if (key == "__proto__") 
 	{
 		set_prototype(val.to_object());
@@ -197,11 +198,11 @@
 	{
 		try 
 		{
-			//log_msg("Found a getter/setter property for key %s", key.c_str());
+			//log_msg(_("Found a getter/setter property for key %s"), key.c_str());
 			if (prop->isReadOnly())
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-                			log_aserror("Attempt to set read-only property '%s'",
+                			log_aserror(_("Attempt to set read-only property '%s'"),
 						    key.c_str());
 	                	);
 			} else
@@ -212,18 +213,18 @@
 		}
 		catch (ActionException& exc)
 		{
-			log_warning("%s: %s. Will create a new member.", key.c_str(), exc.what());
+			log_msg(_("%s: Exception %s.  Will create a new member"), key.c_str(), exc.what());
 		}
 	}
 
-	//log_msg("Found NO getter/setter property for key %s", key.c_str());
+	//log_msg(_("Found no getter/setter property for key %s"), key.c_str());
 
 	// No getter/setter property found, so set (or create) a
 	// SimpleProperty (if possible)
 	if ( ! _members.setValue(key, val, *this) )
 	{
-		log_warning("Attempt to set Read-Only property ``%s''"
-			" on object ``%p''",
+		log_error(_("Attempt to set read-only property ``%s''"
+			" on object ``%p''"),
 			key.c_str(), (void*)this);
 	}
 
@@ -233,8 +234,7 @@
 as_object::init_member(const std::string& key, const as_value& val, int flags)
 {
 
-	//log_msg("Setting member %s (SWF version:%d)", key.c_str(), vm.getSWFVersion());
-	//log_msg("Found NO getter/setter property for key %s", key.c_str());
+	//log_msg(_("Setting member %s (SWF version:%d)"), key.c_str(), vm.getSWFVersion());
 
 	VM& vm = _vm;
 
@@ -246,8 +246,8 @@
 		// Set (or create) a SimpleProperty 
 		if ( ! _members.setValue(keylower, val, *this) )
 		{
-			log_error("Attempt to initialize Read-Only property ``%s''"
-				" (%s) on object ``%p''",
+			log_error(_("Attempt to initialize read-only property ``%s''"
+				" (%s) on object ``%p''"),
 				keylower.c_str(), key.c_str(), (void*)this);
 			// We shouldn't attempt to initialize a member twice, should we ?
 			assert(0);
@@ -260,8 +260,8 @@
 		// Set (or create) a SimpleProperty 
 		if ( ! _members.setValue(key, val, *this) )
 		{
-			log_error("Attempt to initialize Read-Only property ``%s''"
-				" on object ``%p''",
+			log_error(_("Attempt to initialize read-only property ``%s''"
+				" on object ``%p''"),
 				key.c_str(), (void*)this);
 			// We shouldn't attempt to initialize a member twice, should we ?
 			assert(0);
@@ -285,14 +285,14 @@
 		std::string name = key;
 		boost::to_lower(name, _vm.getLocale());
 		success = _members.addGetterSetter(name, getter, setter);
-		//log_msg("Initialized property '%s'", name.c_str());
+		//log_msg(_("Initialized property '%s'"), name.c_str());
 		// TODO: optimize this, don't scan again !
 		_members.setFlags(name, flags, 0);
 	}
 	else
 	{
 		success = _members.addGetterSetter(key, getter, setter);
-		//log_msg("Initialized property '%s'", key.c_str());
+		//log_msg(_("Initialized property '%s'"), key.c_str());
 		// TODO: optimize this, don't scan again !
 		_members.setFlags(key, flags, 0);
 	}
@@ -359,7 +359,7 @@
 
 	// See actionscript.all/Inheritance.as for a way to trigger this
 	IF_VERBOSE_ASCODING_ERRORS(
-	if ( obj ) log_aserror("Circular inheritance chain detected during instanceOf call");
+	if ( obj ) log_aserror(_("Circular inheritance chain detected during instanceOf call"));
 	);
 
 	return false;
@@ -380,7 +380,7 @@
 
 	// See actionscript.all/Inheritance.as for a way to trigger this
 	IF_VERBOSE_ASCODING_ERRORS(
-	if ( obj ) log_aserror("Circular inheritance chain detected during isPrototypeOf call");
+	if ( obj ) log_aserror(_("Circular inheritance chain detected during isPrototypeOf call"));
 	);
 
 	return false;
@@ -389,7 +389,7 @@
 void
 as_object::dump_members() 
 {
-	log_msg(SIZET_FMT " members of object %p follow",
+	log_msg(_(SIZET_FMT " members of object %p follow"),
 		_members.size(), (const void*)this);
 	_members.dump(*this);
 }
@@ -417,9 +417,9 @@
 			// set_member_flags will take care of case conversion
 			if ( ! set_member_flags(prop.c_str(), set_true, set_false) )
 			{
-				log_warning("Can't set propflags on object "
+				log_error(_("Can't set propflags on object "
 					"property %s "
-					"(either not found or protected)",
+					"(either not found or protected)"),
 					prop.c_str());
 			}
 
@@ -495,7 +495,7 @@
 
 	// This happens always since top object in hierarchy
 	// is always Object, which in turn derives from itself
-	//if ( obj ) log_warning("prototype loop during Enumeration");
+	//if ( obj ) log_error(_("prototype loop during Enumeration"));
 }
 
 void
@@ -606,9 +606,8 @@
 as_object::get_prototype()
 {
 	if ( m_prototype ) return m_prototype.get();
-	//log_msg("as_object::get_prototype(): Hit top of inheritance chain");
+	//log_msg(_("as_object::get_prototype(): Hit top of inheritance chain"));
 	return getObjectInterface();
 }
 
 } // end of gnash namespace
-

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/as_value.cpp	16 Apr 2007 18:23:05 -0000	1.37
+++ server/as_value.cpp	18 Apr 2007 09:35:42 -0000	1.38
@@ -1,3 +1,4 @@
+// as_value.cpp:  ActionScript values, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,10 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 //
 
 #ifdef HAVE_CONFIG_H
@@ -168,12 +169,12 @@
 					}
 					else
 					{
-						log_msg("call_method0(%s) did not return a string", methodname.c_str());
+						log_msg(_("call_method0(%s) did not return a string"), methodname.c_str());
 					}
 				}
 				else
 				{
-					log_msg("get_member(%s) returned false", methodname.c_str());
+					log_msg(_("get_member(%s) returned false"), methodname.c_str());
 				}
 			}
 			if ( ! gotValidToStringResult )
@@ -295,7 +296,7 @@
 			//
 			// Arrays and Movieclips should return NaN.
 
-			//log_msg("OBJECT to number conversion, env is %p", env);
+			//log_msg(_("OBJECT to number conversion, env is %p"), env);
 
 			as_object* obj = m_object_value; 
 			bool gotValidValueOfResult = false;
@@ -314,12 +315,12 @@
 					}
 					else
 					{
-						log_msg("call_method0(%s) did not return a number", methodname.c_str());
+						log_msg(_("call_method0(%s) did not return a number"), methodname.c_str());
 					}
 				}
 				else
 				{
-					log_msg("get_member(%s) returned false", methodname.c_str());
+					log_msg(_("get_member(%s) returned false"), methodname.c_str());
 				}
 			}
 			if ( ! gotValidValueOfResult )
@@ -378,7 +379,7 @@
 			{
 				double num = to_number();
 				bool ret = num && ! isnan(num);
-				//log_msg("m_string_value: %s, to_number: %g, to_bool: %d", m_string_value.c_str(), num, ret);
+				//log_msg(_("m_string_value: %s, to_number: %g, to_bool: %d"), m_string_value.c_str(), num, ret);
 				return ret;
 			}
 		}
@@ -412,7 +413,7 @@
 			{
 				double num = to_number();
 				bool ret = num && ! isnan(num);
-				//log_msg("m_string_value: %s, to_number: %g, to_bool: %d", m_string_value.c_str(), num, ret);
+				//log_msg(_("m_string_value: %s, to_number: %g, to_bool: %d"), m_string_value.c_str(), num, ret);
 				return ret;
 			}
 		}
@@ -486,8 +487,8 @@
 	character* target = env.find_target(std::string(m_string_value.c_str()));
 	if ( ! target )
 	{
-		log_warning("MovieClip value is a dangling reference: "
-				"target '%s' not found (should set to NULL?)",
+		log_error(_("MovieClip value is a dangling reference: "
+				"target '%s' not found (should set to NULL?)"),
 				m_string_value.c_str());
 		return NULL;
 	}

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/button_character_instance.cpp	12 Apr 2007 11:35:30 -0000	1.42
+++ server/button_character_instance.cpp	18 Apr 2007 09:35:42 -0000	1.43
@@ -1,3 +1,4 @@
+// button_character_instance.cpp:  Mouse-sensitive buttons, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,16 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
-// 
-//
-//
-
-
-// SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -325,7 +321,7 @@
 #if 0
 	if (id.m_id != event_id::KEY_PRESS)
 	{
-		log_warning("Unsupported event for button instance: %s", id.get_function_name().c_str());
+		log_warning(_("Unsupported event for button instance: %s"), id.get_function_name().c_str());
 		return false;
 	}
 #endif
@@ -530,7 +526,7 @@
 
 	default:
 		//assert(0);	// missed a case?
-		log_error("Unhandled button event %s", event.get_function_name().c_str());
+		log_error(_("Unhandled button event %s"), event.get_function_name().c_str());
 		break;
 	};
 	
@@ -620,8 +616,8 @@
 				action_buffer* ab = m_def->m_button_actions[i].m_actions[j];
 				assert(ab);
 				IF_VERBOSE_ACTION(
-					log_action("Executing actions for "
-						"button condition %d\n", c);
+					log_action(_("Executing actions for "
+						"button condition %d"), c);
 				);
 				ActionExec exec(*ab, get_environment());
 				exec();
@@ -638,7 +634,7 @@
 	}
 	else
 	{
-		//log_warning("No handler for event: %s", event.get_function_name().c_str());
+		//log_warning(_("No handler for event: %s"), event.get_function_name().c_str());
 	}
 
 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/character.cpp	15 Apr 2007 14:31:19 -0000	1.35
+++ server/character.cpp	18 Apr 2007 09:35:42 -0000	1.36
@@ -1,3 +1,4 @@
+// character.cpp:  ActionScript Character class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,15 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
-/* $Id: character.cpp,v 1.35 2007/04/15 14:31:19 strk Exp $ */
+/* $Id: character.cpp,v 1.36 2007/04/18 09:35:42 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -93,11 +92,11 @@
 		}
 		else
 		{
-			// Implement relative drag...
+			// FIXME: Implement relative drag...
 			static bool warned_relative_drag = false;
 			if ( ! warned_relative_drag )
 			{
-				log_warning("FIXME: Relative drag unsupported");
+				log_unimpl(_("Relative drag"));
 		    		warned_relative_drag = true;
 		    	}
 		}
@@ -161,12 +160,12 @@
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
 			// AS code trying to access something before the root
-			log_warning("ActionScript code trying to reference"
-				" an unexistent parent with '..' "
-				" (an unexistent parent probably only "
+			log_warning(_("ActionScript code trying to reference"
+				" a nonexistent parent with '..' "
+				" (a nonexistent parent probably only "
 				"occurs in the root MovieClip)."
 				" Returning a reference to top parent "
-				"(probably the root clip).");
+				"(probably the root clip)."));
 			);
 			//parent = this;
 			assert(this == get_root_movie());
@@ -303,7 +302,7 @@
 		if (isnan(scale_percent))
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _xscale to %g, refused",
+			log_aserror(_("Attempt to set _xscale to %g, refused"),
                             scale_percent);
 			);
                         return as_value();
@@ -311,7 +310,7 @@
 		else if (scale_percent < 0 )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _xscale to %g, use 0",
+			log_aserror(_("Attempt to set _xscale to %g, use 0"),
                             scale_percent);
 			);
                         scale_percent = 0;
@@ -347,7 +346,7 @@
 		if (isnan(scale_percent))
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _yscale to %g, refused",
+			log_aserror(_("Attempt to set _yscale to %g, refused"),
                             scale_percent);
 			);
                         return as_value();
@@ -355,7 +354,7 @@
 		else if (scale_percent < 0 )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Attempt to set _yscale to %g, use 0",
+			log_aserror(_("Attempt to set _yscale to %g, use 0"),
                             scale_percent);
 			);
                         scale_percent = 0;
@@ -473,7 +472,7 @@
 	{
 		if ( ! bounds.isFinite() )
 		{
-			log_error("FIXME: can't set _width on character with null or world bounds");
+			log_unimpl(_("FIXME: can't set _width on character with null or world bounds"));
 			return rv;
 		}
 
@@ -484,7 +483,7 @@
 		if ( newwidth <= 0 )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Setting _width=%g ?", newwidth/20);
+			log_aserror(_("Setting _width=%g"), newwidth/20);
 			);
 		}
 
@@ -518,7 +517,7 @@
 	{
 		if ( ! bounds.isFinite() )
 		{
-			log_error("FIXME: can't set _height on character with null or world bounds");
+			log_unimpl(_("FIXME: can't set _height on character with null or world bounds"));
 			return rv;
 		}
 
@@ -529,7 +528,7 @@
 		if ( newheight <= 0 )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Setting _height=%g ?", newheight/20);
+			log_aserror(_("Setting _height=%g"), newheight/20);
 			);
 		}
 
@@ -607,7 +606,7 @@
 {
 	_event_handlers[id].push_back(&code);
 
-	//log_msg("Setting handler for event %s", id.get_function_name().c_str());
+	//log_msg(_("Setting handler for event %s"), id.get_function_name().c_str());
 
 	// Set the character as a listener iff the
 	// kind of event is a KEY or MOUSE one 
@@ -619,7 +618,7 @@
 		case event_id::MOUSE_UP:
 		case event_id::MOUSE_DOWN:
 		case event_id::MOUSE_MOVE:
-			//log_msg("Registering character as having mouse events");
+			//log_msg(_("Registering character as having mouse events"));
 			has_mouse_event();
 			break;
 		default:
@@ -654,7 +653,7 @@
 character::unload()
 {
 	_unloaded = true;
-	//log_msg("Queuing unload event for character %p", this);
+	//log_msg(_("Queuing unload event for character %p"), this);
 	queueEventHandler(event_id::UNLOAD);
 	//on_event(event_id::UNLOAD);
 }

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/dlist.cpp	11 Apr 2007 14:20:20 -0000	1.58
+++ server/dlist.cpp	18 Apr 2007 09:35:42 -0000	1.59
@@ -1,3 +1,4 @@
+// dlist.cpp:  Display lists, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
-// 
-//
 
 #include "dlist.h"
 #include "log.h"
@@ -122,7 +122,7 @@
 DisplayList::get_character_at_depth(int depth)
 {
 	//GNASH_REPORT_FUNCTION;
-	//dump(std::cout);
+	//dump();
 
 	for (iterator it = _characters.begin(),
 			itEnd = _characters.end();
@@ -179,10 +179,10 @@
 	int clip_depth)
 {
 //	GNASH_REPORT_FUNCTION;
-	//IF_VERBOSE_DEBUG(log_msg("dl::add(%d, '%s')\n", depth, ch->get_name()));//xxxxx
+	//log_msg(_("dl::add(%d, '%s')"), depth, ch->get_name());
 
-	//log_msg("Before adding, list is:");
-	//dump(std::cout);
+	//log_msg(_("Before adding, list is:"));
+	//dump();
 
 	assert(ch);
 	ch->set_invalidated();
@@ -198,13 +198,13 @@
 
 	if ( it == _characters.end() || (*it)->get_depth() != depth )
 	{
-		//log_msg("place_character: new character at depth %d", depth);
+		//log_msg(_("place_character: new character at depth %d"), depth);
 		// add the new char
 		_characters.insert(it, DisplayItem(ch));
 	}
 	else
 	{
-		//log_msg("place_character: replacing existing character at depth %d", depth);
+		//log_msg(_("place_character: replacing existing character at depth %d"), depth);
 		(*it)->unload();
 		// replace existing char
 		*it = DisplayItem(ch);
@@ -275,8 +275,8 @@
 
 		// Error, no existing object found at depth.
 //		IF_VERBOSE_DEBUG(
-//			log_msg("dl::replace_display_object()"
-//				" no obj at depth %d\n", depth)
+//			log_msg(_("dl::replace_display_object()"
+//				" no obj at depth %d"), depth)
 //		);
 
 		// add the new char
@@ -322,14 +322,15 @@
 	int /* clip_depth */)
 {
 	//GNASH_REPORT_FUNCTION;
-	//IF_VERBOSE_DEBUG(log_msg("dl::move(%d)\n", depth));//xxxxx
+	//IF_VERBOSE_DEBUG(log_msg(_("dl::move(%d)"), depth));
 
 	character* ch = get_character_at_depth(depth);
 	if ( ! ch )
 	{
+		// FIXME, should this be log_aserror?
 		IF_VERBOSE_MALFORMED_SWF(
-		log_warning("move_display_object() -- "
-			"can't find object at depth %d",
+		log_swferror(_("move_display_object() -- "
+			"can't find object at depth %d"),
 			depth);
 		);
 		return;
@@ -361,8 +362,8 @@
 {
 	//GNASH_REPORT_FUNCTION;
 
-	//log_msg("Before removing, list is:");
-	//dump(std::cout);
+	//log_msg(_("Before removing, list is:"));
+	//dump();
 
 #ifndef NDEBUG
 	container_type::size_type size = _characters.size();
@@ -385,8 +386,8 @@
 	assert(size >= _characters.size());
 #endif
 
-	//log_msg("Done removing, list is:");
-	//dump(std::cout);
+	//log_msg(_("Done removing, list is:"));
+	//dump();
 }
 	
 	
@@ -585,7 +586,7 @@
 
 //		if (_characters.size() != size)
 //		{
-//			log_error("gnash bug: dlist size changed due to character actions, bailing on update!\n");
+//			log_error(_("gnash bug: dlist size changed due to character actions, bailing on update"));
 //			break;
 //		}
 
@@ -612,7 +613,7 @@
 	bool masked = false;
 	int highest_masked_layer = 0;
 	
-	//log_msg("number of objects to be drawn %i\n", m_display_object_array.size());
+	//log_msg(_("number of objects to be drawn %d"), m_display_object_array.size());
 	
 	for( iterator it = _characters.begin(),
 			endIt = _characters.end();
@@ -637,7 +638,7 @@
 		{
 			if (ch->get_depth() > highest_masked_layer)
 			{
-//					log_msg("disabled mask before drawing depth %i\n", ch->get_depth());
+//					log_msg(_("disabled mask before drawing depth %d"), ch->get_depth());
 				masked = false;
 				// turn off mask
 				render::disable_mask();
@@ -647,7 +648,7 @@
 		// check whether this object should become mask
 		if (ch->get_clip_depth() > 0)
 		{
-			//log_msg("begin submit mask\n");
+			//log_msg(_("begin submit mask"));
 			render::begin_submit_mask();
 		}
 		
@@ -658,7 +659,7 @@
 		// information about it
 		if (ch->get_clip_depth() > 0)
 		{
-			//log_msg("end submit mask\n");
+			//log_msg(_("end submit mask"));
 			render::end_submit_mask();
 			highest_masked_layer = ch->get_clip_depth();
 			masked = true;
@@ -676,7 +677,7 @@
 
 /*public*/
 void
-DisplayList::dump(std::ostream& os) const
+DisplayList::dump() const
 {
 	int num=0;
 	for( const_iterator it = _characters.begin(),
@@ -684,11 +685,9 @@
 		it != endIt; ++it)
 	{
 		const DisplayItem& dobj = *it;
-		os << "Item " << num << " at depth " << dobj->get_depth()
-			<< " (char id " << dobj->get_id()
-			<< ", name " << dobj->get_name()
-			<< ", type " << typeid(*dobj).name()
-			<< ")" << std::endl;
+		log_msg(_("Item %d at depth %d (char id %d, name %s, type %s"),
+			num, dobj->get_depth(), dobj->get_id(),
+			dobj->get_name().c_str(), typeid(*dobj).name());
 		num++;
 	}
 }

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/edit_text_character.cpp	16 Apr 2007 18:23:05 -0000	1.56
+++ server/edit_text_character.cpp	18 Apr 2007 09:35:42 -0000	1.57
@@ -1,3 +1,4 @@
+// edit_text_character.cpp:  User-editable text regions, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-
-/* $Id: edit_text_character.cpp,v 1.56 2007/04/16 18:23:05 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.57 2007/04/18 09:35:42 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -94,7 +96,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.setTextFormat() unimplemented");
+		log_unimpl("TextField.setTextFormat()");
 		warned = true;
 	}
 
@@ -110,7 +112,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.addListener() unimplemented");
+		log_unimpl("TextField.addListener()");
 		warned = true;
 	}
 
@@ -125,7 +127,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.removeListener() unimplemented");
+		log_unimpl("TextField.removeListener()");
 		warned = true;
 	}
 
@@ -140,7 +142,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.setNewTextFormat() unimplemented");
+		log_unimpl("TextField.setNewTextFormat()");
 		warned = true;
 	}
 
@@ -155,7 +157,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.getDepth() unimplemented");
+		log_unimpl("TextField.getDepth()");
 		warned = true;
 	}
 
@@ -170,7 +172,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.getFontList() unimplemented");
+		log_unimpl("TextField.getFontList()");
 		warned = true;
 	}
 
@@ -185,7 +187,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.getNewTextFormat() unimplemented");
+		log_unimpl("TextField.getNewTextFormat()");
 		warned = true;
 	}
 
@@ -200,7 +202,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.getTextFormat() unimplemented");
+		log_unimpl("TextField.getTextFormat()");
 		warned = true;
 	}
 
@@ -215,7 +217,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.replaceSel() unimplemented");
+		log_unimpl("TextField.replaceSel()");
 		warned = true;
 	}
 
@@ -230,7 +232,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.replaceText() unimplemented");
+		log_unimpl("TextField.replaceText()");
 		warned = true;
 	}
 
@@ -245,7 +247,7 @@
 
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: TextField.removeTextField() unimplemented");
+		log_unimpl("TextField.removeTextField()");
 		warned = true;
 	}
 
@@ -637,7 +639,7 @@
 
 	format_text();
 
-	//log_msg("Text set to %s", new_text.c_str());
+	//log_msg(_("Text set to %s"), new_text.c_str());
 
 }
 
@@ -842,9 +844,9 @@
 	//assert(extra_space >= 0.0f);
 	if (extra_space <= 0.0f)
 	{
-		log_warning("TextField text doesn't fit in it's boundaries");
-		log_warning(" m_def->width() == %g", m_def->width());
-		log_warning(" m_def->get_right_margin() == %d", m_def->get_right_margin());
+		log_error(_("TextField text doesn't fit in its boundaries: "
+			    "width %g, margin %d"),
+			    m_def->width(), m_def->get_right_margin());
 		return 0.0f;
 	}
 
@@ -901,7 +903,7 @@
 	//
 	if (_font == NULL)
 	{
-		log_error("No font for edit_text_character! [%s:%d]",
+		log_error(_("No font for edit_text_character! [%s:%d]"),
 			__FILE__, __LINE__);
 		return;
 	}
@@ -929,7 +931,8 @@
 
 		if (_font != newfont)
 		{
-			log_error("error: substituting font!  font '%s' has no glyphs, using font '%s'\n",
+			log_error(_("substituting font!  font '%s' has "
+				  "no glyphs, using font '%s'"),
 				  fontlib::get_font_name(_font),
 				  fontlib::get_font_name(newfont)
 			);
@@ -938,8 +941,8 @@
 		}
 		else
 		{
-			log_error("Current font has no glyphs and I couldn't"
-				  " find another font with glyphs... :(");
+			log_error(_("Current font has no glyphs and I couldn't"
+				  " find another font with glyphs... :("));
 		}
 
 	}
@@ -1062,11 +1065,13 @@
 			int index = _font->get_glyph_index(32); // ascii SPACE
 			if ( index == -1 )
 			{
-				log_warning("%s -- missing glyph for space char (needed for TAB)."
+				IF_VERBOSE_MALFORMED_SWF (
+				  log_error(_("%s -- missing glyph for space char (needed for TAB). "
 					    " Make sure character shapes for font %s are being exported "
-					    "into your SWF file!",
+					    "into your SWF file."),
 					    __PRETTY_FUNCTION__,
 					    _font->get_name());
+				);
 			}
 			else
 			{
@@ -1090,6 +1095,7 @@
 		{ // need a sub-scope to avoid the 'goto' in TAB handling to cross
 		  // initialization of the 'index' variable
 		int index = _font->get_glyph_index((uint16_t) code);
+		IF_VERBOSE_MALFORMED_SWF (
 		if (index == -1)
 		{
 			// error -- missing glyph!
@@ -1099,9 +1105,9 @@
 			if (s_log_count < 10)
 			{
 				s_log_count++;
-				log_warning("%s -- missing glyph for char %d."
+				    log_swferror(_("%s -- missing glyph for char %d. "
 					    " Make sure character shapes for font %s are being exported "
-					    "into your SWF file!",
+						"into your SWF file"),
 					    __PRETTY_FUNCTION__,
 					    code,
 					    _font->get_name()
@@ -1111,6 +1117,7 @@
 			// Drop through and use index == -1; this will display
 			// using the empty-box glyph
 		}
+		);
 		text_glyph_record::glyph_entry	ge;
 		ge.m_glyph_index = index;
 		ge.m_glyph_advance = scale * _font->get_advance(index);
@@ -1132,7 +1139,7 @@
 				static bool warned=false;
 				if ( ! warned )
 				{
-					log_warning("FIXME: implement no word wrap");
+					log_unimpl("edit_text_character: no word wrap");
 					warned=true;
 				}
 			}
@@ -1217,7 +1224,7 @@
 	if ( _text_variable_registered )
 	{
 #ifdef DEBUG_DYNTEXT_VARIABLES
-		log_msg(" registerTextVariable() no-op call (alread registered)");
+		log_msg(_("registerTextVariable() no-op call (already registered)"));
 #endif
 		return;
 	}
@@ -1225,7 +1232,7 @@
 	if ( _variable_name.empty() )
 	{
 #ifdef DEBUG_DYNTEXT_VARIABLES
-		log_msg(" string is empty, consider as registered");
+		log_msg(_("string is empty, consider as registered"));
 #endif
 		_text_variable_registered=true;
 		return;
@@ -1241,7 +1248,7 @@
 	const char* varname = var_str.c_str();
 
 #ifdef DEBUG_DYNTEXT_VARIABLES
-	log_msg(" VariableName: %s", var_str.c_str());
+	log_msg(_("VariableName: %s"), var_str.c_str());
 #endif
 
 	as_environment& env = get_environment();
@@ -1256,7 +1263,7 @@
 	if ( as_environment::parse_path(varname, path, var) )
 	{
 #ifdef DEBUG_DYNTEXT_VARIABLES
-		log_msg("Variable text Path: %s, Var: %s", path.c_str(), var.c_str());
+		log_msg(_("Variable text Path: %s, Var: %s"), path.c_str(), var.c_str());
 #endif
 		// find target for the path component
 		// we use our parent's environment for this
@@ -1269,7 +1276,7 @@
 	if ( ! target )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-			log_warning("VariableName associated to text field refer to an unknown target (%s). It is possible that the character will be instantiated later in the SWF stream. Gnash will try to register again on next access.", path.c_str());
+			log_swferror(_("VariableName associated to text field refer to an unknown target (%s). It is possible that the character will be instantiated later in the SWF stream. Gnash will try to register again on next access."), path.c_str());
 		);
 		return;
 	}
@@ -1284,14 +1291,14 @@
 	if ( sprite->get_member(varname, &val) )
 	{
 #ifdef DEBUG_DYNTEXT_VARIABLES
-		log_msg("target sprite (%p) does have a member named %s", (void*)sprite, varname);
+		log_msg(_("target sprite (%p) does have a member named %s"), (void*)sprite, varname);
 #endif
 		set_text_value(val.to_string().c_str());
 	}
 #ifdef DEBUG_DYNTEXT_VARIABLES
 	else
 	{
-		log_msg("target sprite (%p) does NOT have a member named %s (no problem, we'll add it)", (void*)sprite, varname);
+		log_msg(_("target sprite (%p) does NOT have a member named %s (no problem, we'll add it)"), (void*)sprite, varname);
 	}
 #endif
 

Index: server/fill_style.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fill_style.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/fill_style.cpp	19 Feb 2007 11:56:21 -0000	1.2
+++ server/fill_style.cpp	18 Apr 2007 09:35:42 -0000	1.3
@@ -1,3 +1,4 @@
+// fill_style.cpp:  Graphical region filling styles, for Gnash.
 // 
 //   Copyright (C) 2007 Free Software Foundation, Inc.
 // 
@@ -10,13 +11,14 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 // Based on work of Thatcher Ulrich <tu@tulrich.com> 2003
 
-
 #include "fill_style.h"
 #include "impl.h"
 #include "log.h"
@@ -127,7 +129,7 @@
         if ( ! num_gradients )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("num gradients 0");
+			log_swferror(_("num gradients 0"));
 		);
 		return;
 	}
@@ -136,7 +138,7 @@
 	                         // and we don't have this limitation anyway
         {
             // see: http://sswf.sourceforge.net/SWFalexref.html#swf_gradient
-            log_warning("Unexpected num gradients (%d), expected 1 to 8",
+            log_error(_("Unexpected num gradients (%d), expected 1 to 8"),
                     num_gradients);
         }			
 
@@ -185,13 +187,13 @@
 		static bool warned_about_invalid_char=false;
 		if ( ! warned_about_invalid_char )
 		{
-			log_swferror("Bitmap fill specifies '%d' as associated"
+			log_swferror(_("Bitmap fill specifies '%d' as associated"
 				" bitmap character id,"
 				" but that character is not found"
 				" in the Characters Dictionary."
 				" It seems common to find such "
 				" malformed SWF, so we'll only warn once "
-				"about this.",
+				"about this."),
 				bitmap_char_id);
 			warned_about_invalid_char=true;
 		}
@@ -211,7 +213,7 @@
     }
     else
     {
-        log_error("Unsupported fill style type: 0x%X", m_type);
+        log_unimpl("Unsupported fill style type: 0x%X", m_type);
         // This is a fatal error, we'll be leaving the stream
         // read pointer in an unknown position.
         throw ParserException("Unsupported fill style (Malformed SWF?)");
@@ -241,7 +243,7 @@
    return need_gradient_bitmap();
    
   } else {
-    log_msg("Unknown fill style");
+    log_error(_("Unknown fill style %d"), m_type);
     assert(0);
   }  
 }
@@ -277,11 +279,10 @@
 			static bool warned=false;
 			if ( ! warned ) {
 			log_swferror(
-				"First gradient in a fill_style "
+				_("First gradient in a fill_style "
 				"have position==%d (expected 0)."
 				" This seems to be common, so will"
-				" warn only once."
-				,
+				" warn only once."),
 			        m_gradients[0].m_ratio);
 			warned=true;
 			}
@@ -314,8 +315,8 @@
 			// have the same ratio. This would be a malformed SWF.
 			IF_VERBOSE_MALFORMED_SWF(
 				log_swferror(
-					"two gradients in a fill_style "
-					"have the same position/ratio: %d",
+					_("two gradients in a fill_style "
+					"have the same position/ratio: %d"),
 					gr0.m_ratio);
 			);
 		}

Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/font.cpp	22 Mar 2007 10:51:49 -0000	1.27
+++ server/font.cpp	18 Apr 2007 09:35:42 -0000	1.28
@@ -1,10 +1,25 @@
-// font.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
+// font.cpp:  ActionScript font handling, for Gnash.
+// 
+//   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// A font type for gnash.
+/* $Id: font.cpp,v 1.28 2007/04/18 09:35:42 jgilmore Exp $ */
 
+// Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
 #include "font.h"
 #include "stream.h"
@@ -121,7 +136,7 @@
 	void font::readDefineFont(stream* in, movie_definition* m)
 	{
 		IF_VERBOSE_PARSE (
-		log_parse("reading DefineFont");
+		log_parse(_("reading DefineFont"));
 		);
 
 		int	table_base = in->get_position();
@@ -171,7 +186,7 @@
 	void font::readDefineFont2_or_3(stream* in, movie_definition* m)
 	{
 		IF_VERBOSE_PARSE (
-		log_parse("reading DefineFont2 or DefineFont3");
+		log_parse(_("reading DefineFont2 or DefineFont3"));
 		);
 
 		bool	has_layout = (in->read_uint(1) != 0);
@@ -184,7 +199,7 @@
 		m_is_bold = (in->read_uint(1) != 0);
 		uint8_t	reserved = in->read_u8();
 
-		// Inhibit warning.
+		// Inhibit compiler warning.
 		reserved = reserved;
 
 		m_name = in->read_string_with_length();
@@ -206,7 +221,7 @@
 				uint32_t off = in->read_u32();	
 
 				IF_VERBOSE_PARSE (
-				log_parse("Glyph %d at offset %u", i, off);
+				log_parse(_("Glyph %d at offset %u"), i, off);
 				);
 
 				offsets.push_back(off);
@@ -221,7 +236,7 @@
 				uint16_t off = in->read_u16();	
 
 				IF_VERBOSE_PARSE (
-				log_parse("Glyph %d at offset %u", i, off);
+				log_parse(_("Glyph %d at offset %u"), i, off);
 				);
 
 				offsets.push_back(off);
@@ -257,7 +272,7 @@
 			if (font_code_offset + table_base != current_position)
 			{
 				// Bad offset!  Don't try to read any more.
-				log_warning("Bad offset in DefineFont2!");
+				log_error(_("Bad offset in DefineFont2"));
 				return;
 			}
 		}
@@ -324,7 +339,7 @@
 	// later using the character pair as the key.
 	if ( ! m_kerning_pairs.insert(std::make_pair(k, adjustment)).second )
 	{
-		log_warning("Repeated kerning pair found - ignoring\n");
+		log_error(_("Repeated kerning pair found - ignoring"));
 	}
 
 			}
@@ -346,10 +361,9 @@
 			// See: SWFalexref/SWFalexref.html#tag_definefont2
 			static bool warned = false;
 			if ( ! warned ) {
-				log_warning("DefineFontInfo2 partially implemented");
+				log_unimpl(_("DefineFontInfo2 partially implemented"));
 				warned = true;
 			}
-
 		}
 
 		delete [] m_name;
@@ -378,7 +392,7 @@
 	// codes.
 	{
 		IF_VERBOSE_PARSE (
-		log_parse("reading code table at offset %lu", in->get_position());
+		log_parse(_("reading code table at offset %lu"), in->get_position());
 		);
 
 		assert(m_code_table.empty());
@@ -412,14 +426,14 @@
 		{
 			int glyph_index = it->second;
 #if 0
-			log_msg("get_glyph_index(%u) returning %d",
+			log_msg(_("get_glyph_index(%u) returning %d"),
 				code, glyph_index);
 #endif
 			return glyph_index;
 		}
 
 #if 0
-		log_msg("get_glyph_index(%u) returning -1", code);
+		log_msg(_("get_glyph_index(%u) returning -1"), code);
 #endif
 		return -1;
 	}
@@ -439,7 +453,7 @@
 			if (s_logged == false)
 			{
 				s_logged = true;
-				log_error("empty advance table in font %s\n", get_name());
+				log_error(_("empty advance table in font %s"), get_name());
 			}
 			return 0;
 		}
@@ -506,8 +520,8 @@
 		int	n = in->read_le32();
 		if (n != m_glyphs.size())
 		{
-			log_error("error reading cache file in font::input_cached_data() "
-				  "glyph count mismatch.\n");
+			log_error(_("error reading cache file in font::input_cached_data(): "
+				  "glyph count mismatch"));
 			in->go_to_end();	// ensure that no more data will be read from this stream.
 			return;
 		}

Index: server/generic_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/generic_character.cpp	28 Feb 2007 17:25:26 -0000	1.4
+++ server/generic_character.cpp	18 Apr 2007 09:35:42 -0000	1.5
@@ -1,5 +1,6 @@
+// generic_character.cpp:  Mouse/Character handling, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,15 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
-/* $Id: generic_character.cpp,v 1.4 2007/02/28 17:25:26 udog Exp $ */
+/* $Id: generic_character.cpp,v 1.5 2007/04/18 09:35:42 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -46,7 +45,7 @@
 void
 generic_character::enclose_own_bounds(rect *) const
 {
-	log_error("generic_character::enclose_own_bounds unimplemented");
+	log_unimpl("generic_character::enclose_own_bounds");
 	assert(0); // TO BE IMPLEMENTED!!!!!
 }
 

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/impl.cpp	13 Apr 2007 07:35:55 -0000	1.103
+++ server/impl.cpp	18 Apr 2007 09:35:42 -0000	1.104
@@ -1,3 +1,4 @@
+// impl.cpp:  Implement ActionScript tags, movie loading, library, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: impl.cpp,v 1.103 2007/04/13 07:35:55 bjacques Exp $ */
+/* $Id: impl.cpp,v 1.104 2007/04/18 09:35:42 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -83,7 +86,7 @@
 	// can call this only once during a single run
 	assert(!globals::baseurl.get());
 	globals::baseurl.reset(new URL(url));
-	log_msg("Base url set to: %s", globals::baseurl->str().c_str());
+	log_msg(_("Base url set to: %s"), globals::baseurl->str().c_str());
 }
 
 const URL&
@@ -244,11 +247,11 @@
     // Put extracted info in the given vars.
     // Sets *version to 0 if info can't be extracted.
 {
-    //printf("%s: url is %s\n",  __PRETTY_FUNCTION__, url.str().c_str());
+    //log_msg(_("%s: url is %s"),  __PRETTY_FUNCTION__, url.str().c_str());
 
     tu_file*	in = globals::streamProvider.getStream(url);
     if (in == NULL || in->get_error() != TU_FILE_NO_ERROR) {
-	log_error("get_movie_info(): can't open '%s'\n", url.str().c_str());
+	log_error(_("get_movie_info(): can't open '%s'"), url.str().c_str());
 	if (version) *version = 0;
 	//delete in;
 	return;
@@ -263,7 +266,7 @@
     if ((header & 0x0FFFFFF) != 0x00535746
 	&& (header & 0x0FFFFFF) != 0x00535743) {
 	// ERROR
-	log_error("get_movie_info(): file '%s' does not start with a SWF header!\n", url.str().c_str());
+	log_error(_("get_movie_info(): file '%s' does not start with a SWF header"), url.str().c_str());
 	if (version) *version = 0;
 	//delete in;
 	return;
@@ -273,7 +276,7 @@
     tu_file*	original_in = NULL;
     if (compressed) {
 #if TU_CONFIG_LINK_TO_ZLIB == 0
-	log_error("get_movie_info(): can't read zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0!\n");
+	log_error(_("get_movie_info(): can't read zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0"));
 	return;
 #endif
 	original_in = in;
@@ -325,7 +328,7 @@
 create_jpeg_movie(std::auto_ptr<tu_file> in, const std::string& url)
 {
 	// FIXME: temporarly disabled
-	//log_msg("Loading of jpegs unsupported");
+	//log_unimpl(_("Loading of jpegs"));
 	//return NULL;
 
 
@@ -333,12 +336,12 @@
 
 	if ( ! im.get() )
 	{
-		log_error("Can't read jpeg\n");
+		log_error(_("Can't read jpeg"));
 		return NULL;
 	} 
 
 	BitmapMovieDefinition* mdef = new BitmapMovieDefinition(im, url);
-	//log_msg("BitmapMovieDefinition %p created", mdef);
+	//log_msg(_("BitmapMovieDefinition %p created"), mdef);
 	return mdef;
 
 
@@ -347,7 +350,7 @@
 }
 
 // Get type of file looking at first bytes
-// return 'jpeg', 'swf' or 'unknown'
+// return "jpeg", "swf" or "unknown"
 //
 static std::string
 get_file_type(tu_file* in)
@@ -358,7 +361,7 @@
 	memset(buf, 0, 3);
 	if ( 3 < in->read_bytes(buf, 3) )
 	{
-		log_error("Can't read file header!\n");
+		log_error(_("Can't read file header"));
 		return "unknown";
 	}
 	
@@ -435,7 +438,7 @@
 	{
 		if ( startLoaderThread == false )
 		{
-			log_warning("Requested to keep from completely loading a movie, but the movie in question is a jpeg, for which we don't have the concept of a 'loading thread'");
+			log_unimpl(_("Requested to keep from completely loading a movie, but the movie in question is a jpeg, for which we don't yet have the concept of a 'loading thread'"));
 		}
 		return create_jpeg_movie(in, url);
 	}
@@ -444,7 +447,7 @@
 		return create_swf_movie(in, url, startLoaderThread);
 	}
 
-	log_error("unknown file type (%s)", type.c_str());
+	log_error(_("unknown file type (%s)"), type.c_str());
 	return NULL;
 }
 
@@ -455,17 +458,17 @@
 	std::string url_str = url.str();
 	const char* c_url = url_str.c_str();
 
-//	printf("%s: url is %s\n",  __PRETTY_FUNCTION__, c_url);
+//	log_msg(_("%s: url is %s"),  __PRETTY_FUNCTION__, c_url);
 
 	std::auto_ptr<tu_file> in ( globals::streamProvider.getStream(url) );
 	if ( ! in.get() )
 	{
-	    log_error("failed to open '%s'; can't create movie.", c_url);
+	    log_error(_("failed to open '%s'; can't create movie"), c_url);
 	    return NULL;
 	}
 	else if ( in->get_error() )
 	{
-	    log_error("streamProvider opener can't open '%s'", c_url);
+	    log_error(_("streamProvider opener can't open '%s'"), c_url);
 	    return NULL;
 	}
 
@@ -483,15 +486,17 @@
 			|| cache_in->get_error() != TU_FILE_NO_ERROR)
 		{
 			// Can't open cache file; don't sweat it.
-		        log_parse("note: couldn't open cache file '%s'\n",
+			IF_VERBOSE_PARSE (
+		        log_parse(_("note: couldn't open cache file '%s'"),
 					cache_filename.c_str());
+			)
 
 			// can't read cache, so generate font texture data.
 			ret->generate_font_bitmaps();
 		}
 		else
 		{
-			log_msg("Loading cache file %s",
+			log_msg(_("Loading cache file %s"),
 				cache_filename.c_str());
 			// Load the cached data.
 			ret->input_cached_data(cache_in.get());
@@ -619,7 +624,7 @@
       
 	    if (m->get_ref_count() < 2)
 		{
-		    log_action("extern movie deleted");
+		    log_action(_("extern movie deleted"));
 		    s_extern_sprites.erase(s_extern_sprites.begin() + i);
 		    i--;
 		    root_m->drop_ref();
@@ -659,7 +664,7 @@
 //
 movie_definition* create_library_movie(const URL& url, const char* real_url, bool startLoaderThread)
 {
-//    log_msg("%s: url is %s", __PRETTY_FUNCTION__, url.str().c_str());
+//    log_msg(_("%s: url is %s"), __PRETTY_FUNCTION__, url.str().c_str());
 
     // Use real_url as label for cache if available 
     std::string cache_label = real_url ? URL(real_url).str() : url.str();
@@ -669,7 +674,7 @@
 	boost::intrusive_ptr<movie_definition>	m;
 	if ( s_movie_library.get(cache_label, &m) )
 	    {
-    		log_msg("Movie %s already in library", cache_label.c_str());
+    		log_msg(_("Movie %s already in library"), cache_label.c_str());
 		// Return cached movie.
 		// m->add_ref(); let caller add the ref, if needed
 		return m.get();
@@ -681,18 +686,18 @@
 	// calling create_library_movie() again and NOT finding
 	// the just-created movie.
 	movie_definition* mov = create_movie(url, real_url, false);
-	//log_msg("create_movie(%s, %s, false) returned %p", url.str().c_str(), real_url, mov);
+	//log_msg(_("create_movie(%s, %s, false) returned %p"), url.str().c_str(), real_url, mov);
 
 	if (mov == NULL)
 	{
-		log_error("Couldn't load library movie '%s'",
+		log_error(_("Couldn't load library movie '%s'"),
 			url.str().c_str());
 		return NULL;
 	}
 
 	// Movie is good, add to the library 
 	s_movie_library.add(cache_label, mov);
-    	log_msg("Movie %s (SWF%d) added to library", cache_label.c_str(), mov->get_version());
+    	log_msg(_("Movie %s (SWF%d) added to library"), cache_label.c_str(), mov->get_version());
 
 	// Now complete the load if the movie is an SWF movie
 	// 
@@ -708,7 +713,7 @@
 		}
 	}
 
-	//log_msg("create_library_movie(%s, %s, startLoaderThread=%d) about to return %p", url.str().c_str(), real_url, startLoaderThread, mov);
+	//log_msg(_("create_library_movie(%s, %s, startLoaderThread=%d) about to return %p"), url.str().c_str(), real_url, startLoaderThread, mov);
 	return mov;
 }
 
@@ -731,7 +736,7 @@
 
     if (mov == NULL)
 	{
-	    log_error("couldn't create instance\n");
+	    log_error(_("%s: couldn't create instance"), __FUNCTION__);
 
 	    return NULL;
 	}
@@ -783,7 +788,7 @@
     gnash::sprite_instance*	m = movie_def->create_instance();
     if (m == NULL)
 	{
-	    log_error("precompute_cached_data can't create instance of movie\n");
+	    log_error(_("precompute_cached_data can't create instance of movie"));
 	    return;
 	}
 		
@@ -818,21 +823,21 @@
 	    if (m->get_play_state() == gnash::sprite_instance::STOP)
 		{
 		    // Kick the movie.
-		    //printf("kicking movie, kick ct = %d\n", kick_count);
+		    //log_msg(_("kicking movie, kick ct = %d"), kick_count);
 		    m->goto_frame(last_frame + 1);
 		    m->set_play_state(gnash::sprite_instance::PLAY);
 		    kick_count++;
 
 		    if (kick_count > 10)
 			{
-			    //printf("movie is stalled; giving up on playing it through.\n");
+			    //log_msg(_("movie is stalled; giving up on playing it through"));
 			    break;
 			}
 		}
 	    else if (m->get_current_frame() < last_frame)
 		{
 		    // Hm, apparently we looped back.  Skip ahead...
-		    log_error("loop back; jumping to frame " SIZET_FMT "\n", last_frame);
+		    log_error(_("loop back; jumping to frame " SIZET_FMT), last_frame);
 		    m->goto_frame(last_frame + 1);
 		}
 	    else



From MAILER-DAEMON Wed Apr 18 06:55:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He7om-0005YY-OF
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 06:55:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He7ok-0005YT-Po
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 06:55:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He7oi-0005YH-4E
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 06:55:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He7oi-0005YE-01
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 06:55:16 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1He7jr-0005Gi-9z
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 06:50:16 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3IAnqs06007;
	Wed, 18 Apr 2007 12:49:52 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Wed, 18 Apr 2007 12:49:52 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/character.cpp testsuite/...
Message-ID: <20070418104952.GC92773@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hcmqk-0003sH-0x@cvs>
	<ca4b43ff0704180151g353c27a2wbd6809617f0cf25e@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704180151g353c27a2wbd6809617f0cf25e@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 10:55:19 -0000

On Wed, Apr 18, 2007 at 04:51:10PM +0800, zou lunkai wrote:
> >>-     w = TWIPS_TO_PIXELS(int(bounds.width()));
> >>+    w = TWIPS_TO_PIXELS(rint(bounds.width()));
> 
> Does this fix any testcase?   This is the reference I get from
> internet. "rint" is implementation-dependent, either identical to
> ceil() or floor(). Then why not just using ceil()  or  floor()
> instead?

We want a round() I think.
Yes, it fixed some tests.
Try changing it and see what happens there.
Consider also using Range2d<int>(Range2d<float>) cast as an alternative.

--strk;

> 
> original link:
> http://www.opengroup.org/onlinepubs/7990989775/xsh/rint.html
> 
> 
> 
> double rint(double x);
> 
> DESCRIPTION
> The rint() function returns the integral value (represented as a
> double) nearest x in the direction of the current rounding mode. The
> current rounding mode is implementation-dependent.
> If the current rounding mode rounds toward negative infinity, then
> rint() is identical to floor(). If the current rounding mode rounds
> toward positive infinity, then rint() is identical to ceil().
> 
> 
> 
> 
> 
> On 4/15/07, Sandro Santilli <strk@keybit.net> wrote:
> >CVSROOT:        /sources/gnash
> >Module name:    gnash
> >Changes by:     Sandro Santilli <strk>  07/04/14 18:19:49
> >
> >Modified files:
> >       .              : ChangeLog
> >       server         : character.cpp
> >       testsuite/swfdec: PASSING
> >       testsuite/misc-ming.all: Makefile.am
> >Added files:
> >       testsuite/misc-ming.all: matrix_test.c
> >
> >Log message:
> >               * server/character.cpp (height_getset, width_getset): round
> >                 width and heights to nearest integer twip.
> >               * testsuite/swfdec/PASSING: height4.swf succeeds.
> >               * testsuite/misc-ming.all: Makefile.am, matrix_test.c: new 
> >               test
> >                 for statically-defined matrix interpretation (just 
> >                 started, needs
> >                 many more tests).
> >
> >CVSWeb URLs:
> >http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2873&r2=1.2874
> >http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.33&r2=1.34
> >http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.15&r2=1.16
> >http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.90&r2=1.91
> >http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&rev=1.1
> >
> >Patches:
> >Index: ChangeLog
> >===================================================================
> >RCS file: /sources/gnash/gnash/ChangeLog,v
> >retrieving revision 1.2873
> >retrieving revision 1.2874
> >diff -u -b -r1.2873 -r1.2874
> >--- ChangeLog   14 Apr 2007 16:27:22 -0000      1.2873
> >+++ ChangeLog   14 Apr 2007 18:19:49 -0000      1.2874
> >@@ -1,5 +1,14 @@
> > 2007-04-14 Sandro Santilli <strk@keybit.net>
> >
> >+       * server/character.cpp (height_getset, width_getset): round
> >+         width and heights to nearest integer twip.
> >+       * testsuite/swfdec/PASSING: height4.swf succeeds.
> >+       * testsuite/misc-ming.all: Makefile.am, matrix_test.c: new test
> >+         for statically-defined matrix interpretation (just started, needs
> >+         many more tests).
> >+
> >+2007-04-14 Sandro Santilli <strk@keybit.net>
> >+
> >       * server/sprite_instance.cpp (sprite_getBounds): round bounds
> >         to twips.
> >       * testsuite/actionscript.all/MovieClip.as: more successes.
> >
> >Index: server/character.cpp
> >===================================================================
> >RCS file: /sources/gnash/gnash/server/character.cpp,v
> >retrieving revision 1.33
> >retrieving revision 1.34
> >diff -u -b -r1.33 -r1.34
> >--- server/character.cpp        12 Apr 2007 16:29:14 -0000      1.33
> >+++ server/character.cpp        14 Apr 2007 18:19:49 -0000      1.34
> >@@ -18,7 +18,7 @@
> > //
> > //
> >
> >-/* $Id: character.cpp,v 1.33 2007/04/12 16:29:14 strk Exp $ */
> >+/* $Id: character.cpp,v 1.34 2007/04/14 18:19:49 strk Exp $ */
> >
> > #ifdef HAVE_CONFIG_H
> > #include "config.h"
> >@@ -458,13 +458,13 @@
> >       as_value rv;
> >       if ( fn.nargs == 0 ) // getter
> >       {
> >-               float w = 0;
> >+               double w = 0;
> >               if ( bounds.isFinite() )
> >               {
> >                       matrix m = ptr->get_matrix();
> >                       m.transform(bounds);
> >                       assert(bounds.isFinite());
> >-                       w = TWIPS_TO_PIXELS(int(bounds.width()));
> >+                       w = TWIPS_TO_PIXELS(rint(bounds.width()));
> >               }
> >               rv = as_value(w);
> >       }
> >@@ -503,13 +503,13 @@
> >       as_value rv;
> >       if ( fn.nargs == 0 ) // getter
> >       {
> >-               float h = 0;
> >+               double h = 0;
> >               if ( bounds.isFinite() )
> >               {
> >                       matrix m = ptr->get_matrix();
> >                       m.transform(bounds);
> >                       assert(bounds.isFinite());
> >-                       h = TWIPS_TO_PIXELS(int(bounds.height()));
> >+                       h = TWIPS_TO_PIXELS(rint(bounds.height()));
> >               }
> >               rv = as_value(h);
> >       }
> >
> >Index: testsuite/swfdec/PASSING
> >===================================================================
> >RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
> >retrieving revision 1.15
> >retrieving revision 1.16
> >diff -u -b -r1.15 -r1.16
> >--- testsuite/swfdec/PASSING    12 Apr 2007 09:14:37 -0000      1.15
> >+++ testsuite/swfdec/PASSING    14 Apr 2007 18:19:49 -0000      1.16
> >@@ -52,3 +52,4 @@
> > undefined2-7.swf
> > height1.swf
> > height3.swf
> >+height4.swf
> >
> >Index: testsuite/misc-ming.all/Makefile.am
> >===================================================================
> >RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
> >retrieving revision 1.90
> >retrieving revision 1.91
> >diff -u -b -r1.90 -r1.91
> >--- testsuite/misc-ming.all/Makefile.am 9 Apr 2007 09:04:09 -0000       
> >1.90
> >+++ testsuite/misc-ming.all/Makefile.am 14 Apr 2007 18:19:49 -0000      
> >1.91
> >@@ -52,7 +52,6 @@
> >       -DMING_VERSION_CODE=$(MING_VERSION_CODE) \
> >       $(NULL)
> >
> >-
> > check_PROGRAMS = \
> >       ButtonEventsTest \
> >       ButtonEventsTest-Runner \
> >@@ -86,6 +85,7 @@
> >       registerClassTestRunner \
> >       goto_frame_test \
> >       consecutive_goto_frame_test \
> >+       matrix_test \
> >       multi_doactions_and_goto_frame_test \
> >       simple_loop_test \
> >       simple_loop_testrunner \
> >@@ -140,6 +140,7 @@
> >       reverse_execute_PlaceObject2_test2runner \
> >       displaylist_depths_testrunner \
> >       get_frame_number_testrunner \
> >+       matrix_testrunner \
> >       $(NULL)
> >
> > if MAKESWF_SUPPORTS_PREBUILT_CLIPS
> >@@ -372,6 +373,20 @@
> >       sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
> >       chmod 755 $@
> >
> >+matrix_test_SOURCES =  \
> >+       matrix_test.c   \
> >+       ming_utils.h            \
> >+       ming_utils.c            \
> >+       $(NULL)
> >+matrix_test_LDADD = $(MING_LIBS)
> >+
> >+matrix_test.swf: matrix_test
> >+       ./matrix_test $(top_srcdir)/testsuite/media
> >+
> >+matrix_testrunner: $(srcdir)/../generic-testrunner.sh matrix_test.swf
> >+       sh $< -r5 $(top_builddir) matrix_test.swf > $@
> >+       chmod 755 $@
> >+
> > get_frame_number_test_SOURCES =        \
> >       get_frame_number_test.c \
> >       ming_utils.h            \
> >@@ -892,6 +907,7 @@
> >       reverse_execute_PlaceObject2_test1runner \
> >       reverse_execute_PlaceObject2_test2runner \
> >       displaylist_depths_testrunner \
> >+       matrix_testrunner \
> >       $(NULL)
> >
> > if MAKESWF_SUPPORTS_PREBUILT_CLIPS
> >
> >Index: testsuite/misc-ming.all/matrix_test.c
> >===================================================================
> >RCS file: testsuite/misc-ming.all/matrix_test.c
> >diff -N testsuite/misc-ming.all/matrix_test.c
> >--- /dev/null   1 Jan 1970 00:00:00 -0000
> >+++ testsuite/misc-ming.all/matrix_test.c       14 Apr 2007 18:19:49 -0000 
> >1.1
> >@@ -0,0 +1,138 @@
> >+/*
> >+ *   Copyright (C) 2007 Free Software Foundation, Inc.
> >+ *
> >+ * This program is free software; you can redistribute it and/or modify
> >+ * it under the terms of the GNU General Public License as published by
> >+ * the Free Software Foundation; either version 2 of the License, or
> >+ * (at your option) any later version.
> >+ *
> >+ * This program is distributed in the hope that it will be useful,
> >+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> >+ * GNU General Public License for more details.
> >+ * You should have received a copy of the GNU General Public License
> >+ * along with this program; if not, write to the Free Software
> >+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  
> >USA
> >+ *
> >+ */
> >+
> >+/*
> >+ * Sandro Santilli, strk@keybit.net
> >+ *
> >+ * Test extracting _width, _height, _xscale, _yscale, _x, _y and _rotation
> >+ * from hard-coded matrices.
> >+ *
> >+ * run as ./matrix_test
> >+ */
> >+
> >+#include "ming_utils.h"
> >+
> >+#include <stdlib.h>
> >+#include <stdio.h>
> >+#include <ming.h>
> >+
> >+#define OUTPUT_VERSION 6
> >+#define OUTPUT_FILENAME "matrix_test.swf"
> >+
> >+SWFDisplayItem add_static_mc(SWFMovie mo, const char* name, int depth, 
> >int x, int y, int width, int height);
> >+
> >+SWFDisplayItem
> >+add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int 
> >width, int height)
> >+{
> >+       SWFShape sh;
> >+       SWFMovieClip mc, mc2;
> >+       SWFDisplayItem it;
> >+
> >+       sh = make_fill_square (-(width/2), -(height/2), width, height, 
> >255, 0, 0, 255, 0, 0);
> >+       mc = newSWFMovieClip();
> >+       SWFMovieClip_add(mc, (SWFBlock)sh);
> >+
> >+       sh = make_square (-(width/2)+5, -(height/2)+5, width-10, 
> >height-10, 0, 0, 0);
> >+       mc2 = newSWFMovieClip(); // child
> >+       SWFMovieClip_add(mc2, (SWFBlock)sh);
> >+       SWFMovieClip_nextFrame(mc2);
> >+
> >+       it = SWFMovieClip_add(mc, (SWFBlock)mc2);
> >+       SWFDisplayItem_setName(it, "child");
> >+       SWFMovieClip_nextFrame(mc);
> >+
> >+       it = SWFMovie_add(mo, (SWFBlock)mc);
> >+       SWFDisplayItem_setDepth(it, depth);
> >+       SWFDisplayItem_moveTo(it, x, y);
> >+       SWFDisplayItem_setName(it, name);
> >+
> >+       return it;
> >+}
> >+
> >+
> >+int
> >+main(int argc, char** argv)
> >+{
> >+       SWFMovie mo;
> >+       SWFMovieClip dejagnuclip;
> >+       SWFDisplayItem it;
> >+       int i;
> >+
> >+       const char *srcdir=".";
> >+       if ( argc>1 )
> >+               srcdir=argv[1];
> >+       else
> >+       {
> >+               //fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
> >+               //return 1;
> >+       }
> >+
> >+       Ming_init();
> >+       mo = newSWFMovieWithVersion(OUTPUT_VERSION);
> >+       SWFMovie_setDimension(mo, 800, 600);
> >+       SWFMovie_setRate (mo, 1);
> >+
> >+       dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 
> >10, 0, 0, 800, 600);
> >+       SWFMovie_add(mo, (SWFBlock)dejagnuclip);
> >+
> >+       add_actions(mo, "printBounds = function(b) { return 
> >''+b.xMin+','+b.yMin+' '+b.xMax+','+b.yMax; };");
> >+
> >+       SWFMovie_nextFrame(mo);
> >+
> >+
> >+       // Static 60x60 movieclip
> >+       it = add_static_mc(mo, "staticmc", 3, 50, 300, 60, 60);
> >+
> >+       // Check if we cleaned them all now
> >+       check_equals(mo, "typeof(staticmc)", "'movieclip'");
> >+       check_equals(mo, "staticmc._x", "50");
> >+       check_equals(mo, "staticmc._y", "300");
> >+       check_equals(mo, "staticmc._xscale", "100");
> >+       check_equals(mo, "staticmc._yscale", "100");
> >+       check_equals(mo, "staticmc._rotation", "0");
> >+       check_equals(mo, "Math.round(staticmc._width)", "60");
> >+       check_equals(mo, "Math.round(staticmc._height)", "60");
> >+
> >+       SWFMovie_nextFrame(mo);
> >+
> >+       SWFDisplayItem_rotate(it, -45);
> >+
> >+       check_equals(mo, "staticmc._x", "50");
> >+       check_equals(mo, "staticmc._y", "300");
> >+       check_equals(mo, "Math.round(staticmc._xscale)", "100");
> >+       check_equals(mo, "Math.round(staticmc._yscale)", "100");
> >+       check_equals(mo, "staticmc._rotation", "45");
> >+       check_equals(mo, "printBounds(staticmc.getBounds())", 
> >"'-30.05,-30.05 30.05,30.05'");
> >+       check_equals(mo, "printBounds(staticmc.getBounds(_root))", 
> >"'7.5,257.5 92.5,342.5'");
> >+       check_equals(mo, "staticmc._width", "85");
> >+       check_equals(mo, "staticmc._height", "85");
> >+
> >+       // TODO:
> >+       // - test mixing rotation and scale !
> >+
> >+
> >+
> >+       add_actions(mo, "_root.totals(); stop();");
> >+       SWFMovie_nextFrame(mo);
> >+
> >+       //Output movie
> >+       puts("Saving " OUTPUT_FILENAME );
> >+       SWFMovie_save(mo, OUTPUT_FILENAME);
> >+
> >+       return 0;
> >+}
> >
> >
> >_______________________________________________
> >Gnash-commit mailing list
> >Gnash-commit@gnu.org
> >http://lists.gnu.org/mailman/listinfo/gnash-commit
> >

-- 

 ()   ASCII Ribbon Campaign
 /\   Keep it simple! 




From MAILER-DAEMON Wed Apr 18 07:05:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He7yw-0007lL-3P
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 07:05:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He7yt-0007iJ-UD
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 07:05:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He7yf-0007ee-F3
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 07:05:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He7yf-0007eT-5u
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 07:05:33 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1He7to-0006S8-Bz
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 07:00:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He7tn-0004oc-4f
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:00:31 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1He7tm-0004oZ-FU
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:00:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He7tm-0004oZ-FU@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Wed, 18 Apr 2007 11:00:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/dlist.h server/sprite_in...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 11:05:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/18 11:00:30

Modified files:
	.              : ChangeLog 
	server         : dlist.h sprite_instance.cpp text.cpp 
	                 textformat.cpp video_stream_instance.cpp 
	server/asobj   : Camera.cpp Color.cpp ContextMenu.cpp 
	                 CustomActions.cpp Date.cpp Error.cpp Global.cpp 
	                 Key.cpp LoadVars.cpp LocalConnection.cpp 
	                 Microphone.cpp Mouse.cpp MovieClipLoader.cpp 
	                 NetConnection.cpp NetStream.cpp 
	                 NetStreamFfmpeg.cpp NetStreamGst.cpp Number.cpp 
	                 Object.cpp Selection.cpp SharedObject.cpp 

Log message:
	* Internationalization, phase 2.
	
	* These modules have had their printed messages passed through
	  _(...).  Those messages have also been cleaned up, thusly:
	    *  Stray \n's removed
	    *  Exclamation points and periods removed at ends of messages
	    *  Typos corrected, and English language wording adjusted.
	    *  Misplaced UPPER CASE shouting removed.
	    *  Many complaints about unknown types, values, etc, now include
	       the offending value, for ease of remote diagnosis.
	    *  C++-style << printouts converted to log_xxx calls.
	    *  Direct accesses to dbglogfile converted to log_xxx calls.
	    *  Function name debug prints converted to GNASH_REPORT_FUNCTION.
	  These changes should also make the messages easier to	translate.
	* Commented-out messages were also cleaned up as above.
	* Many modules have also had log_warning calls changed to log_msg,
	  log_error, log_aserror, log_swferror, or log_unimp, according to
	  the documentation checked in earlier by strk and gnu.
	  IF_VERBOSE_xxx macros were inserted around some calls that
	  lacked them.
	* Header comments (at the top of the file) added or adjusted, to
	  describe each file in its initial line, and to correct whitespace
	  in the copyright notices.
	
	* The list of files affected by the above changes:
	  server/dlist.h
	  server/sprite_instance.cpp
	  server/text.cpp
	  server/textformat.cpp
	  server/video_stream_instance.cpp
	  server/asobj/Camera.cpp
	  server/asobj/Color.cpp
	  server/asobj/ContextMenu.cpp
	  server/asobj/CustomActions.cpp
	  server/asobj/Date.cpp
	  server/asobj/Error.cpp
	  server/asobj/Global.cpp
	  server/asobj/Key.cpp
	  server/asobj/LoadVars.cpp
	  server/asobj/LocalConnection.cpp
	  server/asobj/Microphone.cpp
	  server/asobj/Mouse.cpp
	  server/asobj/MovieClipLoader.cpp
	  server/asobj/NetConnection.cpp
	  server/asobj/NetStream.cpp
	  server/asobj/NetStreamFfmpeg.cpp
	  server/asobj/NetStreamGst.cpp
	  server/asobj/Number.cpp
	  server/asobj/Object.cpp
	  server/asobj/Selection.cpp
	  server/asobj/SharedObject.cpp
	
	* New 2006, 2007 Free Software Foundation copyrights applied (to
	  formerly public domain code):
	  server/text.cpp
	 
	* server/dlist.{h,cpp}:  Change API of DisplayList::dump debug
	  function, so it can use log_xxx functions.
	* server/sprite_instance.cpp (sprite_attach_movie):  Comment out
	  log_msg about initializing properties.
	
	I'm sure that I've missed some messages that ought to get 
	translated (with _(...)).  Those will be fixed over time.
	All new messages should be created with _(...) so they can
	be translated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2905&r2=1.2906
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.245&r2=1.246
http://cvs.savannah.gnu.org/viewcvs/gnash/server/text.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Camera.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Color.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ContextMenu.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/CustomActions.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Error.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LocalConnection.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Microphone.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Mouse.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamGst.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Number.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Selection.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2905
retrieving revision 1.2906
diff -u -b -r1.2905 -r1.2906
--- ChangeLog	18 Apr 2007 09:35:41 -0000	1.2905
+++ ChangeLog	18 Apr 2007 11:00:29 -0000	1.2906
@@ -1,4 +1,4 @@
-2007-04-18  John Gilmore  <gnu@quiet.toad.com>
+2007-04-18  John Gilmore  <gnu@toad.com>
 
 	* Internationalization, phase 2.
 	
@@ -12,9 +12,10 @@
 	       the offending value, for ease of remote diagnosis.
 	    *  C++-style << printouts converted to log_xxx calls.
 	    *  Direct accesses to dbglogfile converted to log_xxx calls.
+	    *  Function name debug prints converted to GNASH_REPORT_FUNCTION.
 	  These changes should also make the messages easier to	translate.
 	* Commented-out messages were also cleaned up as above.
-	* Many modules have also had log_warning calls changed to
+	* Many modules have also had log_warning calls changed to log_msg,
 	  log_error, log_aserror, log_swferror, or log_unimp, according to
 	  the documentation checked in earlier by strk and gnu.
 	  IF_VERBOSE_xxx macros were inserted around some calls that
@@ -41,11 +42,37 @@
 	  server/button_character_instance.cpp
 	  server/character.cpp
 	  server/dlist.cpp
+	  server/dlist.h
 	  server/edit_text_character.cpp
 	  server/fill_style.cpp
 	  server/font.cpp
 	  server/generic_character.cpp
 	  server/impl.cpp
+	  server/sprite_instance.cpp
+	  server/text.cpp
+	  server/textformat.cpp
+	  server/video_stream_instance.cpp
+	  server/asobj/Camera.cpp
+	  server/asobj/Color.cpp
+	  server/asobj/ContextMenu.cpp
+	  server/asobj/CustomActions.cpp
+	  server/asobj/Date.cpp
+	  server/asobj/Error.cpp
+	  server/asobj/Global.cpp
+	  server/asobj/Key.cpp
+	  server/asobj/LoadVars.cpp
+	  server/asobj/LocalConnection.cpp
+	  server/asobj/Microphone.cpp
+	  server/asobj/Mouse.cpp
+	  server/asobj/MovieClipLoader.cpp
+	  server/asobj/NetConnection.cpp
+	  server/asobj/NetStream.cpp
+	  server/asobj/NetStreamFfmpeg.cpp
+	  server/asobj/NetStreamGst.cpp
+	  server/asobj/Number.cpp
+	  server/asobj/Object.cpp
+	  server/asobj/Selection.cpp
+	  server/asobj/SharedObject.cpp
 	  
 	* 2007 copyright notices were inserted in:
 	  backend/sound_handler_sdl.cpp
@@ -58,6 +85,7 @@
 	* New 2006, 2007 Free Software Foundation copyrights applied (to
 	  formerly public domain code):
 	  server/font.cpp
+	  server/text.cpp
 	 
 	* backend/sound_handler_sdl.cpp: Move stray FORMAT_VORBIS comment.
 	* gui/gui.cpp: Commented out "Resize request when no movie" error
@@ -68,6 +96,8 @@
 	  c_str accessor when converting string to number.
 	* server/dlist.{h,cpp}:  Change API of DisplayList::dump debug
 	  function, so it can use log_xxx functions.
+	* server/sprite_instance.cpp (sprite_attach_movie):  Comment out
+	  log_msg about initializing properties.
 	
 	I'm sure that I've missed some messages that ought to get 
 	translated (with _(...)).  Those will be fixed over time.
@@ -190,7 +220,7 @@
 	  any path-looking string is necessarely a path, it can still be
 	  a floating number or a frame label.
 
-2007-04-16  John Gilmore  <gnu@quiet.toad.com>
+2007-04-16  John Gilmore  <gnu@toad.com>
 
 	* libbase/log.h: Update documentation for log_* functions; rename
 	  log_warning to log_unimpl (with temporary #define for a few days);
@@ -1997,7 +2027,7 @@
 	* server/sprite_instance.cpp (get_text_value): remove the trailing
 	  dot from name of top-level movies.
 
-2007-03-12  John Gilmore  <gnu@quiet.toad.com>
+2007-03-12  John Gilmore  <gnu@toad.com>
 
 	* configure.ac:  Suggest agg-2.5 rather than 2.4 if
 	agg_gradient_lut.h is missing.

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/dlist.h	12 Apr 2007 05:37:33 -0000	1.34
+++ server/dlist.h	18 Apr 2007 11:00:29 -0000	1.35
@@ -1,3 +1,4 @@
+// dlist.h:  Display list definitions, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,19 +11,15 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
-// 
-//
-
-
 
 #ifndef GNASH_DLIST_H
 #define GNASH_DLIST_H
 
-
 #include "container.h"
 #include "types.h"
 #include "impl.h"
@@ -45,7 +42,7 @@
 //
 /// Any sprite_instance has an associated DisplayList
 /// that may change from frame to frame due to control
-/// tags instructing when to add or remove characthers
+/// tags instructing when to add or remove characters
 /// from the stage.
 ///
 class DisplayList {
@@ -280,8 +277,8 @@
 	template <class V>
 	inline void visitAll(V& visitor);
 
-	/// dump list to given output stream (debugging)
-	void dump(std::ostream& os) const;
+	/// dump list to logfile/stderr
+	void dump() const;
 
   /// Like character_instance::add_invalidated_bounds() this method calls the
   /// method with the same name of all childs.	

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -b -r1.245 -r1.246
--- server/sprite_instance.cpp	16 Apr 2007 18:23:05 -0000	1.245
+++ server/sprite_instance.cpp	18 Apr 2007 11:00:29 -0000	1.246
@@ -1,3 +1,4 @@
+// sprite_instance.cpp:  Stateful live Sprite instance, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,14 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+// 
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 // 
-//
-
-// Stateful live Sprite instance
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -137,8 +135,8 @@
 	if (fn.nargs < 3 || fn.nargs > 4)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("attachMovie called with wrong number of arguments"
-			" expected 3 to 4, got (%d) - returning undefined",
+		log_aserror(_("attachMovie called with wrong number of arguments"
+			" expected 3 to 4, got (%d) - returning undefined"),
 			fn.nargs);
 		);
 		return rv;
@@ -151,8 +149,8 @@
 	if ( exported == NULL )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("attachMovie: '%s': no such exported resource - "
-			"returning undefined",
+		log_aserror(_("attachMovie: '%s': no such exported resource - "
+			"returning undefined"),
 			id_name.c_str());
 		);
 		return rv; 
@@ -161,9 +159,9 @@
 	if ( ! exported_movie )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("attachMovie: exported resource '%s' "
+		log_aserror(_("attachMovie: exported resource '%s' "
 			"is not a movie definition (%s) -- "
-			"returning undefined",
+			"returning undefined"),
 			id_name.c_str(),
 			typeid(*(exported.get())).name());
 		);
@@ -185,7 +183,7 @@
 	// place_character() will set depth on newch
 	if ( ! sprite->attachCharacter(*newch, depth_val) )
 	{
-		log_error("Could not attach character at depth %d", depth_val);
+		log_error(_("Could not attach character at depth %d"), depth_val);
 		return rv;
 	}
 
@@ -196,7 +194,7 @@
 	if (fn.nargs > 3 ) {
 		boost::intrusive_ptr<as_object> initObject = fn.arg(3).to_object();
 		if ( initObject ) {
-			log_msg("Initializing properties from object");
+			//log_msg(_("Initializing properties from object"));
 			newch->copyProperties(*initObject);
 		} else {
 			// This is actually a valid thing to do,
@@ -204,8 +202,8 @@
 			// initializing the properties in this
 			// case.
 			IF_VERBOSE_MALFORMED_SWF(
-			log_aserror("Fourth argument of attachMovie "
-				"doesn't cast to an object (%s)",
+			log_aserror(_("Fourth argument of attachMovie "
+				"doesn't cast to an object (%s)"),
 				fn.arg(3).to_string().c_str());
 			);
 		}
@@ -223,8 +221,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.attachAudio() unimplemented -- "
-			"returning undefined");
+		log_unimpl("MovieClip.attachAudio()");
 		warned=true;
 	}
 	return as_value();
@@ -240,9 +237,9 @@
 		if (fn.nargs < 2)
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("createEmptyMovieClip needs "
+				log_aserror(_("createEmptyMovieClip needs "
 					"2 args, but %d given,"
-					" returning undefined.",
+					" returning undefined"),
 					fn.nargs);
 			);
 			return as_value();
@@ -250,9 +247,9 @@
 		else
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("createEmptyMovieClip takes "
+				log_aserror(_("createEmptyMovieClip takes "
 					"2 args, but %d given, discarding"
-					" the one in excess.",
+					" the excess"),
 					fn.nargs);
 			)
 		}
@@ -288,7 +285,7 @@
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("%s.swapDepths() needs one arg.", sprite->getTarget().c_str());
+		log_aserror(_("%s.swapDepths() needs one arg"), sprite->getTarget().c_str());
 		);
 		return rv;
 	}
@@ -297,7 +294,7 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		stringstream ss; fn.dump_args(ss);
-		log_aserror("%s.swapDepths(%s) : won't swap a clip below depth %d (%d).",
+		log_aserror(_("%s.swapDepths(%s): won't swap a clip below depth %d (%d)"),
 			sprite->getTarget().c_str(), ss.str().c_str(), lowerDepthBound, this_depth);
 		);
 		return rv;
@@ -309,8 +306,8 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		stringstream ss; fn.dump_args(ss);
-		log_aserror("%s.swapDepths(%s): this sprite has no parent, "
-			"swapping depth of root ?",
+		log_aserror(_("%s.swapDepths(%s): this sprite has no parent, "
+			"swapping depth of root?"),
 			sprite->getTarget().c_str(),
 			ss.str().c_str());
 		);
@@ -327,7 +324,7 @@
 		if ( sprite == target_sprite )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("%s.swapDepths(%s): invalid call, swapping to self?",
+			log_aserror(_("%s.swapDepths(%s): invalid call, swapping to self?"),
 				sprite->getTarget().c_str(), target_sprite->getTarget().c_str());
 			);
 			return rv;
@@ -337,7 +334,7 @@
 		if ( this_parent != target_parent )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("%s.swapDepths(%s): invalid call, the two characters don't have the same parent",
+			log_aserror(_("%s.swapDepths(%s): invalid call, the two characters don't have the same parent"),
 				sprite->getTarget().c_str(), target_sprite->getTarget().c_str());
 			);
 			return rv;
@@ -354,8 +351,8 @@
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
 			stringstream ss; fn.dump_args(ss);
-			log_aserror("%s.swapDepths(%s): first argument invalid "
-				"(neither a sprite nor a number).",
+			log_aserror(_("%s.swapDepths(%s): first argument invalid "
+				"(neither a sprite nor a number)"),
 				sprite->getTarget().c_str(),
 				ss.str().c_str());
 			);
@@ -389,7 +386,7 @@
 	if (fn.nargs < 2)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("MovieClip.duplicateMovieClip() needs 2 or 3 args");
+		log_aserror(_("MovieClip.duplicateMovieClip() needs 2 or 3 args"));
 	    	);
 		return as_value();
 	}
@@ -420,7 +417,7 @@
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("sprite_goto_and_play needs one arg");
+		log_aserror(_("sprite_goto_and_play needs one arg"));
 		);
 		return as_value();
 	}
@@ -439,7 +436,7 @@
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("sprite_goto_and_stop needs one arg");
+		log_aserror(_("sprite_goto_and_stop needs one arg"));
 		);
 		return as_value();
 	}
@@ -503,8 +500,8 @@
 	if (fn.nargs < 1) // url
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Invalid call to MovieClip.loadMove(), "
-			"expected 1 or 2 args, got %d - returning undefined",
+		log_aserror(_("MovieClip.loadMovie() "
+			"expected 1 or 2 args, got %d - returning undefined"),
 			fn.nargs);
 		);
 		return as_value();
@@ -515,9 +512,9 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss; fn.dump_args(ss);
-		log_msg("First argument passed to MovieClip.loadMove(%s) "
+		log_msg(_("First argument of MovieClip.loadMovie(%s) "
 			"evaluates to an empty string - "
-			"returning undefined",
+			"returning undefined"),
 			ss.str().c_str());
 		);
 		return as_value();
@@ -528,16 +525,16 @@
 	if (fn.nargs > 1)
 	{
 		// TODO: implement support for second argument
-		log_error("FIXME: second argument of MovieClip.loadMovie(%s, <variables>) "
-			"will be discarded (unsupported)", urlstr.c_str());
+		log_unimpl(_("second argument of MovieClip.loadMovie(%s, <variables>) "
+			"will be discarded"), urlstr.c_str());
 		//return;
 	}
 
 	sprite->loadMovie(url);
-	//log_warning("MovieClip.loadMovie(%s) - TESTING ", url.str().c_str());
+	//log_msg("MovieClip.loadMovie(%s) - TESTING ", url.str().c_str());
 
 
-	//log_error("FIXME: %s not implemented yet", __PRETTY_FUNCTION__);
+	//log_unimp("%s", __PRETTY_FUNCTION__);
 	//moviecliploader_loadclip(fn);
 	return as_value();
 }
@@ -551,8 +548,8 @@
 	if (fn.nargs < 1) // url
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Invalid call to MovieClip.loadVariables(), "
-			"expected 1 or 2 args, got %d - returning undefined",
+		log_msg(_("MovieClip.loadVariables() "
+			"expected 1 or 2 args, got %d - returning undefined"),
 			fn.nargs);
 		);
 		return as_value();
@@ -563,9 +560,9 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss; fn.dump_args(ss);
-		log_msg("First argument passed to MovieClip.loadVariables(%s) "
+		log_msg(_("First argument passed to MovieClip.loadVariables(%s) "
 			"evaluates to an empty string - "
-			"returning undefined",
+			"returning undefined"),
 			ss.str().c_str());
 		);
 		return as_value();
@@ -584,10 +581,10 @@
 	}
 
 	sprite->loadVariables(url, method);
-	log_warning("MovieClip.loadVariables(%s) - TESTING ", url.str().c_str());
+	log_msg("MovieClip.loadVariables(%s) - TESTING ", url.str().c_str());
 
 
-	//log_error("FIXME: %s not implemented yet", __PRETTY_FUNCTION__);
+	//log_unimpl(__PRETTY_FUNCTION__);
 	//moviecliploader_loadclip(fn);
 	return as_value();
 }
@@ -603,7 +600,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.unloadMovie() not implemented yet");
+		log_unimpl("MovieClip.unloadMovie()");
 		warned=true;
 	}
 	return as_value();
@@ -627,13 +624,13 @@
 			if ( ! target )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("Can't find hitTest target %s",
+				log_aserror(_("Can't find hitTest target %s"),
 					tgt_val.to_string().c_str());
 				);
 				return as_value();
 			}
 			if ( ! warned_1_arg ) {
-				log_error("FIXME: hitTest(target) unimplemented");
+				log_unimpl("hitTest(target)");
 				warned_1_arg=true;
 			}
 			break;
@@ -644,8 +641,7 @@
 			double x = fn.arg(0).to_number();
 			double y = fn.arg(1).to_number();
 			if ( ! warned_2_arg ) {
-				log_error("FIXME: hitTest(%g,%g) unimplemented",
-				x,y);
+				log_unimpl("hitTest(%g,%g)", x,y);
 				warned_2_arg=true;
 			}
 			break;
@@ -657,8 +653,7 @@
 			double y = fn.arg(1).to_number();
 			bool shapeFlag = fn.arg(2).to_bool();
 			if ( ! warned_3_arg ) {
-				log_error("FIXME: hitTest(%g,%g,%d) unimplemented",
-					x,y,shapeFlag);
+				log_unimpl("hitTest(%g,%g,%d)", x,y,shapeFlag);
 				warned_3_arg=true;
 			}
 			break;
@@ -667,7 +662,7 @@
 		default:
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("hitTest() called with %u args.",
+				log_aserror(_("hitTest() called with %u args"),
 					fn.nargs);
 			);
 			break;
@@ -686,8 +681,8 @@
 	if (fn.nargs != 6) // name, depth, x, y, width, height
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("createTextField called with %d args, "
-			"expected 6 - returning undefined", fn.nargs);
+		log_msg(_("createTextField called with %d args, "
+			"expected 6 - returning undefined"), fn.nargs);
 		);
 		return as_value();
 	}
@@ -695,8 +690,8 @@
 	if ( ! fn.arg(0).is_string() ) 
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("First argument of createTextField is not a string"
-			" - returning undefined");
+		log_msg(_("First argument of createTextField is not a string"
+			" - returning undefined"));
 		);
 		return as_value();
 	}
@@ -705,8 +700,8 @@
 	if ( ! fn.arg(1).is_number() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Second argument of createTextField is not a number"
-			" - returning undefined");
+		log_msg(_("Second argument of createTextField is not a number"
+			" - returning undefined"));
 		);
 		return as_value();
 	}
@@ -715,8 +710,8 @@
 	if ( ! fn.arg(2).is_number() ) 
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Third argument of createTextField is not a number"
-			" - returning undefined");
+		log_msg(_("Third argument of createTextField is not a number"
+			" - returning undefined"));
 		);
 		return as_value();
 	}
@@ -725,8 +720,8 @@
 	if ( ! fn.arg(3).is_number() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Fourth argument of createTextField is not a number"
-			" - returning undefined");
+		log_msg(_("Fourth argument of createTextField is not a number"
+			" - returning undefined"));
 		);
 		return as_value();
 	}
@@ -735,8 +730,8 @@
 	if ( ! fn.arg(4).is_number() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Fifth argument of createTextField is not a number"
-			" - returning undefined");
+		log_msg(_("Fifth argument of createTextField is not a number"
+			" - returning undefined"));
 		);
 		return as_value();
 	}
@@ -745,8 +740,8 @@
 	if ( ! fn.arg(5).is_number() ) 
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_msg("Fifth argument of createTextField is not a number"
-			" - returning undefined");
+		log_msg(_("Fifth argument of createTextField is not a number"
+			" - returning undefined"));
 		);
 		return as_value();
 	}
@@ -779,7 +774,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.getURL() not implemented yet");
+		log_unimpl("MovieClip.getURL()");
 		warned=true;
 	}
 	return as_value();
@@ -800,7 +795,7 @@
 		if ( ! target )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("MovieClip.getBounds(%s) : invalid call, first arg must be a sprite",
+			log_aserror(_("MovieClip.getBounds(%s): invalid call, first arg must be a sprite"),
 				fn.arg(0).to_debug_string().c_str());
 			);
 			return as_value();
@@ -823,7 +818,7 @@
 		tgtwmat.transform_by_inverse(bounds);
 		//ss << "tgt-w-invtransfor bounds: " << bounds << "(tgtwmat is " << tgtwmat << ")" << endl;
 		//log_msg("%s", ss.str().c_str());
-		log_error("FIXME: MovieClip.getBounds(%s) TESTING", fn.arg(0).to_debug_string().c_str());
+		log_msg("FIXME: MovieClip.getBounds(%s) TESTING", fn.arg(0).to_debug_string().c_str());
 	}
 
 	// Magic numbers here... dunno why
@@ -859,7 +854,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.globalToLocal() not implemented yet");
+		log_unimpl("MovieClip.globalToLocal()");
 		warned=true;
 	}
 	return as_value();
@@ -881,7 +876,7 @@
 	if ( fn.nargs < 2 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("MovieClip.lineTo() takes two args");
+			log_aserror(_("MovieClip.lineTo() takes two args"));
 		);
 		return as_value();
 	}
@@ -902,7 +897,7 @@
 	if ( fn.nargs < 2 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("MovieClip.moveTo() takes two args");
+			log_aserror(_("MovieClip.moveTo() takes two args"));
 		);
 		return as_value();
 	}
@@ -965,7 +960,7 @@
 	if ( fn.nargs < 4 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("MovieClip.curveTo() takes four args");
+			log_aserror(_("MovieClip.curveTo() takes four args"));
 		);
 		return as_value();
 	}
@@ -1026,7 +1021,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.beginGradientFill() not implemented yet");
+		log_unimpl("MovieClip.beginGradientFill()");
 		warned=true;
 	}
 	return as_value();
@@ -1043,7 +1038,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.startDrag() not implemented yet");
+		log_unimpl("MovieClip.startDrag()");
 		warned=true;
 	}
 	return as_value();
@@ -1059,7 +1054,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip.stopDrag() not implemented yet");
+		log_unimpl("MovieClip.stopDrag()");
 		warned=true;
 	}
 	return as_value();
@@ -1128,7 +1123,7 @@
 	{
 		ptr->set_name(fn.arg(0).to_string(&fn.env()).c_str());
 		//IF_VERBOSE_ASCODING_ERRORS(
-		//log_aserror("Attempt to set read-only property '_name'");
+		//log_aserror(_("Attempt to set read-only property '_name'"));
 		//);
 	}
 
@@ -1144,7 +1139,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: MovieClip._droptarget unimplemented");
+		log_unimpl("MovieClip._droptarget");
 		warned=true;
 	}
 
@@ -1182,7 +1177,7 @@
 	{
 		static bool warned=false;
 		if ( ! warned ) {
-			log_warning("MovieClip._highquality setting is unsupported");
+			log_unimpl("MovieClip._highquality setting");
 			warned = true;
 		}
 	}
@@ -1206,7 +1201,7 @@
 	{
 		static bool warned=false;
 		if ( ! warned ) {
-			log_warning("MovieClip._focusrect setting is unsupported");
+			log_unimpl("MovieClip._focusrect setting");
 			warned = true;
 		}
 	}
@@ -1228,7 +1223,7 @@
 	{
 		static bool warned=false;
 		if ( ! warned ) {
-			log_warning("MovieClip._soundbuftime setting is unsupported");
+			log_unimpl("MovieClip._soundbuftime setting");
 			warned = true;
 		}
 	}
@@ -1627,11 +1622,11 @@
 		IF_VERBOSE_ASCODING_ERRORS(
 		if (  m_display_list.get_character_by_name_i(name) )
 		{
-			log_aserror("A sprite member (%s) clashes with "
+			log_aserror(_("A sprite member (%s) clashes with "
 					"the name of an existing character "
-					"in its display list! "
+					"in its display list.  "
 					"The member will hide the "
-					"character.", name.c_str());
+					"character"), name.c_str());
 		}
 		);
 #endif
@@ -1667,8 +1662,8 @@
 	testInvariant();
 
 	IF_VERBOSE_ACTION(
-		log_action("Executing " SIZET_FMT " actions in frame " SIZET_FMT
-			"/" SIZET_FMT " of sprite %s",
+		log_action(_("Executing " SIZET_FMT " actions in frame " SIZET_FMT
+			"/" SIZET_FMT " of sprite %s"),
 			m_action_list.size(),
 			m_current_frame+1,
 			m_def->get_frame_count(), getTargetPath().c_str());
@@ -1717,7 +1712,8 @@
 	{
 		// No dice.
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("call_frame('%s') -- invalid frame", frame_spec.to_debug_string().c_str());
+		log_aserror(_("call_frame('%s') -- invalid frame"),
+			    frame_spec.to_debug_string().c_str());
 		);
 		return;
 	}
@@ -1816,7 +1812,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("FIXME: %s unfinished", __PRETTY_FUNCTION__);
+		log_unimpl("%s unfinished", __PRETTY_FUNCTION__);
 		warned = true;
 	}
 
@@ -1830,13 +1826,13 @@
 	character* parent_ch = get_parent();
 	if ( ! parent_ch )
 	{
-		log_error("Can't clone root the movie");
+		log_error(_("Can't clone root of the movie"));
 		return NULL;
 	}
 	sprite_instance* parent = parent_ch->to_movie();
 	if ( ! parent )
 	{
-		log_error("%s parent is not a sprite, can't clone", getTarget().c_str());
+		log_error(_("%s parent is not a sprite, can't clone"), getTarget().c_str());
 		return NULL;
 	}
 
@@ -1892,7 +1888,7 @@
 	}
     else
     {
-	    log_error("clone_display_object(%s, %s, %d): could not find a character named %s to clone",
+	    log_error(_("clone_display_object(%s, %s, %d): could not find a character named %s to clone"),
 			    name.c_str(), newname.c_str(), depth, name.c_str());
     }
 }
@@ -1988,7 +1984,7 @@
 		const as_value& val)
 {
 #ifdef DEBUG_DYNTEXT_VARIABLES
-log_msg("sprite[%p]::set_member(%s, %s)", (void*)this, name.c_str(), val.to_debug_string().c_str());
+log_msg(_("sprite[%p]::set_member(%s, %s)"), (void*)this, name.c_str(), val.to_debug_string().c_str());
 #endif
 
 	if ( val.is_function() )
@@ -2009,7 +2005,7 @@
 	if ( etc )
 	{
 #ifdef DEBUG_DYNTEXT_VARIABLES
-		log_msg(" it's a Text Variable!");
+		log_msg(_("it's a Text Variable"));
 #endif
 		as_environment* env = const_cast<as_environment*>(&m_as_environment);
 		etc->set_text_value(val.to_string(env).c_str());
@@ -2017,7 +2013,7 @@
 #ifdef DEBUG_DYNTEXT_VARIABLES
 	else
 	{
-		log_msg(" it's NOT a Text Variable!");
+		log_msg(_("it's NOT a Text Variable"));
 	}
 #endif
 
@@ -2031,13 +2027,13 @@
 {
 	if (path_to_var == NULL)
 	{
-		log_error("NULL path_to_var passed to set_variable()");
+		log_error(_("NULL path_to_var passed to set_variable()"));
 		return;
 	}
 	if (new_value == NULL)
 	{
-		log_error("NULL passed to set_variable('%s',"
-			" NULL)", path_to_var);
+		log_error(_("NULL passed to set_variable('%s',"
+			" NULL)"), path_to_var);
 		return;
 	}
 
@@ -2057,12 +2053,12 @@
 
 	    if (path_to_var == NULL)
 		{
-		    log_error("NULL path_to_var passed to set_variable()\n");
+		    log_error(_("NULL path_to_var passed to set_variable()"));
 		    return;
 		}
 	    if (new_value == NULL)
 		{
-		    log_error("NULL passed to set_variable('%s', NULL)\n", path_to_var);
+		    log_error(_("NULL passed to set_variable('%s', NULL)"), path_to_var);
 		    return;
 		}
 
@@ -2090,8 +2086,8 @@
 #ifdef GNASH_DEBUG
 	size_t frame_count = m_def->get_frame_count();
 
-	log_msg("sprite '%s' ::advance_sprite is at frame %u/%u "
-		"- onload called: %d - oldDIsplayList has %d elements",
+	log_msg(_("sprite '%s' ::advance_sprite is at frame %u/%u "
+		"- onload called: %d - oldDIsplayList has %d elements"),
 		getTargetPath().c_str(), m_current_frame,
 		frame_count, m_on_event_load_called, oldDisplayList.size());
 #endif
@@ -2100,7 +2096,7 @@
 	if (m_play_state == PLAY)
 	{
 #ifdef GNASH_DEBUG
-		log_msg("sprite_instance::advance_sprite we're in PLAY mode");
+		log_msg(_("sprite_instance::advance_sprite we're in PLAY mode"));
 #endif
 
 		int prev_frame = m_current_frame;
@@ -2108,11 +2104,11 @@
 		if (m_on_event_load_called)
 		{
 #ifdef GNASH_DEBUG
-			log_msg(" on_event_load called, incrementing");
+			log_msg(_("on_event_load called, incrementing"));
 #endif
 			increment_frame_and_check_for_loop();
 #ifdef GNASH_DEBUG
-			log_msg(" after increment we are at frame %u/%u", m_current_frame, frame_count);
+			log_msg(_("after increment we are at frame %u/%u"), m_current_frame, frame_count);
 #endif
 		}
 
@@ -2126,7 +2122,7 @@
 #ifdef GNASH_DEBUG
 	else
 	{
-		log_msg("sprite_instance::advance_sprite we're in STOP mode");
+		log_msg(_("sprite_instance::advance_sprite we're in STOP mode"));
 		// shouldn't we execute frame tags anyway when in STOP mode ?
 		//execute_frame_tags(m_current_frame);
 	}
@@ -2151,12 +2147,12 @@
 	//
 	DisplayList stillAlive = oldDisplayList;
 	stillAlive.clear_except(m_display_list, false);
-	//log_msg("Advancing %d pre-existing childs of %s", stillAlive.size(), getTargetPath().c_str());
+	//log_msg(_("Advancing %d pre-existing children of %s"), stillAlive.size(), getTargetPath().c_str());
 	stillAlive.advance(delta_time);
 	
 	// Now execute actions on this timeline, after actions
 	// in old childs timelines have been executed.
-	//log_msg("Executing actions in %s timeline", getTargetPath().c_str());
+	//log_msg(_("Executing actions in %s timeline"), getTargetPath().c_str());
 	do_actions();
 
 	// Call UNLOAD event of just removed chars !
@@ -2174,9 +2170,9 @@
 	// we're simply doing internal work here...
 	//
 	DisplayList newlyAdded = m_display_list;
-	//log_msg("%s has %d current childs and %d old childs", getTargetPath().c_str(), m_display_list.size(), oldDisplayList.size());
+	//log_msg(_("%s has %d current children and %d old children"), getTargetPath().c_str(), m_display_list.size(), oldDisplayList.size());
 	newlyAdded.clear(oldDisplayList, false);
-	//log_msg("Advancing %d newly-added (after clearing) childs of %s", newlyAdded.size(), getTargetPath().c_str());
+	//log_msg(_("Advancing %d newly-added (after clearing) children of %s"), newlyAdded.size(), getTargetPath().c_str());
 	newlyAdded.advance(delta_time);
 
 	// Remember current state of the DisplayList for next iteration
@@ -2193,7 +2189,7 @@
 	if (m_on_event_load_called == false)
 	{
 #ifdef GNASH_DEBUG
-		log_msg("Calling ONLOAD event");
+		log_msg(_("Calling ONLOAD event"));
 #endif
 		on_event(event_id::LOAD);	// clip onload
 
@@ -2293,10 +2289,10 @@
 
 			IF_VERBOSE_ACTION(
 				// Use 1-based frame numbers
-				log_action("Executing " SIZET_FMT 
+				log_action(_("Executing " SIZET_FMT 
 					" *init* tags in frame " SIZET_FMT
-					"/" SIZET_FMT
-				        " of sprite %s", init_actions->size(),
+					"/" SIZET_FMT " of sprite %s"),
+					init_actions->size(),
 					frame+1, get_frame_count(),
 					getTargetPath().c_str());
 			);
@@ -2318,8 +2314,8 @@
 
 	IF_VERBOSE_ACTION(
 		// Use 1-based frame numbers
-		log_action("Executing " SIZET_FMT " tags in frame "
-			SIZET_FMT "/" SIZET_FMT " of sprite %s",
+		log_action(_("Executing " SIZET_FMT " tags in frame "
+			SIZET_FMT "/" SIZET_FMT " of sprite %s"),
 			playlist.size(), frame+1, get_frame_count(),
 			getTargetPath().c_str());
 	);
@@ -2402,8 +2398,8 @@
 sprite_instance::goto_frame(size_t target_frame_number)
 {
 #ifdef DEBUG_GOTOFRAME
-	log_msg("sprite %s ::goto_frame(" SIZET_FMT ") - current frame is "
-		SIZET_FMT,
+	log_msg(_("sprite %s ::goto_frame(" SIZET_FMT ") - current frame is "
+		SIZET_FMT),
 		getTargetPath().c_str(), target_frame_number, m_current_frame);
 #endif
 
@@ -2442,10 +2438,10 @@
 	if ( target_frame_number >= loaded_frames )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("GotoFrame(" SIZET_FMT ") targets a yet "
+			log_aserror(_("GotoFrame(" SIZET_FMT ") targets a yet "
 				"to be loaded frame (" SIZET_FMT ") loaded). "
 				"We'll wait for it but a more correct form "
-				"is explicitly using WaitForFrame instead.",
+				"is explicitly using WaitForFrame instead"),
 				target_frame_number+1,
 				loaded_frames);
 
@@ -2533,8 +2529,8 @@
 	}
 
     IF_VERBOSE_MALFORMED_SWF(
-    log_swferror("sprite_instance::goto_labeled_frame('%s') "
-			"unknown label", label.c_str());
+    log_swferror(_("sprite_instance::goto_labeled_frame('%s') "
+			"unknown label"), label.c_str());
     );
     return false;
 }
@@ -2622,8 +2618,8 @@
 	if (cdef == NULL)
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("sprite_instance::add_display_object(): "
-				"unknown cid = %d", character_id);
+			log_swferror(_("sprite_instance::add_display_object(): "
+				"unknown cid = %d"), character_id);
 		);
 		return NULL;
 	}
@@ -2703,13 +2699,13 @@
 		int clip_depth)
 {
 	assert(m_def != NULL);
-	//log_msg("%s: character %s, id is %d, depth is %d", __FUNCTION__, name, character_id, depth); // FIXME: debugging crap
+	//log_msg(_("%s: character %s, id is %d, depth is %d"), __FUNCTION__, name, character_id, depth); // FIXME: debugging crap
 
 	character_def*	cdef = m_def->get_character_def(character_id);
 	if (cdef == NULL)
 	{
-		log_error("sprite::replace_display_object(): "
-			"unknown cid = %d", character_id);
+		log_error(_("sprite::replace_display_object(): "
+			"unknown cid = %d"), character_id);
 		return;
 	}
 	assert(cdef);
@@ -2782,7 +2778,7 @@
 	}
 
 #if 0 // debugging
-	log_msg("Frame %u/%u, bytes %u/%u",
+	log_msg(_("Frame %u/%u, bytes %u/%u"),
 		m_current_frame, frame_count,
 		get_bytes_loaded(), get_bytes_total());
 #endif
@@ -2925,7 +2921,7 @@
 {
 	//return m_def->get_character_def(character_id);
 	// @@ TODO -- look through our dlist for a match
-	log_msg("FIXME: %s doesn't even check for a char",
+	log_unimpl(_("%s doesn't even check for a char"),
 		__PRETTY_FUNCTION__);
 	return NULL;
 }
@@ -3153,7 +3149,7 @@
 sprite_instance::construct()
 {
 #ifdef GNASH_DEBUG
-	log_msg("Constructing sprite '%s'", getTargetPath().c_str());
+	log_msg(_("Constructing sprite '%s'"), getTargetPath().c_str());
 #endif
 
 	// We *might* avoid this, but better safe then sorry
@@ -3181,7 +3177,7 @@
 	if ( ! def ) return;
 
 	as_function* ctor = def->getRegisteredClass();
-	//log_msg("Attached sprite's registered class is %p", (void*)ctor); 
+	//log_msg(_("Attached sprite's registered class is %p"), (void*)ctor); 
 
 	// TODO: builtin constructors are different from user-defined ones
 	// we should likely change that. See also vm/ASHandlers.cpp (construct_object)
@@ -3191,7 +3187,7 @@
 		as_object* proto = ctor->getPrototype();
 		set_prototype(proto);
 
-		//log_msg("Calling the user-defined constructor against this sprite_instance");
+		//log_msg(_("Calling the user-defined constructor against this sprite_instance"));
 		fn_call call(this, &(get_environment()), 0, 0);
 
 		// we don't use the constructor return (should we?)
@@ -3203,7 +3199,7 @@
 sprite_instance::unload()
 {
 #ifdef GNASH_DEBUG
-	log_msg("Unloading sprite '%s'", getTargetPath().c_str());
+	log_msg(_("Unloading sprite '%s'"), getTargetPath().c_str());
 #endif
 
 	UnloaderVisitor visitor;
@@ -3229,7 +3225,7 @@
 	boost::intrusive_ptr<movie_definition> md ( create_library_movie(url) );
 	if (md == NULL)
 	{
-		log_error("can't create movie_definition for %s",
+		log_error(_("can't create movie_definition for %s"),
 			url.str().c_str());
 		return false;
 	}
@@ -3238,8 +3234,8 @@
 	extern_movie = md->create_movie_instance();
 	if (extern_movie == NULL)
 	{
-		log_error("can't create extern movie_instance "
-			"for %s", url.str().c_str());
+		log_error(_("can't create extern movie_instance "
+			"for %s"), url.str().c_str());
 		return false;
 	}
 
@@ -3308,12 +3304,12 @@
 
 	if ( sendVarsMethod )
 	{
-		log_error("FIXME: MovieClip.loadVariables() with GET/POST unimplemented yet - won't append vars for now");
+		log_unimpl(_("MovieClip.loadVariables() with GET/POST won't append vars for now"));
 	}
 
 	_loadVariableRequests.push_back(new LoadVariablesThread(url));
 	_loadVariableRequests.back().process();
-	//log_msg(SIZET_FMT " loadVariables requests pending", _loadVariableRequests.size());
+	//log_msg(_(SIZET_FMT " loadVariables requests pending"), _loadVariableRequests.size());
 
 }
 
@@ -3333,7 +3329,7 @@
 	{
 		const string& name = it->first;
 		const string& val = it->second;
-		log_msg("Setting variable '%s' to value '%s'", name.c_str(), val.c_str());
+		log_msg(_("Setting variable '%s' to value '%s'"), name.c_str(), val.c_str());
 		set_variable(name.c_str(), val.c_str()); // should it be set_member ?
 	}
 }
@@ -3376,8 +3372,8 @@
 	if ( depth < 0 || depth > 1048575 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("removeMovieClip(%s): sprite depth (%d) out of the "
-			"'dynamic' zone [0..1048575], won't remove",
+		log_aserror(_("removeMovieClip(%s): sprite depth (%d) out of the "
+			"'dynamic' zone [0..1048575], won't remove"),
 			getTarget().c_str(), depth);
 		);
 		return;
@@ -3393,7 +3389,7 @@
 	else
 	{
 		// I guess this can only happen if someone uses _root.swapDepth([0..1048575])
-		log_error("Can't remove sprite %s as it has no parent!", getTarget().c_str());
+		log_error(_("Can't remove sprite %s as it has no parent"), getTarget().c_str());
 	}
 
 }

Index: server/text.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/text.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/text.cpp	9 Jan 2007 23:30:37 -0000	1.28
+++ server/text.cpp	18 Apr 2007 11:00:29 -0000	1.29
@@ -1,10 +1,25 @@
-// text.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
+// text.cpp:  Implementation of ActionScript text tags, for Gnash.
+// 
+//   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Code for the text tags.
+/* $Id: text.cpp,v 1.29 2007/04/18 11:00:29 jgilmore Exp $ */
 
+// Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
 #include "utf8.h"
 #include "utility.h"
@@ -32,7 +47,7 @@
 			if (m_font == NULL)
 			{
 				IF_VERBOSE_MALFORMED_SWF(
-	log_warning("text style references unknown font (id = %d)\n",
+	log_error(_("text style references unknown font (id = %d)"),
 		m_font_id);
 				);
 			}
@@ -135,9 +150,8 @@
 
 				if (index == -1)
 				{
-					// Invalid glyph; render it as an empty box.
 #ifdef GNASH_DEBUG_TEXT_RENDERING
-log_msg("invalid glyph, render as an empty box");
+log_error(_("invalid glyph, render as an empty box"));
 #endif
 					render::set_matrix(mat);
 
@@ -164,7 +178,7 @@
 					    && (use_glyph_textures || glyph == NULL))
 					{
 #ifdef GNASH_DEBUG_TEXT_RENDERING
-log_msg("render glyph using draw_glyph");
+log_msg(_("render glyph using draw_glyph"));
 #endif
 						fontlib::draw_glyph(mat, tg, transformed_color, nominal_glyph_height);
 					}
@@ -175,7 +189,7 @@
 						if (glyph)
 						{
 #ifdef GNASH_DEBUG_TEXT_RENDERING
-log_msg("render glyph using filled outline (?) actually draw_glyph()");
+log_msg(_("render glyph using filled outline (?) actually draw_glyph()"));
 #endif
 
 							gnash::render::draw_glyph(glyph, mat, transformed_color, pixel_scale);
@@ -195,4 +209,3 @@
 // mode: C++
 // indent-tabs-mode: t
 // End:
-

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/textformat.cpp	15 Apr 2007 10:52:09 -0000	1.25
+++ server/textformat.cpp	18 Apr 2007 11:00:29 -0000	1.26
@@ -1,3 +1,4 @@
+// textformat.cpp:  ActionScript text formatting decorators, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,14 +11,14 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-// $Id: textformat.cpp,v 1.25 2007/04/15 10:52:09 bjacques Exp $
 //
 
+// $Id: textformat.cpp,v 1.26 2007/04/18 11:00:29 jgilmore Exp $
+
 #include "log.h"
 #include "textformat.h"
 #include "fn_call.h"
@@ -40,7 +41,7 @@
       _tab_stops(-1),
       _target(-1)
 {
-  //log_msg("%s: \n", __FUNCTION__);
+  //log_msg("%s:", __FUNCTION__);
 }
 
 text_format::~text_format()
@@ -52,7 +53,7 @@
 text_format *
 text_format::operator = (text_format &format)
 {
-  log_msg("%s: \n", __FUNCTION__);
+  GNASH_REPORT_FUNCTION;
 
   _underline = format._underline;
   _bold = format._bold;
@@ -79,47 +80,48 @@
 void
 text_format::setTextFormat (text_format& /*format*/)
 {
-  //log_msg("%s: \n", __FUNCTION__);
+  //GNASH_REPORT_FUNCTION;
 }
 
 void
 text_format::setTextFormat (int /*index*/, text_format& /*format*/)
 {
-  //log_msg("%s: \n", __FUNCTION__);
+  //GNASH_REPORT_FUNCTION;
 }
 
 void
 text_format::setTextFormat (int /*start*/, int /*end*/, text_format& /*format*/)
 {
-  //log_msg("%s: \n", __FUNCTION__);
+  //GNASH_REPORT_FUNCTION;
 }
 
 #if 0
 text_format &
 text_format::getTextFormat ()
 {
-  log_msg("%s: \n", __FUNCTION__);
+  GNASH_REPORT_FUNCTION;
 }
 
 text_format &
 text_format::getTextFormat (int index)
 {
-  log_msg("%s: \n", __FUNCTION__);
+  GNASH_REPORT_FUNCTION;
 }
 
 text_format &
 text_format::getTextFormat (int start, int end)
 {
-  log_msg("%s: \n", __FUNCTION__);
+  GNASH_REPORT_FUNCTION;
 }
 #endif
 
 as_value textformat_new(const fn_call& /* fn */)
 {
-  //log_msg("%s: args=%d\n", __FUNCTION__, nargs);
+  //GNASH_REPORT_FUNCTION;
+  //log_msg(_("%s: args=%d"), __FUNCTION__, nargs);
 
   boost::intrusive_ptr<textformat_as_object> text_obj = new textformat_as_object;
-  log_warning("Created New TextFormat object at %p. Not fully implemented yet!", (void*)text_obj.get());
+  log_unimpl(_("Created New TextFormat object at %p.  Not fully implemented yet"), (void*)text_obj.get());
   
   // tulrich: this looks like it's inserting a method into our
   // caller's env.  setTextFormat is a method on TextField.  So here
@@ -136,7 +138,7 @@
 as_value textformat_setformat(const fn_call& fn)
 {
   as_value	method;
-  //log_msg("%s: args=%d at %p\n", __FUNCTION__, nargs, this_ptr);
+  //log_msg(_("%s: args=%d at %p"), __FUNCTION__, nargs, this_ptr);
 
   boost::intrusive_ptr<textformat_as_object> ptr = ensureType<textformat_as_object>(fn.this_ptr);
   //double start = fn.arg(0).to_number();
@@ -145,7 +147,7 @@
   if ( fn.nargs < 3 )
   {
     IF_VERBOSE_ASCODING_ERRORS(
-    log_aserror("TextFormat.setFormat() needs at least 3 arguments - ...me thinks");
+    log_aserror(_("TextFormat.setFormat() needs at least 3 arguments - ...me thinks"));
     );
     return as_value();
   }
@@ -154,73 +156,73 @@
   if ( ! obj )
   {
     IF_VERBOSE_ASCODING_ERRORS(
-    log_aserror("Argument 3 given to TextFormat.setFormat() is not a TextFormat object - ... should it?");
+    log_aserror(_("Argument 3 given to TextFormat.setFormat() is not a TextFormat object - ... should it be?"));
     );
     return as_value();
   }
   assert(obj);
 
-  //log_msg("Change from %f for %f characters for object at %p\n", start, end, obj);
+  //log_msg(_("Change from %f for %f characters for object at %p"), start, end, obj);
 
   // Check for the flags that could be set
   if (obj->get_member("underline", &method)) {
-    //log_msg("Underline exists and is set to %d\n", method.to_bool());
+    //log_msg(_("Underline exists and is set to %d"), method.to_bool());
     obj->obj.underlinedSet(method.to_bool());
   }
   
   if (obj->get_member("italic", &method)) {
-    //log_msg("Italic exists and is set to %d\n", method.to_bool());
+    //log_msg(_("Italic exists and is set to %d"), method.to_bool());
     obj->obj.italicedSet(method.to_bool());
   }
   
   if (obj->get_member("bold", &method)) {
-    //log_msg("Bold exists and is set to %d\n", method.to_bool());
+    //log_msg(_("Bold exists and is set to %d"), method.to_bool());
     obj->obj.boldSet(method.to_bool());
   }
   
   if (obj->get_member("bullet", &method)) {
-    //log_msg("Bullet exists and is set to %d\n", method.to_bool());
+    //log_msg(_("Bullet exists and is set to %d"), method.to_bool());
     obj->obj.bulletSet(method.to_bool());
   }
 
   if (obj->get_member("color", &method)) {
-    //log_msg("Color exists and is set to %f\n", method.to_number());
+    //log_msg(_("Color exists and is set to %f", method.to_number());
     obj->obj.colorSet((uint32_t)method.to_number());
   }
 
   if (obj->get_member("indent", &method)) {
-    //log_msg("Indent exists and is set to %f\n", method.to_number());
+    //log_msg(_("Indent exists and is set to %f"), method.to_number());
     obj->obj.indentSet(float(method.to_number()));
   }
 
   if (obj->get_member("align", &method)) {
-    //log_msg("Align exists and is set to %s\n", method.to_string());
+    //log_msg(_("Align exists and is set to %s"), method.to_string());
     const char* align = method.to_string().c_str();
     if ( align ) obj->obj.alignSet(align);
   }
 
   if (obj->get_member("blockIndent", &method)) {
-    //log_msg("BlockIndent exists and is set to %f\n", method.to_number());
+    //log_msg(_("BlockIndent exists and is set to %f"), method.to_number());
     obj->obj.blockIndentSet(float(method.to_number()));
   }
   
   if (obj->get_member("leading", &method)) {
-    //log_msg("Leading exists and is set to %f\n", method.to_number());
+    //log_msg(_("Leading exists and is set to %f"), method.to_number());
     obj->obj.leadingSet(float(method.to_number()));
   }
   
   if (obj->get_member("leftMargin", &method)) {
-    //log_msg("LeftMargin exists and is set to %f\n", method.to_number());
+    //log_msg(_("LeftMargin exists and is set to %f"), method.to_number());
     obj->obj.leftMarginSet(float(method.to_number()));
   }
   
   if (obj->get_member("RightMargin", &method)) {
-    //log_msg("RightMargin exists and is set to %f\n", method.to_number());
+    //log_msg(_("RightMargin exists and is set to %f"), method.to_number());
     obj->obj.rightMarginSet(float(method.to_number()));
   }
   
   if (obj->get_member("size", &method)) {
-    //log_msg("Size exists and is set to %f\n", method.to_number());
+    //log_msg(_("Size exists and is set to %f"), method.to_number());
     obj->obj.sizeSet(float(method.to_number()));
   }
   
@@ -232,7 +234,7 @@
   void
   textformat_getformat(gnash::as_value* result, gnash::as_object_interface* this_ptr, gnash::as_environment* env, int nargs, int first_arg)
 {
-  log_msg("%s: args=%d unfinished implementation\n", __FUNCTION__, nargs);
+  log_unimpl(_("%s: args=%d unfinished implementation"), __FUNCTION__, nargs);
   textformat_as_object*	ptr = (textformat_as_object*)this_ptr;
   assert(ptr);
   double start = env->bottom(first_arg).to_number();

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/video_stream_instance.cpp	7 Apr 2007 12:25:57 -0000	1.19
+++ server/video_stream_instance.cpp	18 Apr 2007 11:00:29 -0000	1.20
@@ -1,3 +1,4 @@
+// video_stream_instance.cpp:  Draw individual video frames, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 // 
-// $Id: video_stream_instance.cpp,v 1.19 2007/04/07 12:25:57 tgc Exp $
+
+// $Id: video_stream_instance.cpp,v 1.20 2007/04/18 11:00:29 jgilmore Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -38,7 +40,7 @@
 		if (fn.nargs < 1)
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-	    		log_aserror("attachVideo needs 1 arg");
+	    		log_aserror(_("attachVideo needs 1 arg"));
 			);
 			return as_value();
 		}
@@ -51,7 +53,7 @@
 		else
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-	    		log_aserror("attachVideo(%s) first arg is not a NetStream instance.",
+	    		log_aserror(_("attachVideo(%s) first arg is not a NetStream instance"),
 				fn.arg(0).to_debug_string().c_str());
 			);
 		}
@@ -111,7 +113,7 @@
 		{
 			gnash::render::drawVideoFrame(i, &m, &bounds);
 		} else {
-			log_warning("An error occured while decoding video frame.");
+			log_error(_("An error occured while decoding video frame"));
 		}
 
 	}
@@ -142,4 +144,3 @@
 }
 
 } // end of namespace gnash
-

Index: server/asobj/Camera.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Camera.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/Camera.cpp	19 Mar 2007 17:11:14 -0000	1.6
+++ server/asobj/Camera.cpp	18 Apr 2007 11:00:29 -0000	1.7
@@ -1,3 +1,4 @@
+// Camera.cpp:  ActionScript class for video cameras, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -74,19 +75,19 @@
 };
 
 as_value camera_get(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value camera_setmode(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value camera_setmotionlevel(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value camera_setquality(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 
     return as_value();
 }
@@ -121,4 +122,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/Color.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Color.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/Color.cpp	19 Mar 2007 17:11:14 -0000	1.8
+++ server/asobj/Color.cpp	18 Apr 2007 11:00:29 -0000	1.9
@@ -1,3 +1,4 @@
+// Color.cpp:  ActionScript class for colors, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -78,7 +79,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -89,7 +90,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -100,7 +101,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -111,7 +112,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -147,4 +148,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/ContextMenu.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ContextMenu.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/ContextMenu.cpp	20 Mar 2007 15:01:20 -0000	1.11
+++ server/asobj/ContextMenu.cpp	18 Apr 2007 11:00:29 -0000	1.12
@@ -1,3 +1,4 @@
+// ContextMenu.cpp:  ActionScript ContextMenu class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -129,7 +130,7 @@
 {
 	boost::intrusive_ptr<ContextMenu> ptr = ensureType<ContextMenu>(fn.this_ptr);
 	UNUSED(ptr);
-	log_warning("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value();
 }
 
@@ -139,7 +140,7 @@
 {
 	boost::intrusive_ptr<ContextMenu> ptr = ensureType<ContextMenu>(fn.this_ptr);
 	UNUSED(ptr);
-	log_warning("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value();
 }
 
@@ -185,4 +186,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/CustomActions.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/CustomActions.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/CustomActions.cpp	19 Mar 2007 17:11:14 -0000	1.6
+++ server/asobj/CustomActions.cpp	18 Apr 2007 11:00:29 -0000	1.7
@@ -1,3 +1,4 @@
+// CustomActions.cpp:  ActionScript CustomActions class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -74,19 +75,19 @@
 };
 
 as_value customactions_get(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value customactions_install(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value customactions_list(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value customactions_uninstall(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/asobj/Date.cpp	6 Apr 2007 02:43:50 -0000	1.40
+++ server/asobj/Date.cpp	18 Apr 2007 11:00:29 -0000	1.41
@@ -1,3 +1,4 @@
+// Date.cpp:  ActionScript class for date and time, for Gnash.
 // 
 //	Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -5,16 +6,16 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
+//
 
 // Date.cpp
 //
@@ -396,7 +397,7 @@
 		switch (fn.nargs) {
 		default:
 		    IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Date constructor called with more than 7 arguments");
+			log_aserror(_("Date constructor called with more than 7 arguments"));
 		    )
 		case 7:
 			// fractions of milliseconds are ignored
@@ -423,7 +424,7 @@
 		utcsecs = _mktime(&tm);	// convert from local time
 		if (utcsecs == -1) {
 			// mktime could not represent the time
-			log_error("Date() failed to initialise from arguments");
+			log_error(_("Date() failed to initialise from arguments"));
 			date->value = 0;	// or undefined?
 		} else {
 			date->value = (double)utcsecs * 1000.0 + millisecs;
@@ -580,14 +581,14 @@
 	// assert(fn.nargs == 1);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setTime needs one argument");
+		log_aserror(_("Date.setTime needs one argument"));
 	    )
 	} else
 		date->value = fn.arg(0).to_number();
 
 	if (fn.nargs > 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setTime was called with more than one argument");
+		log_aserror(_("Date.setTime was called with more than one argument"));
 	    )
 	}
 
@@ -637,7 +638,7 @@
 	if (t == (time_t)(-1)) {
 		// If mktime fails to reconstruct the date, return bogus value;
 		// Not sure when/how this can happen. Values outside POSIX time?
-		log_error("Failed to set a date.\n");
+		log_error(_("Failed to set a date."));
 		return(NAN);
 	} else {
 		return(t * 1000.0 + msec);
@@ -674,7 +675,7 @@
 #else
 	time_t t = mktime(&tm);
 	if (t == (time_t)(-1)) {
-	    log_error("utc_tm_msec_to_date failed to convert a date");
+	    log_error(_("utc_tm_msec_to_date failed to convert a date"));
 	} else {
 	    // Knock out the H:M:S part of t and replace with UTC time-of-day
 	    t = t - (t % 86400) + tm.tm_sec + 60 * (tm.tm_min + 60 * tm.tm_hour);
@@ -749,7 +750,7 @@
 	// assert(fn.nargs >= 1 && fn.nargs <= 3);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setFullYear needs one argument");
+		log_aserror(_("Date.setFullYear needs one argument"));
 	    )
 	} else {
 	    struct tm tm; double msec;
@@ -762,7 +763,7 @@
 		    tm.tm_mday = (int) fn.arg(2).to_number();
 	    if (fn.nargs > 3) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setFullYear was called with more than three arguments");
+		    log_aserror(_("Date.setFullYear was called with more than three arguments"));
 		)
 	    }
 	    tm_msec_to_date(tm, msec, *date, utc);
@@ -791,7 +792,7 @@
 	// assert(fn.nargs == 1);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setYear needs one argument");
+		log_aserror(_("Date.setYear needs one argument"));
 	    )
 	} else {
 	    struct tm tm; double msec;
@@ -805,7 +806,7 @@
 		    tm.tm_mday = (int) fn.arg(2).to_number();
 	    if (fn.nargs > 3) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setYear was called with more than three arguments");
+		    log_aserror(_("Date.setYear was called with more than three arguments"));
 		)
 	    }
 	    tm_msec_to_date(tm, msec, *date, false);
@@ -827,7 +828,7 @@
 	// assert(fn.nargs >= 1 && fn.nargs <= 2);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setMonth needs one argument");
+		log_aserror(_("Date.setMonth needs one argument"));
 	    )
 	} else {
 	    struct tm tm; double msec;
@@ -838,7 +839,7 @@
 		    tm.tm_mday = (int) fn.arg(2).to_number();
 	    if (fn.nargs > 2) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setMonth was called with more than three arguments");
+		    log_aserror(_("Date.setMonth was called with more than three arguments"));
 		)
 	    }
 	    tm_msec_to_date(tm, msec, *date, utc);
@@ -857,7 +858,7 @@
 
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setDate needs one argument");
+		log_aserror(_("Date.setDate needs one argument"));
 	    )
 	} else {
 		struct tm tm; double msec;
@@ -868,7 +869,7 @@
 	}
 	if (fn.nargs > 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setDate was called with more than one argument");
+		log_aserror(_("Date.setDate was called with more than one argument"));
 	    )
 	}
 	return as_value(date->value);
@@ -892,7 +893,7 @@
 	// assert(fn.nargs >= 1 && fn.nargs <= 4);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setHours needs one argument");
+		log_aserror(_("Date.setHours needs one argument"));
 	    )
 	} else {
 	    struct tm tm; double msec;
@@ -907,7 +908,7 @@
 		    msec = (int) fn.arg(3).to_number();
 	    if (fn.nargs > 4) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setHours was called with more than four arguments");
+		    log_aserror(_("Date.setHours was called with more than four arguments"));
 		)
 	    }
 	    tm_msec_to_date(tm, msec, *date, utc);
@@ -929,7 +930,7 @@
 	//assert(fn.nargs >= 1 && fn.nargs <= 3);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setMinutes needs one argument");
+		log_aserror(_("Date.setMinutes needs one argument"));
 	    )
 	} else {
 	    struct tm tm; double msec;
@@ -942,7 +943,7 @@
 		    msec = (int) fn.arg(2).to_number();
 	    if (fn.nargs > 3) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setMinutes was called with more than three arguments");
+		    log_aserror(_("Date.setMinutes was called with more than three arguments"));
 		)
 	    }
 	    tm_msec_to_date(tm, msec, *date, utc);
@@ -962,7 +963,7 @@
 	// assert(fn.nargs >= 1 && fn.nargs <= 2);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setSeconds needs one argument");
+		log_aserror(_("Date.setSeconds needs one argument"));
 	    )
 	} else {
 	    // We *could* set seconds [and milliseconds] without breaking the
@@ -977,7 +978,7 @@
 		    msec = (int) fn.arg(1).to_number();
 	    if (fn.nargs > 2) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setMinutes was called with more than three arguments");
+		    log_aserror(_("Date.setMinutes was called with more than three arguments"));
 		)
 	    }
 	    tm_msec_to_date(tm, msec, *date, utc);
@@ -991,14 +992,14 @@
 	// assert(fn.nargs == 1);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.setMilliseconds needs one argument");
+		log_aserror(_("Date.setMilliseconds needs one argument"));
 	    )
 	} else {
 	    // Zero the milliseconds and set them from the argument.
 	    date->value = std::fmod(date->value, 1000.0) + (int) fn.arg(0).to_number();
 	    if (fn.nargs > 1) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror("Date.setMilliseconds was called with more than one argument");
+		    log_aserror(_("Date.setMilliseconds was called with more than one argument"));
 		)
 	    }
 	}
@@ -1125,7 +1126,7 @@
 
 	if (fn.nargs < 2) {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.UTC needs one argument");
+		log_aserror(_("Date.UTC needs one argument"));
 	    )
 	    return as_value();
 	}
@@ -1145,7 +1146,7 @@
 	switch (fn.nargs) {
 	default:	// More than 7
 	    IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Date.UTC was called with more than 7 arguments");
+		log_aserror(_("Date.UTC was called with more than 7 arguments"));
 	    )
 	case 7:
 	    // millisecs is double, but fractions of millisecs are ignored.

Index: server/asobj/Error.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Error.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/Error.cpp	19 Mar 2007 17:11:14 -0000	1.7
+++ server/asobj/Error.cpp	18 Apr 2007 11:00:29 -0000	1.8
@@ -1,3 +1,4 @@
+// Error.cpp:  ActionScript "Error" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -70,7 +71,7 @@
 };
 
 as_value error_tostring(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/asobj/Global.cpp	15 Apr 2007 10:52:09 -0000	1.58
+++ server/asobj/Global.cpp	18 Apr 2007 11:00:29 -0000	1.59
@@ -1,3 +1,4 @@
+// Global.cpp:  Global ActionScript class setup, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -5,20 +6,18 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// Implementation of the Global ActionScript Object
-
-/* $Id: Global.cpp,v 1.58 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: Global.cpp,v 1.59 2007/04/18 11:00:29 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -78,13 +77,13 @@
 #define ASSERT_FN_ARGS_IS_1						\
     if (fn.nargs < 1) {							\
 	IF_VERBOSE_ASCODING_ERRORS(					\
-            log_aserror("%s needs one argument", __FUNCTION__);		\
+            log_aserror(_("%s needs one argument"), __FUNCTION__);		\
             )								\
          return as_value();							\
     }									\
     IF_VERBOSE_ASCODING_ERRORS(						\
 	if (fn.nargs > 1)						\
-            log_aserror("%s has more than one argument", __FUNCTION__);	\
+            log_aserror(_("%s has more than one argument"), __FUNCTION__);	\
     )
 
 using namespace std;
@@ -191,13 +190,13 @@
     // assert(fn.nargs == 2 || fn.nargs == 1);
     if (fn.nargs < 1) {
 	IF_VERBOSE_ASCODING_ERRORS(
-            log_aserror("%s needs at least one argument", __FUNCTION__);
+            log_aserror(_("%s needs at least one argument"), __FUNCTION__);
             )
          return as_value();
     }
     IF_VERBOSE_ASCODING_ERRORS(
 	if (fn.nargs > 2)
-            log_aserror("%s has more than two arguments", __FUNCTION__);
+            log_aserror(_("%s has more than two arguments"), __FUNCTION__);
     )
 
     // Make sure our argument is the correct type
@@ -301,7 +300,7 @@
     int version = env->get_version();
     
 
-    //log_msg("ASSetPropFlags called with %d args", fn.nargs);
+    //log_msg(_("ASSetPropFlags called with %d args"), fn.nargs);
 
     // Check the arguments
     // assert(fn.nargs == 3 || fn.nargs == 4);
@@ -309,15 +308,15 @@
 
     if (fn.nargs < 3) {
 	IF_VERBOSE_ASCODING_ERRORS(	
-            log_aserror("%s needs at least three arguments", __FUNCTION__);
+            log_aserror(_("%s needs at least three arguments"), __FUNCTION__);
             )
          return as_value();
     }
     IF_VERBOSE_ASCODING_ERRORS(
 	if (fn.nargs > 4)
-            log_aserror("%s has more than four arguments", __FUNCTION__);
+            log_aserror(_("%s has more than four arguments"), __FUNCTION__);
 	if (version == 5 && fn.nargs == 4)
-            log_aserror("%s has four arguments in a SWF version 5 movie", __FUNCTION__);
+            log_aserror(_("%s has four arguments in a SWF version 5 movie"), __FUNCTION__);
     )
 		
     // ASSetPropFlags(obj, props, n, allowFalse=false)
@@ -326,8 +325,8 @@
     boost::intrusive_ptr<as_object> obj = fn.arg(0).to_object();
     if ( ! obj )
     {
-		log_warning("Invalid call to ASSetPropFlags: "
-			"object argument is not an object: %s",
+		log_error(_("Invalid call to ASSetPropFlags: "
+			"object argument is not an object: %s"),
 			fn.arg(0).to_string().c_str());
 		return as_value();
     }

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/asobj/Key.cpp	2 Apr 2007 15:45:22 -0000	1.20
+++ server/asobj/Key.cpp	18 Apr 2007 11:00:29 -0000	1.21
@@ -1,3 +1,4 @@
+// Key.cpp:  ActionScript "Key" class (keyboards), for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -43,37 +44,37 @@
 void
 Key::addListener()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 Key::getAscii()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 Key::getCode()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 Key::isDown()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 Key::isToggled()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 Key::removeListener()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 as_value
 key_new(const fn_call& /* fn */)
@@ -227,14 +228,14 @@
 {
     if (fn.nargs < 1)
 	{
-	    log_error("key_add_listener needs one argument (the listener object)\n");
+	    log_error(_("key_add_listener needs one argument (the listener object)"));
 	    return as_value();
 	}
 
     boost::intrusive_ptr<as_object> listener = fn.arg(0).to_object();
     if (listener == NULL)
 	{
-	    log_error("key_add_listener passed a NULL object; ignored\n");
+	    log_error(_("key_add_listener passed a NULL object; ignored"));
 	    return as_value();
 	}
 
@@ -275,7 +276,7 @@
 {
     if (fn.nargs < 1)
 	{
-	    log_error("key_is_down needs one argument (the key code)\n");
+	    log_error(_("key_is_down needs one argument (the key code)"));
 	    return as_value();
 	}
 
@@ -299,14 +300,14 @@
 {
     if (fn.nargs < 1)
 	{
-	    log_error("key_remove_listener needs one argument (the listener object)\n");
+	    log_error(_("key_remove_listener needs one argument (the listener object)"));
 	    return as_value();
 	}
 
     boost::intrusive_ptr<as_object> listener = fn.arg(0).to_object();
     if (listener == NULL)
 	{
-	    log_error("key_remove_listener passed a NULL object; ignored\n");
+	    log_error(_("key_remove_listener passed a NULL object; ignored"));
 	    return as_value();
 	}
 

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/LoadVars.cpp	16 Apr 2007 18:23:06 -0000	1.21
+++ server/asobj/LoadVars.cpp	18 Apr 2007 11:00:29 -0000	1.22
@@ -1,3 +1,4 @@
+// LoadVars.cpp:  ActionScript "LoadVars" class (HTTP variables), for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -489,7 +490,7 @@
 {
 	boost::intrusive_ptr<LoadVars> ptr = ensureType<LoadVars>(fn.this_ptr);
 	UNUSED(ptr);
-	log_error("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value(); 
 }
 
@@ -498,7 +499,7 @@
 {
 	boost::intrusive_ptr<LoadVars> ptr = ensureType<LoadVars>(fn.this_ptr);
 	UNUSED(ptr);
-	log_error("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value(); 
 }
 
@@ -524,7 +525,7 @@
 	if ( fn.nargs < 1 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("LoadVars.load() requires at least one argument");
+		log_aserror(_("LoadVars.load() requires at least one argument"));
 		);
 		return as_value(false);
 	}
@@ -533,7 +534,7 @@
 	if ( urlstr.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("LoadVars.load(): invalid empty url ");
+		log_aserror(_("LoadVars.load(): invalid empty url"));
 		);
 		return as_value(false);
 	}
@@ -548,7 +549,7 @@
 {
 	boost::intrusive_ptr<LoadVars> ptr = ensureType<LoadVars>(fn.this_ptr);
 	UNUSED(ptr);
-	log_error("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value(); 
 }
 
@@ -560,7 +561,7 @@
 	if ( fn.nargs < 2 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("LoadVars.sendAndLoad() requires at least two arguments");
+		log_aserror(_("LoadVars.sendAndLoad() requires at least two arguments"));
 		);
 		return as_value(false);
 	}
@@ -569,7 +570,7 @@
 	if ( urlstr.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("LoadVars.sendAndLoad(): invalid empty url ");
+		log_aserror(_("LoadVars.sendAndLoad(): invalid empty url"));
 		);
 		return as_value(false);
 	}
@@ -578,7 +579,7 @@
 	if ( ! target )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("LoadVars.sendAndLoad(): invalid target (must be a LoadVars object)");
+		log_aserror(_("LoadVars.sendAndLoad(): invalid target (must be a LoadVars object)"));
 		);
 		return as_value(false);
 	}
@@ -598,7 +599,7 @@
 {
 	boost::intrusive_ptr<LoadVars> ptr = ensureType<LoadVars>(fn.this_ptr);
 	UNUSED(ptr);
-	log_error("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value(); 
 }
 
@@ -633,4 +634,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/LocalConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LocalConnection.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/LocalConnection.cpp	15 Apr 2007 10:52:09 -0000	1.13
+++ server/asobj/LocalConnection.cpp	18 Apr 2007 11:00:29 -0000	1.14
@@ -1,3 +1,4 @@
+// LocalConnection.cpp:  Connect two SWF movies & send objects, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
 #ifdef HAVE_CONFIG_H
@@ -95,7 +94,7 @@
 void
 LocalConnection::send()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 /// \brief Instantiate a new LocalConnection object within a flash movie
@@ -141,7 +140,7 @@
     if (fn.nargs != 0) {
         ret = ptr->obj.connect(fn.arg(0).to_string().c_str());
     } else {
-        log_msg("ERROR: No connection name specified to LocalConnection.connect()!\n");
+        log_error(_("No connection name specified to LocalConnection.connect()"));
         ret = ptr->obj.connect("localhost"); // FIXME: This should probably
                                        // fail instead
     }
@@ -159,9 +158,8 @@
 // \brief The callback for LocalConnection::send()
 as_value localconnection_send(const fn_call& /*fn*/)
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 
 } // end of gnash namespace
-

Index: server/asobj/Microphone.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Microphone.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/Microphone.cpp	19 Mar 2007 17:11:14 -0000	1.6
+++ server/asobj/Microphone.cpp	18 Apr 2007 11:00:29 -0000	1.7
@@ -1,3 +1,4 @@
+// Microphone.cpp:  ActionScript "Microphone" input class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -76,23 +77,23 @@
 };
 
 as_value microphone_get(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value microphone_setgain(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value microphone_setrate(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value microphone_setsilencelevel(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value microphone_setuseechosuppression(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 
@@ -126,4 +127,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/Mouse.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Mouse.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/Mouse.cpp	30 Mar 2007 14:58:26 -0000	1.7
+++ server/asobj/Mouse.cpp	18 Apr 2007 11:00:29 -0000	1.8
@@ -1,3 +1,4 @@
+// Mouse.cpp:  ActionScript "Mouse" input device class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -81,7 +82,7 @@
     static bool warned=false;
     if ( ! warned )
     {
-        log_warning("%s: unimplemented", __FUNCTION__);
+        log_unimpl (__FUNCTION__);
         warned=true;
     }
     return as_value();
@@ -95,7 +96,7 @@
     static bool warned=false;
     if ( ! warned )
     {
-        log_warning("%s: unimplemented", __FUNCTION__);
+        log_unimpl (__FUNCTION__);
         warned=true;
     }
     return as_value();
@@ -109,7 +110,7 @@
     static bool warned=false;
     if ( ! warned )
     {
-        log_warning("%s: unimplemented", __FUNCTION__);
+        log_unimpl (__FUNCTION__);
         warned=true;
     }
     return as_value();
@@ -123,7 +124,7 @@
     static bool warned=false;
     if ( ! warned )
     {
-        log_warning("%s: unimplemented", __FUNCTION__);
+        log_unimpl (__FUNCTION__);
         warned=true;
     }
     return as_value();
@@ -159,4 +160,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/MovieClipLoader.cpp	15 Apr 2007 10:52:09 -0000	1.24
+++ server/asobj/MovieClipLoader.cpp	18 Apr 2007 11:00:29 -0000	1.25
@@ -1,3 +1,4 @@
+// MovieClipLoader.cpp:  Implementation of ActionScript MovieClipLoader class.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,16 +11,12 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
-// Implementation of ActionScript MovieClipLoader class.
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -82,7 +79,7 @@
 	if ( o == NULL )
 	{
 		o = new as_object();
-		//log_msg("MovieClipLoader interface @ %p", o.get());
+		//log_msg(_("MovieClipLoader interface @ %p"), o.get());
 		attachMovieClipLoaderInterface(*o);
 	}
 	return o.get();
@@ -165,7 +162,7 @@
 struct mcl *
 MovieClipLoader::getProgress(as_object* /*ao*/)
 {
-  //log_msg("%s: \n", __FUNCTION__);
+  GNASH_REPORT_FUNCTION;
 
   return &_mcl;
 }
@@ -182,7 +179,7 @@
 	URL url(url_str.c_str(), get_base_url());
 	
 #if GNASH_DEBUG
-	log_msg(" resolved url: %s\n", url.str().c_str());
+	log_msg(_(" resolved url: %s"), url.str().c_str());
 #endif
 			 
 	// Call the callback since we've started loading the file
@@ -221,7 +218,7 @@
 
 	// TODO: dispatchEvent("onLoadProgress", ...)
 
-	log_warning("FIXME: MovieClipLoader calling onLoadComplete *before* movie has actually been fully loaded (cheating)");
+	log_unimpl (_("FIXME: MovieClipLoader calling onLoadComplete *before* movie has actually been fully loaded (cheating)"));
 	dispatchEvent("onLoadComplete", events_call);
 
 	return true;
@@ -230,7 +227,7 @@
 void
 MovieClipLoader::unloadClip(void *)
 {
-  log_msg("%s: \n", __FUNCTION__);
+  GNASH_REPORT_FUNCTION;
 }
 
 
@@ -261,7 +258,7 @@
 	typedef Listeners::iterator iterator;
 
 #if GNASH_DEBUG
-	log_msg("Dispatching %s event to " SIZET_FMT " listeners",
+	log_msg(_("Dispatching %s event to " SIZET_FMT " listeners"),
 		event.c_str(), _listeners.size());
 #endif
 
@@ -274,7 +271,7 @@
 		if ( ! listener->get_member(event.c_str(), &method) )
 		{
 #if GNASH_DEBUG
-log_msg(" Listener %p doesn't have an %s event to listen for, skipped",
+log_msg(_("Listener %p doesn't have an %s event to listen for, skipped"),
 	(void*)listener, event.c_str());
 #endif
 			// this listener doesn't care about this event
@@ -283,8 +280,8 @@
 		}
 
 #if GNASH_DEBUG
-		log_msg("Testing call to listener's "
-			" %s function", event.c_str());
+		log_msg(_("Testing call to listener's "
+			" %s function"), event.c_str());
 #endif
 
 		call_method(method, &fn.env(), fn.this_ptr.get(), fn.nargs, fn.offset());
@@ -297,7 +294,7 @@
 {
 	as_value	val, method;
 
-	//log_msg("%s: nargs = %d\n", __FUNCTION__, fn.nargs);
+	//log_msg(_("%s: nargs = %d"), __FUNCTION__, fn.nargs);
 
 	boost::intrusive_ptr<MovieClipLoader> ptr = ensureType<MovieClipLoader>(fn.this_ptr);
   
@@ -308,7 +305,7 @@
       // to convert to string anyway...
 	if ( ! url_arg.is_string() )
 	{
-		log_error("Malformed SWF, MovieClipLoader.loadClip() first argument is not a string (%s)", url_arg.to_string());
+		log_swferror(_("MovieClipLoader.loadClip() first argument is not a string (%s)"), url_arg.to_string());
 		return as_value(false);
 		return;
 	}
@@ -318,19 +315,19 @@
 	character* target = fn.env().find_target(fn.arg(1));
 	if ( ! target )
 	{
-		log_error("Could not find target %s", fn.arg(1).to_string().c_str());
+		log_error(_("Could not find target %s"), fn.arg(1).to_string().c_str());
 		return as_value(false);
 	}
 	sprite_instance* sprite = dynamic_cast<sprite_instance*>(target);
 	if ( ! sprite )
 	{
-		log_error("Target is not a sprite instance (%s)",
+		log_error(_("Target is not a sprite instance (%s)"),
 			typeid(*target).name());
 		return as_value(false);
 	}
 
 #if GNASH_DEBUG
-	log_msg("load clip: %s, target is: %p\n",
+	log_msg(_("load clip: %s, target is: %p\n"),
 		str_url.c_str(), (void*)sprite);
 #endif
 
@@ -344,7 +341,7 @@
 moviecliploader_unloadclip(const fn_call& fn)
 {
   const std::string filespec = fn.arg(0).to_string();
-  log_msg("%s: FIXME: Load Movie Clip: %s\n", __FUNCTION__, filespec.c_str());
+  log_unimpl (_("%s: %s"), __PRETTY_FUNCTION__, filespec.c_str());
   return as_value();
 }
 
@@ -353,7 +350,7 @@
 {
 
   as_object*	mov_obj = new MovieClipLoader;
-  //log_msg("MovieClipLoader instance @ %p", mov_obj);
+  //log_msg(_("MovieClipLoader instance @ %p"), mov_obj);
 
   return as_value(mov_obj); // will store in a boost::intrusive_ptr
 }
@@ -363,7 +360,7 @@
 static as_value
 moviecliploader_getprogress(const fn_call& fn)
 {
-  //log_msg("%s: nargs = %d\n", __FUNCTION__, nargs);
+  //log_msg(_("%s: nargs = %d"), __FUNCTION__, nargs);
   
   boost::intrusive_ptr<MovieClipLoader> ptr = ensureType<MovieClipLoader>(fn.this_ptr);
   
@@ -387,7 +384,9 @@
 	boost::intrusive_ptr<as_object> listener = fn.arg(0).to_object();
 	if ( ! listener )
 	{
-		log_error("ActionScript bug: Listener given to MovieClipLoader.addListener() is not an object");
+		IF_VERBOSE_ASCODING_ERRORS (
+		log_aserror(_("Listener given to MovieClipLoader.addListener() is not an object"));
+		)
 		return as_value();
 	}
 
@@ -403,7 +402,9 @@
 	boost::intrusive_ptr<as_object> listener = fn.arg(0).to_object();
 	if ( ! listener )
 	{
-		log_error("ActionScript bug: Listener given to MovieClipLoader.removeListener() is not an object");
+		IF_VERBOSE_ASCODING_ERRORS (
+		log_aserror(_("Listener given to MovieClipLoader.removeListener() is not an object"));
+		)
 		return as_value();
 	}
 
@@ -426,7 +427,7 @@
 		attachMovieClipLoaderInterface(*cl);  // not sure we should be doing this..
 	}
 	global.init_member("MovieClipLoader", cl.get()); //as_value(moviecliploader_new));
-	//log_msg("MovieClipLoader class @ %p", cl.get());
+	//log_msg(_("MovieClipLoader class @ %p"), cl.get());
 }
 
 } // end of gnash namespace

Index: server/asobj/NetConnection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/NetConnection.cpp	15 Apr 2007 10:52:09 -0000	1.37
+++ server/asobj/NetConnection.cpp	18 Apr 2007 11:00:29 -0000	1.38
@@ -1,3 +1,4 @@
+// NetConnection.cpp:  Open local connections for FLV files or URLs.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: NetConnection.cpp,v 1.37 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: NetConnection.cpp,v 1.38 2007/04/18 11:00:29 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -35,10 +38,6 @@
 
 using namespace std;
 
-namespace {
-gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-}
-
 namespace gnash {
 
 static as_value netconnection_new(const fn_call& fn);
@@ -95,20 +94,20 @@
 
 	// Check if we're allowed to open url
 	if (!URLAccessManager::allow(uri)) {
-		log_warning("Gnash is not allowed to open this url.");
+		log_security(_("Gnash is not allowed to open this url: %s"), _url.c_str());
 		return false;
 	}
 
 	_loader = new LoadThread();
 	
 	if (!_loader->setStream(std::auto_ptr<tu_file>(StreamProvider::getDefaultInstance().getStream(uri)))) {
-		log_warning("Gnash could not open this url:%s", _url.c_str());
+		log_error(_("Gnash could not open this url: %s"), _url.c_str());
 		delete _loader;
 		_loader = NULL;
 		return false;
 	}
 
-	log_msg("Connection etablished to movie: %s", _url.c_str());
+	log_msg(_("Connection etablished to movie: %s"), _url.c_str());
 
 	return true;
 }

Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/asobj/NetStream.cpp	15 Apr 2007 10:52:09 -0000	1.36
+++ server/asobj/NetStream.cpp	18 Apr 2007 11:00:30 -0000	1.37
@@ -1,3 +1,4 @@
+// NetStream.cpp:  ActionScript class for streaming audio/video, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStream.cpp,v 1.36 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: NetStream.cpp,v 1.37 2007/04/18 11:00:30 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -80,9 +82,9 @@
 		else
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("First argument "
+				log_aserror(_("First argument "
 					"to NetStream constructor "
-					"doesn't cast to a NetConnection (%s)",
+					"doesn't cast to a NetConnection (%s)"),
 					fn.arg(0).to_string().c_str());
 			);
 		}
@@ -119,7 +121,7 @@
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("NetStream play needs args");
+		log_aserror(_("NetStream play needs args"));
 		);
 		return as_value();
 	}
@@ -248,4 +250,3 @@
 }
 
 } // end of gnash namespace
-

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/asobj/NetStreamFfmpeg.cpp	11 Apr 2007 17:54:21 -0000	1.37
+++ server/asobj/NetStreamFfmpeg.cpp	18 Apr 2007 11:00:30 -0000	1.38
@@ -1,3 +1,4 @@
+// NetStreamFfmpeg.cpp:  Network streaming for FFMPEG video library, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.37 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.38 2007/04/18 11:00:30 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -224,7 +227,7 @@
 	if ( ! _netCon )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("No NetConnection associated with this NetStream, won't play");
+		log_aserror(_("No NetConnection associated with this NetStream, won't play"));
 		);
 		return 0;
 	}
@@ -255,20 +258,20 @@
 
 	AVCodec* codec = avcodec_find_decoder(codec_id);
 	if (!codec) {
-		log_error("libavcodec couldn't find decoder.");
+		log_error(_("libavcodec couldn't find decoder"));
 		return NULL;
 	}
 
 	AVCodecContext * context = avcodec_alloc_context();
 	if (!context) {
-		log_error("libavcodec couldn't allocate context.");
+		log_error(_("libavcodec couldn't allocate context"));
 		return NULL;
 	}
 
 	int rv = avcodec_open(context, codec);
 	if (rv < 0) {
 		avcodec_close(context);
-		log_error("libavcodec failed to initialize codec.");
+		log_error(_("libavcodec failed to initialize codec"));
 		return NULL;
 	}
 
@@ -305,7 +308,7 @@
 			codec_id = CODEC_ID_FLASHSV;
 			break;
 		default:
-			log_error("Unsupported video codec");
+			log_error(_("Unsupported video codec %d"), (int) videoInfo->codec);
 			return NULL;
 	}
 
@@ -336,7 +339,7 @@
 			codec_id = CODEC_ID_MP3;
 			break;
 		default:
-			log_error("Unsupported audio codec");
+			log_error(_("Unsupported audio codec %d"), (int)audioInfo->codec);
 			return NULL;
 	}
 
@@ -361,7 +364,7 @@
 	probe_data.buf_size = 2048;
 
 	if (ns->readPacket(ns, probe_data.buf, probe_data.buf_size) < 1){
- 		log_warning("Gnash could not read from movie url.");
+ 		log_error(_("Gnash could not read from movie url"));
  		return NULL;
 	}
 
@@ -378,7 +381,7 @@
 	// Pass stuff from/to the NetConnection object.
 	assert(ns);
 	if ( !nc->openConnection(ns->url.c_str(), ns) ) {
-		log_warning("Gnash could not open movie: %s", ns->url.c_str());
+		log_error(_("Gnash could not open movie: %s"), ns->url.c_str());
 		ns->set_status("NetStream.Buffer.StreamNotFound");
 		return;
 	}
@@ -397,7 +400,7 @@
 		ns->m_parser = new FLVParser();
 		if (!nc->connectParser(ns->m_parser)) {
 			ns->set_status("NetStream.Buffer.StreamNotFound");
-			log_warning("Gnash could not open movie: %s", ns->url.c_str());
+			log_error(_("Gnash could not open FLV movie: %s"), ns->url.c_str());
 			delete ns->m_parser;
 			return;
 		}
@@ -408,13 +411,13 @@
 
 		ns->m_VCodecCtx = initFlvVideo(ns->m_parser);
 		if (!ns->m_VCodecCtx) {
-			log_msg("Failed to initialize video codec.");
+			log_msg(_("Failed to initialize FLV video codec"));
 			return;
 		}
 
 		ns->m_ACodecCtx = initFlvAudio(ns->m_parser);
 		if (!ns->m_ACodecCtx) {
-			log_msg("Failed to initialize audio codec.");
+			log_msg(_("Failed to initialize FLV audio codec"));
 			return;
 		}
 
@@ -444,7 +447,7 @@
 
 	AVInputFormat* inputFmt = probeStream(ns);
 	if (!inputFmt) {
-		log_error("Couldn't determine stream input format from URL %s", ns->url.c_str());
+		log_error(_("Couldn't determine stream input format from URL %s"), ns->url.c_str());
 		return;
 	}
 
@@ -460,7 +463,7 @@
 
 	// Open the stream. the 4th argument is the filename, which we ignore.
 	if(av_open_input_stream(&ns->m_FormatCtx, &ns->ByteIOCxt, "", inputFmt, NULL) < 0){
-		log_error("Couldn't open file '%s' for decoding", ns->url.c_str());
+		log_error(_("Couldn't open file '%s' for decoding"), ns->url.c_str());
 		ns->set_status("NetStream.Play.StreamNotFound");
 		return;
 	}
@@ -470,7 +473,7 @@
 	int ret = av_find_stream_info(ns->m_FormatCtx);
 	if (ret < 0)
 	{
-		log_error("Couldn't find stream information from '%s', error code: %d", ns->url.c_str(), ret);
+		log_error(_("Couldn't find stream information from '%s', error code: %d"), ns->url.c_str(), ret);
 		return;
 	}
 
@@ -509,7 +512,7 @@
 
 	if (ns->m_video_index < 0)
 	{
-		log_error("Didn't find a video stream from '%s'", ns->url.c_str());
+		log_error(_("Didn't find a video stream from '%s'"), ns->url.c_str());
 		return;
 	}
 
@@ -521,14 +524,16 @@
 	if (pCodec == NULL)
 	{
 		ns->m_VCodecCtx = NULL;
-		log_error("Decoder not found");
+		log_error(_("Video decoder %d not found"), 
+			ns->m_VCodecCtx->codec_id);
 		return;
 	}
 
 	// Open codec
 	if (avcodec_open(ns->m_VCodecCtx, pCodec) < 0)
 	{
-		log_error("Could not open codec");
+		log_error(_("Could not open codec %d"),
+			ns->m_VCodecCtx->codec_id);
 	}
 
 	// Allocate a frame to store the decoded frame in
@@ -553,14 +558,16 @@
 		AVCodec* pACodec = avcodec_find_decoder(ns->m_ACodecCtx->codec_id);
 	    if(pACodec == NULL)
 		{
-			log_error("No available AUDIO decoder to process MPEG file: '%s'", ns->url.c_str());
+			log_error(_("No available audio decoder %d to process MPEG file: '%s'"), 
+				ns->m_ACodecCtx->codec_id, ns->url.c_str());
 			return;
 		}
         
 		// Open codec
 		if (avcodec_open(ns->m_ACodecCtx, pACodec) < 0)
 		{
-			log_error("Could not open AUDIO codec");
+			log_error(_("Could not open audio codec %d for %s"));
+				ns->m_ACodecCtx->codec_id, ns->url.c_str());
 			return;
 		}
 
@@ -734,7 +741,7 @@
 		}
 		else
 		{
-			log_warning("read_frame: not audio & video stream");
+			log_error(_("read_frame: not audio & video stream"));
 		}
 		return true;
 	}
@@ -934,7 +941,7 @@
 	}
 	else
 	{
-		log_warning("Problems decoding frame");
+		log_error(_("Problems decoding frame"));
 		return false;
 	}
 
@@ -978,7 +985,7 @@
 		newpos = static_cast<long>(pos / timebase);
 		
 		if (av_seek_frame(m_FormatCtx, m_video_index, newpos, 0) < 0) {
-			log_warning("seeking failed");
+			log_error(_("%s: seeking failed"), __FUNCTION__);
 			return;
 		}
 	} else {

Index: server/asobj/NetStreamGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamGst.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/NetStreamGst.cpp	7 Apr 2007 12:50:04 -0000	1.23
+++ server/asobj/NetStreamGst.cpp	18 Apr 2007 11:00:30 -0000	1.24
@@ -1,3 +1,4 @@
+// NetStreamGst.cpp:  Audio/video output via Gstreamer library, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $id$ */
+/* $Id: NetStreamGst.cpp,v 1.24 2007/04/18 11:00:30 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -160,11 +163,11 @@
 		return 0;
 	}
 
-	// Does it have an associated NetConnectoin ?
+	// Does it have an associated NetConnection?
 	if ( ! _netCon )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("No NetConnection associated with this NetStream, won't play");
+		log_aserror(_("No NetConnection associated with this NetStream, won't play"));
 		);
 		return 0;
 	}
@@ -340,7 +343,7 @@
 	assert(ns);
 	if ( !nc->openConnection(ns->url.c_str(), ns) ) {
 		ns->set_status("NetStream.Play.StreamNotFound");
-		log_warning("Gnash could not open movie: %s", ns->url.c_str());
+		log_warning(_("Gnash could not open movie: %s"), ns->url.c_str());
 		return;
 	}
 
@@ -357,7 +360,7 @@
 		ns->m_parser = new FLVParser();
 		if (!nc->connectParser(ns->m_parser)) {
 			ns->set_status("NetStream.Play.StreamNotFound");
-			log_warning("Gnash could not open movie: %s", ns->url.c_str());
+			log_error(_("Gnash could not open movie: %s"), ns->url.c_str());
 			return;
 			
 		}
@@ -374,7 +377,7 @@
 
 	// Check if the creation of the gstreamer pipeline and audiosink was a succes
 	if (!ns->pipeline) {
-		gnash::log_error("The gstreamer pipeline element could not be created");
+		gnash::log_error(_("The gstreamer pipeline element could not be created"));
 		return;
 	}
 
@@ -393,7 +396,7 @@
 		if (!ns->audiosink) ns->audiosink = gst_element_factory_make ("esdsink", NULL);
 
 		if (!ns->audiosink) {
-			gnash::log_error("The gstreamer audiosink element could not be created");
+			log_error(_("The gstreamer audiosink element could not be created"));
 			return;
 		}
 	} else {
@@ -407,7 +410,7 @@
 	ns->volume = gst_element_factory_make ("volume", NULL);
 
 	if (!ns->audioconv || !ns->volume) {
-		gnash::log_error("Gstreamer audio element(s) for movie handling could not be created");
+		log_error(_("Gstreamer audio element(s) for movie handling could not be created"));
 		return;
 	}
 
@@ -452,7 +455,7 @@
 
 			// Check if the element was correctly created
 			if (!ns->videodecoder) {
-				log_error("A gstreamer flashvideo (h.263) decoder element could not be created! You probably need to install gst-ffmpeg.");
+				log_error(_("A gstreamer flashvideo (h.263) decoder element could not be created.  You probably need to install gst-ffmpeg."));
 				return;
 			}
 
@@ -466,7 +469,7 @@
 
 			// Check if the element was correctly created
 			if (!ns->videodecoder) {
-				log_error("A gstreamer flashvideo (VP6) decoder element could not be created! You probably need to install gst-ffmpeg.");
+				log_error(_("A gstreamer flashvideo (VP6) decoder element could not be created! You probably need to install gst-ffmpeg."));
 				return;
 			}
 
@@ -480,12 +483,13 @@
 
 			// Check if the element was correctly created
 			if (!ns->videodecoder) {
-				log_error("A gstreamer flashvideo (ScreenVideo) decoder element could not be created! You probably need to install gst-ffmpeg.");
+				log_error(_("A gstreamer flashvideo (ScreenVideo) decoder element could not be created! You probably need to install gst-ffmpeg."));
 				return;
 			}
 
 		} else {
-			log_error("Unsupported video codec");
+			log_error(_("Unsupported video codec %d"),
+				  videoInfo->codec);
 			return;
 		}
 
@@ -502,14 +506,14 @@
 					static bool warned = false;
 					if ( ! warned )
 					{
-					log_warning("This version of fluendos mp3 plugin does not support flash streaming sounds, please upgrade to version 0.10.4 or higher.");
+					log_error(_("This version of Fluendo's mp3 plugin does not support flash streaming sounds, please upgrade to version 0.10.4 or higher."));
 					warned=true;
 					}
 				}
 			}
 			// Check if the element was correctly created
 			if (!ns->audiodecoder) {
-				log_error("A gstreamer mp3-decoder element could not be created! You probably need to install a mp3-decoder plugin like gstreamer0.10-mad or gstreamer0.10-fluendo-mp3.");
+				log_error(_("A gstreamer mp3-decoder element could not be created! You probably need to install a mp3-decoder plugin like gstreamer0.10-mad or gstreamer0.10-fluendo-mp3."));
 				return;
 			}
 
@@ -523,7 +527,8 @@
 			g_object_set (G_OBJECT (ns->audioinputcaps), "caps", audioincaps, NULL);
 			gst_caps_unref (audioincaps);
 		} else {
-			log_error("Unsupported audio codec");
+			log_error(_("Unsupported audio codec %d"),
+				  audioInfo->codec);
 			return;
 		}
 	}
@@ -558,18 +563,18 @@
 
 	if (ns->m_isFLV) {
 		if (!ns->videosource || !ns->audiosource || !ns->videoinputcaps ||  !ns->audioinputcaps) {
-			gnash::log_error("Gstreamer source element(s) for video movie handling could not be created, you proberly need to install gstreamer0.10-core for fakesrc and capsfilter support.");
+			log_error(_("Gstreamer source element(s) for video movie handling could not be created, you probably need to install gstreamer0.10-core for fakesrc and capsfilter support."));
 			return;
 		}
 	} else {
 		if (!ns->decoder || !ns->source) {
-			gnash::log_error("Gstreamer element(s) for video movie handling could not be created, you proberly need to install gstreamer0.10-base for decodebin support.");
+			log_error(_("Gstreamer element(s) for video movie handling could not be created, you probably need to install gstreamer0.10-base for decodebin support."));
 			return;
 		}
 	}
 
 	if (!ns->colorspace || !ns->videocaps || !ns->videorate || !ns->videosink) {
-		gnash::log_error("Gstreamer element(s) for video movie handling could not be created, you proberly need to install gstreamer0.10-base for ffmpegcolorspace and videorate support.");
+		log_error(_("Gstreamer element(s) for video movie handling could not be created, you probably need to install gstreamer0.10-base for ffmpegcolorspace and videorate support."));
 		return;
 	}
 
@@ -636,7 +641,7 @@
 		/*if (!gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
 			GST_SEEK_TYPE_SET, GST_SECOND * static_cast<long>(newpos),
 			GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
-			log_warning("Seek failed");
+			log_error("Gstreamer seek failed");
 			set_status("NetStream.Seek.InvalidTime");
 			return;
 		}*/
@@ -644,7 +649,7 @@
 		if (!gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
 			GST_SEEK_TYPE_SET, GST_SECOND * static_cast<long>(pos),
 			GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
-			log_warning("Seek failed");
+			log_error("Gstreamer seek failed");
 			set_status("NetStream.Seek.InvalidTime");
 			return;
 		}

Index: server/asobj/Number.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Number.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/asobj/Number.cpp	22 Mar 2007 13:19:04 -0000	1.27
+++ server/asobj/Number.cpp	18 Apr 2007 11:00:30 -0000	1.28
@@ -1,3 +1,4 @@
+// Number.cpp:  ActionScript Number class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,13 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: Number.cpp,v 1.27 2007/03/22 13:19:04 strk Exp $ */
-
-// Implementation of ActionScript Number class.
+/* $Id: Number.cpp,v 1.28 2007/04/18 11:00:30 jgilmore Exp $ */
 
 #include "log.h"
 #include "tu_config.h"
@@ -217,7 +218,7 @@
 			
 			sprintf(_str, "%.15g", _val * 10.0);
 			if ((cp = strchr(_str, '.')) == NULL || cp[1] != '0') {
-				log_error("Internal error: Cannot find \".0\" in %s for %.15g\n", _str, _val);
+				log_error(_("Internal error: Cannot find \".0\" in %s for %.15g"), _str, _val);
 				// Just give it to them raw instead
 				sprintf(_str, "%.15g", _val);
 			} else {

Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/Object.cpp	16 Apr 2007 18:23:06 -0000	1.23
+++ server/asobj/Object.cpp	18 Apr 2007 11:00:30 -0000	1.24
@@ -1,3 +1,4 @@
+// Object.cpp:  Implementation of ActionScript Object class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,17 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
 //
-//
-
-/* $Id: Object.cpp,v 1.23 2007/04/16 18:23:06 strk Exp $ */
 
-// Implementation of ActionScript Object class.
+/* $Id: Object.cpp,v 1.24 2007/04/18 11:00:30 jgilmore Exp $ */
 
 #include "tu_config.h"
 #include "Object.h"
@@ -124,7 +121,9 @@
 	}
 	else
 	{
-		log_error("Too many args to Object constructor");
+		IF_VERBOSE_ASCODING_ERRORS (
+		log_aserror(_("Too many args to Object constructor"));
+		)
 		new_obj = new object_as_object();
 	}
 
@@ -169,8 +168,8 @@
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss;
 		fn.dump_args(ss);
-		log_aserror("Invalid call to Object.addProperty(%s) - "
-			"expected 3 arguments (<name>, <getter>, <setter>).",
+		log_aserror(_("Invalid call to Object.addProperty(%s) - "
+			"expected 3 arguments (<name>, <getter>, <setter>)"),
 		       	ss.str().c_str());
 		);
 
@@ -186,8 +185,8 @@
 	if ( propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.addProperty() - "
-			"empty property name");
+		log_aserror(_("Invalid call to Object.addProperty() - "
+			"empty property name"));
 		);
 		return as_value(false);
 	}
@@ -196,8 +195,8 @@
 	if ( ! getter )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.addProperty() - "
-			"getter is not an AS function");
+		log_aserror(_("Invalid call to Object.addProperty() - "
+			"getter is not an AS function"));
 		);
 		return as_value(false);
 	}
@@ -206,8 +205,8 @@
 	if ( ! setter )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.addProperty() - "
-			"setter is not an AS function");
+		log_aserror(_("Invalid call to Object.addProperty() - "
+			"setter is not an AS function"));
 		);
 		return as_value(false);
 	}
@@ -218,7 +217,7 @@
 	
 	bool result = obj->add_property(propname, *getter, *setter);
 
-	//log_warning("Object.addProperty(): testing");
+	//log_msg("Object.addProperty(): testing");
 	return as_value(result);
 }
 
@@ -233,8 +232,8 @@
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss;
 		fn.dump_args(ss);
-		log_aserror("Invalid call to Object.registerClass(%s) - "
-			"expected 2 arguments (<symbol>, <constructor>).",
+		log_aserror(_("Invalid call to Object.registerClass(%s) - "
+			"expected 2 arguments (<symbol>, <constructor>)"),
 			ss.str().c_str());
 		);
 
@@ -250,8 +249,8 @@
 	if ( symbolid.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.registerClass() - "
-			"empty symbol id");
+		log_aserror(_("Invalid call to Object.registerClass() - "
+			"empty symbol id"));
 		);
 		return as_value(false);
 	}
@@ -260,8 +259,8 @@
 	if ( ! theclass )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.registerClass() - "
-			"class is not a function");
+		log_aserror(_("Invalid call to Object.registerClass() - "
+			"class is not a function"));
 		);
 		return as_value(false);
 	}
@@ -275,8 +274,8 @@
 	if ( ! exp_res )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Object.registerClass(%s, %s): "
-			"can't find exported symbol",
+		log_aserror(_("Object.registerClass(%s, %s): "
+			"can't find exported symbol"),
 			symbolid.c_str(), 
 			typeid(theclass).name());
 		);
@@ -293,9 +292,9 @@
 	if ( ! exp_clipdef )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Object.registerClass(%s, %s): "
+		log_aserror(_("Object.registerClass(%s, %s): "
 			"exported symbol is not a MovieClip symbol "
-			"(sprite_definition), but a %s",
+			"(sprite_definition), but a %s"),
 			symbolid.c_str(), 
 			typeid(theclass).name(),
 			typeid(*exp_res).name());
@@ -314,7 +313,7 @@
 	if ( fn.nargs < 1 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Object.hasOwnProperty() requires one arg");
+		log_aserror(_("Object.hasOwnProperty() requires one arg"));
 		);
 		return as_value();
 	}
@@ -323,7 +322,7 @@
 	if ( arg.is_undefined() || propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.hasOwnProperty('%s')", arg.to_debug_string().c_str());
+		log_aserror(_("Invalid call to Object.hasOwnProperty('%s')"), arg.to_debug_string().c_str());
 		);
 		return as_value();
 	}
@@ -337,7 +336,7 @@
 	if ( fn.nargs < 1 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Object.isPropertyEnumerable() requires one arg");
+		log_aserror(_("Object.isPropertyEnumerable() requires one arg"));
 		);
 		return as_value();
 	}
@@ -346,7 +345,7 @@
 	if ( arg.is_undefined() || propname.empty() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Invalid call to Object.isPropertyEnumerable('%s')", arg.to_debug_string().c_str());
+		log_aserror(_("Invalid call to Object.isPropertyEnumerable('%s')"), arg.to_debug_string().c_str());
 		);
 		return as_value();
 	}
@@ -367,7 +366,7 @@
 	if ( fn.nargs < 1 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Object.isPrototypeOf() requires one arg");
+		log_aserror(_("Object.isPrototypeOf() requires one arg"));
 		);
 		return as_value(false); 
 	}
@@ -376,7 +375,7 @@
 	if ( ! obj )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("First arg to Object.isPrototypeOf(%s) is not an object", fn.arg(0).to_debug_string().c_str());
+		log_aserror(_("First arg to Object.isPrototypeOf(%s) is not an object"), fn.arg(0).to_debug_string().c_str());
 		);
 		return as_value(false);
 	}
@@ -390,7 +389,7 @@
 {
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: %s unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned=true;
 	}
 	return as_value();
@@ -401,7 +400,7 @@
 {
 	static bool warned = false;
 	if ( ! warned ) {
-		log_error("FIXME: %s unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned=true;
 	}
 	return as_value();

Index: server/asobj/Selection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Selection.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/Selection.cpp	19 Mar 2007 17:11:14 -0000	1.7
+++ server/asobj/Selection.cpp	18 Apr 2007 11:00:30 -0000	1.8
@@ -1,3 +1,4 @@
+// Selection.cpp:  Selectable graphical things, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -82,35 +83,35 @@
 };
 
 as_value selection_addlistener(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_getbeginindex(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_getcaretindex(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_getendindex(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_getfocus(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_removelistener(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_setfocus(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value selection_setselection(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 
@@ -136,4 +137,3 @@
 
 
 } // end of gnash namespace
-

Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/SharedObject.cpp	29 Mar 2007 12:57:36 -0000	1.8
+++ server/asobj/SharedObject.cpp	18 Apr 2007 11:00:30 -0000	1.9
@@ -1,3 +1,4 @@
+// SharedObject.cpp:  ActionScript "SharedObject" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -87,7 +88,7 @@
 
 	static bool warned=false;
 	if ( ! warned ) {
-		log_error("FIXME: %s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned=true;
 	}
 	return as_value();
@@ -100,7 +101,7 @@
 
 	static bool warned=false;
 	if ( ! warned ) {
-		log_error("FIXME: %s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned=true;
 	}
 	return as_value();
@@ -115,7 +116,7 @@
 
 	static bool warned=false;
 	if ( ! warned ) {
-		log_error("FIXME: %s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned=true;
 	}
 	return as_value();
@@ -128,7 +129,7 @@
 
 	static bool warned=false;
 	if ( ! warned ) {
-		log_error("FIXME: %s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned=true;
 	}
 	return as_value();
@@ -162,6 +163,4 @@
 
 }
 
-
 } // end of gnash namespace
-



From MAILER-DAEMON Wed Apr 18 08:44:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1He9WL-00064X-Rx
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 08:44:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1He9WJ-00064R-KB
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:44:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1He9WH-00064F-Rm
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:44:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1He9WH-00064C-MZ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:44:21 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1He9RR-0001Tb-I7
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 08:39:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1He9RP-0002sH-Gc
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:39:19 +0000
Received: from strk by cvs with local (Exim 4.50) id 1He9RP-0002sE-70
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:39:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1He9RP-0002sE-70@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 12:39:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/matrix.cpp server/matrix.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 12:44:24 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 12:39:19

Modified files:
	.              : ChangeLog 
	server         : matrix.cpp matrix.h 

Log message:
	* server/matrix.{cpp,h}: add transform_by_inverse(point&).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2906&r2=1.2907
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/matrix.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2906
retrieving revision 1.2907
diff -u -b -r1.2906 -r1.2907
--- ChangeLog	18 Apr 2007 11:00:29 -0000	1.2906
+++ ChangeLog	18 Apr 2007 12:39:18 -0000	1.2907
@@ -1,3 +1,7 @@
+2007-04-18 Sandro Santilli <strk@keybit.net>
+
+	* server/matrix.{cpp,h}: add transform_by_inverse(point&).
+
 2007-04-18  John Gilmore  <gnu@toad.com>
 
 	* Internationalization, phase 2.

Index: server/matrix.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/matrix.cpp	15 Apr 2007 14:31:19 -0000	1.12
+++ server/matrix.cpp	18 Apr 2007 12:39:18 -0000	1.13
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.cpp,v 1.12 2007/04/15 14:31:19 strk Exp $ 
+// $Id: matrix.cpp,v 1.13 2007/04/18 12:39:18 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -319,6 +319,16 @@
 }
 
 void
+matrix::transform_by_inverse(point& p) const
+// Transform point 'p' by the inverse of our matrix.  
+{
+	// @@ TODO optimize this!
+	matrix	m;
+	m.set_inverse(*this);
+	m.transform(p);
+}
+
+void
 matrix::transform_by_inverse(geometry::Range2d<float>& r) const
 {
 	// @@ TODO optimize this!

Index: server/matrix.h
===================================================================
RCS file: /sources/gnash/gnash/server/matrix.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/matrix.h	15 Apr 2007 14:31:19 -0000	1.7
+++ server/matrix.h	18 Apr 2007 12:39:18 -0000	1.8
@@ -18,7 +18,7 @@
 //
 // Original author: Thatcher Ulrich <tu@tulrich.com> 2003
 //
-// $Id: matrix.h,v 1.7 2007/04/15 14:31:19 strk Exp $ 
+// $Id: matrix.h,v 1.8 2007/04/18 12:39:18 strk Exp $ 
 //
 
 #ifndef GNASH_MATRIX_H
@@ -157,6 +157,9 @@
 	/// Transform point 'p' by our matrix. 
 	void	transform(point& p) const;
 
+	/// Transform point 'p' by the inverse of our matrix. 
+	void	transform_by_inverse(point& p) const;
+
 	/// Transform point 'x,y' by our matrix. 
 	void	transform(float& x, float& y) const;
 



From MAILER-DAEMON Wed Apr 18 09:29:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeAEI-0003vC-U7
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 09:29:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeAEH-0003uD-Nw
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:29:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeAEG-0003ss-CJ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:29:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeAEG-0003sm-92
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:29:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeA9P-0007U8-N1
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:24:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeA9N-0004VZ-FS
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:24:45 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeA9N-0004VV-6M
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:24:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeA9N-0004VV-6M@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 13:24:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/edit_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 13:29:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 13:24:44

Modified files:
	.              : ChangeLog 
	server         : character.h edit_text_character.cpp 
	                 edit_text_character.h generic_character.cpp 
	                 generic_character.h sprite_instance.cpp 
	                 sprite_instance.h 
	server/parser  : character_def.h 
	testsuite/misc-ming.all: duplicate_movie_clip_test.c 
	                         loadMovieTestRunner.cpp 

Log message:
	        * server/matrix.{cpp,h}: add transform_by_inverse(point&).
	        * server/character.h: add pointInBounds, pointInShape() and
	          pointInVisibleShape() new methods; document
	          get_topmost_mouse_entity.
	        * server/edit_text_character.{h,cpp}: implement pointInShape.
	        * server/generic_character.{h,cpp}: implement pointInShape.
	        * server/sprite_instance.{h,cpp}: implement pointInShape
	          and pointInVisibleShape; fix get_topmost_mouse_entity
	          implementation.
	        * server/parser/character_def.h: document point_test_local.
	        * testsuite/misc-ming.all/duplicate_movie_clip_test.c: don't
	          expect a failure.
	        * testsuite/misc-ming.all/loadMovieTestRunner.cpp: add two
	          small tests checking that the new two small buttons
	          are clickable. Needs more tests actually clicking those
	          buttons.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2907&r2=1.2908
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.246&r2=1.247
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/character_def.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/duplicate_movie_clip_test.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2907
retrieving revision 1.2908
diff -u -b -r1.2907 -r1.2908
--- ChangeLog	18 Apr 2007 12:39:18 -0000	1.2907
+++ ChangeLog	18 Apr 2007 13:24:44 -0000	1.2908
@@ -1,6 +1,21 @@
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
 	* server/matrix.{cpp,h}: add transform_by_inverse(point&).
+	* server/character.h: add pointInBounds, pointInShape() and
+	  pointInVisibleShape() new methods; document
+	  get_topmost_mouse_entity.
+	* server/edit_text_character.{h,cpp}: implement pointInShape.
+	* server/generic_character.{h,cpp}: implement pointInShape.
+	* server/sprite_instance.{h,cpp}: implement pointInShape
+	  and pointInVisibleShape; fix get_topmost_mouse_entity
+	  implementation.
+	* server/parser/character_def.h: document point_test_local.
+	* testsuite/misc-ming.all/duplicate_movie_clip_test.c: don't 
+	  expect a failure.
+	* testsuite/misc-ming.all/loadMovieTestRunner.cpp: add two
+	  small tests checking that the new two small buttons
+	  are clickable. Needs more tests actually clicking those
+	  buttons.
 
 2007-04-18  John Gilmore  <gnu@toad.com>
 

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- server/character.h	12 Apr 2007 16:29:14 -0000	1.67
+++ server/character.h	18 Apr 2007 13:24:44 -0000	1.68
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.67 2007/04/12 16:29:14 strk Exp $ */
+/* $Id: character.h,v 1.68 2007/04/18 13:24:44 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -463,6 +463,50 @@
 		return geometry::Range2d<float>(geometry::nullRange);
 	}
 
+	/// Return true if the given point falls in this character's bounds
+	//
+	/// Point coordinates are in world TWIPS
+	///
+	bool pointInBounds(float x, float y) const
+	{
+		geometry::Range2d<float> bounds = getBounds();
+		matrix wm = get_world_matrix();
+		wm.transform(bounds);
+		return bounds.contains(x, y);
+	}
+
+	/// Return true if the given point falls in this character's shape
+	//
+	/// Point coordinates are in world TWIPS
+	///
+	/// The default implementation warns about a missing
+	/// override and invokes pointInBounds().
+	///
+	///
+	virtual bool pointInShape(float x, float y) const
+	{
+		log_error("Character %s did not override pointInShape() - using pointInBounds() instead", typeid(*this).name());
+		return pointInBounds(x, y);
+	}
+
+	/// Return true if the given point falls in this character's visible shape
+	//
+	/// Point coordinates are in world TWIPS
+	///
+	/// The default implementation returns false if the character is
+	/// not visible, calling pointInBounds() otherwise.
+	///
+	/// Note that this is good for simple characters but needs
+	/// to be overridden for characters with childs. When a
+	/// character has childs it must take into account the case
+	/// in which some childs are visible and some are not.
+	///
+	virtual bool pointInVisibleShape(float x, float y) const
+	{
+		if ( get_visible() ) return pointInShape(x, y);
+		else return false;
+	}
+
 	/// Return the "relative" root of this character
 	//
 	/// The "relative" is the movie_instance created by
@@ -581,10 +625,13 @@
 	}
 
 
+    // TODO: why is this virtual ??
     virtual void	set_visible(bool visible) {
       if (m_visible!=visible) set_invalidated();  
       m_visible = visible;      
     }
+
+    // TODO: why is this virtual ??
     virtual bool	get_visible() const { return m_visible; }
 
     virtual void	set_display_callback(void (*callback)(void*), void* user_ptr)
@@ -647,6 +694,30 @@
 		on_event(id);
 	}
 
+	/// \brief
+	/// Return the topmost entity covering the given point
+	/// and enabled to receive mouse events.
+	//
+	/// Return NULL if no "active" entity is found under the pointer.
+	///
+	/// Coordinates of the point are given in parent's coordinate space.
+	/// This means that in order to convert the point to the local coordinate
+	/// space you need to apply an inverse transformation using this
+	/// character matrix. Example:
+	///
+	///	point p(x,y);
+	///	get_matrix().transform_by_inverse(p);
+	///	-- p is now in local coordinates
+	///
+	/// Don't blame me for this mess, I'm just trying to document the existing
+	/// functions ... --strk
+	///
+	/// @param x
+	/// 	X ordinate of the pointer, in parent's coordinate space.
+	///
+	/// @param y
+	/// 	Y ordinate of the pointer, in parent's coordiante space.
+	///
 	virtual character* get_topmost_mouse_entity(float /* x */, float /* y */)
 	{
 		return NULL;

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/edit_text_character.cpp	18 Apr 2007 09:35:42 -0000	1.57
+++ server/edit_text_character.cpp	18 Apr 2007 13:24:44 -0000	1.58
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.57 2007/04/18 09:35:42 jgilmore Exp $ */
+/* $Id: edit_text_character.cpp,v 1.58 2007/04/18 13:24:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -593,11 +593,14 @@
 character*
 edit_text_character::get_topmost_mouse_entity(float x, float y)
 {
+	//log_msg("get_topmost_mouse_entity called on edit_text_character %p, labeled '%s'", (void*)this, get_text_value());
+
 	if (get_visible() == false)
 	{
 		return NULL;
 	}
 	
+	// shouldn't this be !can_handle_mouse_event() instead ?
 	if (m_def->get_no_select())
 	{
 		// not selectable, so don't catch mouse events!
@@ -609,7 +612,7 @@
 	point	p;
 	m.transform_by_inverse(&p, point(x, y));
 
-	const rect def_bounds = m_def->get_bounds();
+	const rect& def_bounds = m_def->get_bounds();
 	if (def_bounds.point_test(p.m_x, p.m_y))
 	{
 		return this;
@@ -1337,6 +1340,16 @@
 	global.init_member("TextField", cl.get());
 }
 
+bool
+edit_text_character::pointInShape(float x, float y) const
+{
+	matrix wm = get_world_matrix();
+	point lp(x, y);
+	wm.transform_by_inverse(lp);
+	const rect& def_bounds = m_def->get_bounds();
+	return def_bounds.point_test(lp.m_x, lp.m_y);
+}
+
 } // namespace gnash
 
 

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/edit_text_character.h	12 Apr 2007 11:35:30 -0000	1.28
+++ server/edit_text_character.h	18 Apr 2007 13:24:44 -0000	1.29
@@ -52,15 +52,17 @@
 
 	~edit_text_character();
 
-	virtual bool can_handle_mouse_event() const { return true; }
-	virtual character* get_topmost_mouse_entity(float x, float y);
+	// TODO: should this return !m_def->get_no_select() ?
+	bool can_handle_mouse_event() const { return true; }
 	
-	virtual bool wantsInstanceName()
+	character* get_topmost_mouse_entity(float x, float y);
+	
+	bool wantsInstanceName()
 	{
 		return true; // text fields can be referenced 
 	}	
 		
-	virtual bool on_event(const event_id& id);	
+	bool on_event(const event_id& id);	
 
 	const char* get_variable_name() const
 	{
@@ -76,10 +78,10 @@
 	void set_variable_name(const std::string& newname);
 
 	/// Set our text to the given string.
-	virtual void	set_text_value(const char* new_text);
+	void	set_text_value(const char* new_text);
 
  	/// Return value of our text.
-	virtual const char* get_text_value() const;
+	const char* get_text_value() const;
 
 	/// We have a "text" member.
 	void set_member(const std::string& name, const as_value& val);
@@ -96,6 +98,9 @@
 		return m_def->get_bounds().getRange();
 	}
 
+	// See dox in character.h
+	bool pointInShape(float x, float y) const;
+
 private:
 
 	/// The actual text

Index: server/generic_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/generic_character.cpp	18 Apr 2007 09:35:42 -0000	1.5
+++ server/generic_character.cpp	18 Apr 2007 13:24:44 -0000	1.6
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: generic_character.cpp,v 1.5 2007/04/18 09:35:42 jgilmore Exp $ */
+/* $Id: generic_character.cpp,v 1.6 2007/04/18 13:24:44 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -49,6 +49,15 @@
 	assert(0); // TO BE IMPLEMENTED!!!!!
 }
 
+bool
+generic_character::pointInShape(float x, float y) const
+{
+	matrix wm = get_world_matrix();
+	point lp(x, y);
+	wm.transform_by_inverse(lp);
+	return m_def->point_test_local(lp.m_x, lp.m_y);
+}
+
 character*
 generic_character::get_topmost_mouse_entity(float x, float y)
 {

Index: server/generic_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/generic_character.h	12 Apr 2007 11:35:30 -0000	1.21
+++ server/generic_character.h	18 Apr 2007 13:24:44 -0000	1.22
@@ -77,6 +77,9 @@
 
 	virtual character* get_topmost_mouse_entity(float x, float y);
 
+	// See dox in character.h
+	virtual bool pointInShape(float x, float y) const;
+
 	/// \brief
 	/// Return the character definition from which this
 	/// instance derive. 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -b -r1.246 -r1.247
--- server/sprite_instance.cpp	18 Apr 2007 11:00:29 -0000	1.246
+++ server/sprite_instance.cpp	18 Apr 2007 13:24:44 -0000	1.247
@@ -2820,6 +2820,90 @@
 		
 };
 
+/// Find the first character whose shape contain the point
+//
+/// Point coordinates in world TWIPS
+///
+class ShapeContainerFinder {
+
+	bool _found;
+	float _x;
+	float _y;
+
+public:
+
+	ShapeContainerFinder(float x, float y)
+		:
+		_found(false),
+		_x(x),
+		_y(y)
+	{}
+
+	bool operator() (character* ch)
+	{
+		if ( ch->pointInShape(_x, _y) )
+		{
+			_found = true;
+			return false;
+		}
+		else return true;
+	}
+
+	bool hitFound() { return _found; }
+		
+};
+
+/// Find the first visible character whose shape contain the point
+//
+/// Point coordinates in world TWIPS
+///
+class VisibleShapeContainerFinder {
+
+	bool _found;
+	float _x;
+	float _y;
+
+public:
+
+	VisibleShapeContainerFinder(float x, float y)
+		:
+		_found(false),
+		_x(x),
+		_y(y)
+	{}
+
+	bool operator() (character* ch)
+	{
+		if ( ch->get_visible() && ch->pointInShape(_x, _y) )
+		{
+			_found = true;
+			return false;
+		}
+		else return true;
+	}
+
+	bool hitFound() { return _found; }
+		
+};
+
+bool
+sprite_instance::pointInShape(float x, float y) const
+{
+	ShapeContainerFinder finder(x, y);
+	const_cast<DisplayList&>(m_display_list).visitBackward(finder);
+	if ( finder.hitFound() ) return true;
+	return _drawable_inst->pointInShape(x, y); 
+}
+
+bool
+sprite_instance::pointInVisibleShape(float x, float y) const
+{
+	VisibleShapeContainerFinder finder(x, y);
+	const_cast<DisplayList&>(m_display_list).visitBackward(finder);
+	if ( finder.hitFound() ) return true;
+	return _drawable_inst->pointInVisibleShape(x, y); 
+}
+
 character*
 sprite_instance::get_topmost_mouse_entity(float x, float y)
 {
@@ -2830,6 +2914,18 @@
 		return NULL;
 	}
 
+	if ( can_handle_mouse_event() )
+	{
+		// point is in parent's space,
+		// we need to convert it in world space
+		matrix parent_world_matrix = get_parent()->get_world_matrix();
+		point wp(x,y);
+		parent_world_matrix.transform(wp);
+		if ( pointInVisibleShape(wp.m_x, wp.m_y) ) return this;
+		else return NULL;
+	}
+
+
 	matrix	m = get_matrix();
 	point	p;
 	m.transform_by_inverse(&p, point(x, y));
@@ -2842,15 +2938,7 @@
 		ch = _drawable_inst->get_topmost_mouse_entity(p.m_x, p.m_y);
 	}
 
-	if ( ch && can_handle_mouse_event() )
-	{
-		return this;
-	}
-	else
-	{
 		return ch; // might be NULL
-	}
-
 }
 
 bool

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/sprite_instance.h	16 Apr 2007 18:23:06 -0000	1.98
+++ server/sprite_instance.h	18 Apr 2007 13:24:44 -0000	1.99
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.98 2007/04/16 18:23:06 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.99 2007/04/18 13:24:44 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -139,6 +139,12 @@
 	/// Get the composite bounds of all component drawing elements
 	geometry::Range2d<float> getBounds() const;
 
+	// See dox in character.h
+	bool pointInShape(float x, float y) const;
+
+	// See dox in character.h
+	bool pointInVisibleShape(float x, float y) const;
+
 	size_t get_current_frame() const
 	{
 		return m_current_frame;

Index: server/parser/character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/character_def.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/parser/character_def.h	11 Nov 2006 22:44:54 -0000	1.9
+++ server/parser/character_def.h	18 Apr 2007 13:24:44 -0000	1.10
@@ -66,6 +66,10 @@
 	{
 	}
 
+    	/// Return true if the specified point is on the interior of our shape.
+	//
+	/// Point coordinates are local coords (TWIPS)
+	///
 	virtual bool point_test_local(float /*x*/, float /*y*/)
 	{
 		return false;

Index: testsuite/misc-ming.all/duplicate_movie_clip_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/duplicate_movie_clip_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/duplicate_movie_clip_test.c	18 Apr 2007 08:13:45 -0000	1.1
+++ testsuite/misc-ming.all/duplicate_movie_clip_test.c	18 Apr 2007 13:24:44 -0000	1.2
@@ -76,7 +76,7 @@
   check_equals(mo, "typeof(mc.onLoad)", "'function'");
   check_equals(mo, "mc.getDepth()", "-16374");
   check_equals(mo, "dup.prop1", "undefined");  // user defined property will not be duplicated
-  xcheck_equals(mo, "typeof(dup.onLoad)", "'undefined'"); //user defined event will not be duplicated
+  check_equals(mo, "typeof(dup.onLoad)", "'undefined'"); //user defined event will not be duplicated
   check_equals(mo, "dup.getDepth()", "1");
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); 

Index: testsuite/misc-ming.all/loadMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-ming.all/loadMovieTestRunner.cpp	17 Apr 2007 20:53:29 -0000	1.6
+++ testsuite/misc-ming.all/loadMovieTestRunner.cpp	18 Apr 2007 13:24:44 -0000	1.7
@@ -101,5 +101,15 @@
 	coverart = coverartch->to_movie();
 	check_equals(coverart->get_movie_definition()->get_url(), offspringURL.str());
 
+	//---------------------------------------------------
+	// Now check that the active movieclip "buttons" work
+	//---------------------------------------------------
+
+	tester.movePointerTo(73, 204); // the "Scribble" button
+	check(tester.isMouseOverMouseEntity());
+
+	tester.movePointerTo(63, 227); // the "clear" button
+	check(tester.isMouseOverMouseEntity());
+
 }
 



From MAILER-DAEMON Wed Apr 18 09:52:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeAaG-0001vO-UU
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 09:52:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeAaF-0001vH-2Y
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:52:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeAaD-0001uv-DC
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:52:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeAaC-0001uk-Q6
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:52:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeAVL-0002H2-L1
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:47:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeAVJ-00070k-PP
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:47:25 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeAVJ-00070h-72
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:47:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeAVJ-00070h-72@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 13:47:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog configure.ac doc/C/asspec/date....
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 13:52:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 13:47:24

Modified files:
	.              : ChangeLog configure.ac 
	doc/C/asspec   : date.xml 
	server/asobj   : Date.cpp Global.cpp 
	server         : as_value.h as_value.cpp 
	testsuite/actionscript.all: Date.as 

Log message:
	        * configure.ac: Introduce HAVE_LONG_TIMEZONE if extern long timezone
	          exists
	        * doc/C/asspec/date.xml: first draft
	        * server/asobj/Date.cpp: Complete its implementation
	        * server/asobj/Global.cpp: Use definitions of NAN and INFINITY from
	          as_value.h
	        * server/as_value.h: add definition for INFINITY, as for NAN
	        * server/as_value.cpp: Reject accidental "Infinity" and "-Infinity"
	          string-to-number conversions (should give NaN); 
	          Use NAN from as_value.h;
	          Conversion of an AS function to a number gives NaN, not 0.
	        * testsuite/actionscript.all/Date.as: Add extensive constructor tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2908&r2=1.2909
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.290&r2=1.291
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/date.xml?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Date.as?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2908
retrieving revision 1.2909
diff -u -b -r1.2908 -r1.2909
--- ChangeLog	18 Apr 2007 13:24:44 -0000	1.2908
+++ ChangeLog	18 Apr 2007 13:47:24 -0000	1.2909
@@ -1,3 +1,18 @@
+2007-04-18 Martin Guy <martinwguy@yahoo.it>
+
+	* configure.ac: Introduce HAVE_LONG_TIMEZONE if extern long timezone
+	  exists
+	* doc/C/asspec/date.xml: first draft
+	* server/asobj/Date.cpp: Complete its implementation
+	* server/asobj/Global.cpp: Use definitions of NAN and INFINITY from	
+	  as_value.h
+	* server/as_value.h: add definition for INFINITY, as for NAN
+	* server/as_value.cpp: Reject accidental "Infinity" and "-Infinity"
+	  string-to-number conversions (should give NaN);
+	  Use NAN from as_value.h;
+	  Conversion of an AS function to a number gives NaN, not 0.
+	* testsuite/actionscript.all/Date.as: Add extensive constructor tests
+
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
 	* server/matrix.{cpp,h}: add transform_by_inverse(point&).

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -b -r1.290 -r1.291
--- configure.ac	10 Apr 2007 18:18:45 -0000	1.290
+++ configure.ac	18 Apr 2007 13:47:24 -0000	1.291
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.290 2007/04/10 18:18:45 rsavoye Exp $
+dnl $Id: configure.ac,v 1.291 2007/04/18 13:47:24 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -488,12 +488,56 @@
 AC_LANG_POP(C++)
 AC_REPLACE_FUNCS(getopt)
 
-AC_CHECK_FUNCS(sysconf)
-AC_CHECK_FUNCS(shmget shmat shmdt mmap)
+dnl Date portability stuff, used in server/asobj/Date.cpp
 AC_CHECK_FUNCS(gettimeofday)
 AC_CHECK_FUNCS(ftime)
 AC_CHECK_FUNCS(tzset)
 AC_CHECK_FUNCS(localtime_r)
+
+AC_CACHE_CHECK([whether struct tm has tm_gmtoff], ac_cv_tm_gmtoff, [
+        AC_TRY_LINK([
+/* ctime(1) says "The glibc version of struct tm has additional fields
+ * defined  when _BSD_SOURCE was set before including <time.h>"
+ * In practice, you don't need to define it yourself (tested on glibc-2.2.1 
+ * and 2.3.6) but if you *do* define it yourself, it makes *all* functions
+ * favour BSD-like behaviour over of GNU/POSIX, which seems dangerous.
+ */
+// #define _BSD_SOURCE 1
+#include <time.h>
+], 
+                [ struct tm tm; long l = tm.tm_gmtoff; ], 
+                [ ac_cv_tm_gmtoff="yes" ],
+                [ ac_cv_tm_gmtoff="no" ]
+        )
+])
+if test "x$ac_cv_tm_gmtoff" = "xyes" ; then
+        AC_DEFINE(HAVE_TM_GMTOFF, [1], [struct tm has member tm_gmtoff])
+fi
+
+AC_CACHE_CHECK([whether timezone is a long], ac_cv_long_timezone, [
+        AC_TRY_LINK([
+/* On Linux/glibc, tzset(3) says "extern long timezone;" (seconds West of GMT)
+ * but on BSD char *timezone(int,int) is a function returning a string name.
+ * The BSD function timegm() may be the equivalent, but this should
+ * not be necessary because on BSD the code should use tm.tm_gmtoff instead
+ * (use of long timezone is a fallback strategy for when tm_gmtoff exists not).
+ */
+#include <stdio.h>
+#include <time.h>
+extern long timezone;
+], 
+                [ printf("%ld", timezone); ], 
+                [ ac_cv_long_timezone="yes" ],
+                [ ac_cv_long_timezone="no" ]
+        )
+])
+if test "x$ac_cv_long_timezone" = "xyes" ; then
+        AC_DEFINE(HAVE_LONG_TIMEZONE, [1], [extern timezone is a long integer, not a function])
+fi
+
+
+AC_CHECK_FUNCS(sysconf)
+AC_CHECK_FUNCS(shmget shmat shmdt mmap)
 AC_CHECK_FUNCS(memmove)
 AC_CHECK_FUNCS(strlcpy, AC_DEFINE(HAVE_STRLCPY_PROTO, [1],[Define if you have the strlcpy prototype]))
 AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT_PROTO, [1],[Define if you have the strlcat prototype]))

Index: doc/C/asspec/date.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/date.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- doc/C/asspec/date.xml	29 Mar 2007 22:09:44 -0000	1.1
+++ doc/C/asspec/date.xml	18 Apr 2007 13:47:24 -0000	1.2
@@ -2,7 +2,7 @@
   <title>Date ActionScript Class</title>
 
   <para>
-    This class implements an Date object.
+    This class implements the Date object.
   </para>
 
   <sect5 id="datemethods">
@@ -14,6 +14,8 @@
 	  <term>getDate()</term>
 	  <listitem>
 	    <para>
+		Returns a Date's day-of-month from 1 to 31
+		according to local time.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -22,6 +24,9 @@
 	  <term>getDay()</term>
 	  <listitem>
 	    <para>
+		Returns the day-of-the-week for a Date,
+		according to local time,
+		in the range 0-6 where 0 means Sunday and 6 means Saturday.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -30,6 +35,11 @@
 	  <term>getFullYear()</term>
 	  <listitem>
 	    <para>
+		Returns the Gregorian year number for a Date,
+		according to local time.
+		Since Gnash currently uses POSIX date routines internally,
+		this probably only works for dates from
+		13 Dec 1901 to 19 Jan 2038.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -38,6 +48,9 @@
 	  <term>getHours()</term>
 	  <listitem>
 	    <para>
+		Returns the hour-of-the-day for a Date,
+		according to local time,
+		in the range 0-23.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -46,6 +59,8 @@
 	  <term>getMilliseconds()</term>
 	  <listitem>
 	    <para>
+		Returns the milliseconds component of a Date
+		as an integer in the range 0-999.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -54,6 +69,9 @@
 	  <term>getMinutes()</term>
 	  <listitem>
 	    <para>
+		Returns the minutes-past-the-hour for a Date,
+		according to local time,
+		in the range 0-59.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -62,6 +80,9 @@
 	  <term>getMonth()</term>
 	  <listitem>
 	    <para>
+		Returns the month of the year for a Date,
+		according to local time,
+		in the range 0-11 where 0 means January and 11 means December.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -70,6 +91,8 @@
 	  <term>getSeconds()</term>
 	  <listitem>
 	    <para>
+		Returns the seconds past the minute for a Date,
+		in the range 0-59.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -78,6 +101,11 @@
 	  <term>getTime()</term>
 	  <listitem>
 	    <para>
+		Returns the number of milliseconds elapsed since 
+		1 Jan 1970 00:00:00 in Universal Coordinated Time,
+		as a floating point number: fractions of milliseconds
+		are included.
+		Negative values indicate times before 1 Jan 1970.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -86,6 +114,20 @@
 	  <term>getTimezoneOffset()</term>
 	  <listitem>
 	    <para>
+		Returns the difference between Universal Coordinated Time
+		and the local time represented by a Date, including
+		Daylight Savings Time if it was in effect at that time
+		in the current locale.
+		The return value is in minutes; negative for timezones east of
+		Greenwich and positive for those west of Greenwich.
+	    </para>
+	    <para>
+		For example in the GMT+1 timezone, one hour east of Greenwich,
+		for a time when DST was not in effect,
+		the result would be -60.
+		In the same timezone when DST is in effect,
+		the extra hour in advance of UTC makes the value -120.
+		Positive values are returned for locales west of Greenwich.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -94,6 +136,8 @@
 	  <term>getUTCDate()</term>
 	  <listitem>
 	    <para>
+		Returns a Date's day-of-month from 1 to 31,
+		according to Universal Coordinated Time.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -102,6 +146,9 @@
 	  <term>getUTCDay()</term>
 	  <listitem>
 	    <para>
+		Returns the day-of-the-week for a Date,
+		according to local time,
+		in the range 0-6 where 0 means Sunday and 6 means Saturday.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -110,6 +157,11 @@
 	  <term>getUTCFullYear()</term>
 	  <listitem>
 	    <para>
+		Returns the Gregorian year number for a Date,
+		according to Universal Coordinated Time.
+		Since Gnash currently uses POSIX date routines internally,
+		this probably only works for dates from
+		13 Dec 1901 to 19 Jan 2038.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -118,6 +170,9 @@
 	  <term>getUTCHours()</term>
 	  <listitem>
 	    <para>
+			Returns the hour-of-the-day for a Date,
+			according to Universal Coordinated Time,
+		in the range 0-23.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -126,6 +181,8 @@
 	  <term>getUTCMilliseconds()</term>
 	  <listitem>
 	    <para>
+		Returns the milliseconds component of a Date
+		as an integer in the range 0-999.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -134,6 +191,9 @@
 	  <term>getUTCMinutes()</term>
 	  <listitem>
 	    <para>
+		Returns the minutes-past-the-hour for a Date,
+		according to Universal Coordinated Time,
+		in the range 0-59.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -142,6 +202,9 @@
 	  <term>getUTCMonth()</term>
 	  <listitem>
 	    <para>
+		Returns the month of the year for a Date,
+		according to Universal Coordinated Time,
+		in the range 0-11 where 0 means January and 11 means December.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -150,6 +213,8 @@
 	  <term>getUTCSeconds()</term>
 	  <listitem>
 	    <para>
+		Returns the seconds past the minute for a Date,
+		in the range 0-59.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -158,30 +223,91 @@
 	  <term>getYear()</term>
 	  <listitem>
 	    <para>
+		Returns the number of Gregorian years elapsed between 1900
+		and a Date,
+		according to local time.
+	    </para>
+	    <para>
+		For dates past 1st Jan 2000 it returns values from 100 onwards;
+		for years before 1900 it returns negative values.
+	    </para>
+	    <para>
+		This function is a historical wart left over from the days when
+		nobody could believe we would still be using Flash in 2000.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setDate()</term>
+	  <term>setDate(dayofmonth)</term>
 	  <listitem>
 	    <para>
+		Sets the day-of-month for a Date object,
+		in the range 1-31, leaving the year, month, and
+		time-of-day unchanged for valid values.
+	    </para>
+	    <para>
+		If dayofmonth is greater than the number of days in the
+		month in question, it wraps into the following month:
+		for example, trying to set the 35th to a date in January
+		will result in the 4th of February.
+		If it is zero or negative, this will take the Date back
+		to a previous month and possibly a previous year.
+	    </para>
+	    <para>
+		If there are no parameters to setDate,
+		if dayofmonth is not of type Number
+		(or a String that contains a decimal number
+		or the Boolean values "true" and "false",
+		which behave the same as 1 and 0)
+		is an infinity or NotANumber,
+		this sets the value of the Date object to "Not A Number",
+		which is converted to a string as "Invalid date".
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setFullYear()</term>
+	  <term>setFullYear(year,[month[,dayofmonth]])</term>
 	  <listitem>
 	    <para>
+		If a single parameter is given, this
+		sets the Gregorian year number for a Date,
+		normally leaving the month and day-of-month unchanged.
+	    </para>
+	    <para>
+		When changing from a leap year to a non-leap year
+		when the date is set to 29th February,
+		the resulting date is 1st March of the same year.
+	    </para>
+	    <para>
+		If month, and maybe dayofmonth, are also given, they
+		simultaneously set the month (and day of month), following
+		the usual rules whereby excessively large or negative values
+		carry over to affect the month or year and still give a
+		valid date.
+	    </para>
+	    <para>
+		If any supplied value cannot be converted to a valid number,
+		the Date's value is set to NotANumber.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setHours()</term>
+	  <term>setHours(hour)</term>
 	  <listitem>
 	    <para>
+		Sets the hour-of-the-day, normally in the range 0-23,
+		leaving the calendar date and minutes/seconds unchanged.
+	    </para>
+	    <para>
+		Values greater than 23 will make the date roll over to one of
+		the following days; negative values will result in previous
+		dates.
+		If no parameter is given, or if it is not of a type that can be
+		converted to a number, the resulting date value is NotANumber,
+		which prints as "Invalid date".
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -190,30 +316,117 @@
 	  <term>setMilliseconds()</term>
 	  <listitem>
 	    <para>
+		Sets the milliseconds with a resolution of one millisecond:
+		fractional parts of a millisecond are ignored.
+	    </para>
+	    <para>
+		The parameter is normally a value from 0-999, but values
+		outside this range will carry over into, or borrow from,
+		the seconds (and minutes, hours etc if necessary).
 	    </para>
+	    <para>
+		If no parameters are given, or if the parameter cannot
+		be converted to a number, the Date's value is set to
+		NotANumber. Any extra parameters are ignored.
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setMinutes()</term>
+	  <term>setMinutes(minutes[,seconds[,milliseconds]])</term>
 	  <listitem>
 	    <para>
+		Sets the minutes-past-the-hour normally in the range 0-59,
+		leaving the calendar date and hour/seconds unchanged.
+	    </para>
+	    <para>
+		"Minutes" greater than 59 carry over into the hours (and
+		may consequently advance the date);
+		simiarly, negative values borrow from them.
+	    </para>
+	    <para>
+		The optional second and third parameters simultaneously set
+		the seconds and millisecond components,
+		with similar carry/borrow if they are outside the ranges
+		0-59 and 0-999;
+		fractions of seconds and milliseconds are ignored.
+	    </para>
+	    <para>
+		If no parameter is given, or if it is not of a type that can be
+		converted to a number, the resulting date value is NotANumber,
+		which prints as "Invalid date".
+		Gnash differs from the commercial Flash player in this,
+		which, given a non-numeric value for "minutes",
+		returns a seemingly random date such as 9th December, 2077 BC.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setMonth()</term>
+	  <term>setMonth(month[,day])</term>
 	  <listitem>
 	    <para>
+		Sets the month of the year, normally in the range 0-11,
+		leaving the year and time of day (in localtime) unchanged.
+	    </para>
+	    <para>
+		Values greater than 11 will make the date roll over into a
+		following year; negative values will result in previous
+		years.
+	    </para>
+	    <para>
+		If only the month is given, the new month has less days that
+		the old, and the day-of-month is beyond the end of the new
+		month, the date wraps over into the first days of the month
+		after the specified one. Gnash differs in this from the
+		commercial player, which leaves the date set to the last day
+		of the requested month.
+	    </para>
+	    <para>
+		If no parameter is given, or if it is not of a type that can
+		be converted to a number, the month is set to January without
+		changing the year.
+	    </para>
+	    <para>
+		If the optional extra parameter "day" is given, both the
+		month and day-of-month are set. As usual, day numbers beyond
+		the last day of the selected month wrap over into the following
+		month(s), and negative values take us back to previous months
+		and possibly years.
+	    </para>
+	    <para>
+		Unlike the "month" parameter, non-numeric values for "day"
+		result in the Date's value being set to NotANumber.
+	    </para>
+	    <para>
+		Any further parameters are ignored.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setSeconds()</term>
+	  <term>setSeconds(seconds[,milliseconds])</term>
 	  <listitem>
 	    <para>
+		Sets the seconds component of a Date.
+		If the value of "seconds" is from 0-59, the hours and
+		minutes will be unchanged.
+	    </para>
+	    <para>
+		An optional extra parameter can be used to simultanously
+		set the milliseconds, though only to a precision of
+		one millisecond: fractions of milliseconds can be given
+		but are ignored). Likewise, any fractional part of a second
+		is ignored.
+	    </para>
+	    <para>
+		As usual, values outside the range 0-999 for milliseconds
+		are (added or subtracted) from the seconds,
+		and values outside the range 0-59 for the seconds carry over
+		into the minutes, hours etc.
+	    </para>
+	    <para>
+		Non-numerical values for "seconds" or "milliseconds"
+		result in the Date's value being set to NotANumber.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -222,7 +435,15 @@
 	  <term>setTime()</term>
 	  <listitem>
 	    <para>
+		Sets a Date object to a specified number of milliseconds
+		since 1 Jan 1970 in Universal Coordinated Time.
+		Fractions of milliseconds are ignored;
+		the only way to set a a date to sub-millisecond accuracy
+		is to use the single-argument version of the Date constructor.
 	    </para>
+	    <para>
+		If no parameters are supplied, or if the parameter cannot be
+		converted to a number, the Date's value is set to NotANumber.
 	  </listitem>
 	</varlistentry>
 
@@ -230,6 +451,8 @@
 	  <term>setUTCDate()</term>
 	  <listitem>
 	    <para>
+		Is the same as setDate(),
+		but specifying the time in Universal Coordinated Time.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -238,6 +461,8 @@
 	  <term>setUTCFullYear()</term>
 	  <listitem>
 	    <para>
+		Is the same as setFullYear(),
+		but specifying the time in Universal Coordinated Time.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -246,6 +471,8 @@
 	  <term>setUTCHours()</term>
 	  <listitem>
 	    <para>
+		Is the same as setHours(),
+		but specifying the time in Universal Coordinated Time.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -254,6 +481,7 @@
 	  <term>setUTCMilliseconds()</term>
 	  <listitem>
 	    <para>
+		Is the same as setMilliseconds().
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -262,6 +490,14 @@
 	  <term>setUTCMinutes()</term>
 	  <listitem>
 	    <para>
+		Is the same as setMinutes(),
+		but specifying the time in Universal Coordinated Time.
+	    </para>
+	    <para>
+		This differs from setMinutes in countries that have
+		a time offset that is not a whole number of hours and on
+		Lord Howe Island which also has daylight savings time of
+		half an hour.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -270,6 +506,8 @@
 	  <term>setUTCMonth()</term>
 	  <listitem>
 	    <para>
+		Is the same as setMonth(),
+		but specifying the time in Universal Coordinated Time.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -278,14 +516,19 @@
 	  <term>setUTCSeconds()</term>
 	  <listitem>
 	    <para>
+		Is the same as setSeconds(),
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>setYear()</term>
+	  <term>setYear(year[,month[,dayofmonth]])</term>
 	  <listitem>
 	    <para>
+		Is the same as setFullYear(), except that values from
+		0 to 99 specify the years 1900 to 1999, and negative values
+		specify a year prior to 1900. Thus the only way to specify
+		the year 55AD with this method is to use -1845.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -294,14 +537,41 @@
 	  <term>toString()</term>
 	  <listitem>
 	    <para>
+		Converts a Date object to a printable string in the form
+		"Thu Jan 1 00:00:00 GMT+0000 1970" in local time, according to
+		the local timezone and whether Daylight Saving Time
+		was in force at the time in question.
+	    </para>
+	    <para>
+		If the Date's value is NotANumber or Infinity,
+		the string "Invalid Date" is returned.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>UTC()</term>
+	  <term>UTC(year,month[,dayofmonth[,hour[,minutes[,seconds[,milliseconds]]]]])</term>
 	  <listitem>
 	    <para>
+		Is a static function that converts the specified time,
+		expressed in Universal Coordinated Time,
+		to a Date value. It is most often used in conjunction with
+		the Date constructor or the setTime method, to create a
+		Date object according to UTC.
+	    </para>
+	    <para>
+		All parameters are 0-based except "month" which is 1-based,
+		and the usual carry/borrow rules apply for oversized and
+		negative values.
+	    </para>
+	    <para>
+		A missing day-of-month defaults to the first of the month;
+		the other parameters default to zero.
+	    </para>
+	    <para>
+		If less than two paramemters are supplied, or if any supplied
+		parameters cannot be converted to numeric values, the Date's
+		value is set to NotANumber.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -333,7 +603,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -343,7 +613,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -353,7 +623,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -363,7 +633,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -373,7 +643,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -383,7 +653,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -393,7 +663,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -403,7 +673,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -413,7 +683,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -423,7 +693,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -433,7 +703,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -443,7 +713,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -453,7 +723,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -463,7 +733,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -473,7 +743,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -483,7 +753,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -493,7 +763,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -503,7 +773,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -513,7 +783,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -523,7 +793,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -533,7 +803,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -543,7 +813,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -553,7 +823,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -563,7 +833,13 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
+		</para>
+		<para>
+		  The commercial player, given d.setMinutes(), leaves the
+		  date set to a random value such as 9th December 2077 BC.
+		  Gnash gives NotANumber, in the same way as all the
+		  other functions.
 		</para>
 	      </entry>
 	    </row>
@@ -573,7 +849,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -583,7 +859,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -593,7 +869,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -603,7 +879,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -613,7 +889,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -623,7 +899,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -633,7 +909,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -643,7 +919,8 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
+		  See setMinutes above.
 		</para>
 	      </entry>
 	    </row>
@@ -653,7 +930,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -663,7 +940,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -673,7 +950,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -683,7 +960,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
 		</para>
 	      </entry>
 	    </row>
@@ -693,7 +970,12 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method is unimplemented.
+		  Implemented.
+		</para>
+		<para>
+		  The commercial player, given Date.UTC(Infinity, 0),
+		  returns -6.77681005679712e+19;
+		  Gnash returns NAN if any parameter is non-numeric.
 		</para>
 	      </entry>
 	    </row>

Index: server/asobj/Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/asobj/Date.cpp	18 Apr 2007 11:00:29 -0000	1.41
+++ server/asobj/Date.cpp	18 Apr 2007 13:47:24 -0000	1.42
@@ -22,10 +22,6 @@
 // Implements methods of the ActionScript "Date" class for Gnash
 //
 // TODO:
-//	implement static method Date.UTC
-//	Make Date constructor treat years <100 as after (or before) 1900.
-//	Check whether Date.TimezoneOffset just returns geographical timezone
-//	or if it also includes DST in force at the specified moment.
 //	What does Flash setTime() do/return if you hand it 0 parameters?
 //
 // BUGS:
@@ -36,20 +32,17 @@
 //	this is not worth doing unless we also implement full-range localtime
 //	operations too.
 //
-//	If day=31 and you setYear() to April, or if you change Feb 29 from a
-//	leap year to a non-leap year, the date should "wrap" into the next
-//	month; our current code does not modify the date at all.
-//
-//	If setMonth is called with one parameter, the new month has fewer
-//	days than the old and the old day is beyond the end of the new month,
-//	the day-of-month should be set to the last day of the requested month
-//	(our current code wraps it into the first days of the following month).
+//	We probably get negative datestamps (1901-1969) wrong sometimes but
+//	don't really care that much.
 //
 // FEATURES:
 //	Flash Player does not seem to respect TZ or the zoneinfo database;
 //	It changes to/from daylight saving time according to its own rules.
 //	We use the operating system's localtime routines.
 //
+//	Flash player does bizarre things for some argument combinations,
+//	returning datestamps of /6.*e+19  We don't bother doing this...
+//
 // It may be useful to convert this to use libboost's date_time stuff
 // http://www.boost.org/doc/html/date_time.html
 // Pros:
@@ -71,15 +64,15 @@
 //        static function main(mc) {
 //		var now = new Date();
 //		var s:String;
-//               _root.createTextField("tf",0,0,0,320,200);
 //		s = now.toString();	// or whatever
-//		trace(s);			// output in gnash -v
+//              _root.createTextField("tf",0,0,0,320,200);
 //              _root.tf.text = now.toString(); // output in flash player
+//		trace(s);			// output in gnash -v
 //        }
 // }
 // in test.as, compile with
 //	mtasc -swf test.swf -main -header 320:200:10 test.as
-// and open test.swf in the commercial Flash Player.
+// and get someone to open test.swf for you in the commercial Flash Player.
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -108,19 +101,21 @@
 // Declaration for replacement timezone functions
 // In the absence of gettimeofday() we use ftime() to get milliseconds,
 // but not for timezone offset bcos ftime's TZ stuff is unreliable.
-// For that we use tzset()/timezone if it is available
-// However, ftime() is the only reliable way to get the timezone offset.
+// For that we use tzset()/timezone if it is available.
+
+// The structure of these ifdefs mimics the structure of the code below
+// where these things are used if available.
 
-#if HAVE_FTIME
+#if !defined(HAVE_GETTIMEOFDAY) || (!defined(HAVE_TM_GMTOFF) && !defined(HAVE_TZSET))
+# if HAVE_FTIME
 # include <sys/timeb.h>		// for ftime()
+# endif
 #endif
 
-// Is broken on BSD where timezone(int,int) is a function (!)
-// See comment at line 497 for a better implementation
-#undef HAVE_TZSET	
-
-#if HAVE_TZSET
-extern long timezone;		// for tzset()/timezone
+#if !defined(HAVE_TM_GMTOFF)
+# if HAVE_LONG_TIMEZONE
+extern long timezone;		// for tzset()/long timezone;
+# endif
 #endif
 
 namespace gnash {
@@ -141,6 +136,11 @@
 // forward declarations
 static void utctime(double tim, struct tm *tmp, double *msecp);
 static double mkutctime(struct tm *tmp, double msec);
+static void local_date_to_tm_msec(double value, struct tm &tm, double &msec);
+static void utc_date_to_tm_msec(double value, struct tm &tm, double &msec);
+static double local_tm_msec_to_date(struct tm &tm, double &msec);
+static double utc_tm_msec_to_date(struct tm &tm, double &msec);
+static double rogue_date_args(const fn_call& fn, int maxargs);
 #endif
 
 // Select functions to implement _localtime_r and _gmtime_r
@@ -345,6 +345,7 @@
 //
 /// The constructor has three forms: 0 args, 1 arg and 2-7 args.
 /// new Date() sets the Date to the current time of day
+/// new Date(undefined[,*]) does the same.
 /// new Date(timeValue:Number) sets the date to a number of milliseconds since
 ///	1 Jan 1970 UTC
 /// new Date(year, month[,date[,hour[,minute[,second[,millisecond]]]]])
@@ -364,8 +365,20 @@
 
 	date_as_object *date = new date_as_object;
 
+	// Reject all date specifications containing Infinities and NaNs.
+	// The commercial player does different things according to which
+	// args are NaNs or Infinities:
+	// for now, we just use rogue_date_args' algorithm
+	{
+		double foo;
+		if ((foo = rogue_date_args(fn, 7)) != 0.0) {
+			date->value = foo;
+			return as_value(date);
+		}
+	}
+
 	// TODO: move this to date_as_object constructor
-	if (fn.nargs < 1) {
+	if (fn.nargs < 1 || fn.arg(0).is_undefined()) {
 		// Set from system clock
 #ifdef HAVE_GETTIMEOFDAY
 		struct timeval tv;
@@ -373,11 +386,14 @@
 
 		gettimeofday(&tv,&tz);
 		date->value = (double)tv.tv_sec * 1000.0 + tv.tv_usec / 1000.0;
-#else
+#elif HAVE_FTIME
 		struct timeb tb;
 		
 		ftime (&tb);
 		date->value = (double)tb.time * 1000.0 + tb.millitm;
+#else
+		// Poo! Use old time() to get seconds only
+		date->value = time((time_t *) 0) * 1000.0;
 #endif
 	} else if (fn.nargs == 1) {
 		// Set the value in milliseconds since 1970 UTC
@@ -523,19 +539,31 @@
 // date_getutcmilliseconds is implemented by date_getmilliseconds.
 
 
-// Return number of minutes east of GMT, also used in toString()
+// Return the difference between UTC and localtime+DST for a given date/time
+// as the number of minutes east of GMT.
 
-// Yet another implementation option is suggested by localtime(3):
-// "The glibc version of struct tm has additional fields
-// long tm_gmtoff;           /* Seconds east of UTC */
-// defined when _BSD_SOURCE was set before including <time.h>"
-
-static int minutes_east_of_gmt()
+static int minutes_east_of_gmt(struct tm &tm)
 {
-#if HAVE_TZSET
+#if HAVE_TM_GMTOFF
+	// tm_gmtoff is in seconds east of GMT; convert to minutes.
+	return((int) (tm.tm_gmtoff / 60));
+#else
+	// Find the geographical system timezone offset and add an hour if
+	// DST applies to the date.
+	// To get it really right I guess we should call both gmtime()
+	// and localtime() and look at the difference.
+	//
+	// The range of standard time is GMT-11 to GMT+14.
+	// The most extreme with DST is Chatham Island GMT+12:45 +1DST
+
+	int minutes_east;
+
+	// Find out system timezone offset...
+
+# if defined(HAVE_TZSET) && defined(HAVE_LONG_TIMEZONE)
 	tzset();
-	return(-timezone/60); // timezone is seconds west of GMT
-#elif HAVE_FTIME
+	minutes_east = -timezone/60; // timezone is seconds west of GMT
+# elif HAVE_FTIME
 	// ftime(3): "These days the contents of the timezone and dstflag
 	// fields are undefined."
 	// In practice, timezone is -120 in Italy when it should be -60.
@@ -543,8 +571,8 @@
 		
 	ftime (&tb);
 	// tb.timezone is number of minutes west of GMT
-	return(-tb.timezone);
-#elif HAVE_GETTIMEOFDAY
+	minutes_east = -tb.timezone;
+# elif HAVE_GETTIMEOFDAY
 	// gettimeofday(3):
 	// "The use of the timezone structure is obsolete; the tz argument
 	// should normally be specified as NULL. The tz_dsttime field has
@@ -554,17 +582,54 @@
 	struct timeval tv;
 	struct timezone tz;
 	gettimeofday(&tv,&tz);
-	return(-tz.tz_minuteswest);
-#else
-	return(0);	// No idea.
-#endif
+	minutes_east = -tz.tz_minuteswest;
+# else
+	minutes_east = 0;	// No idea.
+# endif
+
+	// ...and adjust by one hour if DST was in force at that time.
+	//
+	// According to http://www.timeanddate.com/time/, the only place that
+	// uses DST != +1 hour is Lord Howe Island with half an hour. Tough.
+
+	if (tm.tm_isdst == 0) {
+		// DST exists and is not in effect
+	} else if (tm.tm_isdst > 0) {
+		// DST exists and was in effect
+		minutes_east += 60;
+	} else {
+		// tm_isdst is negative: cannot get TZ info.
+		// Convert and print in UTC instead.
+		log_error("Cannot get timezone information");
+		minutes_east = 0;
+	}
+
+	return minutes_east;
+#endif // HAVE_TM_OFFSET
 }
 
+
 /// \brief Date.getTimezoneOffset
-/// returns the difference between localtime and UTC.
+/// returns the difference between localtime and UTC that was in effect at the
+/// time specified by a Date object, according to local timezone and DST.
+/// For example, if you are in GMT+0100, the offset is -60
+
+static as_value date_gettimezoneoffset(const fn_call& fn) {
+	boost::intrusive_ptr<date_as_object> date = ensureType<date_as_object>(fn.this_ptr);
+	struct tm tm;
+	double msec;
+
+	if (fn.nargs > 0) {
+	    IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("Date.getTimezoneOffset was called with parameters");
+	    )
+	}
 
-static as_value date_gettimezoneoffset(const fn_call& /* fn */) {
-	return as_value(minutes_east_of_gmt());
+	// Turn Flash datestamp into tm structure...
+	local_date_to_tm_msec(date->value, tm, msec);
+
+	// ...and figure out the timezone/DST offset from that.
+	return as_value(-minutes_east_of_gmt(tm));
 }
 
 
@@ -574,11 +639,10 @@
 
 /// \brief Date.setTime
 /// sets a Date in milliseconds after January 1, 1970 00:00 UTC.
-/// Returns value is the same aqs the paramemeter.
+/// The return value is the same as the parameter.
 static as_value date_settime(const fn_call& fn) {
 	boost::intrusive_ptr<date_as_object> date = ensureType<date_as_object>(fn.this_ptr);
 
-	// assert(fn.nargs == 1);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setTime needs one argument"));
@@ -617,13 +681,13 @@
 // Two low-level functions to convert between datestamps and time structures
 // whose contents are in local time
 
-// convert flash datestamp (number of milliseconds since the epoch as a double)
+// convert flash datestamp (number of milliseconds since the epoch)
 // to time structure and remaining milliseconds expressed in localtime.
 static void
-local_date_to_tm_msec(date_as_object& date, struct tm &tm, double &msec)
+local_date_to_tm_msec(double value, struct tm &tm, double &msec)
 {
-	time_t t = (time_t)(date.value / 1000.0);
-	msec = std::fmod(date.value, 1000.0);
+	time_t t = (time_t)(value / 1000.0);
+	msec = std::fmod(value, 1000.0);
 	_localtime_r(&t, &tm);	// break out date/time elements
 }
 
@@ -645,24 +709,24 @@
 	}
 }
 
-// Two low-level functions to convert between datestamps and time structures
-// whose contents are in UTC
+// Two low-level functions to convert between Flash datestamps
+// and time structures whose contents are in UTC
 //
 // gmtime() will split it for us, but mktime() only works in localtime.
 
 static void
-utc_date_to_tm_msec(date_as_object& date, struct tm &tm, double &msec)
+utc_date_to_tm_msec(double value, struct tm &tm, double &msec)
 {
 #if USE_UTCCONV
-	utctime(date.value, &tm, &msec);
+	utctime(value, &tm, &msec);
 #else
-	time_t t = (time_t)(date.value / 1000.0);
-	msec = std::fmod(date.value, 1000.0);
+	time_t t = (time_t)(value / 1000.0);
+	msec = std::fmod(value, 1000.0);
 	_gmtime_r(&t, &tm);
 #endif
 }
 
-// Until we find the correct algorithm, we can use mktime which, by
+// Until we find a better algorithm, we can use mktime which, by
 // experiment, seems to flip timezone at midnight, not at 2 in the morning,
 // so we use that to do year/month/day and put the unadjusted hours/mins/secs
 // in by hand. It's probably not right but it'll do for the moment.
@@ -701,9 +765,9 @@
 date_to_tm_msec(date_as_object& date, struct tm &tm, double &msec, bool utc)
 {
     if (utc)
-	utc_date_to_tm_msec(date, tm, msec);
+	utc_date_to_tm_msec(date.value, tm, msec);
     else
-	local_date_to_tm_msec(date, tm, msec);
+	local_date_to_tm_msec(date.value, tm, msec);
 }
 
 //
@@ -747,11 +811,13 @@
 static as_value _date_setfullyear(const fn_call& fn, bool utc) {
 	boost::intrusive_ptr<date_as_object> date = ensureType<date_as_object>(fn.this_ptr);
 
-	// assert(fn.nargs >= 1 && fn.nargs <= 3);
 	if (fn.nargs < 1) {
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setFullYear needs one argument"));
 	    )
+	    date->value = NAN;
+	} else if (rogue_date_args(fn, 3) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    struct tm tm; double msec;
 
@@ -794,12 +860,18 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setYear needs one argument"));
 	    )
+	    date->value = NAN;
+	} else if (rogue_date_args(fn, 3) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    struct tm tm; double msec;
 
 	    date_to_tm_msec(*date, tm, msec, false);
 	    tm.tm_year = (int) fn.arg(0).to_number();
-	    if (tm.tm_year < 100) tm.tm_year += 1900;
+	    // tm_year is number of eyars since 1900, so if they gave a
+	    // full year spec, we must adjust it.
+	    if (tm.tm_year >= 100) tm.tm_year -= 1900;
+
 	    if (fn.nargs >= 2)
 		    tm.tm_mon = (int) fn.arg(1).to_number();
 	    if (fn.nargs >= 3)
@@ -809,7 +881,7 @@
 		    log_aserror(_("Date.setYear was called with more than three arguments"));
 		)
 	    }
-	    tm_msec_to_date(tm, msec, *date, false);
+	    tm_msec_to_date(tm, msec, *date, false); // utc=false: use localtime
 	}
 	return as_value(date->value);
 }
@@ -822,6 +894,12 @@
 /// the day should be set to the last day of the specified month.
 /// This implementation currently wraps it into the next month, which is wrong.
 
+// If no arguments are given or if an invalid type is given,
+// the commercial player sets the month to January in the same year.
+// Only if the second parameter is present and has a non-numeric value,
+// the result is NAN.
+// We do not do the same cos it's a bugger to code.
+
 static as_value _date_setmonth(const fn_call& fn, bool utc) {
 	boost::intrusive_ptr<date_as_object> date = ensureType<date_as_object>(fn.this_ptr);
 
@@ -830,13 +908,31 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setMonth needs one argument"));
 	    )
+	    date->value = NAN;
+	} else if (rogue_date_args(fn, 2) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    struct tm tm; double msec;
+	    double monthvalue; // result from to_number()
 
 	    date_to_tm_msec(*date, tm, msec, utc);
-	    tm.tm_mon = (int) fn.arg(0).to_number();
-	    if (fn.nargs >= 2)
-		    tm.tm_mday = (int) fn.arg(2).to_number();
+
+	    // It seems odd, but FlashPlayer takes all bad month values to mean
+	    // January.
+	    monthvalue =  fn.arg(0).to_number();
+	    if (isnan(monthvalue) || isinf(monthvalue)) monthvalue = 0.0;
+	    tm.tm_mon = (int) monthvalue;
+
+	    // If the day-of-month value is invalid instead, the result is NAN.
+	    if (fn.nargs >= 2) {
+		double mdayvalue = fn.arg(1).to_number();
+		if (isnan(mdayvalue) || isinf(mdayvalue)) {
+		    date->value = NAN;
+		    return as_value(date->value);
+		} else {
+		    tm.tm_mday = (int) mdayvalue;
+		}
+	    }
 	    if (fn.nargs > 2) {
 		IF_VERBOSE_ASCODING_ERRORS(
 		    log_aserror(_("Date.setMonth was called with more than three arguments"));
@@ -860,6 +956,9 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setDate needs one argument"));
 	    )
+	    date->value = NAN;	// Is what FlashPlayer sets
+	} else if (rogue_date_args(fn, 1) != 0.0) {
+	    date->value = NAN;
 	} else {
 		struct tm tm; double msec;
 
@@ -895,6 +994,9 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setHours needs one argument"));
 	    )
+	    date->value = NAN;	// Is what FlashPlayer sets
+	} else if (rogue_date_args(fn, 4) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    struct tm tm; double msec;
 
@@ -932,6 +1034,10 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setMinutes needs one argument"));
 	    )
+	    date->value = NAN;	// FlashPlayer instead leaves the date set to
+				// a random value such as 9th December 2077 BC
+	} else if (rogue_date_args(fn, 3) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    struct tm tm; double msec;
 
@@ -965,6 +1071,9 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setSeconds needs one argument"));
 	    )
+	    date->value = NAN;	// Same as commercial player
+	} else if (rogue_date_args(fn, 2) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    // We *could* set seconds [and milliseconds] without breaking the
 	    // structure out and reasembling it. We do it the same way as the
@@ -981,6 +1090,8 @@
 		    log_aserror(_("Date.setMinutes was called with more than three arguments"));
 		)
 	    }
+	    // This is both setSeconds and setUTCSeconds.
+	    // Use utc to avoid needless worrying about timezones.
 	    tm_msec_to_date(tm, msec, *date, utc);
 	}
 	return as_value(date->value);
@@ -994,9 +1105,12 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.setMilliseconds needs one argument"));
 	    )
+	    date->value = NAN;
+	} else if (rogue_date_args(fn, 1) != 0.0) {
+	    date->value = NAN;
 	} else {
 	    // Zero the milliseconds and set them from the argument.
-	    date->value = std::fmod(date->value, 1000.0) + (int) fn.arg(0).to_number();
+	    date->value = date->value - std::fmod(date->value, 1000.0) + (int) fn.arg(0).to_number();
 	    if (fn.nargs > 1) {
 		IF_VERBOSE_ASCODING_ERRORS(
 		    log_aserror(_("Date.setMilliseconds was called with more than one argument"));
@@ -1048,38 +1162,27 @@
 
 	boost::intrusive_ptr<date_as_object> date = ensureType<date_as_object>(fn.this_ptr);
 	
-	time_t t = (time_t) (date->value / 1000.0);
+	/// NAN and infinities all print as "Invalid Date"
+	if (isnan(date->value) || isinf(date->value)) {
+		strcpy(buffer, "Invalid Date");
+		return as_value((char *)&buffer);
+	}
+
+	// The date value split out to year, month, day, hour etc and millisecs
 	struct tm tm;
+	double msec;
+	// Time zone offset (including DST) as hours and minutes east of GMT
 	int tzhours, tzminutes;
 
-	_localtime_r(&t, &tm);
+	local_date_to_tm_msec(date->value, tm, msec);
 
 	// At the meridian we need to print "GMT+0100" when Daylight Saving
 	// Time is in force, "GMT+0000" when it isn't, and other values for
 	// other places around the globe when DST is/isn't in force there.
-	//
-	// For now, just take time East of GMT and add an hour if DST is
-	// active. To get it right I guess we should call both gmtime()
-	// and localtime() and look at the difference.
-	//
-	// According to http://www.timeanddate.com/time/, the only place that
-	// uses DST != +1 hour is Lord Howe Island with half an hour. Tough.
-
-	tzhours = (tzminutes = minutes_east_of_gmt()) / 60, tzminutes %= 60;
 
-	if (tm.tm_isdst == 0) {
-		// DST exists and is not in effect
-	} else if (tm.tm_isdst > 0) {
-		// DST exists and is in effect
-		tzhours++;
-		// The range of standard time is GMT-11 to GMT+14.
-		// The most extreme with DST is Chatham Island GMT+12:45 +1DST
-	} else {
-		// tm_isdst is negative: cannot get TZ info.
-		// Convert and print in UTC instead.
-		_gmtime_r(&t, &tm);
-		tzhours = tzminutes = 0;
-	}
+	// Split offset into hours and minutes
+	tzminutes = minutes_east_of_gmt(tm);
+	tzhours = tzminutes / 60, tzminutes %= 60;
 
 	// If timezone is negative, both hours and minutes will be negative
 	// but for the purpose of printing a string, only the hour needs to
@@ -1113,11 +1216,19 @@
 // This probably doesn't handle exceptional cases such as NaNs and infinities
 // the same as the commercial player. What that does is:
 // - if any argument is NaN, the result is NaN
-// - if one or more arguments are +Infinity, the result is +Infinity
-// - if one or more arguments are -Infinity, the result is -Infinity
-// - if both +Infinity and -Infinity are present in the args, result is NaN.
+// - if one or more of the optional arguments are +Infinity,
+//	the result is +Infinity
+// - if one or more of the optional arguments are -Infinity,
+//	the result is -Infinity
+// - if both +Infinity and -Infinity are present in the optional args,
+//	or if one of the first two arguments is not numeric (including Inf),
+//	the result is NaN.
+// Actually, given a first parameter of Infinity,-Infinity or NAN,
+// it returns -6.77681005679712e+19 but that's just crazy.
+//
+// We test for < 2 parameters and return undefined, but given any other
+// non-numeric arguments we give NAN.
 
-static double rogue_date_args(const fn_call& fn);	// Forward decl
 
 static as_value date_utc(const fn_call& fn) {
 	struct tm tm;	// Date structure for values down to seconds
@@ -1128,13 +1239,13 @@
 	    IF_VERBOSE_ASCODING_ERRORS(
 		log_aserror(_("Date.UTC needs one argument"));
 	    )
-	    return as_value();
+	    return as_value();	// undefined
 	}
 
 	// Check for presence of NaNs and Infinities in the arguments 
 	// and return the appropriate value if so.
-	if ( (result = rogue_date_args(fn)) != 0.0) {
-		return as_value(result);
+	if ( (result = rogue_date_args(fn, 7)) != 0.0) {
+		return as_value(NAN);
 	}
 
 	// Preset default values
@@ -1175,8 +1286,10 @@
 
 // Auxillary function checks for Infinities and NaN in a function's args and
 // returns 0.0 if there are none, 
+// plus (or minus) infinity if positive (or negative) infinites are present,
+// NAN is there are NANs present, or a mixture of positive and negative infs.
 static double
-rogue_date_args(const fn_call& fn) {
+rogue_date_args(const fn_call& fn, int maxargs) {
 	// Two flags: Did we find any +Infinity (or -Infinity) values in the
 	// argument list? If so, "infinity" must be set to the kind that we
 	// found.
@@ -1185,7 +1298,10 @@
 	double infinity = 0.0;	// The kind of infinity we found.
 				// 0.0 == none yet.
 
-	for (unsigned int i = 0; i < fn.nargs; i++) {
+	// Only check the present parameters, up to the stated maximum number
+	if (fn.nargs < maxargs) maxargs = fn.nargs;
+
+	for (unsigned int i = 0; i < maxargs; i++) {
 		double arg = fn.arg(i).to_number();
 
 		if (isnan(arg)) return(NAN);

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/asobj/Global.cpp	18 Apr 2007 11:00:29 -0000	1.59
+++ server/asobj/Global.cpp	18 Apr 2007 13:47:24 -0000	1.60
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Global.cpp,v 1.59 2007/04/18 11:00:29 jgilmore Exp $ */
+/* $Id: Global.cpp,v 1.60 2007/04/18 13:47:24 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -435,13 +435,11 @@
 	init_member("isNaN", new builtin_function(as_global_isnan));
 	init_member("isFinite", new builtin_function(as_global_isfinite));
 
-	// NaN should only be in _global since SWF6, but this is just because
-	// SWF5 or lower did not have a "_global" reference at all, most likely
-	init_member("NaN", as_value(std::numeric_limits<double>::quiet_NaN()));
-
-	// Infinity should only be in _global since SWF6, but this is just because
-	// SWF5 or lower did not have a "_global" reference at all, most likely
-	init_member("Infinity", as_value(std::numeric_limits<double>::infinity()));
+	// NaN and Infinity should only be in _global since SWF6,
+	// but this is just because SWF5 or lower did not have a "_global"
+	// reference at all, most likely.
+	init_member("NaN", as_value(NAN));
+	init_member("Infinity", as_value(INFINITY));
 
 	if ( vm.getSWFVersion() < 6 ) goto extscan;
 	//-----------------------

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/as_value.h	16 Apr 2007 18:23:05 -0000	1.44
+++ server/as_value.h	18 Apr 2007 13:47:24 -0000	1.45
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.44 2007/04/16 18:23:05 strk Exp $ */
+/* $Id: as_value.h,v 1.45 2007/04/18 13:47:24 martinwguy Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -49,6 +49,10 @@
 #       define NAN (std::numeric_limits<double>::quiet_NaN())
 #endif
 
+#ifndef INFINITY
+#       define INFINITY (std::numeric_limits<double>::infinity());
+#endif
+
 
 #ifndef isnan
 # define isnan(x) \

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/as_value.cpp	18 Apr 2007 09:35:42 -0000	1.38
+++ server/as_value.cpp	18 Apr 2007 13:47:24 -0000	1.39
@@ -259,25 +259,31 @@
 			// @@ Moock says the rule here is: if the
 			// string is a valid float literal, then it
 			// gets converted; otherwise it is set to NaN.
-			//
-			// Also, "Infinity", "-Infinity", and "NaN"
-			// are recognized by strtod() but not by Flash Player.
 			char* tail=0;
 			m_number_value = strtod(m_string_value.c_str(), &tail);
+			// Detect failure by "tail" still being at the start of
+			// the string or there being extra junk after the
+			// converted characters.
 			if ( tail == m_string_value.c_str() || *tail != 0 )
 			{
 				// Failed conversion to Number.
 				m_number_value = NAN;
 			}
+
+			// "Infinity" and "-Infinity" are recognized by strtod()
+			// but Flash Player returns NaN for them.
+			if ( isinf(m_number_value) ) {
+				m_number_value = NAN;
+			}
+
 			return m_number_value;
 		}
 
 		case NULLTYPE:
 		case UNDEFINED:
 			// Evan: from my tests
-			// Martin: I tried var foo = new Number(null) and got NaN
-			if ( swfversion >= 7 ) return std::numeric_limits<double>::quiet_NaN();
-			else return 0;
+			// Martin: FlashPlayer6 gives 0; FP9 gives NaN.
+			return ( swfversion >= 7 ? NAN : 0 );
 
 		case BOOLEAN:
 			// Evan: from my tests
@@ -288,7 +294,6 @@
 			return m_number_value;
 
 		case OBJECT:
-		case AS_FUNCTION:
 		{
 			// @@ Moock says the result here should be
 			// "the return value of the object's valueOf()
@@ -299,7 +304,6 @@
 			//log_msg(_("OBJECT to number conversion, env is %p"), env);
 
 			as_object* obj = m_object_value; 
-			bool gotValidValueOfResult = false;
 			if ( env )
 			{
 				std::string methodname = "valueOf";
@@ -310,7 +314,6 @@
 					as_value ret = call_method0(method, env, obj);
 					if ( ret.is_number() )
 					{
-						gotValidValueOfResult=true;
 						return ret.m_number_value;
 					}
 					else
@@ -323,11 +326,14 @@
 					log_msg(_("get_member(%s) returned false"), methodname.c_str());
 				}
 			}
-			if ( ! gotValidValueOfResult )
-			{
 				return obj->get_numeric_value(); 
 			}
-		}
+
+		case AS_FUNCTION:
+			// This used to be the same case as AS_OBJECT,
+			// but empirically "new String(_root.createTextField)"
+			// or any other function returns NAN.
+			return NAN;
 
 		case MOVIECLIP:
 			// This is tested, no valueOf is going
@@ -339,6 +345,7 @@
 			// every GUI's movie canvas shrinks to size 0x0. No idea why.
 			return NAN; // 0.0;
 	}
+	/* NOTREACHED */
 }
 
 // Conversion to boolean for SWF7 and up

Index: testsuite/actionscript.all/Date.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Date.as,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/actionscript.all/Date.as	27 Mar 2007 09:05:23 -0000	1.20
+++ testsuite/actionscript.all/Date.as	18 Apr 2007 13:47:24 -0000	1.21
@@ -1,4 +1,4 @@
-// 
+/N/ 
 //   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Date.as,v 1.20 2007/03/27 09:05:23 strk Exp $";
+rcsid="$Id: Date.as,v 1.21 2007/04/18 13:47:24 martinwguy Exp $";
 
 #include "check.as"
 
@@ -32,12 +32,12 @@
 // returning 2147483647 instead of the correct value.
 check_equals (Date.UTC(2000,0,1).valueOf(), 946684800000.0);
 
-// test the Date constructor.
+// test the Date constructor exists.
 // This specific value is used below to check conversion back to year/mon/day etc
 var d = new Date(70,1,2,3,4,5,6);
-check (d);
+check (d != undefined);
 
-// test methods existance
+// test methods' existence
 check (d.getDate != undefined);
 check (d.getDay != undefined);
 check (d.getFullYear != undefined);
@@ -121,105 +121,323 @@
 
 #endif
 
-// var d = new Date(70,1,2,3,4,5,6);	// See above
-trace ("Testing random d");
-check_equals (d.getFullYear(), 1970);
-check_equals (d.getYear(), 70);
-check_equals (d.getMonth(), 1);
-check_equals (d.getDate(), 2);
-check_equals (d.getHours(), 3);
-check_equals (d.getMinutes(), 4);
-check_equals (d.getSeconds(), 5);
-check_equals (d.getMilliseconds(), 6);
-
-// Test decoding methods
-// Check the epoch, 1 Jan 1970
-trace ("Testing 1 Jan 1970 UTC");
-check_equals (d.setTime(0), 0);
-check_equals (d.getTime(), 0);
-check_equals (d.getUTCFullYear(), 1970);
-check_equals (d.getUTCMonth(), 0);
-check_equals (d.getUTCDate(), 1);
-check_equals (d.getUTCDay(), 4);	// It was a Thursday
-check_equals (d.getUTCHours(), 0);
-check_equals (d.getUTCMinutes(), 0);
-check_equals (d.getUTCSeconds(), 0);
-check_equals (d.getUTCMilliseconds(), 0);
-check_equals (d.valueOf(), 0);
+// Some values we will use to test things
+    var zero = 0.0;
+    var plusinfinity = 1.0/zero;
+    var minusinfinity = -1.0/zero;
+    var notanumber = zero/zero;
+
+// Check Date constructor in its many forms,
+// (also uses valueOf() and toString() methods)
+
+// Constructor with no args sets current localtime
+    var d = new Date();
+	check (d != undefined);
+	// Check it's a valid number after 1 April 2007
+	check (d.valueOf() > 1175385600000.0)
+	// and before Jan 1 2037 00:00:00
+	check (d.valueOf() < 2114380800000.0)
+
+// Constructor with first arg == undefined also sets current localtime
+    var d2 = new Date(undefined);
+	check (d2 != undefined);
+	check (d2.valueOf() >= d.valueOf());
+// that shouldn't have taken more than five seconds!
+	check (d2.valueOf() < d.valueOf() + 5000);
+    delete d2;
+
+// One numeric argument sets milliseconds since 1970 UTC
+    delete d; var d = new Date(0);
+	// Check UTC "get" methods too
+	check_equals(d.valueOf(), 0);
+	check_equals(d.getTime(), 0);
+	check_equals(d.getUTCFullYear(), 1970);
+	check_equals(d.getUTCMonth(), 0);
+	check_equals(d.getUTCDate(), 1);
+	check_equals(d.getUTCDay(), 4);	// It was a Thursday
+	check_equals(d.getUTCHours(), 0);
+	check_equals(d.getUTCMinutes(), 0);
+	check_equals(d.getUTCSeconds(), 0);
+	check_equals(d.getUTCMilliseconds(), 0);
+// Check other convertible types
+// Booleans convert to 0 and 1
+    var foo = true; delete d; var d = new Date(foo);
+	check_equals(d.valueOf(), 1);
+    foo = false; delete d; var d = new Date(foo);
+	check_equals(d.valueOf(), 0);
+// Numeric strings
+    foo = "12345"; delete d; var d = new Date(foo);
+	check_equals(d.valueOf(), 12345.0);
+    foo = "12345.0"; delete d; var d = new Date(foo);
+	check_equals(d.valueOf(), 12345.0);
+    foo = "12345.5"; delete d; var d = new Date(foo);
+	check_equals(d.valueOf(), 12345.5);	// Sets fractions of msec ok?
+    foo = "-12345"; delete d; var d = new Date(foo);
+	check_equals(d.valueOf(), -12345.0);
+// Bad numeric values
+	// NAN
+    delete d; var d = new Date(notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+	check_equals(d.toString(), "Invalid Date");
+	// Infinity
+    delete d; var d = new Date(plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+	check_equals(d.toString(), "Invalid Date");
+	// -Infinity
+    delete d; var d = new Date(minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+	check_equals(d.toString(), "Invalid Date");
+// Bogus values: non-numeric strings
+	foo = "bones"; delete d; var d = new Date(foo);
+	check_equals(d.valueOf().toString(), "NaN");
+	foo = "1234X"; delete d; var d = new Date(foo);
+	check_equals(d.valueOf().toString(), "NaN");
+// Bogus types: a function
+	foo = d.valueOf; var d2 = new Date(foo);
+	check_equals(d2.valueOf().toString(), "NaN");
+	delete d2;
+
+// Constructor with two numeric args means year and month in localtime.
+// Now we check the localtime decoding methods too.
+// Negative year means <1900; 0-99 means 1900-1999; 100- means 100-)
+// Month is 0-11. month>11 increments year; month<0 decrements year.
+    delete d; var d = new Date(70,0);	// 1 Jan 1970 00:00:00 localtime
+	check_equals(d.getYear(), 70);
+	check_equals(d.getFullYear(), 1970);
+	check_equals(d.getMonth(), 0);
+	check_equals(d.getDate(), 1);
+	check_equals(d.getDay(), 4);	// It was a Thursday
+	check_equals(d.getHours(), 0);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 0);
+	check_equals(d.getMilliseconds(), 0);
+// Check four-figure version - should be the same.
+    var d2 = new Date(1970,0); check_equals(d.valueOf(), d2.valueOf());
+// Check four-figure version and non-zero month
+    delete d; var d = new Date(2000,3);	// 1 April 2000 00:00:00 localtime
+	check_equals(d.getYear(), 100);
+	check_equals(d.getFullYear(), 2000);
+	check_equals(d.getMonth(), 3);
+	check_equals(d.getDate(), 1);
+	check_equals(d.getDay(), 6);	// It was a Saturday
+	check_equals(d.getHours(), 0);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 0);
+	check_equals(d.getMilliseconds(), 0);
+// Check month overflow/underflow
+    delete d; var d = new Date(2000,12);
+	check_equals(d.getFullYear(), 2001);
+	check_equals(d.getMonth(), 0);
+    delete d; var d = new Date(2000,-18);
+	check_equals(d.getFullYear(), 1998);
+	check_equals(d.getMonth(), 6);
+// Bad numeric value handling: year is an invalid number with >1 arg
+// The commercial player for these first three cases gives
+// -6.77681005679712e+19  Tue Jan -719527 00:00:00 GMT+0000
+// but that doesn't seem worth emulating...
+    delete d; var d = new Date(notanumber,0);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(plusinfinity,0);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(minusinfinity,0);
+	check_equals(d.valueOf().toString(), "-Infinity");
+// Bad numeric value handling: month is an invalid number
+    delete d; var d = new Date(0,notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(0,plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(0,minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+
+// Constructor with three numeric args means year month day-of-month
+    delete d; var d = new Date(2000,0,1); // 1 Jan 2000 00:00:00 localtime
+	check_equals(d.getFullYear(), 2000);
+	check_equals(d.getMonth(), 0);
+	check_equals(d.getDate(), 1);
+// Check day-of-month overflow/underflow
+    delete d; var d = new Date(2000,0,32); // 32 Jan -> 1 Feb
+	check_equals(d.getFullYear(), 2000);
+	check_equals(d.getMonth(), 1);
+	check_equals(d.getDate(), 1);
+    delete d; var d = new Date(2000,1,0); // 0 Feb -> 31 Jan
+	check_equals(d.getFullYear(), 2000);
+	check_equals(d.getMonth(), 0);
+	check_equals(d.getDate(), 31);
+    delete d; var d = new Date(2000,0,-6); // -6 Jan 2000 -> 25 Dec 1999
+	check_equals(d.getFullYear(), 1999);
+	check_equals(d.getMonth(), 11);
+	check_equals(d.getDate(), 25);
+// Bad numeric value handling when day-of-month is an invalid number
+// A bad month always returns NaN but a bad d-o-m returns the infinities.
+    delete d; var d = new Date(2000,0,notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(2000,0,plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(2000,0,minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+    // Check bad string value
+    foo = "bones"; delete d; var d = new Date(2000,0,foo);
+	check_equals(d.valueOf().toString(), "NaN");
+
+// Constructor with four numeric args means year month day-of-month hour
+    delete d; var d = new Date(2000,0,1,12);
+	check_equals(d.getHours(), 12);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 0);
+	check_equals(d.getMilliseconds(), 0);
+    // Check that fractional parts of hours are ignored
+    delete d; var d = new Date(2000,0,1,12.5);
+	check_equals(d.getHours(), 12);
+	check_equals(d.getMinutes(), 0);
+    // Check hours overflow/underflow
+    delete d; var d = new Date(2000,0,1,25);
+	check_equals(d.getDate(), 2);
+	check_equals(d.getHours(), 1);
+    // Bad hours, like bad d-o-m, return infinites.
+    delete d; var d = new Date(2000,0,1,notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(2000,0,1,plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(2000,0,1,minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+    // Check bad string value
+    foo = "bones"; delete d; var d = new Date(2000,0,1,foo);
+	check_equals(d.valueOf().toString(), "NaN");
+
+// Constructor with five numeric args means year month day-of-month hour min
+    delete d; var d = new Date(2000,0,1,12,30);
+	check_equals(d.getHours(), 12);
+	check_equals(d.getMinutes(), 30);
+	check_equals(d.getSeconds(), 0);
+	check_equals(d.getMilliseconds(), 0);
+    // Check minute overflow/underflow
+    delete d; var d = new Date(2000,0,1,12,70);
+	check_equals(d.getHours(), 13);
+	check_equals(d.getMinutes(), 10);
+	check_equals(d.getSeconds(), 0);
+    delete d; var d = new Date(2000,0,1,12,-120);
+	check_equals(d.getHours(), 10);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 0);
+    // Infinite minutes return infinites.
+    delete d; var d = new Date(2000,0,1,0,notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(2000,0,1,0,plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(2000,0,1,0,minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+    // Check bad string value
+    foo = "bones"; delete d; var d = new Date(2000,0,1,0,foo);
+	check_equals(d.valueOf().toString(), "NaN");
+
+// Constructor with six numeric args means year month d-of-m hour min sec
+// Check UTC seconds here too since it should be the same.
+    delete d; var d = new Date(2000,0,1,0,0,45);
+	check_equals(d.getHours(), 0);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 45);
+	check_equals(d.getUTCSeconds(), 45);
+	check_equals(d.getMilliseconds(), 0);
+    // Check second overflow/underflow
+    delete d; var d = new Date(2000,0,1,12,0,70);
+	check_equals(d.getHours(), 12);
+	check_equals(d.getMinutes(), 1);
+	check_equals(d.getSeconds(), 10);
+    delete d; var d = new Date(2000,0,1,12,0,-120);
+	check_equals(d.getHours(), 11);
+	check_equals(d.getMinutes(), 58);
+	check_equals(d.getSeconds(), 0);
+    // Infinite seconds return infinites.
+    delete d; var d = new Date(2000,0,1,0,0,notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(2000,0,1,0,0,plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(2000,0,1,0,0,minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+    // Check bad string value
+    foo = "bones"; delete d; var d = new Date(2000,0,1,0,0,foo);
+	check_equals(d.valueOf().toString(), "NaN");
+
+// Constructor with seven numeric args means year month dom hour min sec msec
+// Check UTC milliseconds here too since it should be the same.
+    delete d; var d = new Date(2000,0,1,0,0,0,500);
+	check_equals(d.getHours(), 0);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 0);
+	check_equals(d.getMilliseconds(), 500);
+	check_equals(d.getUTCMilliseconds(), 500);
+    // Fractions of milliseconds are ignored here
+    delete d; var d = new Date(2000,0,1,0,0,0,500.5);
+	check_equals(d.getMilliseconds(), 500.0);
+    // Check millisecond overflow/underflow
+    delete d; var d = new Date(2000,0,1,12,0,0,1000);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 1);
+	check_equals(d.getMilliseconds(), 0);
+    delete d; var d = new Date(2000,0,1,12,0,0,-120000);
+	check_equals(d.getHours(), 11);
+	check_equals(d.getMinutes(), 58);
+	check_equals(d.getSeconds(), 0);
+    // Infinite milliseconds return infinites.
+    delete d; var d = new Date(2000,0,1,0,0,0,notanumber);
+	check_equals(d.valueOf().toString(), "NaN");
+    delete d; var d = new Date(2000,0,1,0,0,0,plusinfinity);
+	check_equals(d.valueOf().toString(), "Infinity");
+    delete d; var d = new Date(2000,0,1,0,0,0,minusinfinity);
+	check_equals(d.valueOf().toString(), "-Infinity");
+    // Check bad string value
+    foo = "bones"; delete d; var d = new Date(2000,0,1,0,0,0,foo);
+	check_equals(d.valueOf().toString(), "NaN");
+    // Finally, check that a millisecond is enough to overflow/underflow a year
+    delete d; var d = new Date(1999,11,31,23,59,59,1001);
+	check_equals(d.getFullYear(), 2000);
+	check_equals(d.getMonth(), 0);
+	check_equals(d.getDate(), 1);
+	check_equals(d.getMinutes(), 0);
+	check_equals(d.getSeconds(), 0);
+	check_equals(d.getMilliseconds(), 1);
+    delete d; var d = new Date(2000,0,1,0,0,0,-1);
+	check_equals(d.getFullYear(), 1999);
+	check_equals(d.getMonth(), 11);
+	check_equals(d.getDate(), 31);
+	check_equals(d.getMinutes(), 59);
+	check_equals(d.getSeconds(), 59);
+	check_equals(d.getMilliseconds(), 999);
+// If a mixture of infinities and/or NaNs are present the result is NaN.
+    delete d; var d = new Date(2000,0,1,plusinfinity,minusinfinity,0,0);
+	check_equals(d.valueOf().toString(), "NaN");
+
+// It's hard to test TimezoneOffset because the values will be different
+// depending upon where geographically you run the tests.
+// We do what we can without knowing where we are!
 
-trace ("Testing 1 Jan 2000 UTC");
-d.setUTCFullYear(2000, 0, 1);
-d.setUTCHours(0, 0, 0);
-check_equals (d.getUTCFullYear(), 2000);
-check_equals (d.getUTCMonth(), 0);
-check_equals (d.getUTCDate(), 1);
-check_equals (d.getUTCDay(), 6);	// It was a Saturday
+// Set midnight local time, adjust for tzoffset
+// and this should give us midnight UTC.
+//
+// If we are in GMT+1 then TimezoneOffset is -60.
+// If we set midnight localtime in the GMT+1 zone,
+// that is 23:00 the day before in UTC (because in GMT+1 clock times happen
+// an hour earlier than they do in "real" time).
+// Thus to set UTC to midnight we need to subtract the TimezoneOffset.
+delete d;
+var d = new Date(2000, 0, 1, 0, 0, 0, 0);
+d.setTime(d.getTime() - (60000 * d.getTimezoneOffset()));
 check_equals (d.getUTCHours(), 0);
-check_equals (d.getUTCMinutes(), 0);
-check_equals (d.getUTCSeconds(), 0);
-check_equals (d.getUTCMilliseconds(), 0);
-check_equals (d.valueOf(), 946684800000.0);	// Same as flashplayer gives
 
-trace ("Testing 1 Jul 2000 UTC");
-d.setUTCFullYear(2000, 6, 1);
-d.setUTCHours(0, 0, 0);
-check_equals (d.getUTCFullYear(), 2000);
-check_equals (d.getUTCMonth(), 6);
-check_equals (d.getUTCDate(), 1);
-check_equals (d.getUTCDay(), 6);	// It was a Saturday
+// Try the same thing in July to get one with DST and one without
+d = new Date(2000, 6, 1, 0, 0, 0, 0);
+d.setTime(d.getTime() - (60000 * d.getTimezoneOffset()));
 check_equals (d.getUTCHours(), 0);
-check_equals (d.getUTCMinutes(), 0);
-check_equals (d.getUTCSeconds(), 0);
-check_equals (d.getUTCMilliseconds(), 0);
-check_equals (d.valueOf(), 962409600000.0);	// Same as flashplayer gives
 
-trace ("Testing 1 Jan 2000 localtime");
-// The many-argument version of the Date constructor sets the d in localtime
-delete d;
-var d = new Date(2000, 0, 1, 0, 0, 0, 0);
-check_equals (d.getFullYear(), 2000);
-check_equals (d.getYear(), 100);
-check_equals (d.getMonth(), 0);
-check_equals (d.getDate(), 1);
-check_equals (d.getDay(), 6);	// It was a Saturday
-check_equals (d.getHours(), 0);
-check_equals (d.getMinutes(), 0);
-check_equals (d.getSeconds(), 0);
-check_equals (d.getMilliseconds(), 0);
-
-trace ("Testing 1 Jul 2000 localtime");
-// The many-argument version of the Date constructor sets the d in localtime
-delete d;
-var d = new Date(2000, 6, 1, 0, 0, 0, 0);
-check_equals (d.getFullYear(), 2000);
-check_equals (d.getYear(), 100);
-check_equals (d.getMonth(), 6);
-check_equals (d.getDate(), 1);
-check_equals (d.getDay(), 6);	// It was a Saturday
-check_equals (d.getHours(), 0);
-check_equals (d.getMinutes(), 0);
-check_equals (d.getSeconds(), 0);
-check_equals (d.getMilliseconds(), 0);
-
-// Test TimezoneOffset and local hours by setting a d to the 1 Jan 2000 UTC
-// offset by the tzoffset so that localtime should be 00:00 or 01:00
-// (according to whether DST is active or not)
-
-trace ("Testing timezone offset");
-var tzoffset = new Number(d.getTimezoneOffset());	// in mins east of GMT
-trace("timezone offset = " + tzoffset.toString());
-d.setUTCFullYear(2000, 0, 1);
-d.setUTCHours(0, 0, 0, 0);
-d.setTime(d.getTime() - (60000*tzoffset));
-note("d.getHours(): "+d.getHours());
-check (d.getHours() >= 0);
-//check (d.getHours() <= 1);
 
-// Test behaviour when you set the time during DST then change the d to
-// a non-DST d.
+// Test behaviour when you set the time during DST then change
+// to a non-DST date.
 // setUTCHours should preserve the time of day in UTC;
 // setHours should preserve the time of day in localtime.
-trace ("Testing hour when setting d into/out of DST");
+//
+// We assume that January/December and June/July will have different DST values
+
+trace ("Testing hour when setting date into/out of DST");
 d.setUTCFullYear(2000, 0, 1);
 d.setUTCHours(0, 0, 0, 0);
 d.setUTCMonth(6);



From MAILER-DAEMON Wed Apr 18 10:02:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeAju-0004fO-3x
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:02:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeAjt-0004fJ-DO
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:02:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeAjs-0004eu-Lt
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:02:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeAjs-0004em-I3
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:02:28 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeAf2-0003fI-1Q
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 09:57:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeAf0-0007dA-9S
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:57:26 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeAez-0007d7-TZ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:57:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeAez-0007d7-TZ@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 18 Apr 2007 13:57:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/dlist...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:02:29 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/18 13:57:25

Modified files:
	.              : ChangeLog 
	server         : character.h dlist.cpp 
	server/swf     : PlaceObject2Tag.cpp 

Log message:
	fix masks bug; introduce isMask()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2909&r2=1.2910
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2909
retrieving revision 1.2910
diff -u -b -r1.2909 -r1.2910
--- ChangeLog	18 Apr 2007 13:47:24 -0000	1.2909
+++ ChangeLog	18 Apr 2007 13:57:25 -0000	1.2910
@@ -1,3 +1,8 @@
+2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/character.h, server/dlist.cpp, server/swf/PlaceObject2Tag.cpp:
+	  make masks work again, introduce isMask()   
+		
 2007-04-18 Martin Guy <martinwguy@yahoo.it>
 
 	* configure.ac: Introduce HAVE_LONG_TIMEZONE if extern long timezone

Index: server/character.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/character.h,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- server/character.h	18 Apr 2007 13:24:44 -0000	1.68
+++ server/character.h	18 Apr 2007 13:57:25 -0000	1.69
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.68 2007/04/18 13:24:44 strk Exp $ */
+/* $Id: character.h,v 1.69 2007/04/18 13:57:25 udog Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -242,6 +242,11 @@
     ///
     static const int staticDepthOffset = -16384;
 
+    /// This value is used for m_clip_depth when the value has no meaning, ie.
+    /// the character is not a mask. Depths below -16384 are illegal, so this
+    /// value should not collide with real depths.  
+    static const int noClipDepthValue = -1000000;
+
     ~character();
 
     character(character* parent, int id)
@@ -332,9 +337,22 @@
       m_ratio = f;       
     }
 
+    /// Returns the clipping depth (if any) of this character. The parameter is 
+    /// tells us to use the character as a mask for all the objects contained 
+    /// in the display list from m_depth to m_clipping_depth inclusive.
+    /// 
+    /// The value returned by get_clip_depth() is only valid when isMask()
+    /// returns true!
+    ///  
     int get_clip_depth() const { return m_clip_depth; }
     void set_clip_depth(int d) { m_clip_depth = d; }
 
+    /// Returns true when the character (and it's childs) are used as a mask
+    /// for other characters. isMask() does *not* return true when one of it's
+    /// parents is a mask and the character itself is not.
+    ///   
+    bool isMask() const { return m_clip_depth!=noClipDepthValue; }
+
     virtual void set_name(const char* name) { _name = name; }
 
     const std::string& get_name() const { return _name; }

Index: server/dlist.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/dlist.cpp	18 Apr 2007 09:35:42 -0000	1.59
+++ server/dlist.cpp	18 Apr 2007 13:57:25 -0000	1.60
@@ -646,7 +646,7 @@
 		}
 
 		// check whether this object should become mask
-		if (ch->get_clip_depth() > 0)
+		if (ch->isMask())
 		{
 			//log_msg(_("begin submit mask"));
 			render::begin_submit_mask();
@@ -657,7 +657,7 @@
 		// if this object should have become a mask,
 		// inform the renderer that it now has all
 		// information about it
-		if (ch->get_clip_depth() > 0)
+		if (ch->isMask())
 		{
 			//log_msg(_("end submit mask"));
 			render::end_submit_mask();

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/PlaceObject2Tag.cpp	11 Apr 2007 17:54:22 -0000	1.2
+++ server/swf/PlaceObject2Tag.cpp	18 Apr 2007 13:57:25 -0000	1.3
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: PlaceObject2Tag.cpp,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.3 2007/04/18 13:57:25 udog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -229,7 +229,10 @@
 
 	if (has_name) m_name = in->read_string();
 
-	if (has_clip_bracket) m_clip_depth = in->read_u16()+character::staticDepthOffset; 
+	if (has_clip_bracket) 
+		m_clip_depth = in->read_u16()+character::staticDepthOffset;
+	else 
+		m_clip_depth = character::noClipDepthValue; 
 
 	if (has_actions)
 	{



From MAILER-DAEMON Wed Apr 18 10:12:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeAtv-000712-A1
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:12:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeAts-00070r-TN
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:12:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeAtj-0006yp-7L
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:12:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeAti-0006yl-VK
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:12:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HeAoq-00050V-AZ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:07:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeAoo-00087L-Fp
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:07:34 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HeAoo-00087I-4C
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:07:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeAoo-00087I-4C@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Wed, 18 Apr 2007 14:07:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Sound.cpp server/a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:12:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/18 14:07:33

Modified files:
	.              : ChangeLog 
	server/asobj   : Sound.cpp SoundFfmpeg.cpp SoundGst.cpp 
	                 SoundMad.cpp Stage.cpp System.cpp 
	                 TextSnapshot.cpp Video.cpp gen-asclass.pl 
	                 gen-asclass.sh string.cpp xml.cpp xmlnode.cpp 
	                 xmlsocket.cpp 
	server/parser  : BitmapMovieDefinition.cpp action_buffer.cpp 
	                 button_character_def.cpp 
	                 edit_text_character_def.cpp 
	                 morph2_character_def.cpp movie_def_impl.cpp 
	                 shape_character_def.cpp sprite_definition.cpp 
	                 sprite_definition.h text_character_def.cpp 
	server/swf     : DefineFontAlignZonesTag.cpp PlaceObject2Tag.cpp 
	                 tag_loaders.cpp 
	server/vm      : ASHandlers.cpp ActionExec.cpp action.cpp 
	libbase        : curl_adapter.cpp extension.cpp log.cpp 
	                 network.cpp FLVParser.cpp FLVParser.h 

Log message:
	* Internationalization, phase 2.
	
	* These modules have had their printed messages passed through
	  _(...).  Those messages have also been cleaned up, thusly:
	    *  Stray \n's removed
	    *  Exclamation points and periods removed at ends of messages
	    *  Typos corrected, and English language wording adjusted.
	    *  Misplaced UPPER CASE shouting removed.
	    *  Many complaints about unknown types, values, etc, now include
	       the offending value, for ease of remote diagnosis.
	    *  C++-style << printouts converted to log_xxx calls.
	    *  Direct accesses to dbglogfile converted to log_xxx calls.
	    *  printf converted to log_xxx calls.
	    *  Function name debug prints converted to GNASH_REPORT_FUNCTION.
	  These changes should also make the messages easier to	translate.
	* Commented-out messages were also cleaned up as above.
	* Many modules have also had log_warning calls changed to log_msg,
	  log_error, log_aserror, log_swferror, or log_unimp, according to
	  the documentation checked in earlier by strk and gnu.
	  IF_VERBOSE_xxx macros were inserted around some calls that
	  lacked them.
	* Header comments (at the top of the file) added or adjusted, to
	  describe each file in its initial line, and to correct whitespace
	  in the copyright notices.  Eliminate trailing spaces and tabs.
	
	* The list of files affected by the above changes:
	  server/asobj/Sound.cpp
	  server/asobj/SoundFfmpeg.cpp
	  server/asobj/SoundGst.cpp
	  server/asobj/SoundMad.cpp
	  server/asobj/Stage.cpp	
	  server/asobj/System.cpp	
	  server/asobj/TextSnapshot.cpp	
	  server/asobj/Video.cpp	
	  server/asobj/gen-asclass.pl
	  server/asobj/gen-asclass.sh
	  server/asobj/string.cpp
	  server/asobj/xml.cpp
	  server/asobj/xmlnode.cpp
	  server/asobj/xmlsocket.cpp
	  server/parser/BitmapMovieDefinition.cpp
	  server/parser/action_buffer.cpp
	  server/parser/button_character_def.cpp
	  server/parser/edit_text_character_def.cpp
	  server/parser/morph2_character_def.cpp
	  server/parser/movie_def_impl.cpp
	  server/parser/shape_character_def.cpp
	  server/parser/sprite_definition.cpp
	  server/parser/sprite_definition.h
	  server/parser/text_character_def.cpp
	  server/swf/DefineFontAlignZonesTag.cpp	
	  server/swf/PlaceObject2Tag.cpp
	  server/swf/tag_loaders.cpp
	  server/vm/ASHandlers.cpp
	  server/vm/ActionExec.cpp
	  server/vm/action.cpp
	  libbase/curl_adapter.cpp
	  libbase/extension.cpp
	  libbase/log.cpp
	  libbase/network.cpp
	
	* 2007 copyright notices were inserted in:
	  libbase/curl_adapter.cpp
	
	* New 2006, 2007 Free Software Foundation copyrights applied (to
	  formerly public domain code):
	  server/parser/button_character_def.cpp
	  server/parser/edit_text_character_def.cpp
	  server/parser/morph2_character_def.cpp
	  server/parser/movie_def_impl.cpp
	  server/parser/shape_character_def.cpp
	 
	* server/asobj/gen-asclass.{pl,sh}:  Use log_unimpl in generated code.
	  Improve whitespace, and generate header line describing the file.
	* text_character_def.cpp:  Remove commented-out includes.
	* FLVParser.{cpp,h}:  Fix compiler warning (signed/unsigned).
	
	I'm sure that I've missed some messages that ought to get 
	translated (with _(...)).  Those will be fixed over time.
	All new messages should be created with _(...) so they can
	be translated.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2910&r2=1.2911
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Sound.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundFfmpeg.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundGst.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SoundMad.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/System.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextSnapshot.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Video.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.pl?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.sh?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlnode.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/BitmapMovieDefinition.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/button_character_def.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/morph2_character_def.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/text_character_def.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.88&r2=1.89
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/extension.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/FLVParser.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2910
retrieving revision 1.2911
diff -u -b -r1.2910 -r1.2911
--- ChangeLog	18 Apr 2007 13:57:25 -0000	1.2910
+++ ChangeLog	18 Apr 2007 14:07:32 -0000	1.2911
@@ -51,6 +51,7 @@
 	       the offending value, for ease of remote diagnosis.
 	    *  C++-style << printouts converted to log_xxx calls.
 	    *  Direct accesses to dbglogfile converted to log_xxx calls.
+	    *  printf converted to log_xxx calls.
 	    *  Function name debug prints converted to GNASH_REPORT_FUNCTION.
 	  These changes should also make the messages easier to	translate.
 	* Commented-out messages were also cleaned up as above.
@@ -61,7 +62,7 @@
 	  lacked them.
 	* Header comments (at the top of the file) added or adjusted, to
 	  describe each file in its initial line, and to correct whitespace
-	  in the copyright notices.
+	  in the copyright notices.  Eliminate trailing spaces and tabs.
 	
 	* The list of files affected by the above changes:
 	  backend/sound_handler_sdl.cpp
@@ -112,6 +113,40 @@
 	  server/asobj/Object.cpp
 	  server/asobj/Selection.cpp
 	  server/asobj/SharedObject.cpp
+	  server/asobj/Sound.cpp
+	  server/asobj/SoundFfmpeg.cpp
+	  server/asobj/SoundGst.cpp
+	  server/asobj/SoundMad.cpp
+	  server/asobj/Stage.cpp	
+	  server/asobj/System.cpp	
+	  server/asobj/TextSnapshot.cpp	
+	  server/asobj/Video.cpp	
+	  server/asobj/gen-asclass.pl
+	  server/asobj/gen-asclass.sh
+	  server/asobj/string.cpp
+	  server/asobj/xml.cpp
+	  server/asobj/xmlnode.cpp
+	  server/asobj/xmlsocket.cpp
+	  server/parser/BitmapMovieDefinition.cpp
+	  server/parser/action_buffer.cpp
+	  server/parser/button_character_def.cpp
+	  server/parser/edit_text_character_def.cpp
+	  server/parser/morph2_character_def.cpp
+	  server/parser/movie_def_impl.cpp
+	  server/parser/shape_character_def.cpp
+	  server/parser/sprite_definition.cpp
+	  server/parser/sprite_definition.h
+	  server/parser/text_character_def.cpp
+	  server/swf/DefineFontAlignZonesTag.cpp	
+	  server/swf/PlaceObject2Tag.cpp
+	  server/swf/tag_loaders.cpp
+	  server/vm/ASHandlers.cpp
+	  server/vm/ActionExec.cpp
+	  server/vm/action.cpp
+          libbase/curl_adapter.cpp
+	  libbase/extension.cpp
+	  libbase/log.cpp
+	  libbase/network.cpp
 	
 	* 2007 copyright notices were inserted in:
 	  backend/sound_handler_sdl.cpp
@@ -120,11 +155,17 @@
 	  plugin/klash/klash.cpp
 	  plugin/win32/plugin.cpp
 	  server/generic_character.cpp
+          libbase/curl_adapter.cpp
 	
 	* New 2006, 2007 Free Software Foundation copyrights applied (to
 	  formerly public domain code):
 	  server/font.cpp
 	  server/text.cpp
+	  server/parser/button_character_def.cpp
+	  server/parser/edit_text_character_def.cpp
+	  server/parser/morph2_character_def.cpp
+	  server/parser/movie_def_impl.cpp
+	  server/parser/shape_character_def.cpp
 	 
 	* backend/sound_handler_sdl.cpp: Move stray FORMAT_VORBIS comment.
 	* gui/gui.cpp: Commented out "Resize request when no movie" error
@@ -137,6 +178,10 @@
 	  function, so it can use log_xxx functions.
 	* server/sprite_instance.cpp (sprite_attach_movie):  Comment out
 	  log_msg about initializing properties.
+        * server/asobj/gen-asclass.{pl,sh}:  Use log_unimpl in generated code.
+	  Improve whitespace, and generate header line describing the file.
+	* text_character_def.cpp:  Remove commented-out includes.
+	* FLVParser.{cpp,h}:  Fix compiler warning (signed/unsigned).
 	
 	I'm sure that I've missed some messages that ought to get 
 	translated (with _(...)).  Those will be fixed over time.

Index: server/asobj/Sound.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Sound.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/Sound.cpp	16 Apr 2007 18:23:06 -0000	1.14
+++ server/asobj/Sound.cpp	18 Apr 2007 14:07:32 -0000	1.15
@@ -1,3 +1,4 @@
+// Sound.cpp:  ActionScript Sound output stub class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -5,12 +6,12 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -83,7 +84,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 }
@@ -94,7 +95,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 }
@@ -105,7 +106,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 }
@@ -116,7 +117,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 }
@@ -136,10 +137,10 @@
 void
 Sound::loadSound(std::string file, bool /*streaming*/)
 {
-	log_msg("%s is still testing!!", __FUNCTION__);
+	log_msg(_("%s is still testing!"), __FUNCTION__);
 
 	if (connection) {
-		log_warning("This sound already has a connection?? (We try to handle this by deleting the old one...)");
+		log_error(_("%s: This sound already has a connection?  (We try to handle this by deleting the old one...)"), __FUNCTION__);
 		delete connection;
 	}
 	externalURL = file;
@@ -154,7 +155,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 }
@@ -165,7 +166,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 }
@@ -213,7 +214,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: only works when ffmpeg, gstreamer or libmad is enabled", __FUNCTION__);
+		log_error(_("%s: only works when ffmpeg, gstreamer or libmad is enabled"), __FUNCTION__);
 		warned = true;
 	}
 	return 0;
@@ -225,7 +226,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_error("%s: only works when ffmpeg, gstreamer or libmad is enabled", __FUNCTION__);
+		log_error(_("%s: only works when ffmpeg, gstreamer or libmad is enabled"), __FUNCTION__);
 		warned = true;
 	}
 	return 0;
@@ -252,7 +253,9 @@
 as_value
 sound_start(const fn_call& fn)
 {
-	log_action("-- start sound");
+	IF_VERBOSE_ACTION (
+	log_action(_("-- start sound"));
+	)
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
 	int loop = 0;
 	int secondOffset = 0;
@@ -275,7 +278,9 @@
 as_value
 sound_stop(const fn_call& fn)
 {
-	log_action("-- stop sound ");
+	IF_VERBOSE_ACTION (
+	log_action(_("-- stop sound "));
+	)
 	boost::intrusive_ptr<Sound> so = ensureType<Sound>(fn.this_ptr);
 
 	int si = -1;
@@ -290,7 +295,7 @@
 		if (res == NULL)
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-		    log_swferror("import error: resource '%s' is not exported", name.c_str());
+		    log_swferror(_("import error: resource '%s' is not exported"), name.c_str());
 		    	);
 		    return as_value();
 		}
@@ -304,7 +309,7 @@
 		}
 		else
 		{
-		    log_error("sound sample is NULL (doesn't cast to sound_sample)");
+		    log_error(_("sound sample is NULL (doesn't cast to sound_sample)"));
 		    return as_value();
 		}
 
@@ -316,11 +321,13 @@
 as_value
 sound_attachsound(const fn_call& fn)
 {
-    log_action("-- attach sound");
+    IF_VERBOSE_ACTION (
+    log_action(_("-- attach sound"));
+    )
     if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("attach sound needs one argument");
+	    log_aserror(_("attach sound needs one argument"));
 	    	);
 	    return as_value();
 	}
@@ -330,7 +337,7 @@
     const std::string& name = fn.arg(0).to_string(&(fn.env()));
     if (name.empty()) {
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("attachSound need a non-empty string");
+		log_aserror(_("attachSound needs a non-empty string"));
 		);
 		return as_value();
 	}
@@ -342,7 +349,7 @@
 	if (res == NULL)
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("import error: resource '%s' is not exported", name.c_str());
+		log_swferror(_("import error: resource '%s' is not exported"), name.c_str());
 			);
 		return as_value();
 	}
@@ -356,7 +363,7 @@
 	}
 	else
 	{
-		log_error("sound sample is NULL (doesn't cast to sound_sample)");
+		log_error(_("sound sample is NULL (doesn't cast to sound_sample)"));
 		return as_value();
 	}
 
@@ -372,7 +379,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -384,7 +391,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -396,7 +403,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -408,7 +415,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -431,7 +438,7 @@
 {
 	if (fn.nargs != 2) {
 		IF_VERBOSE_ASCODING_ERRORS(
-	    log_aserror("loadSound needs 2 arguments!");
+	    log_aserror(_("loadSound needs 2 arguments"));
 	    	);
 	    return as_value();		
 	}
@@ -448,7 +455,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -460,7 +467,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -472,7 +479,7 @@
 	if (fn.nargs < 1)
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("set volume of sound needs one argument");
+		log_aserror(_("set volume of sound needs one argument"));
 		);
 		return as_value();
 	}
@@ -497,7 +504,7 @@
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_warning("%s: unimplemented", __FUNCTION__);
+		log_unimpl (__FUNCTION__);
 		warned = true;
 	}
 	return as_value();
@@ -579,4 +586,3 @@
 }
 
 } // end of gnash namespace
-

Index: server/asobj/SoundFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundFfmpeg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/SoundFfmpeg.cpp	4 Apr 2007 20:30:45 -0000	1.6
+++ server/asobj/SoundFfmpeg.cpp	18 Apr 2007 14:07:32 -0000	1.7
@@ -1,3 +1,4 @@
+// SoundFfmpeg.cpp:  Gnash sound output via FFMPEG library.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -5,12 +6,12 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -88,7 +89,8 @@
 	// Pass stuff from/to the NetConnection object.
 	assert(so);
 	if ( !nc->openConnection(so->externalURL.c_str(), so) ) {
-		log_warning("Gnash could not open audio url: %s", so->externalURL.c_str());
+		log_error(_("%s could not open audio url: %s"), 
+				__FUNCTION__, so->externalURL.c_str());
 		delete so->lock;
 		return;
 	}
@@ -110,7 +112,8 @@
 	pd->buf_size = 2048;
 
 	if (readPacket(so, pd->buf, pd->buf_size) < 1){
- 		log_warning("Gnash could not read from audio url: %s", so->externalURL.c_str());
+ 		log_error(_("%s: could not read from audio url: %s"), 
+				__FUNCTION__, so->externalURL.c_str());
  		delete[] pd->buf;
  		delete so->lock;
  		return;
@@ -130,7 +133,7 @@
 
 	// Open the stream. the 4th argument is the filename, which we ignore.
 	if(av_open_input_stream(&so->formatCtx, &so->ByteIOCxt, "", inputFmt, NULL) < 0){
-		log_error("Couldn't open file '%s' for decoding", so->externalURL.c_str());
+		log_error(_("Couldn't open file '%s' for decoding"), so->externalURL.c_str());
 		delete so->lock;
 		return;
 	}
@@ -140,7 +143,7 @@
 	int ret = av_find_stream_info(so->formatCtx);
 	if (ret < 0)
 	{
-		log_error("Couldn't find stream information from '%s', error code: %d", so->externalURL.c_str(), ret);
+		log_error(_("Couldn't find stream information from '%s', error code: %d"), so->externalURL.c_str(), ret);
 		delete so->lock;
 		return;
 	}
@@ -166,14 +169,16 @@
 			case CODEC_TYPE_DATA:
 			case CODEC_TYPE_SUBTITLE:
 			case CODEC_TYPE_UNKNOWN:
-				log_warning("Non-audio data found in file %s\n", so->externalURL.c_str());
+				log_error(_("Non-audio data (type %d) found in file %s"),
+				   enc->codec_type, so->externalURL.c_str());
+		
 				break;
 		}
 	}
 
 	if (so->audioIndex < 0)
 	{
-		log_error("Didn't find a audio stream from '%s'", so->externalURL.c_str());
+		log_error(_("Didn't find a audio stream from '%s'"), so->externalURL.c_str());
 		return;
 	}
 
@@ -184,7 +189,8 @@
 	AVCodec* pACodec = avcodec_find_decoder(so->audioCodecCtx->codec_id);
     if(pACodec == NULL)
 	{
-		log_error("No available AUDIO decoder to process file: '%s'", so->externalURL.c_str());
+		log_error(_("No available audio decoder %d to process file: '%s'"),
+		   so->audioCodecCtx->codec_id, so->externalURL.c_str());
 		delete so->lock;
 		return;
 	}
@@ -192,7 +198,8 @@
 	// Open codec
 	if (avcodec_open(so->audioCodecCtx, pACodec) < 0)
 	{
-		log_error("Could not open AUDIO codec");
+		log_error(_("Could not open audio codec %d for %s"),
+		   so->audioCodecCtx->codec_id, so->externalURL.c_str());
 		delete so->lock;
 		return;
 	}
@@ -310,7 +317,7 @@
 
 				// Seek to begining of file
 				if (av_seek_frame(so->formatCtx, so->audioIndex, 0, 0) < 0) {
-					log_warning("seeking to start of file (for looping) failed\n");
+					log_error(_("seeking to start of file (for looping) failed"));
 					so->remainingLoops = 0;
 				}
 			} else {
@@ -362,7 +369,7 @@
 	remainingLoops = 0;
 
 	if (connection) {
-		log_warning("This sound already has a connection?? (We try to handle this by deleting the old one...)\n");
+		log_error(_("This sound already has a connection.  (We try to handle this by deleting the old one...)"));
 		delete connection;
 	}
 	externalURL = file;
@@ -392,7 +399,8 @@
 			long newpos = (long)(offset / timebase);
 
 			if (av_seek_frame(formatCtx, audioIndex, newpos, 0) < 0) {
-				log_warning("seeking to offset failed\n");
+				log_error(_("%s: seeking to offset failed"),
+					__FUNCTION__);
 			}
 		}
 		// Save how many loops to do
@@ -459,4 +467,3 @@
 }
 
 } // end of gnash namespace
-

Index: server/asobj/SoundGst.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundGst.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/asobj/SoundGst.cpp	23 Mar 2007 00:30:10 -0000	1.4
+++ server/asobj/SoundGst.cpp	18 Apr 2007 14:07:32 -0000	1.5
@@ -1,3 +1,4 @@
+// SoundGst.cpp:  Produce sound for gnash, via Gstreamer library.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -5,12 +6,12 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -104,7 +105,7 @@
 void
 SoundGst::callback_newpad (GstElement* /*decodebin*/, GstPad *pad, gboolean /*last*/, gpointer data)
 {
-printf("new pad found\n");
+	log_msg(_("%s: new pad found"), __FUNCTION__);
 	SoundGst* so = static_cast<SoundGst*>(data);
 	GstCaps *caps;
 	GstStructure *str;
@@ -118,14 +119,14 @@
 	if (g_strrstr (gst_structure_get_name (str), "audio")) {
 		// link'n'play
 		gst_pad_link (pad, audiopad);
-printf("new pad connected\n");
+		log_msg(_("%s: new pad connected"), __FUNCTION__);
 	} else {
 		gst_object_unref (audiopad);
-		log_warning("Non-audio data found in file %s\n", so->externalURL.c_str());
+		log_error(_("%s: Non-audio data found in file %s"), __FUNCTION__,
+				so->externalURL.c_str());
 	}
 	gst_caps_unref (caps);
 	return;
-
 }
 
 void
@@ -138,7 +139,7 @@
 	// Pass stuff from/to the NetConnection object.
 	assert(so);
 	if ( !nc->openConnection(so->externalURL.c_str(), so) ) {
-		log_warning("Gnash could not open audio url: %s", so->externalURL.c_str());
+		log_error(_("could not open audio url: %s"), so->externalURL.c_str());
 		delete so->lock;
 		return;
 	}
@@ -167,11 +168,11 @@
 
 	// Check if the creation of the gstreamer pipeline and audiosink was a succes
 	if (!so->pipeline) {
-		gnash::log_error("The gstreamer pipeline element could not be created\n");
+		gnash::log_error(_("Could not create gstreamer pipeline element"));
 		return;
 	}
 	if (!so->audiosink) {
-		gnash::log_error("The gstreamer audiosink element could not be created\n");
+		gnash::log_error(_("Could not create gstreamer audiosink element"));
 		return;
 	}
 
@@ -194,7 +195,7 @@
 
 
 	if (!so->source || !so->audioconv || !so->volume || !so->decoder) {
-		gnash::log_error("Gstreamer element(s) for movie handling could not be created\n");
+		gnash::log_error(_("Could not create Gstreamer element(s) for movie handling"));
 		return;
 	}
 
@@ -225,7 +226,7 @@
 	remainingLoops = 0;
 
 	if (connection) {
-		log_warning("This sound already has a connection?? (We try to handle this by deleting the old one...)\n");
+		log_error(_("%s: This sound already has a connection?  (We try to handle this by deleting the old one...)"), __FUNCTION__);
 		delete connection;
 	}
 	externalURL = file;
@@ -253,7 +254,8 @@
 			if (!gst_element_seek (pipeline, 1.0, GST_FORMAT_TIME, GST_SEEK_FLAG_FLUSH,
 				GST_SEEK_TYPE_SET, GST_SECOND * static_cast<long>(offset),
 				GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)) {
-				log_warning("seeking to offset failed\n");
+				log_error(_("%s: seeking to offset failed"), 
+					__FUNCTION__);
 			}
 
 		}
@@ -330,4 +332,3 @@
 }
 
 } // end of gnash namespace
-

Index: server/asobj/SoundMad.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SoundMad.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/SoundMad.cpp	27 Feb 2007 09:10:20 -0000	1.3
+++ server/asobj/SoundMad.cpp	18 Apr 2007 14:07:32 -0000	1.4
@@ -1,3 +1,4 @@
+// SoundMad.cpp:  Play sounds using libmad (MP3 audio decoder), for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -5,12 +6,12 @@
 // it under the terms of the GNU General Public License as published by
 // the Free Software Foundation; either version 2 of the License, or
 // (at your option) any later version.
-
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -79,7 +80,7 @@
 	// Pass stuff from/to the NetConnection object.
 	assert(so);
 	if ( !nc->openConnection(so->externalURL.c_str(), so) ) {
-		log_warning("Gnash could not open audio url: %s", so->externalURL.c_str());
+		log_error(_("Gnash could not open audio url: %s"), so->externalURL.c_str());
 		delete so->lock;
 		return;
 	}
@@ -116,7 +117,7 @@
 		// Error handling is done by relooping (max. 8 times) and just hooping that it will work...
 		if (loops > 8) break;
 		if (ret == -1 && so->stream.error != MAD_ERROR_BUFLEN && MAD_RECOVERABLE(so->stream.error)) {
-			log_warning("Recoverable error while decoding MP3, MAD error: %s", mad_stream_errorstr (&so->stream));
+			log_error(_("Recoverable error while decoding MP3, MAD error: %s"), mad_stream_errorstr (&so->stream));
 			continue;
 		}
 		break;
@@ -203,7 +204,7 @@
 					// Error handling is done by relooping (max. 8 times) and just hooping that it will work...
 					if (loops > 8) break;
 					if (ret == -1 && so->stream.error != MAD_ERROR_BUFLEN && MAD_RECOVERABLE(so->stream.error)) {
-						log_warning("Recoverable error while decoding MP3, MAD error: %s", mad_stream_errorstr (&so->stream));
+						log_error(_("Recoverable error while decoding MP3, MAD error: %s"), mad_stream_errorstr (&so->stream));
 						continue;
 					}
 					
@@ -211,7 +212,7 @@
 				}
 
 				if (ret == -1 && so->stream.error != MAD_ERROR_BUFLEN) {
-					log_error("Unrecoverable error while decoding MP3, MAD error: %s", mad_stream_errorstr (&so->stream));
+					log_error(_("Unrecoverable error while decoding MP3, MAD error: %s"), mad_stream_errorstr (&so->stream));
 					bufSize = 0;
 					loop = false;
 				} else if (ret == -1 && so->stream.error == MAD_ERROR_BUFLEN) {
@@ -266,9 +267,9 @@
 					s->convert_raw_data(&adjusted_data, &adjusted_size, tmp_raw_buffer, sample_count, 0, 
 							so->frame.header.samplerate, so->frame.header.mode);
 
-					// Hopefully this wont happen
+					// Hopefully this won't happen
 					if (!adjusted_data) {
-						log_warning("Error in sound sample convertion");
+						log_error(_("Error in sound sample convertion"));
 						continue;
 					}
 
@@ -347,7 +348,7 @@
 	remainingLoops = 0;
 
 	if (connection) {
-		log_warning("This sound already has a connection?? (We try to handle this by deleting the old one...)\n");
+		log_error(_("This sound already has a connection?  (We try to handle this by deleting the old one...)"));
 		delete connection;
 	}
 	externalURL = file;
@@ -436,4 +437,3 @@
 }
 
 } // end of gnash namespace
-

Index: server/asobj/Stage.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/Stage.cpp	16 Apr 2007 18:23:06 -0000	1.11
+++ server/asobj/Stage.cpp	18 Apr 2007 14:07:32 -0000	1.12
@@ -1,3 +1,4 @@
+// Stage.cpp:  All the world is one, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -157,7 +158,7 @@
 	if ( fn.nargs < 1 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Stage.addListener() needs one argument");
+		log_aserror(_("Stage.addListener() needs one argument"));
 		);
 		return as_value();
 	}
@@ -168,7 +169,7 @@
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss;
 		fn.dump_args(ss);
-		log_aserror("Invalid call to Stage.addListener(%s) : first arg doesn't cast to an object",
+		log_aserror(_("Invalid call to Stage.addListener(%s) : first arg doesn't cast to an object"),
 			ss.str().c_str());
 		);
 		return as_value();
@@ -185,7 +186,7 @@
 	if ( fn.nargs < 1 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Stage.removeListener() needs one argument");
+		log_aserror(_("Stage.removeListener() needs one argument"));
 		);
 		return as_value();
 	}
@@ -196,7 +197,7 @@
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss;
 		fn.dump_args(ss);
-		log_aserror("Invalid call to Stage.removeListener(%s) : first arg doesn't cast to an object",
+		log_aserror(_("Invalid call to Stage.removeListener(%s) : first arg doesn't cast to an object"),
 			ss.str().c_str());
 		);
 		return as_value();
@@ -231,12 +232,8 @@
 // extern (used by Global.cpp)
 void stage_class_init(as_object& global)
 {
-
 	static boost::intrusive_ptr<as_object> obj = new Stage();
 	global.init_member("Stage", obj.get());
-
 }
 
-
 } // end of gnash namespace
-

Index: server/asobj/System.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/System.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/System.cpp	19 Mar 2007 17:11:14 -0000	1.11
+++ server/asobj/System.cpp	18 Apr 2007 14:07:32 -0000	1.12
@@ -1,3 +1,4 @@
+// System.cpp:  ActionScript "System" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,12 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
-//
 //
 
 #ifdef HAVE_CONFIG_H
@@ -41,31 +40,31 @@
 void
 System::security_allowDomain()
 {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
 System::security_allowInsecureDomain()
 {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
 System::security_loadPolicyFile()
 {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
 System::setClipboard()
 {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
 System::showSettings()
 {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 #endif
@@ -137,27 +136,27 @@
 }
 
 as_value system_security_allowdomain(const fn_call& /*fn*/) {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
     return as_value();
 }
 
 as_value system_security_allowinsecuredomain(const fn_call& /*fn*/) {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
     return as_value();
 }
 
 as_value system_security_loadpolicyfile(const fn_call& /*fn*/) {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
     return as_value();
 }
 
 as_value system_setclipboard(const fn_call& /*fn*/) {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
     return as_value();
 }
 
 as_value system_showsettings(const fn_call& /*fn*/) {
-    log_msg("%s: unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
     return as_value();
 }
 
@@ -171,6 +170,4 @@
 	global.init_member("System", obj.get());
 }
 
-
-} // end of gnaash namespace
-
+} // end of gnash namespace

Index: server/asobj/TextSnapshot.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/TextSnapshot.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/TextSnapshot.cpp	19 Mar 2007 17:11:14 -0000	1.7
+++ server/asobj/TextSnapshot.cpp	18 Apr 2007 14:07:32 -0000	1.8
@@ -1,3 +1,4 @@
+// TextSnapshot.cpp:  ActionScript "TextSnapshot" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -85,35 +86,35 @@
 };
 
 as_value textsnapshot_findtext(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_getcount(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_getselected(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_getselectedtext(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_gettext(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_hittesttextnearpos(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_setselectcolor(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value textsnapshot_setselected(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 
@@ -137,14 +138,10 @@
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attachTextSnapshotInterface(*cl);
-		     
 	}
 
 	// Register _global.TextSnapshot
 	global.init_member("TextSnapshot", cl.get());
-
 }
 
-
 } // end of gnash namespace
-

Index: server/asobj/Video.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Video.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/Video.cpp	19 Mar 2007 17:11:14 -0000	1.8
+++ server/asobj/Video.cpp	18 Apr 2007 14:07:32 -0000	1.9
@@ -1,3 +1,4 @@
+// Video.cpp:  ActionScript "Video" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -70,11 +71,11 @@
 };
 
 as_value video_attachvideo(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 as_value video_clear(const fn_call& /*fn*/) {
-    log_warning("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 
@@ -98,14 +99,10 @@
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attachVideoInterface(*cl);
-		     
 	}
 
 	// Register _global.Video
 	global.init_member("Video", cl.get());
-
 }
 
-
 } // end of gnash namespace
-

Index: server/asobj/gen-asclass.pl
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/gen-asclass.pl	29 Mar 2007 12:06:44 -0000	1.2
+++ server/asobj/gen-asclass.pl	18 Apr 2007 14:07:32 -0000	1.3
@@ -18,8 +18,7 @@
 
 our $VERBOSE = 0;  ## default setting; can be changed by command-line option
 
-our $LICENSE = q|
-// 
+our $LICENSE = q|//
 // Copyright (C) | . (join ', ', (2005..((localtime)[5]+1900))) .
 q| Free Software Foundation, Inc.
 //
@@ -53,6 +52,9 @@
     open ($fh, '>', $args{headerfile}) or die
         "Cannot open file '$args{headerfile}': $!\n";
     notify("Creating file '$args{headerfile}'.");
+    print $fh <<EOF;
+// $args{headerfile}:  ActionScript "$args{class}" class, for Gnash.
+EOF
     print $fh $LICENSE;
 
     ## The text between the EOFs will be printed in the header file.
@@ -81,7 +83,6 @@
 
 // __GNASH_ASOBJ_$args{up}_H__
 #endif
-
 EOF
 
     close $fh;
@@ -96,6 +97,9 @@
     open ($fh, '>', $args{cppfile}) or die
         "Cannot open file '$args{cppfile}': $!\n";
     notify("Creating file '$args{cppfile}'.");
+    print $fh <<EOF;
+// $args{cppfile}:  ActionScript "$args{class}" class, for Gnash.
+EOF
     print $fh $LICENSE;
 
 
@@ -119,12 +123,12 @@
           qq|\n    o.init_member("$m", new builtin_function($args{lc}_$m));|;
 
         $implementations .=
-          qq|static as_value\n$args{lc}_| .$m. 
+          qq|\nstatic as_value\n$args{lc}_| .$m.
           qq|(const fn_call& fn) 
 {   
         $args{lc}_as_object* ptr = ensureType<$args{lc}_as_object>(fn.this_ptr);  
         UNUSED(ptr);
-        log_warning("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
         return as_value();
 }
 |;
@@ -152,9 +156,7 @@
 
 static void
 attach$args{class}Interface(as_object& o)
-{
-$registrations
-
+{$registrations
 }
 
 static as_object*
@@ -187,7 +189,6 @@
 };
 
 $implementations
-
 as_value
 $args{lc}_ctor(const fn_call& fn)
 {
@@ -208,16 +209,13 @@
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attach$args{class}Interface(*cl);
-		     
 	}
 
 	// Register _global.$args{class}
 	global.init_member("$args{class}", cl.get());
-
 }
 
 } // end of gnash namespace
-
 EOF
 
     close $fh;

Index: server/asobj/gen-asclass.sh
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/asobj/gen-asclass.sh	20 Mar 2007 10:36:45 -0000	1.11
+++ server/asobj/gen-asclass.sh	18 Apr 2007 14:07:32 -0000	1.12
@@ -65,6 +65,7 @@
 #
 rm -f ${outname}
 cat <<EOF>>${outname}
+// ${outname}:  ActionScript "${asname}" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -106,15 +107,14 @@
 
 // __GNASH_ASOBJ_${upname}_H__
 #endif
-
 EOF
-
 ##############################################################
 # now generate the source file
 #
 
 # start with the header part
 cat <<EOF>>${srcname}
+// ${srcname}:  ActionScript "${asname}" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -207,12 +207,13 @@
 # DO NOT CONVERT CASE, SWF7+ is case-sensitive 
 newi=`echo $i | sed -e 's/)//g'` # | tr '[A-Z]' '[a-z]'
 cat <<EOF>>${srcname}
+
 static as_value
 ${lowname}_${newi}const fn_call& fn)
 {
 	${lowname}_as_object* ptr = ensureType<${lowname}_as_object>(fn.this_ptr);
 	UNUSED(ptr);
-	log_warning("%s: unimplemented", __FUNCTION__);
+	log_unimpl (__FUNCTION__);
 	return as_value();
 }
 EOF
@@ -240,17 +241,11 @@
 		// replicate all interface to class, to be able to access
 		// all methods as static functions
 		attach${asname}Interface(*cl);
-		     
 	}
 
 	// Register _global.${asname}
 	global.init_member("${asname}", cl.get());
-
 }
 
-
 } // end of gnash namespace
-
 EOF
-
-

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/string.cpp	16 Apr 2007 18:23:06 -0000	1.28
+++ server/asobj/string.cpp	18 Apr 2007 14:07:32 -0000	1.29
@@ -1,3 +1,4 @@
+// string.cpp:  ActionScript "String" class, for Gnash.
 //
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
@@ -14,9 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.28 2007/04/16 18:23:06 strk Exp $ */
-
-// Implementation of ActionScript String class.
+/* $Id: string.cpp,v 1.29 2007/04/18 14:07:32 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,13 +36,13 @@
 #define ENSURE_FN_ARGS(min, max, rv)                                    \
     if (fn.nargs < min) {                                               \
         IF_VERBOSE_ASCODING_ERRORS(                                     \
-            log_aserror("%s needs one argument", __FUNCTION__);         \
+            log_aserror(_("%s needs one argument"), __FUNCTION__);         \
             )                                                           \
          return as_value(rv);                                           \
     }                                                                   \
     IF_VERBOSE_ASCODING_ERRORS(                                         \
         if (fn.nargs > max)                                             \
-            log_aserror("%s has more than one argument", __FUNCTION__); \
+            log_aserror(_("%s has more than one argument"), __FUNCTION__); \
     )
 
 
@@ -361,7 +360,7 @@
 
             if (end < start) {
                 IF_VERBOSE_ASCODING_ERRORS(
-                    log_aserror("string.slice() called with end < start");
+                    log_aserror(_("string.slice() called with end < start"));
                 )
                 swap(&end, &start);
             }
@@ -424,7 +423,7 @@
 
     if (fn.nargs == 0) {
         IF_VERBOSE_ASCODING_ERRORS(
-            log_aserror("string.charCodeAt needs one argument");
+            log_aserror(_("string.charCodeAt needs one argument"));
         )
         as_value rv;
         rv.set_nan();
@@ -433,7 +432,7 @@
 
     IF_VERBOSE_ASCODING_ERRORS(
         if (fn.nargs > 1) {
-            log_aserror("string.charCodeAt has more than one argument");
+            log_aserror(_("string.charCodeAt has more than one argument"));
         }
     )
 

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/asobj/xml.cpp	17 Apr 2007 10:38:16 -0000	1.39
+++ server/asobj/xml.cpp	18 Apr 2007 14:07:32 -0000	1.40
@@ -1,3 +1,4 @@
+// xml.cpp:  XML markup language support, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: xml.cpp,v 1.39 2007/04/17 10:38:16 strk Exp $ */
+/* $Id: xml.cpp,v 1.40 2007/04/18 14:07:32 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -91,9 +94,9 @@
 {
     //GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("Creating XML data at %p \n", this);
+    log_msg(_("Creating XML data at %p"), this);
 #endif
-    //log_msg("%s: %p \n", __FUNCTION__, this);
+    //log_msg("%s: %p", __FUNCTION__, this);
     attachXMLProperties(*this);
 }
 
@@ -109,7 +112,7 @@
 {
     //GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("Creating XML data at %p \n", this);
+    log_msg(_("Creating XML data at %p"), this);
 #endif
     parseXML(xml_in);
 }
@@ -124,9 +127,9 @@
 {
     GNASH_REPORT_FUNCTION;
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\tCreating XML data at %p \n", this);
+    log_msg(_("\tCreating XML data at %p"), this);
 #endif
-    //log_msg("%s: %p \n", __FUNCTION__, this);
+    //log_msg("%s: %p", __FUNCTION__, this);
 }
 
 bool
@@ -158,7 +161,7 @@
         else if ( name == "loaded" )
         {
                 bool b = val.to_bool();
-		log_msg("set_member 'loaded' (%s) became boolean %d", val.to_debug_string().c_str(), b);
+		log_msg(_("set_member 'loaded' (%s) became boolean %d"), val.to_debug_string().c_str(), b);
                 if ( b ) _loaded = 1;
                 else _loaded = 0;
                 return;
@@ -172,7 +175,7 @@
     GNASH_REPORT_FUNCTION;
     
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\tDeleting XML top level node at %p", this);
+    log_msg(_("\tDeleting XML top level node at %p"), this);
 #endif
   
 }
@@ -237,20 +240,20 @@
     xmlChar *ptr = NULL;
     boost::intrusive_ptr<XMLNode> child;
 
-//    log_msg("Created new element for %s at %p\n", node->name, element);
+//    log_msg(_("Created new element for %s at %p"), node->name, element);
 
-//    log_msg("%s: extracting node %s\n", __FUNCTION__, node->name);
+//    log_msg(_("%s: extracting node %s"), __FUNCTION__, node->name);
 
     // See if we have any Attributes (properties)
     attr = node->properties;
     while (attr != NULL)
     {
-        //log_msg("extractNode %s has property %s, value is %s\n",
+        //log_msg(_("extractNode %s has property %s, value is %s"),
         //          node->name, attr->name, attr->children->content);
         XMLAttr attrib(reinterpret_cast<const char*>(attr->name),
 			reinterpret_cast<const char*>(attr->children->content));
 
-        //log_msg("\tPushing attribute %s for element %s has value %s\n",
+        //log_msg(_("\tPushing attribute %s for element %s has value %s"),
         //        attr->name, node->name, attr->children->content);
         element._attributes.push_back(attrib);
         attr = attr->next;
@@ -274,7 +277,7 @@
                 {
                     if (node->content)
                     {
-                        //log_msg("extractChildNode from text for %s has contents '%s'", node->name, ptr);
+                        //log_msg(_("extractChildNode from text for %s has contents '%s'"), node->name, ptr);
                         std::string val(reinterpret_cast<const char*>(ptr));
                         element.nodeValueSet(val);
                     }
@@ -305,7 +308,7 @@
     xmlNodePtr cur;
 
     if (document == 0) {
-        log_error("Can't load XML file!");
+        log_error(_("Can't load XML file"));
         return false;
     }
 
@@ -329,10 +332,10 @@
 {
     //GNASH_REPORT_FUNCTION;
 
-    //log_msg("Parse XML from memory: %s", xml_in.c_str());
+    //log_msg(_("Parse XML from memory: %s"), xml_in.c_str());
 
     if (xml_in.empty()) {
-        log_error("XML data is empty!");
+        log_error(_("XML data is empty"));
         return false;
     }
 
@@ -347,7 +350,7 @@
     xmlInitParser();
     _doc = xmlParseMemory(xml_in.c_str(), xml_in.size());
     if (_doc == 0) {
-        log_error("Can't parse XML data!\n");
+        log_error(_("Can't parse XML data"));
         return false;
     }
     ret = parseDoc(_doc, true);
@@ -370,17 +373,17 @@
 {
 //    GNASH_REPORT_FUNCTION;
   
-    //log_msg("%s: mem is %d\n", __FUNCTION__, mem);
+    //log_msg(_("%s: mem is %d"), __FUNCTION__, mem);
 
     std::auto_ptr<tu_file> str ( StreamProvider::getDefaultInstance().getStream(url) );
     if ( ! str.get() ) 
     {
-        log_error("Can't load XML file: %s (security?)", url.str().c_str());
+        log_error(_("Can't load XML file: %s (security?)"), url.str().c_str());
         onLoadEvent(false);
         return false;
     }
 
-    log_msg("Loading XML file from url: '%s'", url.str().c_str());
+    log_msg(_("Loading XML file from url: '%s'"), url.str().c_str());
 
     initParser();
 
@@ -391,7 +394,7 @@
     {
 	xmlFreeDoc(_doc);
         _doc = 0;
-        log_error("Can't read XML file %s (stream error %d)!", url.str().c_str(), str->get_error());
+        log_error(_("Can't read XML file %s (stream error %d)"), url.str().c_str(), str->get_error());
         _loaded = 0;
         onLoadEvent(false);
         return false;
@@ -402,7 +405,7 @@
     if (_doc == 0)
     {
         xmlErrorPtr err = xmlGetLastError();
-        log_error("Can't read XML file %s (%s)!", url.str().c_str(), err->message);
+        log_error(_("Can't read XML file %s (%s)"), url.str().c_str(), err->message);
         _loaded = 0;
         onLoadEvent(false);
         return false;
@@ -425,7 +428,7 @@
 bool
 XML::onLoad()
 {
-    log_msg("%s: FIXME: onLoad Default event handler\n", __FUNCTION__);
+    log_msg(_("%s: FIXME: onLoad Default event handler"), __FUNCTION__);
 
     return(_loaded);
 }
@@ -449,32 +452,32 @@
 void
 XML::addRequestHeader(const char * /* name */, const char * /* value */)
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 
 void
 XML::load()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 XML::parseXML()
 {
-    log_msg("%s: unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 XML::send()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 void
 XML::sendAndLoad()
 {
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
 }
 
 
@@ -553,7 +556,7 @@
     boost::intrusive_ptr<XML> xml_obj;
     //const char    *data;
   
-    // log_msg("%s: nargs=%d\n", __FUNCTION__, fn.nargs);
+    // log_msg(_("%s: nargs=%d"), __FUNCTION__, fn.nargs);
   
     if ( fn.nargs > 0 )
     {
@@ -563,7 +566,7 @@
             xml_obj = boost::dynamic_pointer_cast<XML>(obj);
             if ( xml_obj )
             {
-                log_msg("\tCloned the XML object at %p\n", xml_obj.get());
+                log_msg(_("\tCloned the XML object at %p"), xml_obj.get());
                 return as_value(xml_obj->cloneNode(true).get());
             }
         }
@@ -572,7 +575,7 @@
         if ( xml_in.empty() )
         {
             IF_VERBOSE_ASCODING_ERRORS(
-            log_aserror("First arg given to XML constructor (%s) evaluates to the empty string",
+            log_aserror(_("First arg given to XML constructor (%s) evaluates to the empty string"),
                     fn.arg(0).to_debug_string().c_str());
             );
         }
@@ -584,7 +587,7 @@
     }
 
     xml_obj = new XML;
-    //log_msg("\tCreated New XML object at %p\n", xml_obj);
+    //log_msg(_("\tCreated New XML object at %p"), xml_obj);
 
     return as_value(xml_obj.get());
 }
@@ -597,11 +600,11 @@
 as_value xml_addrequestheader(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
-    log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
+    log_msg(_("%s: %d args"), __PRETTY_FUNCTION__, fn.nargs);
     
 //    return as_value(ptr->getAllocated());
 //    ptr->addRequestHeader();
-    log_msg("%s:unimplemented \n", __FUNCTION__);
+    log_unimpl (__FUNCTION__);
     return as_value();
 }
 
@@ -630,7 +633,7 @@
 	return as_value(xml_obj);
 	
     } else {
-        log_msg("ERROR: no text for element creation!\n");
+        log_error(_("no text for element creation"));
     }
     return as_value();
 }
@@ -657,9 +660,9 @@
 	xml_obj->nodeValueSet(text);
 	xml_obj->nodeTypeSet(XMLNode::tText);
 	return as_value(xml_obj);
-//	log_msg("%s: xml obj is %p\n", __PRETTY_FUNCTION__, xml_obj);
+//	log_msg(_("%s: xml obj is %p"), __PRETTY_FUNCTION__, xml_obj);
     } else {
-	log_msg("ERROR: no text for text node creation!\n");
+	log_error(_("no text for text node creation"));
     }
     return as_value();
 }
@@ -785,7 +788,7 @@
     vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
 
-    log_warning("XML parser: %s", tmp);
+    log_error(_("XML parser: %s"), tmp);
     
     va_end (ap);    
 }

Index: server/asobj/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlnode.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/xmlnode.cpp	17 Apr 2007 12:58:20 -0000	1.32
+++ server/asobj/xmlnode.cpp	18 Apr 2007 14:07:32 -0000	1.33
@@ -1,3 +1,4 @@
+// xmlnode.cpp:  ActionScript "XMLNode" class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -14,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: xmlnode.cpp,v 1.32 2007/04/17 12:58:20 strk Exp $ */
+/* $Id: xmlnode.cpp,v 1.33 2007/04/18 14:07:32 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -77,9 +78,9 @@
     _parent(0),
     _type(tElement)
 {
-    //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
+    //log_msg("%s: %p", __PRETTY_FUNCTION__, this);
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\tCreating XMLNode data at %p \n", this);
+    log_msg(_("\tCreating XMLNode data at %p"), this);
 #endif
 }
 
@@ -89,9 +90,9 @@
     _parent(0),
     _type(tElement)
 {
-    //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
+    //log_msg("%s: %p", __PRETTY_FUNCTION__, this);
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\tCreating XMLNode data at %p \n", this);
+    log_msg(_("\tCreating XMLNode data at %p"), this);
 #endif
 }
 
@@ -103,7 +104,7 @@
     _value(tpl._value),
     _type(tpl._type)
 {
-    // only clone childs if in deep mode
+    // only clone children if in deep mode
     if ( deep ) 
     {
         const ChildList& from=tpl._children;
@@ -117,9 +118,9 @@
 
 XMLNode::~XMLNode()
 {
-    //log_msg("%s: %p \n", __PRETTY_FUNCTION__, this);
+    //log_msg("%s: %p", __PRETTY_FUNCTION__, this);
 #ifdef DEBUG_MEMORY_ALLOCATION
-    log_msg("\tDeleting XMLNode data %s at %p", this->_name.c_str(), this);
+    log_msg(_("\tDeleting XMLNode data %s at %p"), this->_name.c_str(), this);
 #endif
 }
 
@@ -147,7 +148,7 @@
 	//GNASH_REPORT_FUNCTION;
 	if ( _children.empty() )
 	{
-			log_msg("XMLNode %p has no childrens", (void*)this);
+			log_msg(_("XMLNode %p has no children"), (void*)this);
 			return NULL;
 	}
 	return _children.back();
@@ -166,14 +167,14 @@
         oldparent->_children.remove(node);
     }
 
-//  log_msg("%s: partially unimplemented\n", __PRETTY_FUNCTION__);
+//  log_unimpl("%s: partially unimplemented", __PRETTY_FUNCTION__);
 }
 
 boost::intrusive_ptr<XMLNode> 
 XMLNode::cloneNode(bool deep)
 {
     //GNASH_REPORT_FUNCTION;
-    //log_msg("%s: deep is %d", __PRETTY_FUNCTION__, deep);
+    //log_msg(_("%s: deep is %d"), __PRETTY_FUNCTION__, deep);
 
     boost::intrusive_ptr<XMLNode> newnode = new XMLNode(*this, deep);
 
@@ -188,7 +189,7 @@
     if ( it == _children.end() )
     {
         IF_VERBOSE_ASCODING_ERRORS(
-        log_aserror("XMLNode.insertBefore(): positional parameter is not a child of this node");
+        log_aserror(_("XMLNode.insertBefore(): positional parameter is not a child of this node"));
         );
         return;
     }
@@ -231,7 +232,7 @@
     {
         if (itx->get() == this)
         {
-            // log_msg("Found the previous XMLNode child !!!! %s <%p>\n", (*itx)->nodeName(), (void*)*itx);
+            // log_msg("Found the previous XMLNode child !!!! %s <%p>", (*itx)->nodeName(), (void*)*itx);
 		    return previous_node;
 		}
 		previous_node = itx->get();
@@ -288,10 +289,10 @@
     NodeType type = xml.nodeType();
 
 
-//    log_msg("%s: processing for object %s <%p>\n", __PRETTY_FUNCTION__, nodename, xml);
+//    log_msg("%s: processing for object %s <%p>", __PRETTY_FUNCTION__, nodename, xml);
 
 #ifdef GNASH_DEBUG
-    log_msg("Stringifying node %p with name %s, value %s, %u attributes and %u childs",
+    log_msg(_("Stringifying node %p with name %s, value %s, %u attributes and %u children"),
                     (void*)&xml, nodename, nodevalue, xml._attributes.size(), xml._children.size());
 #endif
 
@@ -312,7 +313,7 @@
         xmlout << ">";
     }
 
-    // Node value first, then childs
+    // Node value first, then children
     if ( type == tText )
     {
 	    xmlout << nodevalue;
@@ -322,7 +323,7 @@
     ChildList::const_iterator itx;
     for (itx = xml._children.begin(); itx != xml._children.end(); itx++)
     {
-//      log_msg("Found One XMLNode child !!!! %s <%p>\n", (*itx)->nodeName().c_str(), (void*)*itx);
+//      log_msg(_("Found One XMLNode child.  %s <%p>"), (*itx)->nodeName().c_str(), (void*)*itx);
 //      cerr << "<" << (*it)->nodeName() << ">" << endl;
         (*itx)->toString(xmlout);
     }
@@ -439,7 +440,7 @@
 	if ( ! fn.nargs )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("XMLNode::appendChild() needs at least one argument");
+		log_aserror(_("XMLNode::appendChild() needs at least one argument"));
 		);
 		return as_value();
 	}
@@ -448,7 +449,7 @@
 	if ( ! xml_obj )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("First argument to XMLNode::appendChild() is not an XMLNode");
+		log_aserror(_("First argument to XMLNode::appendChild() is not an XMLNode"));
 		);
 		return as_value();
 	}
@@ -462,7 +463,7 @@
 xmlnode_clonenode(const fn_call& fn)
 {
     //GNASH_REPORT_FUNCTION;
-//    log_msg("%s: %d args\n", __PRETTY_FUNCTION__, fn.nargs);
+//    log_msg("%s: %d args", __PRETTY_FUNCTION__, fn.nargs);
     boost::intrusive_ptr<XMLNode> ptr = ensureType<XMLNode>(fn.this_ptr);
 
     bool deep = false;
@@ -482,7 +483,7 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss; fn.dump_args(ss);
-		log_aserror("XMLNode.insertBefore(%s) needs at least two argument", ss.str().c_str());
+		log_aserror(_("XMLNode.insertBefore(%s) needs at least two argument"), ss.str().c_str());
 		);
 		return as_value();
 	}
@@ -492,7 +493,7 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
 		std::stringstream ss; fn.dump_args(ss);
-		log_aserror("First argument to XMLNode.insertBefore(%s) is not an XMLNode",
+		log_aserror(_("First argument to XMLNode.insertBefore(%s) is not an XMLNode"),
                 ss.str().c_str());
 		);
 		return as_value();
@@ -503,7 +504,7 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
         std::stringstream ss; fn.dump_args(ss);
-		log_aserror("Second argument to XMLNode.insertBefore(%s) is not an XMLNode",
+		log_aserror(_("Second argument to XMLNode.insertBefore(%s) is not an XMLNode"),
                 ss.str().c_str());
 		);
 		return as_value();
@@ -514,7 +515,7 @@
     
 //    return as_value(ptr->obj.getAllocated());
 //    ptr->obj.insertBefore();
-    log_msg("%s:unimplemented \n", __PRETTY_FUNCTION__);
+    log_unimpl (__PRETTY_FUNCTION__);
     return as_value();
 }
 

Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/asobj/xmlsocket.cpp	16 Apr 2007 18:23:06 -0000	1.25
+++ server/asobj/xmlsocket.cpp	18 Apr 2007 14:07:32 -0000	1.26
@@ -1,3 +1,4 @@
+// xmlsocket.cpp:  Network socket for XML-encoded information, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -13,6 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -173,14 +175,14 @@
 bool XMLSocket::processingData()
 {
     //GNASH_REPORT_FUNCTION;
-    //printf("%s: processing flags is is %d\n", __FUNCTION__, _processing);
+    //log_msg(_("%s: processing flag is %d"), __FUNCTION__, _processing);
     return _processing;
 }
 
 void XMLSocket::processing(bool x)
 {
     GNASH_REPORT_FUNCTION;
-    //printf("%s: set processing flag to %d\n", __FUNCTION__, x);
+    //log_msg(_("%s: set processing flag to %d"), __FUNCTION__, x);
     _processing = x;
 }
 
@@ -202,7 +204,7 @@
     
     
     if (fd <= 0) {
-	log_msg("fd <= 0, returning false (timer not unregistered while socket disconnected?");
+	log_error(_("%s: fd <= 0, returning false (timer not unregistered while socket disconnected?"), __FUNCTION__);
         return false;
     }
     
@@ -217,36 +219,36 @@
         
         // If interupted by a system call, try again
         if (ret == -1 && errno == EINTR) {
-            log_msg("The socket for fd #%d was interupted by a system call!",
+            log_msg(_("The socket for fd #%d was interupted by a system call"),
                     fd);
             continue;
         }
         if (ret == -1) {
-            log_error("%s: The socket for fd #%d never was available!",
+            log_error(_("%s: The socket for fd #%d never was available"),
                 __FUNCTION__, fd);
             return false;
         }
         if (ret == 0) {
-            //log_msg("%s: There is no data in the socket for fd #%d!",
+            //log_msg(_("%s: There is no data in the socket for fd #%d"),
             //   __FUNCTION__, fd);
             return false;
         }
         if (ret > 0) {
-            //log_msg("%s: There is data in the socket for fd #%d!",
+            //log_msg(_("%s: There is data in the socket for fd #%d"),
             //    __FUNCTION__, fd);
         }
         memset(buf, 0, INBUF);
         ret = ::read(_sockfd, buf, INBUF-2);
         cr = strlen(buf);
-        log_msg("%s: read %d bytes, first msg terminates at %d\n", __FUNCTION__, ret, cr);
-        //log_msg("%s: read (%d,%d) %s\n", __FUNCTION__, buf[0], buf[1], buf);
+        log_msg(_("%s: read %d bytes, first msg terminates at %d"), __FUNCTION__, ret, cr);
+        //log_msg(_("%s: read (%d,%d) %s"), __FUNCTION__, buf[0], buf[1], buf);
         ptr = buf;
         // If we get a single XML message, do less work
         if (ret == cr + 1)
 		{
             adjusted_size = memadjust(ret + 1);
             packet = new char[adjusted_size];
-            printf("Packet size is %d at %p\n", ret + 1, packet);
+            log_msg(_("Packet size is %d at %p"), ret + 1, packet);
             memset(packet, 0, adjusted_size);
             strcpy(packet, ptr);
             eom = strrchr(packet, '\n'); // drop the CR off the end if there is one
@@ -254,7 +256,7 @@
                 *eom = 0;
             }
             msgs.push_back( packet );
-            printf("%d: Pushing Packet of size " SIZET_FMT " at %p\n", __LINE__, strlen(packet), packet);
+            log_msg(_("%d: Pushing Packet of size " SIZET_FMT " at %p"), __LINE__, strlen(packet), packet);
             processing(false);
             return true;
         }
@@ -264,8 +266,8 @@
         while (strchr(ptr, '\n') > 0) {
             if (leftover) {
                 processing(false);
-                //printf("%s: The remainder is: \"%s\"\n", __FUNCTION__, leftover);
-                //printf("%s: The rest of the message is: \"%s\"\n", __FUNCTION__, ptr);
+                //log_msg(_("%s: The remainder is: \"%s\""), __FUNCTION__, leftover);
+                //log_msg(_("%s: The rest of the message is: \"%s\""), __FUNCTION__, ptr);
                 adjusted_size = memadjust(cr + strlen(leftover) + 1);
                 packet = new char[adjusted_size];
                 memset(packet, 0, adjusted_size);
@@ -275,7 +277,7 @@
                 if (eom) {
                     *eom = 0;
                 }
-                //printf("%s: The whole message is: \"%s\"\n", __FUNCTION__, packet);
+                //log_msg(_("%s: The whole message is: \"%s\""), __FUNCTION__, packet);
                 ptr = strchr(ptr, '\n') + 2; // messages are delimited by a "\n\0"
                 delete leftover;
                 leftover = 0;
@@ -287,20 +289,20 @@
                 ptr += cr + 1;
             } // end of if remainder
             if (*packet == '<') {
-                //printf("%d: Pushing Packet #%d of size %d at %p: %s\n", __LINE__,
+                //log_msg(_("%d: Pushing Packet #%d of size %d at %p: %s"), __LINE__,
                 //       data.size(), strlen(packet), packet, packet);
                 eom = strrchr(packet, '\n'); // drop the CR off the end there is one
                 if (eom) {
                     *eom = 0;
                 }
-                //printf("Allocating new packet at %p\n", packet);
+                //log_msg(_("Allocating new packet at %p"), packet);
                 //data.push_back(packet);
                 msgs.push_back( std::string(packet) );
             } else {
-                log_error("Throwing out partial packet %s\n", packet);
+                log_error(_("Throwing out partial packet %s"), packet);
             }
             
-            //log_msg("%d messages in array now\n", data.size());
+            //log_msg(_("%d messages in array now"), data.size());
             cr = strlen(ptr);
         } // end of while (cr)
         
@@ -308,11 +310,11 @@
             leftover = new char[strlen(ptr) + 1];
             strcpy(leftover, ptr);
             processing(true);
-            //printf("%s: Adding remainder: \"%s\"\n", __FUNCTION__, leftover);
+            //log_msg(_("%s: Adding remainder: \"%s\""), __FUNCTION__, leftover);
         }
         
         processing(false);
-        printf("Returning %d messages\n", index);
+        log_msg(_("%s: Returning %d messages"), __FUNCTION__, index);
         return true;
         
     } // end of while (retires)
@@ -327,14 +329,14 @@
     
     if ( ! connected() )
     {
+        log_error(_("%s: socket not initialized"), __FUNCTION__);
 	assert(!_sockfd);
-        log_warning("socket not initialized at XMLSocket.send() call time");
 	return false;
     }
     
     int ret = write(_sockfd, str.c_str(), str.size());
     
-    log_msg("%s: sent %d bytes, data was %s\n", __FUNCTION__, ret, str.c_str());
+    log_msg(_("%s: sent %d bytes, data was %s"), __FUNCTION__, ret, str.c_str());
     if (ret == static_cast<signed int>(str.size())) {
         return true;
     } else {
@@ -394,19 +396,19 @@
     
     // If interupted by a system call, try again
     if (ret == -1 && errno == EINTR) {
-        log_msg("%s: The socket for fd #%d was interupted by a system call in this thread!",
+        log_msg(_("%s: The socket for fd #%d was interupted by a system call in this thread"),
                 __FUNCTION__, fd);
     }
     if (ret == -1) {
-        log_error("%s: The socket for fd #%d never was available!",
+        log_error(_("%s: The socket for fd #%d never was available"),
             __FUNCTION__, fd);
     }
     if (ret == 0) {
-        log_msg("%s: There is no data in the socket for fd #%d!",
+        log_msg(_("%s: There is no data in the socket for fd #%d"),
             __FUNCTION__, fd);
     }
     if (ret > 0) {
-        log_msg("%s: There is data in the socket for fd #%d!",
+        log_msg(_("%s: There is data in the socket for fd #%d"),
             __FUNCTION__, fd);
     }
     
@@ -424,14 +426,14 @@
 #ifdef GNASH_XMLSOCKET_DEBUG
     std::stringstream ss;
     fn.dump_args(ss);
-    log_msg("XMLSocket.connect(%s) called", ss.str().c_str());
+    log_msg(_("XMLSocket.connect(%s) called"), ss.str().c_str());
 #endif
 
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
 
     if (ptr->obj.connected())
     {
-        log_warning("XMLSocket.connect() called while already connected, ignored");
+        log_error(_("XMLSocket.connect() called while already connected, ignored"));
     }
     
     as_value hostval = fn.arg(0);
@@ -450,7 +452,7 @@
 	boost::intrusive_ptr<as_function> handler = ptr->getEventHandler("onConnect");
     if ( handler )
     {
-        log_msg("XMLSocket.connect(): calling onConnect");
+        log_msg(_("XMLSocket.connect(): calling onConnect"));
         as_environment env;
         env.push(success);
         val = call_method(handler.get(), &env, ptr.get(), 1, env.stack_size()-1); 
@@ -458,7 +460,7 @@
 	    
     if ( success )
     {
-        log_warning("Setting up timer for calling XMLSocket.onData()");
+        log_msg(_("Setting up timer for calling XMLSocket.onData()"));
 
         Timer timer;
         boost::intrusive_ptr<builtin_function> ondata_handler = new builtin_function(&xmlsocket_inputChecker, NULL);
@@ -466,7 +468,7 @@
         timer.setInterval(*ondata_handler, interval, boost::dynamic_pointer_cast<as_object>(ptr));
         VM::get().getRoot().add_interval_timer(timer);
 
-        log_warning("Timer set");
+        log_msg(_("Timer set"));
     }
 
     return as_value(success);
@@ -480,7 +482,7 @@
     
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
     const std::string& object = fn.arg(0).to_string(&fn.env());
-    //  log_msg("%s: host=%s, port=%g\n", __FUNCTION__, host, port);
+    //  log_msg(_("%s: host=%s, port=%g"), __FUNCTION__, host, port);
     return as_value(ptr->obj.send(object));
 }
 
@@ -500,14 +502,14 @@
 xmlsocket_new(const fn_call& fn)
 {
     //GNASH_REPORT_FUNCTION;
-    //log_msg("%s: nargs=%d\n", __FUNCTION__, nargs);
+    //log_msg(_("%s: nargs=%d"), __FUNCTION__, nargs);
     
     boost::intrusive_ptr<as_object> xmlsock_obj = new xmlsocket_as_object;
 
 #ifdef GNASH_XMLSOCKET_DEBUG
     std::stringstream ss;
     fn.dump_args(ss);
-    log_msg("new XMLSocket(%s) called - created object at %p", ss.str().c_str(), (void*)xmlsock_obj.get());
+    log_msg(_("new XMLSocket(%s) called - created object at %p"), ss.str().c_str(), (void*)xmlsock_obj.get());
 #else
     UNUSED(fn);
 #endif
@@ -527,7 +529,7 @@
     boost::intrusive_ptr<xmlsocket_as_object> ptr = ensureType<xmlsocket_as_object>(fn.this_ptr);
     if ( ! ptr->obj.connected() )
     {
-        log_warning("XMLSocket not connected at xmlsocket_inputChecker call");
+        log_error(_("%s: not connected"), __FUNCTION__);
         return as_value();
     }
 
@@ -549,8 +551,8 @@
     boost::intrusive_ptr<as_function> onXMLEvent = ptr->getEventHandler("onXML");
     if ( ! onXMLEvent )
     {
-            log_msg("Builtin XMLSocket.onData doing nothing as no "
-                            "onXML event is defined on XMLSocket %p",
+            log_msg(_("Builtin XMLSocket.onData doing nothing as no "
+                            "onXML event is defined on XMLSocket %p"),
                             (void*)ptr.get());
             return as_value();
     }
@@ -558,7 +560,7 @@
     if ( fn.nargs < 1 )
     {
         IF_VERBOSE_ASCODING_ERRORS(
-        log_aserror("Builtin XMLSocket.onData() needs an argument");
+        log_aserror(_("Builtin XMLSocket.onData() needs an argument"));
         );
         return as_value();
     }
@@ -568,8 +570,8 @@
 
     if ( xmlin.empty() )
     {
-            log_error("Builtin XMLSocket.onData() called with an argument "
-                            "that resolves to the empty string: %s",
+            log_error(_("Builtin XMLSocket.onData() called with an argument "
+                            "that resolves to the empty string: %s"),
                             fn.arg(0).to_debug_string().c_str());
             return as_value();
     }
@@ -619,7 +621,7 @@
     if ( cl == NULL )
     {
         cl=new builtin_function(&xmlsocket_new, getXMLSocketInterface());
-        // Do not replicate all interface to class !
+        // Do not replicate all interface to class!
         //attachXMLSocketInterface(*cl);
     }
     
@@ -649,7 +651,7 @@
     assert(obj.connected());
 
     if (obj.processingData()) {
-        log_msg("Still processing data!");
+        log_msg(_("Still processing data"));
     }
     
 #ifndef USE_DMALLOC
@@ -659,16 +661,16 @@
     std::vector<std::string > msgs;
     if (obj.anydata(msgs))
     {
-        log_msg("Got " SIZET_FMT " messages: ", msgs.size());
+        log_msg(_("Got " SIZET_FMT " messages: "), msgs.size());
         for (size_t i=0; i<msgs.size(); ++i)
         {
-            log_msg(" Message " SIZET_FMT " : %s ", i, msgs[i].c_str());
+            log_msg(_(" Message " SIZET_FMT " : %s "), i, msgs[i].c_str());
         }
 
         boost::intrusive_ptr<as_function> onDataHandler = getEventHandler("onData");
         if ( onDataHandler )
         {
-            //log_msg("Got %d messages from XMLsocket", msgs.size());
+            //log_msg(_("Got %d messages from XMLsocket"), msgs.size());
             for (XMLSocket::MessageList::iterator it=msgs.begin(),
 							itEnd=msgs.end();
 			    it != itEnd; ++it)
@@ -690,7 +692,7 @@
         }
         else
         {
-            log_error("Couldn't find onData!");
+            log_error(_("%s: Couldn't find onData"), __FUNCTION__);
         }
 
     }

Index: server/parser/BitmapMovieDefinition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/BitmapMovieDefinition.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/parser/BitmapMovieDefinition.cpp	19 Feb 2007 11:08:22 -0000	1.8
+++ server/parser/BitmapMovieDefinition.cpp	18 Apr 2007 14:07:32 -0000	1.9
@@ -1,3 +1,4 @@
+// BitmapMovieDefinition.cpp:  , for Gnash.
 // 
 //   Copyright (C) 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -61,7 +61,7 @@
 	float w = _framesize.width()/20;
 	float h = _framesize.height()/20;
 
-	log_msg("Creating a shape_definition wrapping a %g x %g bitmap", w, h);
+	log_msg(_("Creating a shape_definition wrapping a %g x %g bitmap"), w, h);
 
 	path bmPath(w, h, fillLeft, 0, 0);
 	bmPath.drawLineTo(w, 0);

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/action_buffer.cpp	13 Apr 2007 07:35:56 -0000	1.16
+++ server/parser/action_buffer.cpp	18 Apr 2007 14:07:32 -0000	1.17
@@ -1,5 +1,6 @@
+// action_buffer.cpp:  holds actions for later execution, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: action_buffer.cpp,v 1.16 2007/04/13 07:35:56 bjacques Exp $ */
+/* $Id: action_buffer.cpp,v 1.17 2007/04/18 14:07:32 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -99,8 +102,8 @@
     }
     
     if (m_decl_dict_processed_at != -1)	{
-	log_warning("process_decl_dict(" SIZET_FMT ", " SIZET_FMT "): decl_dict was already processed at %d. "
-		"Skipping (or maybe we should append, or replace?).",
+	log_msg(_("process_decl_dict(" SIZET_FMT ", " SIZET_FMT "): decl_dict was already processed at %d. "
+		"Skipping (or maybe we should append, or replace?)."),
 		  start_pc, stop_pc, m_decl_dict_processed_at);
 	return;
     }
@@ -113,7 +116,7 @@
     uint16_t count = uint16_t(read_int16(i+3)); 
     i += 2;
     
-//log_msg("Start at %d, stop at %d, length read was %d, count read was %d", start_pc, stop_pc, length, count);
+//log_msg(_("Start at %d, stop at %d, length read was %d, count read was %d"), start_pc, stop_pc, length, count);
 
     assert(start_pc + 3 + length == stop_pc);
     
@@ -127,7 +130,7 @@
 	while (m_buffer[3 + i]) {
 	    // safety check.
 	    if (i >= stop_pc) {
-		log_error("action buffer dict length exceeded\n");
+		log_error(_("action buffer dict length exceeded"));
 		
 		// Jam something into the remaining (invalid) entries.
 		while (ct < count) {
@@ -450,7 +453,6 @@
 
 }
 
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

Index: server/parser/button_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/button_character_def.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/parser/button_character_def.cpp	22 Mar 2007 10:33:11 -0000	1.10
+++ server/parser/button_character_def.cpp	18 Apr 2007 14:07:32 -0000	1.11
@@ -1,10 +1,25 @@
-// -- Thatcher Ulrich <tu@tulrich.com> 2003
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
+// button_character_def.cpp:  Mouse-sensitive SWF buttons, for Gnash.
+//
+//   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// SWF buttons.  Mouse-sensitive update/display, actions, etc.
+/* $Id: button_character_def.cpp,v 1.11 2007/04/18 14:07:32 jgilmore Exp $ */
 
+// Based on the public domain work of Thatcher Ulrich <tu@tulrich.com> 2003
 
 #include "button_character_def.h"
 #include "button_character_instance.h" // for create_character_instance()
@@ -40,7 +55,7 @@
 	}
 
 	IF_VERBOSE_PARSE (
-	log_parse("-- actions in button\n"); // @@ need more info about which actions
+	log_parse(_("-- actions in button\n")); // @@ need more info about which actions
 	);
 
 	// Read actions.
@@ -81,9 +96,9 @@
 	// definition, we print an error, but keep parsing.
 	if ( ! m_character_def )
 	{
-		log_error("button record refer to "
+		log_error(_("button record refer to "
 			"character with id %d, which is not found "
-			"in the chars dictionary", m_character_id);
+			"in the chars dictionary"), m_character_id);
 	}
 
 	m_button_layer = in->read_u16(); 
@@ -207,7 +222,7 @@
 		assert(m_sound == NULL);	// redefinition button sound is error
 		m_sound = new button_sound_def();
 		IF_VERBOSE_PARSE(
-		log_parse("button sound options: ");
+		log_parse(_("button sound options: "));
 		);
 		for (int i = 0; i < 4; i++)
 		{
@@ -257,7 +272,7 @@
 		if ( next_action_pos >= in->get_tag_end_position() )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("Next Button2 actionOffset (%u) points past the end of tag", button_2_action_offset);
+			log_swferror(_("Next Button2 actionOffset (%u) points past the end of tag"), button_2_action_offset);
 			);
 			return;
 		}
@@ -283,7 +298,7 @@
 			if ( next_action_pos >= in->get_tag_end_position() )
 			{
 				IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("Next action offset (%u) in Button2ActionConditions points past the end of tag",
+				log_swferror(_("Next action offset (%u) in Button2ActionConditions points past the end of tag"),
 					next_action_offset);
 				);
 				break;
@@ -318,7 +333,6 @@
 
 }
 
-
 // Local Variables:
 // mode: C++
 // c-basic-offset: 8 

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/parser/edit_text_character_def.cpp	28 Mar 2007 20:38:35 -0000	1.7
+++ server/parser/edit_text_character_def.cpp	18 Apr 2007 14:07:32 -0000	1.8
@@ -1,10 +1,25 @@
-// text.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
+// edit_text_character_def.cpp:  Text tags, for Gnash.
+//
+//   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Code for the text tags.
+/* $Id: edit_text_character_def.cpp,v 1.8 2007/04/18 14:07:32 jgilmore Exp $ */
 
+// Based on the public domain text.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
 #include "stream.h"
 #include "log.h"
@@ -102,7 +117,7 @@
 		m_font = m_root_def->get_font(m_font_id);
 		if (m_font == NULL)
 		{
-			log_error("error: text style with undefined font; font_id = %d", m_font_id);
+			log_error(_("error: text style with undefined font; font_id = %d"), m_font_id);
 		}
 	}
 
@@ -141,12 +156,9 @@
 	return ch;
 }
 
-
 } // namespace gnash
 
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t
 // End:
-

Index: server/parser/morph2_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/morph2_character_def.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/morph2_character_def.cpp	3 Apr 2007 16:13:07 -0000	1.6
+++ server/parser/morph2_character_def.cpp	18 Apr 2007 14:07:32 -0000	1.7
@@ -1,10 +1,27 @@
-// morph2.cpp
-// -- Thatcher Ulrich <tu@tulrich.com>, Mike Shaver <shaver@off.net> 2003, Vitalij Alexeev <tishka92@mail.ru> 2004.
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Loading and rendering of morphing shapes using gnash_shape.
+// morph2_character_def.cpp:   Load and render morphing shapes, for Gnash.
+//
+//   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
+
+/* $Id: morph2_character_def.cpp,v 1.7 2007/04/18 14:07:32 jgilmore Exp $ */
+
+// Based on the public domain morph2.cpp of:
+// Thatcher Ulrich <tu@tulrich.com>, Mike Shaver <shaver@off.net> 2003,
+// Vitalij Alexeev <tishka92@mail.ru> 2004.
 
 #include "morph2_character_def.h"
 #include "stream.h"
@@ -223,7 +240,7 @@
 			fs2.m_type = fs1.m_type;
 
 			IF_VERBOSE_PARSE(
-			  log_parse("morph fill style type = 0x%X",
+			  log_parse(_("morph fill style type = 0x%X"),
 			    fs1.m_type);
 			);
 
@@ -233,9 +250,9 @@
 				fs2.m_color.read_rgba(in);
 
 				IF_VERBOSE_PARSE(
-				  log_parse("morph fill style begin color: ");
+				  log_parse(_("morph fill style begin color: "));
 				  fs1.m_color.print();
-				  log_parse("morph fill style end color: ");
+				  log_parse(_("morph fill style end color: "));
 				  fs2.m_color.print();
 				);
 			}
@@ -283,7 +300,7 @@
 				}
 
 				IF_VERBOSE_PARSE(
-				  log_parse("morph fsr: num_gradients = %d",
+				  log_parse(_("morph fsr: num_gradients = %d"),
 				    num_gradients);
 				);
 
@@ -299,7 +316,7 @@
 
 				int	bitmap_char_id = in->read_u16();
 				IF_VERBOSE_PARSE(
-				  log_parse("morph fsr bitmap_char = %d",
+				  log_parse(_("morph fsr bitmap_char = %d"),
 				    bitmap_char_id);
 				);
 
@@ -367,17 +384,17 @@
 
 		if ( m_shape1->m_paths.size() != m_shape2->m_paths.size() )
 		{
-			log_swferror("Different number of paths "
+			log_swferror(_("Different number of paths "
 				"in start (" SIZET_FMT ") and end (" SIZET_FMT
-				") shapes of a morph",
+				") shapes of a morph"),
 				m_shape1->m_paths.size(),
 				m_shape2->m_paths.size());
 		}
 		else if ( edges_count1 != edges_count2 )
 		{
-			log_swferror("Different number of edges "
+			log_swferror(_("Different number of edges "
 				"in start (%u) and end (%u) shapes "
-				"of a morph",
+				"of a morph"),
 				edges_count1, edges_count1);
 		}
 
@@ -386,8 +403,6 @@
 	}
 }
 
-
-
 // Local Variables:
 // mode: C++
 // c-basic-offset: 8 

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- server/parser/movie_def_impl.cpp	14 Apr 2007 15:53:17 -0000	1.66
+++ server/parser/movie_def_impl.cpp	18 Apr 2007 14:07:32 -0000	1.67
@@ -1,5 +1,6 @@
+// movie_def_impl.cpp:  Load in Movie definitions, for Gnash.
 // 
-//   Copyright (C) 2005, 200, 2007 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,9 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -127,6 +130,7 @@
 //
 // some utility stuff
 //
+// FIXME, this needs work now that log_msg always ends with a newline.
 
 void	dump_tag_bytes(stream* in)
     // Log the contents of the current tag, in hex.
@@ -273,7 +277,7 @@
 
                     if (res == NULL)
                         {
-                            log_error("import error: resource '%s' is not exported from movie '%s'",
+                            log_error(_("import error: resource '%s' is not exported from movie '%s'"),
                                       inf.m_symbol.c_str(), source_url.c_str());
                         }
                     else if (font* f = res->cast_to_font())
@@ -290,7 +294,7 @@
                         }
                     else
                         {
-                            log_error("import error: resource '%s' from movie '%s' has unknown type",
+                            log_error(_("import error: resource '%s' from movie '%s' has unknown type"),
                                       inf.m_symbol.c_str(), source_url.c_str());
                         }
 
@@ -319,7 +323,7 @@
     // make sure character_id is resolved
     if (in_import_table(character_id))
         {
-            log_error("get_character_def(): character_id %d is still waiting to be imported",
+            log_error(_("get_character_def(): character_id %d is still waiting to be imported"),
                       character_id);
         }
 #endif // not NDEBUG
@@ -341,7 +345,7 @@
     // make sure font_id is resolved
     if (in_import_table(font_id))
         {
-            log_error("get_font(): font_id %d is still waiting to be imported",
+            log_error(_("get_font(): font_id %d is still waiting to be imported"),
                       font_id);
         }
 #endif // not NDEBUG
@@ -365,7 +369,7 @@
 		bitmap_character_def* ch)
 {
     assert(ch);
-    //log_msg("Add bitmap character %d", character_id);
+    //log_msg(_("Add bitmap character %d"), character_id);
     //m_bitmap_characters.add(character_id, ch);
     m_bitmap_characters.insert(make_pair(character_id, boost::intrusive_ptr<bitmap_character_def>(ch)));
 
@@ -388,7 +392,7 @@
 void movie_def_impl::add_sound_sample(int character_id, sound_sample* sam)
 {
     assert(sam);
-	log_msg("Add sound sample %d", character_id);
+	log_msg(_("Add sound sample %d"), character_id);
     m_sound_samples.insert(make_pair(character_id,
             boost::intrusive_ptr<sound_sample>(sam)));
 }
@@ -416,33 +420,33 @@
 		&& (header & 0x0FFFFFF) != 0x00535743)
         {
 		// ERROR
-		log_error("gnash::movie_def_impl::read() -- "
-			"file does not start with a SWF header!\n");
+		log_error(_("gnash::movie_def_impl::read() -- "
+			"file does not start with a SWF header"));
 		return false;
         }
 	bool	compressed = (header & 255) == 'C';
     
 	IF_VERBOSE_PARSE(
-		log_parse("version = %d, file_length = %d",
+		log_parse(_("version = %d, file_length = %d"),
 			m_version, m_file_length);
 	);
 
 	if ( m_version > 7 )
 	{
-		log_warning("SWF%d is not fully supported, trying anyway "
-			"but don't expect it to work", m_version);
+		log_unimpl(_("SWF%d is not fully supported, trying anyway "
+			"but don't expect it to work"), m_version);
 	}
 
 	if (compressed)
         {
 #if TU_CONFIG_LINK_TO_ZLIB == 0
-		log_error("movie_def_impl::read(): unable to read "
-			"zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0");
+		log_error(_("movie_def_impl::read(): unable to read "
+			"zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0"));
 		return false;
 #endif
 
 		IF_VERBOSE_PARSE(
-			log_parse("file is compressed.");
+			log_parse(_("file is compressed"));
 		);
 
 		// Uncompress the input as we read it.
@@ -470,7 +474,7 @@
 
 	IF_VERBOSE_PARSE(
 		m_frame_size.print();
-		log_parse("frame rate = %f, frames = " SIZET_FMT,
+		log_parse(_("frame rate = %f, frames = " SIZET_FMT),
 			m_frame_rate, m_frame_count);
 	);
 
@@ -498,7 +502,7 @@
 	// Start the loading frame
 	if ( ! _loader.start() )
 	{
-		log_error("Could not start loading thread");
+		log_error(_("Could not start loading thread"));
 		return false;
 	}
 
@@ -542,12 +546,12 @@
 	if ( framenum <= _frames_loaded ) return true;
 
 	_waiting_for_frame = framenum;
-        //log_msg("Waiting for frame %u to be loaded", framenum);
+        //log_msg(_("Waiting for frame %u to be loaded"), framenum);
 
 	// TODO: return false on timeout 
 	_frame_reached_condition.wait(lock);
 
-        //log_msg("Condition reached (_frames_loaded=%u)", _frames_loaded);
+        //log_msg(_("Condition reached (_frames_loaded=%u)"), _frames_loaded);
 
 	return ( framenum <= _frames_loaded );
 }
@@ -650,13 +654,13 @@
     in->read_bytes(header, 4);
     if (header[0] != 'g' || header[1] != 's' || header[2] != 'c')
         {
-            log_error("cache file does not have the correct format; skipping\n");
+            log_error(_("cache file does not have the correct format; skipping"));
             return;
         }
     else if (header[3] != CACHE_FILE_VERSION)
         {
             log_error(
-                "cached data is version %d, but we require version %d; skipping\n",
+                _("cached data is version %d, but we require version %d; skipping"),
                 int(header[3]), CACHE_FILE_VERSION);
             return;
         }
@@ -671,12 +675,12 @@
         {
             if (in->get_error() != TU_FILE_NO_ERROR)
                 {
-                    log_error("error reading cache file (characters); skipping\n");
+                    log_error(_("error reading cache file (characters); skipping"));
                     return;
                 }
             if (in->get_eof())
                 {
-                    log_error("unexpected eof reading cache file (characters); skipping\n");
+                    log_error(_("unexpected eof reading cache file (characters); skipping"));
                     return;
                 }
 
@@ -691,8 +695,8 @@
                 }
             else
                 {
-                    log_error("sync error in cache file (reading characters)!  "
-                              "Skipping rest of cache data.\n");
+                    log_error(_("sync error in cache file (reading characters).  "
+                              "Skipping rest of cache data."));
                     return;
                 }
         }
@@ -725,7 +729,7 @@
 	for ( const_iterator it=begin(), endIt=end();
 		it != endIt; ++it )
 	{
-		log_msg("Character %d @ %p", it->first, static_cast<void*>(it->second.get()));
+		log_msg(_("Character %d @ %p"), it->first, static_cast<void*>(it->second.get()));
 		//character_def* cdef = it->second;
 	}
 }
@@ -737,7 +741,7 @@
 	if ( it == _map.end() )
 	{
 		IF_VERBOSE_PARSE(
-		log_parse("Could not find char %d, dump is:", id);
+		log_parse(_("Could not find char %d, dump is:"), id);
 		dump_chars();
 		);
 		return boost::intrusive_ptr<character_def>();
@@ -748,7 +752,7 @@
 void
 CharacterDictionary::add_character(int id, boost::intrusive_ptr<character_def> c)
 {
-	//log_msg("CharacterDictionary: add char %d", id);
+	//log_msg(_("CharacterDictionary: add char %d"), id);
 	_map[id] = c;
 	//dump_chars();
 }
@@ -771,16 +775,16 @@
 	nextframe += FRAMELOAD_CHUNK; // load in chunks of 10 frames 
 	if ( nextframe > framecount ) nextframe = framecount;
 #endif
-	//log_msg("Framecount: %u, Lastloaded: %u", framecount, lastloaded);
+	//log_msg(_("Framecount: %u, Lastloaded: %u"), framecount, lastloaded);
 	if ( nextframe <= framecount )
 	{
 #ifdef DEBUG_FRAMES_LOAD // debugging
-		log_msg("Ensure load of frame %u/%u (last loaded is: %u)",
+		log_msg(_("Ensure load of frame %u/%u (last loaded is: %u)"),
 			nextframe, framecount, lastloaded);
 #endif
 		if ( ! ensure_frame_loaded(nextframe) )
 		{
-			log_error("Could not advance to frame " SIZET_FMT "!",
+			log_error(_("Could not advance to frame " SIZET_FMT),
 				nextframe);
 			// these kind of errors should be handled by callers
 			assert(0);
@@ -789,7 +793,7 @@
 #ifdef DEBUG_FRAMES_LOAD
 	else
 	{
-		log_msg("No more frames to load. Framecount: %u, Lastloaded: %u, next to load: %u", framecount, lastloaded, nextframe);
+		log_msg(_("No more frames to load. Framecount: %u, Lastloaded: %u, next to load: %u"), framecount, lastloaded, nextframe);
 	}
 #endif
 }
@@ -815,7 +819,7 @@
 	while ( (uint32_t) str.get_position() < _swf_end_pos )
 	{
 	
-		//log_msg("Loading thread iteration %u", it++);
+		//log_msg(_("Loading thread iteration %u"), it++);
 
 		SWF::tag_type tag_type = str.open_tag();
 
@@ -845,9 +849,9 @@
 				if ( tag_type != SWF::END )
 				{
 					IF_VERBOSE_MALFORMED_SWF(
-					log_swferror("last expected SHOWFRAME "
+					log_swferror(_("last expected SHOWFRAME "
 						"in SWF stream '%s' isn't "
-						"followed by an END (%d).",
+						"followed by an END (%d)."),
 						get_url().c_str(), tag_type);
 					);
 				}
@@ -864,7 +868,7 @@
 		else
 		{
 			// no tag loader for this tag type.
-			log_error("*** no tag loader for type %d (movie)",
+			log_error(_("*** no tag loader for type %d (movie)"),
 				tag_type);
 			IF_VERBOSE_PARSE(
 				dump_tag_bytes(&str);
@@ -877,15 +881,17 @@
 
 		if (tag_type == SWF::END)
                 {
+		    IF_VERBOSE_MALFORMED_SWF(
 			if ((unsigned int) str.get_position() != _swf_end_pos)
                         {
 				// Safety break, so we don't read past
 				// the end of the  movie.
-				log_warning("hit stream-end tag, "
+				log_swferror(_("Hit stream-end tag, "
 					"but not at the advertised SWF end; "
-					"stopping for safety.");
+					"stopping for safety."));
 				break;
 			}
+		    )
 		}
 	}
 
@@ -896,14 +902,14 @@
 		//        Also, we should probably call _loader.unlock()
 		//        and make sure any wait_for_frame call is
 		//        released (condition set and false result)
-		log_error("Parsing exception: %s", e.what());
+		log_error(_("Parsing exception: %s"), e.what());
 	}
 
 	if ( ! m_playlist[_frames_loaded].empty() || ! m_init_action_list[_frames_loaded].empty() )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror(SIZET_FMT " action blocks and " SIZET_FMT " init action blocks are NOT followed by"
-			" a SHOWFRAME tag",
+		log_swferror(_(SIZET_FMT " action blocks and " SIZET_FMT " init action blocks are NOT followed by"
+			" a SHOWFRAME tag"),
 			m_playlist[_frames_loaded].size(),
 			m_init_action_list[_frames_loaded].size());
 		);
@@ -912,15 +918,14 @@
 	if ( m_frame_count > _frames_loaded )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror(SIZET_FMT " frames advertised in header, but only " SIZET_FMT " SHOWFRAME tags "
-			"found in stream. Updating total frames count", m_frame_count, _frames_loaded);
+		log_swferror(_(SIZET_FMT " frames advertised in header, but only " SIZET_FMT " SHOWFRAME tags "
+			"found in stream. Updating total frames count"), m_frame_count, _frames_loaded);
 		);
 		boost::mutex::scoped_lock lock(_frames_loaded_mutex);
 		m_frame_count = _frames_loaded;
 		// Notify any thread waiting on frame reached condition
 		_frame_reached_condition.notify_all();
 	}
-
 }
 
 size_t
@@ -939,11 +944,11 @@
 	if ( _frames_loaded > m_frame_count )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("number of SHOWFRAME tags "
+			log_swferror(_("number of SHOWFRAME tags "
 				"in SWF stream '%s' (" SIZET_FMT
 				") exceeds "
 				"the advertised number in header ("
-			        SIZET_FMT ").",
+			        SIZET_FMT ")."),
 				get_url().c_str(), _frames_loaded,
 				m_frame_count);
 		);
@@ -952,7 +957,7 @@
 	}
 
 #ifdef DEBUG_FRAMES_LOAD
-	log_msg("Loaded frame %u/%u",
+	log_msg(_("Loaded frame %u/%u"),
 		_frames_loaded, m_frame_count);
 #endif
 
@@ -964,7 +969,6 @@
 		// See: http://boost.org/doc/html/condition.html
 		_frame_reached_condition.notify_all();
 	}
-
 }
 
 void
@@ -983,7 +987,7 @@
 	boost::intrusive_ptr<resource> res;
 
 #ifdef DEBUG_EXPORTS
-	log_msg("get_exported_resource called, frame count=%u", m_frame_count);
+	log_msg(_("get_exported_resource called, frame count=%u"), m_frame_count);
 #endif
 
 	// Don't call get_exported_resource() from this movie loader
@@ -1019,8 +1023,8 @@
 
 		if ( new_loading_frame != loading_frame )
 		{
-			log_msg("frame load advancement (from "
-				SIZET_FMT " to " SIZET_FMT ")",
+			log_msg(_("frame load advancement (from "
+				SIZET_FMT " to " SIZET_FMT ")"),
 				loading_frame, new_loading_frame);
 			loading_frame = new_loading_frame;
 			timeout = def_timeout;
@@ -1029,12 +1033,12 @@
 		{
 			if ( ! timeout-- )
 			{
-				log_warning("No frame progress in movie %s "
+				log_error(_("No frame progress in movie %s "
 					"after %lu milliseconds "
 					"(%lu microseconds = %lu iterations), "
 					"giving up on "
 					"get_exported_resource(%s): "
-					"circular IMPORTS?",
+					"circular IMPORTS?"),
 					get_url().c_str(),
 					(def_timeout*naptime)/1000,
 					def_timeout*naptime,
@@ -1043,23 +1047,23 @@
 				return res;
 			}
 
-			log_warning("no frame progress at iteration %lu", timeout);
+			log_error(_("no frame progress at iteration %lu"), timeout);
 
 			continue; // not worth checking
 		}
 
 		if ( loading_frame >= m_frame_count )
 		{
-			log_msg("At end of stream, still no '%s' symbol found "
+			log_error(_("At end of stream, still no '%s' symbol found "
 				"in m_exports (" SIZET_FMT " entries in it, "
-				"follow)", symbol.c_str(), m_exports.size());
+				"follow)"), symbol.c_str(), m_exports.size());
 			return res;
 		}
 
 #ifdef DEBUG_EXPORTS
-		log_msg("We haven't finished loading (loading frame %u), "
+		log_msg(_("We haven't finished loading (loading frame %u), "
 			"and m_exports.get returned no entries, "
-			"sleeping a bit and trying again",
+			"sleeping a bit and trying again"),
 			get_loading_frame());
 #endif
 
@@ -1072,7 +1076,7 @@
 void
 movie_def_impl::add_frame_name(const std::string& n)
 {
-	//log_msg("labelframe: frame %d, name %s", _frames_loaded, name);
+	//log_msg(_("labelframe: frame %d, name %s"), _frames_loaded, name);
 	assert(_frames_loaded < m_frame_count);
     m_named_frames[n] = _frames_loaded;
 }
@@ -1086,6 +1090,4 @@
     return true;
 }
 
-
 } // namespace gnash
-

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/shape_character_def.cpp	12 Apr 2007 05:37:33 -0000	1.15
+++ server/parser/shape_character_def.cpp	18 Apr 2007 14:07:32 -0000	1.16
@@ -1,12 +1,27 @@
-// shape.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
+// shape_character_def.cpp:  Quadratic bezier outline shapes, for Gnash.
+//
+//   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-// Quadratic bezier outline shapes, the basis for most SWF rendering.
+/* $Id: shape_character_def.cpp,v 1.16 2007/04/18 14:07:32 jgilmore Exp $ */
 
+// Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
-/* $Id: shape_character_def.cpp,v 1.15 2007/04/12 05:37:33 strk Exp $ */
+// Quadratic bezier outline shapes are the basis for most SWF rendering.
 
 #include "shape_character_def.h"
 
@@ -67,7 +82,7 @@
 	}
 
 	IF_VERBOSE_PARSE (
-		log_parse("  read_fill_styles: count = %u", fill_style_count);
+		log_parse(_("  read_fill_styles: count = %u"), fill_style_count);
 	);
 
 	// Read the styles. 
@@ -102,7 +117,7 @@
     
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  read_line_styles: count = %d", line_style_count);
+    log_parse(_("  read_line_styles: count = %d"), line_style_count);
     		);
 
     // @@ does the 0xFF flag apply to all tag types?
@@ -112,7 +127,7 @@
 	line_style_count = in->read_u16();
 		IF_VERBOSE_PARSE
 		(
-	log_parse("  read_line_styles: count2 = %d", line_style_count);
+	log_parse(_("  read_line_styles: count2 = %d"), line_style_count);
 		);
     }
     // }
@@ -162,7 +177,7 @@
 		IF_VERBOSE_PARSE
 		(
 		 std::string b = m_bound.toString();
-    log_parse("  bound rect: %s", b.c_str()); 
+    log_parse(_("  bound rect: %s"), b.c_str());
     		);
 
 	read_fill_styles(m_fill_styles, in, tag_type, m);
@@ -174,7 +189,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  shape_character_def read: nfillbits = %d, nlinebits = %d", num_fill_bits, num_line_bits);
+    log_parse(_("  shape_character_def read: nfillbits = %d, nlinebits = %d"), num_fill_bits, num_line_bits);
     		);
 
     // These are state variables that keep the
@@ -231,7 +246,7 @@
 		IF_VERBOSE_PARSE
 		(
 		if (SHAPE_LOG) 
-		    log_parse("  shape_character read: moveto %4g %4g", x, y);
+		    log_parse(_("  shape_character read: moveto %4g %4g"), x, y);
 		);
 	    }
 	    if ((flags & 0x02) && num_fill_bits > 0) {
@@ -250,7 +265,7 @@
 		IF_VERBOSE_PARSE
 		(
 		if (SHAPE_LOG) {
-		    log_parse("  shape_character read: fill0 (left) = %d", current_path.getLeftFill());
+		    log_parse(_("  shape_character read: fill0 (left) = %d"), current_path.getLeftFill());
 		}
 		);
 		
@@ -270,7 +285,7 @@
 		current_path.setRightFill(style); // getRightFill() = style;
 		IF_VERBOSE_PARSE (
 		if (SHAPE_LOG) {
-		    log_parse("  shape_character read: fill1 (right) = %d", current_path.getRightFill());
+		    log_parse(_("  shape_character read: fill1 (right) = %d"), current_path.getRightFill());
 		}
 		);
 	    }
@@ -290,7 +305,7 @@
 		IF_VERBOSE_PARSE (
 		if (SHAPE_LOG)
 		{
-		    log_parse("  shape_character_read: line = %d", current_path.getLineStyle());
+		    log_parse(_("  shape_character_read: line = %d"), current_path.getLineStyle());
 		}
 		);
 	    }
@@ -301,7 +316,7 @@
 		assert(tag_type >= 22);
 
 		IF_VERBOSE_PARSE (
-		log_parse("  shape_character read: more fill styles");
+		log_parse(_("  shape_character read: more fill styles"));
 		);
 
 		// Store the current path if any.
@@ -337,7 +352,7 @@
 		IF_VERBOSE_PARSE (
 		if (SHAPE_LOG)
 		{
-		    log_parse("  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g", x, y, cx, cy, ax, ay);
+		    log_parse(_("  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g"), x, y, cx, cy, ax, ay);
 		}
 		);
 
@@ -368,7 +383,7 @@
 		IF_VERBOSE_PARSE (
 		if (SHAPE_LOG)
 		{
-		    log_parse("  shape_character_read: straight edge = %4g %4g - %4g %4g", x, y, x + dx, y + dy);
+		    log_parse(_("  shape_character_read: straight edge = %4g %4g - %4g %4g"), x, y, x + dx, y + dy);
 		}
 		);
 
@@ -664,7 +679,6 @@
 
 }	// end namespace gnash
 
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/parser/sprite_definition.cpp	13 Apr 2007 07:35:56 -0000	1.12
+++ server/parser/sprite_definition.cpp	18 Apr 2007 14:07:32 -0000	1.13
@@ -1,3 +1,4 @@
+// sprite_definition.cpp:  for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -39,7 +39,7 @@
 		int id)
 {
 #ifdef DEBUG_REGISTER_CLASS
-	log_msg("Instanciating sprite_def %p", (void*)this);
+	log_msg(_("Instantiating sprite_def %p"), (void*)this);
 #endif
 	sprite_instance* si = new sprite_instance(this,
 		parent->get_root(), parent, id);
@@ -78,7 +78,7 @@
 	m_playlist.resize(m_frame_count);
 
 		IF_VERBOSE_PARSE (
-	log_parse("  frames = " SIZET_FMT, m_frame_count);
+	log_parse(_("  frames = " SIZET_FMT), m_frame_count);
 		);
 
 	m_loading_frame = 0;
@@ -89,11 +89,13 @@
 
 		SWF::TagLoadersTable::loader_function lf = NULL;
 
+		IF_VERBOSE_MALFORMED_SWF(
 		if (tag_type == SWF::DEFINESPRITE)
 		{
-			log_error("DefineSprite tag inside sprite "
-				"definition - Malformed SWF!");
+			log_swferror(_("DefineSprite tag inside sprite "
+				"definition"));
 		}
+		);
 
 		if (tag_type == SWF::SHOWFRAME)
 		{
@@ -101,9 +103,9 @@
 		    	++m_loading_frame;
 
 			IF_VERBOSE_PARSE (
-				log_parse("  show_frame "
+				log_parse(_("  show_frame "
 					SIZET_FMT "/" SIZET_FMT
-					" (sprite)",
+					" (sprite)"),
 					m_loading_frame,
 					m_frame_count);
 		    	);
@@ -116,10 +118,10 @@
 				while ( in->open_tag() != SWF::END )
 				{
 					IF_VERBOSE_MALFORMED_SWF(
-					log_warning("last SHOWFRAME of a "
+					log_swferror(_("last SHOWFRAME of a "
 						"DEFINESPRITE tag "
 						"isn't followed by an END."
-						" Seeking to next END tag.");
+						" Seeking to next END tag."));
 					);
 					in->close_tag();
 				}
@@ -136,7 +138,8 @@
 		else
 		{
 			// no tag loader for this tag type.
-                    log_error("*** no tag loader for type %d (sprite)",
+			// FIXME, should this be a log_swferror instead?
+                    log_error(_("*** no tag loader for type %d (sprite)"),
                               tag_type);
 		}
 
@@ -144,7 +147,7 @@
 	}
 
 		IF_VERBOSE_PARSE (
-	log_parse("  -- sprite END --");
+	log_parse(_("  -- sprite END --"));
 		);
 }
 
@@ -152,7 +155,7 @@
 void
 sprite_definition::add_frame_name(const std::string& name)
 {
-	//log_msg("labelframe: frame %d, name %s", m_loading_frame, name);
+	//log_msg(_("labelframe: frame %d, name %s"), m_loading_frame, name);
 	assert(m_loading_frame < m_frame_count);
     m_named_frames[name] = m_loading_frame;
 }
@@ -202,12 +205,11 @@
 {
 	registeredClass = the_class;
 #ifdef DEBUG_REGISTER_CLASS
-	log_msg("Registered class %p for sprite_def %p", (void*)registeredClass.get(), (void*)this);
+	log_msg(_("Registered class %p for sprite_def %p"), (void*)registeredClass.get(), (void*)this);
 	as_object* proto = registeredClass->getPrototype();
-	log_msg(" Exported interface: ");
+	log_msg(_(" Exported interface: "));
 	proto->dump_members();
 #endif
 }
 
-
 } // namespace gnash

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/sprite_definition.h	10 Apr 2007 15:48:39 -0000	1.16
+++ server/parser/sprite_definition.h	18 Apr 2007 14:07:32 -0000	1.17
@@ -1,3 +1,4 @@
+// sprite_definition.h:  Holds immutable data for a sprite, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,10 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-// 
 //
 
 #ifndef GNASH_SPRITE_DEFINITION_H
@@ -156,8 +156,7 @@
 	virtual void add_font(int /*id*/, font* /*ch*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_warning("add_font tag appears in sprite tags! "
-			"Malformed SWF?\n");
+		log_swferror(_("add_font tag appears in sprite tags"));
 		);
 	}
 
@@ -178,8 +177,7 @@
 			bitmap_character_def* /*ch*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_warning("add_bitmap_character_def appears in sprite tags!"
-			" Malformed SWF?");
+		log_swferror(_("add_bitmap_character_def appears in sprite tags"));
 		);
 	}
 
@@ -193,8 +191,7 @@
 	virtual void add_sound_sample(int /*id*/, sound_sample* /*sam*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_warning("add sam appears in sprite tags!"
-			" Malformed SWF?");
+		log_swferror(_("add sam appears in sprite tags"));
 		);
 	}
 
@@ -217,7 +214,7 @@
 			resource* /*res*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_swferror("Can't export from sprite!");
+		log_swferror(_("Can't export from sprite"));
 		);
 	}
 
@@ -246,8 +243,7 @@
 	virtual void add_character(int /*id*/, character_def* /*ch*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_warning("add_character tag appears in sprite tags!"
-				" Maformed SWF?");
+		log_swferror(_("add_character tag appears in sprite tags"));
 		);
 	}
 
@@ -277,7 +273,7 @@
 	virtual void	add_init_action(execute_tag* /*c*/)
 	{
 		IF_VERBOSE_MALFORMED_SWF (
-		log_warning("sprite_definition::add_init_action called!  Ignored. (Malformed SWF?)\n");
+		log_swferror(_("sprite_definition::add_init_action called!  Ignored"));
 		);
 	}
 
@@ -313,9 +309,9 @@
 		// TODO: return false on timeout 
 		while ( m_loading_frame < framenum )
 		{
-			log_msg("sprite_definition: "
+			log_msg(_("sprite_definition: "
 				"loading of frame " SIZET_FMT " requested "
-				"(we are at " SIZET_FMT "/" SIZET_FMT ")",
+				"(we are at " SIZET_FMT "/" SIZET_FMT ")"),
 				framenum, m_loading_frame, m_frame_count);
 			// Could this ever happen ?
 			assert(0);

Index: server/parser/text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/text_character_def.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/parser/text_character_def.cpp	8 Nov 2006 07:28:21 -0000	1.2
+++ server/parser/text_character_def.cpp	18 Apr 2007 14:07:32 -0000	1.3
@@ -1,24 +1,15 @@
-// text.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
+// text_character_def.cpp:  Read text character definitions, for Gnash.
+
+// Derived from text.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
 
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
 // Code for the text tags.
 
-
-//#include "utf8.h"
-//#include "utility.h"
-//#include "impl.h"
-//#include "shape.h"
-//#include "shape_character_def.h"
 #include "stream.h"
 #include "log.h"
-//#include "font.h"
-//#include "fontlib.h"
-//#include "render.h"
-//#include "textformat.h"
 #include "text_character_def.h"
-//#include "movie_definition.h"
 
 namespace gnash {
 
@@ -35,7 +26,7 @@
 	int	advance_bits = in->read_u8();
 
 	IF_VERBOSE_PARSE(
-	log_parse("begin text records");
+	log_parse(_("begin text records"));
 	);
 
 	bool	last_record_was_style_change = false;
@@ -49,7 +40,7 @@
 		{
 			// This is the end of the text records.
 			IF_VERBOSE_PARSE(
-			log_parse("end text records");
+			log_parse(_("end text records"));
 			);
 			break;
 		}
@@ -68,7 +59,7 @@
 			bool	has_x_offset = (first_byte >> 0) & 1;
 
 			IF_VERBOSE_PARSE(
-			log_parse("  text style change");
+			log_parse(_("  text style change"));
 			);
 
 			if (has_font)
@@ -77,7 +68,7 @@
 				style.m_font_id = font_id;
 				style.resolve_font(m);
 				IF_VERBOSE_PARSE(
-				log_parse("  has_font: font id = %d", font_id);
+				log_parse(_("  has_font: font id = %d"), font_id);
 				);
 			}
 			if (has_color)
@@ -92,7 +83,7 @@
 					style.m_color.read_rgba(in);
 				}
 				IF_VERBOSE_PARSE(
-				log_parse("  has_color");
+				log_parse(_("  has_color"));
 				);
 			}
 			if (has_x_offset)
@@ -100,7 +91,7 @@
 				style.m_has_x_offset = true;
 				style.m_x_offset = in->read_s16();
 				IF_VERBOSE_PARSE(
-				log_parse("  has_x_offset = %g", style.m_x_offset);
+				log_parse(_("  has_x_offset = %g"), style.m_x_offset);
 				);
 			}
 			else
@@ -113,7 +104,7 @@
 				style.m_has_y_offset = true;
 				style.m_y_offset = in->read_s16();
 				IF_VERBOSE_PARSE(
-				log_parse("  has_y_offset = %g", style.m_y_offset);
+				log_parse(_("  has_y_offset = %g"), style.m_y_offset);
 				);
 			}
 			else
@@ -125,7 +116,7 @@
 			{
 				style.m_text_height = in->read_u16();
 				IF_VERBOSE_PARSE(
-				log_parse("  text_height = %g", style.m_text_height);
+				log_parse(_("  text_height = %g"), style.m_text_height);
 				);
 			}
 		}
@@ -148,7 +139,7 @@
 			m_text_glyph_records.back().read(in, glyph_count, glyph_bits, advance_bits);
 
 			IF_VERBOSE_PARSE(
-			log_parse("  glyph_records: count = %d", glyph_count);
+			log_parse(_("  glyph_records: count = %d"), glyph_count);
 			);
 		}
 	}
@@ -161,7 +152,4 @@
 		m_text_glyph_records, m_root_def);
 }
 
-
 }	// end namespace gnash
-
-

Index: server/swf/DefineFontAlignZonesTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/DefineFontAlignZonesTag.cpp	4 Apr 2007 20:30:45 -0000	1.2
+++ server/swf/DefineFontAlignZonesTag.cpp	18 Apr 2007 14:07:33 -0000	1.3
@@ -1,3 +1,4 @@
+// DefineFontAlignZonesTag.cpp:  for Gnash.
 // 
 //   Copyright (C) 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: DefineFontAlignZonesTag.cpp,v 1.2 2007/04/04 20:30:45 bjacques Exp $ */
+/* $Id: DefineFontAlignZonesTag.cpp,v 1.3 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -47,7 +50,7 @@
 	if ( ! referencedFont )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("DefineFontAlignZones tag references an undefined font %d", ref);
+		log_swferror(_("DefineFontAlignZones tag references an undefined font %d"), ref);
 		);
 		in->skip_to_tag_end();
 		return;
@@ -61,11 +64,11 @@
 	// 	- register the tag with the referencedFont
 
 	IF_VERBOSE_PARSE (
-	log_parse("  DefinFontAlignZones: font=%d, flags=%d", ref, flags);
+	log_parse(_("  DefinFontAlignZones: font=%d, flags=%d"), ref, flags);
 	);
 
 	in->skip_to_tag_end();
-	log_error("FIXME: DefineFontAlignZoneTag unfinished ");
+	log_error(_("FIXME: DefineFontAlignZoneTag unfinished"));
 
 
 }

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/swf/PlaceObject2Tag.cpp	18 Apr 2007 13:57:25 -0000	1.3
+++ server/swf/PlaceObject2Tag.cpp	18 Apr 2007 14:07:33 -0000	1.4
@@ -1,3 +1,4 @@
+// PlaceObject2Tag.cpp:  for Gnash.
 // 
 //   Copyright (C) 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: PlaceObject2Tag.cpp,v 1.3 2007/04/18 13:57:25 udog Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.4 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -41,8 +44,8 @@
 
 	IF_VERBOSE_PARSE
 	(
-		log_parse("  char_id = %d", m_character_id);
-		log_parse("  depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
+		log_parse(_("  char_id = %d"), m_character_id);
+		log_parse(_("  depth = %d (%d)"), m_depth, m_depth-character::staticDepthOffset);
 		m_matrix.print();
 	);
 
@@ -52,7 +55,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-			log_parse("  cxform:");
+			log_parse(_("  cxform:"));
 			m_color_transform.print();
 		);
 
@@ -74,7 +77,7 @@
 	UNUSED(all_flags);
 
 	IF_VERBOSE_PARSE (
-		log_parse("  actions: flags = 0x%X", all_flags);
+		log_parse(_("  actions: flags = 0x%X"), all_flags);
 	);
 
 	// Read swf_events.
@@ -95,10 +98,10 @@
 		if ( in->get_tag_end_position()-in->get_position() <  event_length )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("swf_event::read(), "
+			log_swferror(_("swf_event::read(), "
 				"even_length = %u, but only %lu bytes left "
 				"to the end of current tag."
-				" Breaking for safety.",
+				" Breaking for safety."),
 				event_length, in->get_tag_end_position()-in->get_position());
 			);
 			break;
@@ -120,10 +123,10 @@
 		if (readlen > event_length)
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("swf_event::read(), "
+			log_swferror(_("swf_event::read(), "
 				"event_length = %d, "
 				"but read " SIZET_FMT
-				". Breaking for safety.",
+				". Breaking for safety."),
 				event_length, readlen);
 			);
 			// or should we just continue here ?
@@ -132,10 +135,10 @@
 		else if ( readlen < event_length )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("swf_event::read(), "
+			log_swferror(_("swf_event::read(), "
 				"event_length = %d, "
 				"but read " SIZET_FMT 
-				". Skipping excessive bytes.",
+				". Skipping excessive bytes."),
 				event_length, readlen);
 			);
 			in->skip_bytes(event_length - readlen);
@@ -171,7 +174,7 @@
 		if ((pow(2.0, int( sizeof(s_code_bits) / sizeof(s_code_bits[0]) )) - 1) < flags)
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x", flags);
+			log_swferror(_("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"), flags);
 			);
 		}
 
@@ -257,26 +260,24 @@
 	}
 
 	IF_VERBOSE_PARSE (
-		log_parse("  PLACEOBJECT2: depth = %d (%d)", m_depth, m_depth-character::staticDepthOffset);
-		if ( has_char ) log_parse("  char id = %d", m_character_id);
+		log_parse(_("  PLACEOBJECT2: depth = %d (%d)"), m_depth, m_depth-character::staticDepthOffset);
+		if ( has_char ) log_parse(_("  char id = %d"), m_character_id);
 		if ( has_matrix ) 
 		{
-			log_parse("  mat:");
+			log_parse(_("  mat:"));
 			m_matrix.print();
 		}
 		if ( has_cxform )
 		{
-			log_parse("  cxform:");
+			log_parse(_("  cxform:"));
 			m_color_transform.print();
 		}
-		if ( has_ratio ) log_parse("  ratio: %f", m_ratio);
-		if ( has_name ) log_parse("  name = %s", m_name ? m_name : "<null>");
-		if ( has_clip_bracket ) log_parse("  clip_depth = %d (%d)", m_clip_depth, m_clip_depth-character::staticDepthOffset);
-		log_parse(" m_place_type: %d", m_place_type);
+		if ( has_ratio ) log_parse(_("  ratio: %f"), m_ratio);
+		if ( has_name ) log_parse(_("  name = %s"), m_name ? m_name : "<null>");
+		if ( has_clip_bracket ) log_parse(_("  clip_depth = %d (%d)"), m_clip_depth, m_clip_depth-character::staticDepthOffset);
+		log_parse(_(" m_place_type: %d"), m_place_type);
 	);
 			
-
-			
 	//log_msg("place object at depth %i", m_depth);
 }
 
@@ -379,7 +380,7 @@
 	  if (last_add) {
 	      last_add->execute_state(m);
 	  } else {
-	      log_error("reverse REPLACE can't find previous replace or add tag(%d, %d)",
+	      log_error(_("reverse REPLACE can't find previous replace or add tag(%d, %d)"),
 			frame, m_depth);
 	      
 	  }

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -b -r1.88 -r1.89
--- server/swf/tag_loaders.cpp	11 Apr 2007 14:20:21 -0000	1.88
+++ server/swf/tag_loaders.cpp	18 Apr 2007 14:07:33 -0000	1.89
@@ -1,3 +1,4 @@
+// tag_loaders.cpp:  for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: tag_loaders.cpp,v 1.88 2007/04/11 14:20:21 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.89 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -136,13 +139,13 @@
 	{
 		if ( end_tag == curr_pos + 1 )
 		{
-	log_warning("FIXME: anchor-labeled frame not supported");
+	log_unimpl(_("anchor-labeled frame not supported"));
 		}
 		else
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-	log_swferror("frame_label_loader end position " SIZET_FMT ", "
-			"read up to " SIZET_FMT,
+	log_swferror(_("frame_label_loader end position " SIZET_FMT ", "
+			"read up to " SIZET_FMT),
 			end_tag, curr_pos);
 			);
 		}
@@ -176,7 +179,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-	    log_parse("  set_background_color: (%d %d %d)",
+	    log_parse(_("  set_background_color: (%d %d %d)"),
 		      m_color.m_r, m_color.m_g, m_color.m_b);
 		);
 	}
@@ -205,7 +208,7 @@
 
 	IF_VERBOSE_PARSE
 	(
-    log_parse("  jpeg_tables_loader");
+    log_parse(_("  jpeg_tables_loader"));
     	);
 
 #if TU_CONFIG_LINK_TO_JPEGLIB
@@ -243,7 +246,7 @@
 	    //bi = render::create_bitmap_info_rgb(im);
 	    //delete im;
 #else
-	    log_error("gnash is not linked to jpeglib -- can't load jpeg image data!");
+	    log_error(_("gnash is not linked to jpeglib -- can't load jpeg image data"));
 	    return;
 #endif
 
@@ -255,7 +258,7 @@
 		if ( m->get_bitmap_character_def(character_id) )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it", character_id);
+			log_swferror(_("DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it"), character_id);
 			);
 		}
 		else
@@ -276,7 +279,7 @@
 
 	IF_VERBOSE_PARSE
 	(
-		log_parse("  define_bits_jpeg2_loader: charid = %d pos = %lx",
+		log_parse(_("  define_bits_jpeg2_loader: charid = %d pos = %lx"),
 			character_id, in->get_position());
     	);
 
@@ -292,7 +295,7 @@
 	    //bi = render::create_bitmap_info_rgb(im);
 	    //delete im;
 #else
-	    log_error("gnash is not linked to jpeglib -- can't load jpeg image data!");
+	    log_error(_("gnash is not linked to jpeglib -- can't load jpeg image data"));
 	    return;
 #endif
 
@@ -301,7 +304,7 @@
 		if ( m->get_bitmap_character_def(character_id) )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it", character_id);
+			log_swferror(_("DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it"), character_id);
 			);
 		}
 		else
@@ -338,7 +341,7 @@
 
     int err = inflateInit(&d_stream);
     if (err != Z_OK) {
-	log_error("inflate_wrapper() inflateInit() returned %d", err);
+	log_error(_("inflate_wrapper() inflateInit() returned %d"), err);
 	return;
     }
 
@@ -354,14 +357,14 @@
 	if (err == Z_STREAM_END) break;
 	if (err != Z_OK)
 	    {
-		log_error("inflate_wrapper() inflate() returned %d", err);
+		log_error(_("inflate_wrapper() inflate() returned %d"), err);
 	    }
     }
 
     err = inflateEnd(&d_stream);
     if (err != Z_OK)
 	{
-	    log_error("inflate_wrapper() inflateEnd() return %d", err);
+	    log_error(_("inflate_wrapper() inflateEnd() return %d"), err);
 	}
 }
 #endif // TU_CONFIG_LINK_TO_ZLIB
@@ -378,7 +381,7 @@
 
 	IF_VERBOSE_PARSE
 	(
-		log_parse("  define_bits_jpeg3_loader: charid = %d pos = %lx",
+		log_parse(_("  define_bits_jpeg3_loader: charid = %d pos = %lx"),
 			character_id, in->get_position());
 	);
 
@@ -389,7 +392,7 @@
 	{
 
 #if TU_CONFIG_LINK_TO_JPEGLIB == 0 || TU_CONFIG_LINK_TO_ZLIB == 0
-	    log_error("gnash is not linked to jpeglib/zlib -- can't load jpeg/zipped image data!");
+	    log_error(_("gnash is not linked to jpeglib/zlib -- can't load jpeg/zipped image data"));
 	    return;
 #else
 	    //
@@ -437,8 +440,8 @@
 
 	IF_VERBOSE_PARSE
 	(
-		log_parse("  defbitslossless2: tag = %d, id = %d, "
-			"fmt = %d, w = %d, h = %d",
+		log_parse(_("  defbitslossless2: tag = %d, id = %d, "
+			"fmt = %d, w = %d, h = %d"),
 			tag,
 			character_id,
 			bitmap_format,
@@ -450,7 +453,7 @@
     if (m->get_create_bitmaps() == DO_LOAD_BITMAPS)
 	{
 #if TU_CONFIG_LINK_TO_ZLIB == 0
-	    log_error("gnash is not linked to zlib -- can't load zipped image data!");
+	    log_error(_("gnash is not linked to zlib -- can't load zipped image data"));
 	    return;
 #else
 	    if (tag == SWF::DEFINELOSSLESS) // 20
@@ -556,7 +559,7 @@
 			if ( m->get_bitmap_character_def(character_id) )
 			{
 				IF_VERBOSE_MALFORMED_SWF(
-				log_swferror("DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it", character_id);
+				log_swferror(_("DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it"), character_id);
 				);
 			}
 			else
@@ -686,7 +689,7 @@
 void
 fixme_loader(stream* /*in*/, tag_type tag, movie_definition* /*m*/)
 {
-    log_error("  FIXME: tagtype = %d", tag);
+    log_unimpl(_("  FIXME: tagtype = %d"), tag);
 }
 
 void define_shape_loader(stream* in, tag_type tag, movie_definition* m)
@@ -698,7 +701,7 @@
     uint16_t	character_id = in->read_u16();
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  shape_loader: id = %d", character_id);
+    log_parse(_("  shape_loader: id = %d"), character_id);
     		);
 
     shape_character_def*	ch = new shape_character_def;
@@ -714,7 +717,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  shape_morph_loader: id = %d", character_id);
+    log_parse(_("  shape_morph_loader: id = %d"), character_id);
     		);
 
     morph2_character_def* morph = new morph2_character_def;
@@ -761,8 +764,8 @@
 	else
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("define_font_info_loader: "
-			"can't find font w/ id %d", font_id);
+		log_swferror(_("define_font_info_loader: "
+			"can't find font w/ id %d"), font_id);
 		);
 	}
 }
@@ -774,7 +777,7 @@
 
     IF_VERBOSE_PARSE
     (
-    log_parse("  place_object_2");
+    log_parse(_("  place_object_2"));
     );
 
     // TODO: who owns and is going to remove this tag ?
@@ -794,7 +797,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-	log_parse("  sprite:  char id = %d", character_id);
+	log_parse(_("  sprite:  char id = %d"), character_id);
 		);
 
 	// A DEFINESPRITE tag as part of a DEFINESPRITE
@@ -802,7 +805,7 @@
 	if ( ! dynamic_cast<movie_def_impl*>(m) )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("nested DEFINESPRITE tags");
+		log_swferror(_("nested DEFINESPRITE tags"));
 		);
 	}
 
@@ -869,7 +872,7 @@
 		}
 	    else
 		{
-		    log_error("reverse REMOVE can't find previous replace or add tag(%d, %d)",
+		    log_error(_("reverse REMOVE can't find previous replace or add tag(%d, %d)"),
 			      frame, m_depth);
 					
 		}
@@ -888,7 +891,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  remove_object_2(%d)", t->m_depth);
+    log_parse(_("  remove_object_2(%d)"), t->m_depth);
     		);
 
     m->add_execute_tag(t);
@@ -919,7 +922,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  button character loader: char_id = %d", character_id);
+    log_parse(_("  button character loader: char_id = %d"), character_id);
     		);
 
     button_character_definition*	ch = new button_character_definition;
@@ -943,7 +946,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-    log_parse("  export: count = %d", count);
+    log_parse(_("  export: count = %d"), count);
     		);
 
     // Read the exports.
@@ -952,7 +955,7 @@
 	    uint16_t	id = in->read_u16();
 	    char*	symbol_name = in->read_string();
 		IF_VERBOSE_PARSE (
-	    log_parse("  export: id = %d, name = %s", id, symbol_name);
+	    log_parse(_("  export: id = %d, name = %s"), id, symbol_name);
 		);
 
 	    if (font* f = m->get_font(id))
@@ -971,8 +974,8 @@
 		}
 	    else
 		{
-		    log_warning("don't know how to export resource '%s' "
-                              "with id %d (can't find that id)",
+		    log_error(_("don't know how to export resource '%s' "
+                              "with id %d (can't find that id)"),
 			      symbol_name, id);
 		}
 
@@ -1008,8 +1011,7 @@
 
 	IF_VERBOSE_PARSE
 	(
-	log_parse("  import: version = %u, source_url = %s (%s), count = %d", import_version, abs_url.str().c_str(), source_url, count);
-	//log_parse("  import: version = %u, source_url = %s (%s), count = %d", import_version, abs_url.str().c_str(), source_url, count);
+	log_parse(_("  import: version = %u, source_url = %s (%s), count = %d"), import_version, abs_url.str().c_str(), source_url, count);
 	);
 
 
@@ -1021,13 +1023,13 @@
 		try {
 			source_movie = create_library_movie(abs_url);
 		} catch (gnash::GnashException& e) {
-			log_error("%s", e.what());
+			log_error(_("Exception: %s"), e.what());
 			source_movie = NULL;
 		}
 		if (source_movie == NULL)
 		{
 		    // Give up on imports.
-		    log_error("can't import movie from url %s", abs_url.str().c_str());
+		    log_error(_("can't import movie from url %s"), abs_url.str().c_str());
 		    return;
 		}
 
@@ -1036,7 +1038,7 @@
 		if (source_movie == m)
 		{
 		    IF_VERBOSE_MALFORMED_SWF(
-		    log_swferror("Movie attempts to import symbols from itself.");
+		    log_swferror(_("Movie attempts to import symbols from itself."));
 		    );
 		    return;
 		}
@@ -1049,7 +1051,7 @@
 	    char*	symbol_name = in->read_string();
 		IF_VERBOSE_PARSE
 		(
-	    log_parse("  import: id = %d, name = %s", id, symbol_name);
+	    log_parse(_("  import: id = %d, name = %s"), id, symbol_name);
 	    	);
 	    
 	    if (s_no_recurse_while_loading)
@@ -1065,7 +1067,7 @@
 		    boost::intrusive_ptr<resource> res = source_movie->get_exported_resource(symbol_name);
 		    if (res == NULL)
 			{
-			    log_warning("import error: could not find resource '%s' in movie '%s'",
+			    log_error(_("import error: could not find resource '%s' in movie '%s'"),
 				      symbol_name, source_url);
 			}
 		    else if (font* f = res->cast_to_font())
@@ -1080,7 +1082,7 @@
 			}
 		    else
 			{
-			    log_error("import error: resource '%s' from movie '%s' has unknown type",
+			    log_error(_("import error: resource '%s' from movie '%s' has unknown type"),
 				      symbol_name, source_url);
 			}
 		}
@@ -1101,7 +1103,7 @@
 	edit_text_character_def* ch = new edit_text_character_def(m);
 		IF_VERBOSE_PARSE
 		(
-	log_parse("edit_text_char, id = %d", character_id);
+	log_parse(_("edit_text_char, id = %d"), character_id);
 		);
 	ch->read(in, tag, m);
 
@@ -1119,7 +1121,7 @@
 	text_character_def* ch = new text_character_def(m);
 		IF_VERBOSE_PARSE
 		(
-	log_parse("text_character, id = %d", character_id);
+	log_parse(_("text_character, id = %d"), character_id);
 		);
 	ch->read(in, tag, m);
 
@@ -1140,8 +1142,8 @@
 {
 		IF_VERBOSE_PARSE
 		(
-    log_parse("tag %d: do_action_loader", tag);
-    log_parse("-- actions in frame " SIZET_FMT,
+    log_parse(_("tag %d: do_action_loader"), tag);
+    log_parse(_("-- actions in frame " SIZET_FMT),
 	       m->get_loading_frame());
 		);
     
@@ -1166,8 +1168,8 @@
 
 		IF_VERBOSE_PARSE
 		(
-	log_parse("  tag %d: do_init_action_loader", tag);
-	log_parse("  -- init actions for sprite %d",
+	log_parse(_("  tag %d: do_init_action_loader"), tag);
+	log_parse(_("  -- init actions for sprite %d"),
 		   sprite_character_id);
 		);
 
@@ -1201,8 +1203,8 @@
 
 	IF_VERBOSE_PARSE
 	(
-		log_parse("define sound: ch=%d, format=%d, "
-			"rate=%d, 16=%d, stereo=%d, ct=%d",
+		log_parse(_("define sound: ch=%d, format=%d, "
+			"rate=%d, 16=%d, stereo=%d, ct=%d"),
 			character_id, int(format), sample_rate,
 			int(sample_16bit), int(stereo), sample_count);
 	);
@@ -1217,7 +1219,7 @@
 		if (! (sample_rate >= 0 && sample_rate <= 3))
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("Bad sample rate read from SWF header.");
+			log_swferror(_("Bad sound sample rate %d read from SWF header"), sample_rate);
 			);
                 	return;
 		}
@@ -1277,9 +1279,9 @@
 	else
 	{
 		// is this nice to do?
-		log_warning("There is not sound handler currently active, "
+		log_error(_("There is no sound handler currently active, "
 			"so character with id %d will NOT be added to "
-			"the dictionary.",
+			"the dictionary"),
 			character_id);
 	}
 }
@@ -1303,7 +1305,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-		log_parse("start_sound tag: id=%d, stop = %d, loop ct = %d",
+		log_parse(_("start_sound tag: id=%d, stop = %d, loop ct = %d"),
 			  sound_id, int(sst->m_stop_playback), sst->m_loop_count);
 		);
 	}
@@ -1312,7 +1314,7 @@
 		if (handler)
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("start_sound_loader: sound_id %d is not defined", sound_id);
+			log_swferror(_("start_sound_loader: sound_id %d is not defined"), sound_id);
 			);
 		}
 	}
@@ -1355,7 +1357,7 @@
 
 		IF_VERBOSE_PARSE
 		(
-	log_parse("sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, ct=%d",
+	log_parse(_("sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"),
 		  int(format), sample_rate, int(sample_16bit), int(stereo), sample_count);
 		);
 
@@ -1365,7 +1367,8 @@
 	if (! (sample_rate >= 0 && sample_rate <= 3))
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("Bad sample rate read from SWF header.");
+		log_swferror(_("Bad sound sample rate %d read from SWF header"),
+				sample_rate);
 		);
 		return;
 	}
@@ -1525,17 +1528,17 @@
 
 	IF_VERBOSE_PARSE
 	(
-		log_parse("  file attributes: has_metadata=%s use_network=%s",
-			flags.has_metadata ? "true" : "false",
-			flags.use_network ? "true" : "false")
+		log_parse(_("  file attributes: has_metadata=%s use_network=%s"),
+			flags.has_metadata ? _("true") : _("false"),
+			flags.use_network ? _("true") : _("false"))
 	);
 
 	if ( ! flags.use_network )
 	{
-		log_warning("FileAttributes tag in the SWF requests that "
+		log_warning(_("FileAttributes tag in the SWF requests that "
 			"network access is not granted to this movie "
-			"(or application?). Anyway Gnash won't care "
-			"use white/black listing in your .gnashrc instead");
+			"(or application?). Anyway Gnash won't care; "
+			"use white/black listing in your .gnashrc instead"));
 	}
 
 	// TODO: attach info to movie_definition 
@@ -1551,10 +1554,10 @@
 	char* metadata = in->read_string();
 
 	IF_VERBOSE_PARSE (
-		log_parse("  metadata = [[\n%s\n]]", metadata);
+		log_parse(_("  metadata = [[\n%s\n]]"), metadata);
 	);
 
-	log_warning("METADATA tag parsed but unused");
+	log_unimpl(_("METADATA tag unused: %s"), metadata);
 
 	// TODO: attach to movie_definition instead
 	//       (should we parse the XML maybe?)
@@ -1572,10 +1575,10 @@
 	in->read_string_with_length(in->get_tag_length(), serial);
 
 	IF_VERBOSE_PARSE (
-		log_parse("  serialnumber = [[\n%s\n]]", serial.c_str());
+		log_parse(_("  serialnumber = [[\n%s\n]]"), serial.c_str());
 	);
 
-	log_msg("SERIALNUMBER: %s", serial.c_str());
+	log_msg(_("SERIALNUMBER: %s"), serial.c_str());
 
 	// attach to movie_definition ?
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/vm/ASHandlers.cpp	16 Apr 2007 18:23:06 -0000	1.96
+++ server/vm/ASHandlers.cpp	18 Apr 2007 14:07:33 -0000	1.97
@@ -1,3 +1,4 @@
+// ASHandlers.cpp:  ActionScript handlers, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: ASHandlers.cpp,v 1.96 2007/04/16 18:23:06 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.97 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -56,7 +59,6 @@
 using namespace std;
 
 namespace {
-static gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 #ifdef USE_DEBUGGER
 static gnash::Debugger& debugger = gnash::Debugger::getDefaultInstance();
 #endif
@@ -96,7 +98,7 @@
 
 static void unsupported_action_handler(ActionExec& thread)
 {
-	log_error("Unsupported action handler invoked, code at pc is %d", thread.code[thread.pc]);
+	log_error(_("Unsupported action handler invoked, code at pc is %d"), thread.code[thread.pc]);
 }
 
 ActionHandler::ActionHandler()
@@ -177,7 +179,7 @@
 	// based on version (would make sense)
 	if ( ! VM::isInitialized() )
 	{
-		log_error("FIXME: VM not initialized at SWFHandlers construction time, can't set action handlers based on SWF version");
+		log_error(_("FIXME: VM not initialized at SWFHandlers construction time, can't set action handlers based on SWF version"));
 	}
 
     vector<std::string> & property_names = get_property_names();
@@ -461,7 +463,7 @@
 	assert( code[thread.pc] == SWF::ACTION_END );
 #endif
 
-	dbglogfile << __PRETTY_FUNCTION__ << ": CHECKME: was broken" << endl;
+	log_error (_("%s: CHECKME: was broken"), __PRETTY_FUNCTION__);
 	thread.next_pc=thread.stop_pc;
 }
 void
@@ -541,7 +543,7 @@
     const action_buffer& code = thread.code;
 
     assert( code[thread.pc] == SWF::ACTION_TOGGLEQUALITY );
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
@@ -604,7 +606,7 @@
 	const char* target = code.read_string(pc+3+url_len);
 
 		IF_VERBOSE_ACTION (
-	log_action("GetUrl: target=%s url=%s", target, url);
+	log_action(_("GetUrl: target=%s url=%s"), target, url);
 		);
 
 	CommonGetUrl(env, target, url, 0u);
@@ -624,8 +626,10 @@
 	size_t tag_len = code.read_int16(thread.pc+1);
 	if ( tag_len != 3 )
 	{
-		log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag length == " SIZET_FMT
-		            " (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
+		IF_VERBOSE_MALFORMED_SWF (
+		log_swferror(_("ActionWaitForFrame (0x%X) tag length == " SIZET_FMT
+		            " (expected 3)"), SWF::ACTION_WAITFORFRAME, tag_len);
+		);
 	}
 
 	// If we haven't loaded a specified frame yet, then 
@@ -638,7 +642,8 @@
 	sprite_instance* target_sprite = target->to_movie();
 	if ( ! target_sprite )
 	{
-		log_error("environment target is not a sprite_instance while executing ActionWaitForFrame");
+		log_error(_("%s: environment target is not a sprite_instance"),
+				__FUNCTION__);
 		return;
 	}
 
@@ -651,12 +656,12 @@
 	size_t lastloaded = target_sprite->get_loaded_frames();
 	if ( lastloaded < framenum )
 	{
-		//log_msg("ActionWaitForFrame: frame %u not reached yet (loaded %u), skipping next %u actions", framenum, lastloaded, skip);
+		//log_msg(_("%s: frame %u not reached yet (loaded %u), skipping next %u actions"), __FUNCTION__, framenum, lastloaded, skip);
 		// better delegate this to ActionExec
 		thread.skip_actions(skip);
 	}
 
-	//dbglogfile << __PRETTY_FUNCTION__ << ": testing" << endl;
+	//log_msg(_("%s: testing"), __PRETTY_FUNCTION__);
 }
 
 void
@@ -688,7 +693,8 @@
 	sprite_instance *target_sprite = target->to_movie();
 	if ( ! target_sprite )
 	{
-		log_error("environment target is not a sprite_instance while executing ActionGotoLabel");
+		log_error(_("%s: environment target is not a sprite_instance"),
+			__FUNCTION__);
 	}
 	else
 	{
@@ -852,8 +858,8 @@
     // input checks
     if ( string_val.is_undefined() || string_val.is_null() )
     {
-    	log_warning("Undefined or null string passed to ActionSubString, "
-		"returning undefined");
+    	log_error(_("Undefined or null string passed to ActionSubString, "
+		"returning undefined"));
     	env.drop(2);
     	env.top(0).set_undefined();
 	return;
@@ -867,8 +873,8 @@
 
     if ( size < 0 )
     {
-    	log_warning("Negative size passed to ActionSubString, "
-		"taking as whole length");
+    	log_error(_("Negative size passed to ActionSubString, "
+		"taking as whole length"));
 	size = str.length();
     }
 
@@ -878,8 +884,8 @@
     if ( base < 1 )
     {
 	IF_VERBOSE_ASCODING_ERRORS (
-    	log_aserror("Less then 1 base in ActionSubString, "
-		"setting to 1.");
+    	log_aserror(_("Base is less then 1 in ActionSubString, "
+		"setting to 1."));
 	);
 	base=1;
     }
@@ -887,8 +893,8 @@
     else if ( unsigned(base) > str.length() )
     {
 	IF_VERBOSE_ASCODING_ERRORS (
-    	log_aserror("base goes beyond input string in ActionSubString, "
-		"returning the empty string.");
+    	log_aserror(_("base goes beyond input string in ActionSubString, "
+		"returning the empty string."));
 	);
     	env.drop(2);
     	env.top(0).set_string("");
@@ -901,8 +907,8 @@
     if ( unsigned(base+size) > str.length() )
     {
 	IF_VERBOSE_ASCODING_ERRORS (
-    	log_aserror("base+size goes beyond input string in ActionSubString, "
-		"adjusting size");
+    	log_aserror(_("base+size goes beyond input string in ActionSubString, "
+		"adjusting size"));
 	);
 	size = str.length()-base;
     }
@@ -912,7 +918,7 @@
     assert(unsigned(base) < str.length() );
     assert(size >= 0);
 
-    //log_msg("string: %s, size: %d, base: %d", str.c_str(), size, base);
+    //log_msg(_("string: %s, size: %d, base: %d"), str.c_str(), size, base);
 
     // Keep base within range.
     //base = iclamp(base, 0, str.length());
@@ -969,11 +975,11 @@
 	(
 	        boost::intrusive_ptr<as_object> obj=top_value.to_object();
 		if (obj == NULL) {
-			log_action("-- get var: %s=%s",
+			log_action(_("-- get var: %s=%s"),
 				var_string.c_str(),
 				top_value.to_debug_string().c_str());
 		} else {
-			log_action("-- get var: %s=%s at %p",
+			log_action(_("-- get var: %s=%s at %p"),
 				var_string.c_str(),
 				top_value.to_string(&env).c_str(),
 				(void*)obj.get());
@@ -998,7 +1004,7 @@
 	thread.setVariable(name, env.top(0));
 
         IF_VERBOSE_ACTION (
-            log_action("-- set var: %s = %s", name.c_str(), env.top(0).to_debug_string().c_str());
+            log_action(_("-- set var: %s = %s"), name.c_str(), env.top(0).to_debug_string().c_str());
             );
 
 	// TODO: move this to ActionExec::setVariable !
@@ -1055,12 +1061,12 @@
 	{
 		as_object* obj = thread.getTarget();
 
-		//log_msg("ActionGetProperty(<empty>) called, target is %p", (void*)obj);
+		//log_msg(_("ActionGetProperty(<empty>) called, target is %p"), (void*)obj);
 
 		target = dynamic_cast<character*>(obj);
 		if ( ! target )
 		{
-			log_warning("ActionGetProperty(<empty>) called, but current target is not a character");
+			log_error(_("ActionGetProperty(<empty>) called, but current target is not a character"));
 		}
 	}
 	else
@@ -1083,8 +1089,8 @@
 		}
 		else
 		{
-			log_error("invalid property query, property "
-				"number %d", prop_number);
+			log_error(_("invalid property query, property "
+				"number %d"), prop_number);
 			env.top(1) = as_value();
 		}
 	}
@@ -1092,7 +1098,7 @@
 	{
 		// ASCODING error ? (well, last time it was a gnash error ;)
 		IF_VERBOSE_ASCODING_ERRORS (
-		log_aserror("Could not find GetProperty target (%s)",
+		log_aserror(_("Could not find GetProperty target (%s)"),
 				tgt_val.to_debug_string().c_str());
 		);
 		env.top(1) = as_value();
@@ -1123,7 +1129,9 @@
 	else
 	{
 	    // Malformed SWF ? (don't think this is possible to do with syntactically valid ActionScript)
-	    log_error("invalid set_property, property number %d", prop_number);
+	    IF_VERBOSE_MALFORMED_SWF (
+	    log_swferror(_("invalid set_property, property number %d"), prop_number);
+	    )
 	}
         
     }
@@ -1146,7 +1154,7 @@
 	if ( ! ch )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Path given to duplicateMovieClip(%s) doesn't point to a character",
+		log_aserror(_("Path given to duplicateMovieClip(%s) doesn't point to a character"),
 			path.c_str());
 		);
 		env.drop(3);
@@ -1157,7 +1165,7 @@
 	if ( ! sprite )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Path given to duplicateMovieClip(%s) is not a sprite",
+		log_aserror(_("Path given to duplicateMovieClip(%s) is not a sprite"),
 			path.c_str());
 		);
 		env.drop(3);
@@ -1182,7 +1190,7 @@
 	if ( ! ch )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Path given to removeMovieClip(%s) doesn't point to a character",
+		log_aserror(_("Path given to removeMovieClip(%s) doesn't point to a character"),
 			path.c_str());
 		);
 		return;
@@ -1192,7 +1200,7 @@
 	if ( ! sprite )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Path given to removeMovieClip(%s) is not a sprite",
+		log_aserror(_("Path given to removeMovieClip(%s) is not a sprite"),
 			path.c_str());
 		);
 		return;
@@ -1231,7 +1239,7 @@
 	if ( tgt ) {
 		st.setCharacter( tgt );
 	} else {
-		log_error("start_drag of invalid target '%s'.",
+		log_error(_("start_drag of invalid target '%s'"),
 			env.top(0).to_debug_string().c_str());
 	}
     
@@ -1255,7 +1263,7 @@
 		if ( y1 < y0 )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_msg("Y values in ActionStartDrag swapped, fixing");
+			log_swferror(_("Y values in ActionStartDrag swapped, fixing"));
 			);
 			swap(y1, y0);
 		}
@@ -1263,7 +1271,7 @@
 		if ( x1 < x0 )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			log_msg("X values in ActionStartDrag swapped, fixing");
+			log_swferror(_("X values in ActionStartDrag swapped, fixing"));
 			);
 			swap(x1, x0);
 		}
@@ -1307,7 +1315,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     //as_environment& env = thread.env;
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
@@ -1329,7 +1337,7 @@
 	if (!super || ! instance)
 	{
 		IF_VERBOSE_ACTION (
-		log_action("-- %s cast_to %s (invalid args?)",
+		log_action(_("-- %s cast_to %s (invalid args?)"),
 			env.top(1).to_debug_string().c_str(),
 			env.top(0).to_debug_string().c_str());
 		);
@@ -1349,7 +1357,7 @@
 		env.top(0) = as_value();
 	}
 
-	log_warning("ActionCastOp TESTING");
+	log_msg(_("ActionCastOp TESTING"));
 }
 
 void
@@ -1360,7 +1368,7 @@
 	// assert(thread.code[thread.pc] == SWF::ACTION_IMPLEMENTSOP);
 
 	//as_environment& env = thread.env;
-	dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
@@ -1381,7 +1389,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 //    as_environment& env = thread.env;
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
@@ -1436,7 +1444,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 //    as_environment& env = thread.env;
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
@@ -1444,7 +1452,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 //    as_environment& env = thread.env;
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 void
@@ -1452,7 +1460,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 //    as_environment& env = thread.env;
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 // also known as WaitForFrame2
@@ -1476,8 +1484,8 @@
 	sprite_instance* target_sprite = target->to_movie();
 	if ( ! target_sprite )
 	{
-		log_error("environment target is not a sprite_instance "
-			"while executing ActionWaitForFrameExpression");
+		log_error(_("%s: environment target is not a sprite_instance"),
+			__FUNCTION__);
 		return;
 	}
 
@@ -1485,9 +1493,9 @@
         if ( ! target_sprite->get_frame_number(framespec, framenum) )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Frame spec found on stack "
+		log_aserror(_("Frame spec found on stack "
 			"at ActionWaitForFrame doesn't evaluate "
-		        "to a valid frame: %s",
+		        "to a valid frame: %s"),
 			framespec.to_debug_string().c_str());
 		);
 		return;
@@ -1501,12 +1509,12 @@
 	size_t lastloaded = target_sprite->get_loaded_frames();
 	if ( lastloaded < framenum )
 	{
-		//log_msg("ActionWaitForFrameExpression: frame %u not reached yet (loaded %u), skipping next %u actions", framenum, lastloaded, skip);
+		//log_msg(_("ActionWaitForFrameExpression: frame %u not reached yet (loaded %u), skipping next %u actions"), framenum, lastloaded, skip);
 		// better delegate this to ActionExec
 		thread.skip_actions(skip);
 	}
 
-	//dbglogfile << __PRETTY_FUNCTION__ << ": testing" << endl;
+	//log_msg(_("%s: testing"), __PRETTY_FUNCTION__);
 }
 
 void
@@ -1550,7 +1558,7 @@
 
 #if 0 // is this really useful ?
         IF_VERBOSE_ACTION (
-            log_action("[push length=%d]", length);
+            log_action(_("[push length=%d]"), length);
             );
 #endif
 
@@ -1569,10 +1577,10 @@
 			default:
 			{
 				IF_VERBOSE_MALFORMED_SWF(
-					log_warning("Unknown push type %d."
+					log_swferror(_("Unknown push type %d."
 						" Execution will continue "
 						"but it is likely to fail "
-						"due to lost sync.", type);
+						"due to lost sync."), type);
 				);
 				continue;
 			}
@@ -1619,8 +1627,8 @@
 				{
 					env.push(as_value());
 					IF_VERBOSE_MALFORMED_SWF(
-					log_warning("register %d "
-						"out of bounds!", reg);
+					log_swferror(_("register %d "
+						"out of bounds"), reg);
 					);
 				}
 				else
@@ -1665,8 +1673,8 @@
 				else
 				{
 					IF_VERBOSE_MALFORMED_SWF(
-					log_warning("dict_lookup %d "
-					"is out of bounds!", id);
+					log_swferror(_("dict_lookup %d "
+					"is out of bounds"), id);
 					);
 					env.push(0);
 				}
@@ -1684,8 +1692,8 @@
 				else
 				{
 					IF_VERBOSE_MALFORMED_SWF(
-					log_warning("dict_lookup %d "
-					"is out of bounds!", id);
+					log_swferror(_("dict_lookup %d "
+					"is out of bounds"), id);
 					);
 					env.push(0);
 				}
@@ -1696,11 +1704,11 @@
 		IF_VERBOSE_ACTION (
 		if ( type == pushDict8 || type == pushDict16 )
 		{
-			log_action("\t" SIZET_FMT ") type=%s (%d), value=%s", count, pushType[type], id, env.top(0).to_debug_string().c_str());
+			log_action(_("\t" SIZET_FMT ") type=%s (%d), value=%s"), count, pushType[type], id, env.top(0).to_debug_string().c_str());
 		}
 		else
 		{
-			log_action("\t" SIZET_FMT ") type=%s, value=%s", count, pushType[type], env.top(0).to_debug_string().c_str());
+			log_action(_("\t" SIZET_FMT ") type=%s, value=%s"), count, pushType[type], env.top(0).to_debug_string().c_str());
 		}
 		++count;
 		);
@@ -1751,7 +1759,7 @@
 
 	if ( *url_c == '\0' )
 	{
-		log_warning("Bogus GetUrl url (empty) in SWF file, skipping");
+		log_error(_("Bogus empty GetUrl url in SWF file, skipping"));
 		return;
 	}
 
@@ -1766,8 +1774,8 @@
 	// handle malformed sendVarsMethod
 	if ( sendVarsMethod == 3 )
 	{
-		log_warning("Bogus GetUrl2 send vars method "
-			" in SWF file (both GET and POST requested), set to 0");
+		log_error(_("Bogus GetUrl2 send vars method "
+			" in SWF file (both GET and POST requested), set to 0"));
 		sendVarsMethod=0;
 	}
 
@@ -1794,7 +1802,7 @@
 	// a print request.
 	if (strncmp(url_c, "print:", 6) == 0)
 	{
-		log_error("Printing unimplemented");
+		log_unimpl("print: URL");
 		return;
 	}
 
@@ -1819,7 +1827,7 @@
 	const URL& baseurl = get_base_url();
 	URL url(url_s, baseurl);
 
-	log_msg("get url: target=%s, url=%s (%s)", target_string.c_str(),
+	log_msg(_("get url: target=%s, url=%s (%s)"), target_string.c_str(),
 		url.str().c_str(), url_c);
 
 	if ( loadTargetFlag )
@@ -1827,7 +1835,7 @@
 		character* target_ch = env.find_target(target);
 		if ( ! target_ch )
 		{
-			log_error("get url: target %s not found",
+			log_error(_("get url: target %s not found"),
 				target_string.c_str());
 			return;
 		}
@@ -1835,21 +1843,21 @@
 		sprite_instance* target_movie = target_ch->to_movie();
 		if ( ! target_movie ) 
 		{
-			log_error("get url: target %s is not a sprite",
+			log_error(_("get url: target %s is not a sprite"),
 				target_string.c_str());
 			return;
 		}
 
 		if ( loadVariableFlag )
 		{
-			log_msg("getURL2 loadVariable");
+			log_msg(_("getURL2 loadVariable"));
 
-			//log_warning("Unhandled GetUrl2 loadVariable flag. loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), target.to_string(&env).c_str());
+			//log_unimpl("Unhandled GetUrl2 loadVariable flag. loadTargetFlag=%d, target=%s (%s)", loadTargetFlag, target.typeOf(), target.to_string(&env).c_str());
 			target_movie->loadVariables(url, sendVarsMethod);
 		}
 		else
 		{
-			log_msg("getURL2 target load");
+			log_msg(_("getURL2 target load"));
 		      
 			// Check host security
 			if ( ! URLAccessManager::allow(url) )
@@ -1860,8 +1868,8 @@
 
 			if ( sendVarsMethod )
 			{
-				log_warning("Unhandled GetUrl2 sendVariableMethod (%d)"
-					" with loadTargetFlag and ! loadVariablesFlag",
+				log_unimpl(_("Unhandled GetUrl2 sendVariableMethod (%d)"
+					" with loadTargetFlag and ! loadVariablesFlag"),
 					sendVarsMethod);
 			}
 
@@ -1873,8 +1881,8 @@
 	{
 		if ( sendVarsMethod )
 		{
-			log_warning("Unhandled GetUrl2 sendVariableMethod (%d)"
-				" with no loadTargetFlag",
+			log_unimpl (_("Unhandled GetUrl2 sendVariableMethod (%d)"
+				" with no loadTargetFlag"),
 				sendVarsMethod);
 		}
 
@@ -1887,7 +1895,7 @@
 		}
 #endif
 		command += ")\"";
-		dbglogfile << "Launching URL... " << command << endl;
+		log_msg (_("Launching URL... %s"), command.c_str());
 		system(command.c_str());
 	}
 }
@@ -1912,8 +1920,8 @@
 	{
 		IF_VERBOSE_ASCODING_ERRORS (
 		log_aserror(
-			"Couldn't find movie \"%s\" to set target to!"
-			" Not setting target at all...",
+			_("Couldn't find movie \"%s\" to set target to!"
+			" Not setting target at all..."),
 			target_name.c_str());
 		);
 	}
@@ -1940,7 +1948,7 @@
 	as_value url_val = env.top(1);
 	if ( url_val.is_undefined() )
 	{
-		log_warning("Undefined GetUrl2 url on stack, skipping");
+		log_error(_("Undefined GetUrl2 url on stack, skipping"));
 	}
 	else
 	{
@@ -1976,9 +1984,11 @@
 		      
 		if (next_pc > stop_pc)
 		{
-			log_error("branch to offset " SIZET_FMT "  -- "
-				" this section only runs to " SIZET_FMT ". "
-				" Malformed SWF !.", next_pc, stop_pc);
+			IF_VERBOSE_MALFORMED_SWF (
+			log_swferror(_("branch to offset " SIZET_FMT "  -- "
+				" this section only runs to " SIZET_FMT),
+			        next_pc, stop_pc);
+			)
 		}
 	}
 }
@@ -2013,10 +2023,12 @@
 	}
 	else
 	{
-		log_aserror(
+		IF_VERBOSE_ASCODING_ERRORS (
+		log_aserror(_(
 			"Couldn't find target_sprite \"%s\" in ActionCallFrame!"
-			" target frame actions will not be called...",
+			" target frame actions will not be called..."),
 			target_path.c_str());
+		)
 	}
 
 	env.drop(1);
@@ -2075,9 +2087,9 @@
 		if ( ! target_sprite->get_frame_number(frame_var, frame_number) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("Frame spec found on stack "
+			log_aserror(_("Frame spec found on stack "
 				"at ActionGotoExpression doesn't evaluate "
-		        "to a valid frame: %s",
+				"to a valid frame: %s"),
 				target_frame.c_str());
 			);
 			return;
@@ -2087,10 +2099,12 @@
 	}
 	else
 	{
-		log_aserror(
-			"Couldn't find target_sprite \"%s\" in ActionGotoExpression!"
-			" will not goto taget_frame...",
+		IF_VERBOSE_ASCODING_ERRORS (
+		log_aserror(_(
+			"Couldn't find target sprite \"%s\" in ActionGotoExpression. "
+			" Will not go to target frame..."),
 			target_frame.c_str());
+		)
 	}		  
 }
 
@@ -2108,9 +2122,9 @@
 	if ( stacksize < 1 )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-			log_warning("No elements on the stack "
+			log_swferror(_("No elements on the stack "
 				"at ActionDelete (0x3A). "
-				"Returning FALSE.");
+				"Returning FALSE."));
 		);
 		env.push(as_value(false));
 		return;
@@ -2147,7 +2161,7 @@
     thread.setLocalVariable(varname.to_string(&env), value);
 
     IF_VERBOSE_ACTION (
-    log_action("-- set local var: %s = %s", varname.to_string(&env).c_str(), value.to_debug_string().c_str());
+    log_action(_("-- set local var: %s = %s"), varname.to_string(&env).c_str(), value.to_debug_string().c_str());
     );
 
     env.drop(2);
@@ -2178,14 +2192,18 @@
 
 	if ( ! function.is_object() ) 
 	{
-		log_aserror("ActionCallFunction: %s is not an object", env.top(0).to_string(&env).c_str());
+		IF_VERBOSE_ASCODING_ERRORS (
+		log_aserror(_("ActionCallFunction: %s is not an object"), env.top(0).to_string(&env).c_str());
+		)
 	}
 	else if ( ! function.is_function() ) 
 	{
 		boost::intrusive_ptr<as_object> obj = function.to_object();
 		if ( ! obj->get_member("constructor", &function) )
 		{
-			log_aserror("Object doensn't have a construcor");
+			IF_VERBOSE_ASCODING_ERRORS (
+			log_aserror(_("Object doensn't have a constructor"));
+			)
 		}
 	}
 
@@ -2195,14 +2213,14 @@
 	if ( available_args < nargs )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("Attempt to call a function with %u arguments "
-			"while only %u are available on the stack.",
+		log_swferror(_("Attempt to call a function with %u arguments "
+			"while only %u are available on the stack."),
 			nargs, available_args);
 		);
 		nargs = available_args;
 	}
 
-	//log_msg("Function's nargs: %d", nargs);
+	//log_msg(_("Function's nargs: %d"), nargs);
     
 #ifdef USE_DEBUGGER
 //        cerr << "entering function: " << function_name << endl;
@@ -2212,7 +2230,7 @@
 	as_value result = call_method(function, &env, this_ptr,
 				  nargs, env.get_top_index() - 2);
 
-	//log_msg("Function's result: %s", result.to_string(&env));
+	//log_msg(_("Function's result: %s"), result.to_string(&env));
     
 	env.drop(nargs + 1);
 	env.top(0) = result;
@@ -2229,7 +2247,7 @@
 	as_environment& env = thread.env;
 	as_value* retval = thread.retval;
 
-	//log_msg("Before top/drop (retval=%p)", (void*)retval);
+	//log_msg(_("Before top/drop (retval=%p)"), (void*)retval);
 	//env.dump_stack();
 
 	thread.ensureStack(1); // ret value
@@ -2246,7 +2264,7 @@
         debugger.callStackPop();
 #endif
 
-	//log_msg("After top/drop");
+	//log_msg(_("After top/drop"));
 	//env.dump_stack();
     
 	// Skip the rest of this buffer (return from this action_buffer).
@@ -2270,7 +2288,7 @@
     result = fmod(x, y);
 //  env.top(1).set_double(fmod(env.top(1).to_bool() && env.top(0).to_bool());
 //  env.drop(1);
-//  log_error("modulo x=%f, y=%f, z=%f",x,y,result.to_number(&env));
+//  log_error(_("modulo x=%f, y=%f, z=%f"), x, y, result.to_number(&env));
     env.push(result);
 }
 
@@ -2286,7 +2304,7 @@
 	const string& classname = val.to_string(&env);
 
 	IF_VERBOSE_ACTION (
-		log_action("---new object: %s",
+		log_action(_("---new object: %s"),
 			classname.c_str());
 	);
 
@@ -2299,8 +2317,8 @@
 	if ( ! constructor )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("ActionNew: "
-			"'%s' is NOT a constructor", classname.c_str());
+		log_aserror(_("ActionNew: "
+			"'%s' is not a constructor"), classname.c_str());
 		);
 		env.drop(nargs);
 		env.push(as_value()); // should we push an object anyway ?
@@ -2339,7 +2357,7 @@
     else
     {
        IF_VERBOSE_ASCODING_ERRORS(
-       log_aserror("The 'var whatever' syntax in timeline context is a no-op.");
+       log_aserror(_("The 'var whatever' syntax in timeline context is a no-op."));
        );
     }
     env.drop(1);
@@ -2358,7 +2376,7 @@
 
     thread.ensureStack((unsigned int)array_size); // array elements
     
-    //log_msg("xxx init array: size = %d, top of stack = %d", array_size, env.get_top_index());//xxxxx
+    //log_msg(_("xxx init array: size = %d, top of stack = %d"), array_size, env.get_top_index());//xxxxx
     
     // Call the array constructor, to create an empty array.
     as_value	result;
@@ -2379,7 +2397,7 @@
     
     env.push(result);
     
-    //log_msg("xxx init array end: top of stack = %d, trace(top(0)) =", env.get_top_index());//xxxxxxx
+    //log_msg(_("xxx init array end: top of stack = %d, trace(top(0)) ="), env.get_top_index());//xxxxxxx
     
     //as_global_trace(fn_call(NULL, NULL, env, 1, env.get_top_index()));	//xxxx
     
@@ -2417,7 +2435,7 @@
     }
     
     // @@ TODO
-    //log_error("checkme opcode: %02X", action_id);
+    //log_error(_("checkme opcode: %02X"), action_id);
     
     as_value new_obj;
     new_obj.set_as_object(new_obj_ptr.get());
@@ -2455,7 +2473,7 @@
 	else
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Argument to TargetPath(%s) doesn't cast to a movieclip",
+		log_aserror(_("Argument to TargetPath(%s) doesn't cast to a MovieClip"),
 			env.top(0).to_debug_string().c_str());
 		);
 		env.top(0).set_undefined();
@@ -2493,8 +2511,8 @@
 	if ( ! variable.is_object() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Top of stack not an object (%s) at "
-			"ActionEnumerate execution",
+		log_aserror(_("Top of stack not an object (%s) at "
+			"ActionEnumerate execution"),
 			variable.to_debug_string().c_str());
 		);
 		return;
@@ -2516,7 +2534,7 @@
     as_value& v1 = env.top(0);
     as_value& v2 = env.top(1);
 
-    //log_msg("ActionNewAdd(%s, %s) called", v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
+    //log_msg(_("ActionNewAdd(%s, %s) called"), v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
 
 
     if (v1.is_string() || v2.is_string() )
@@ -2530,9 +2548,9 @@
     {
 	// use numeric semantic
 	double v2num = v2.to_number(&env);
-	//log_msg("v2 num = %g", v2num);
+	//log_msg(_("v2 num = %g"), v2num);
 	double v1num = v1.to_number(&env);
-	//log_msg("v1 num = %g", v1num);
+	//log_msg(_("v1 num = %g"), v1num);
 
         v2.set_double(v2num + v1num); // modify env.top(1)
     }
@@ -2642,16 +2660,16 @@
     
     boost::intrusive_ptr<as_object> obj = target.to_object();
     if (!obj) {
-//         IF_VERBOSE_DEBUG(log_msg("getMember called against "
+//         IF_VERBOSE_DEBUG(log_msg(_("getMember called against "
 //                                  "a value that does not cast "
-//                                  "to an as_object: %s", target.to_string(&env).c_str()));
+//                                  "to an as_object: %s"), target.to_string(&env).c_str()));
         env.top(1).set_undefined();
         env.drop(1);
         return;
     }
     
 	IF_VERBOSE_ACTION (
-    log_action(" ActionGetMember: target: %s (object %p)",
+    log_action(_(" ActionGetMember: target: %s (object %p)"),
                target.to_debug_string().c_str(), (void*)obj.get());
 	);
     
@@ -2667,7 +2685,7 @@
         }
         
 	IF_VERBOSE_ACTION (
-        log_action("-- get_member %s.%s=%s",
+        log_action(_("-- get_member %s.%s=%s"),
 		   target.to_debug_string().c_str(),
                    member_name.to_debug_string().c_str(),
                    env.top(1).to_debug_string().c_str());
@@ -2693,7 +2711,7 @@
 	{
 		thread.setObjectMember(*obj, member_name, member_value);
 		IF_VERBOSE_ACTION (
-			log_action("-- set_member %s.%s=%s",
+			log_action(_("-- set_member %s.%s=%s"),
 				env.top(2).to_debug_string().c_str(),
 				member_name.c_str(),
 				member_value.to_debug_string().c_str());
@@ -2702,9 +2720,10 @@
 	else
 	{
 		// Malformed SWF ? (don't think this is possible to do with ActionScript syntax)
+		// FIXME, should this be log_swferror?
 		IF_VERBOSE_ACTION (
 			// Invalid object, can't set.
-			log_action("-- set_member %s.%s=%s on invalid object!",
+			log_action(_("-- set_member %s.%s=%s on invalid object!"),
 				env.top(2).to_debug_string().c_str(),
 				member_name.c_str(),
 				member_value.to_debug_string().c_str());
@@ -2759,8 +2778,8 @@
 	if ( available_args < nargs )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("Attempt to call a method with %u arguments "
-			"while only %u are available on the stack.",
+		log_swferror(_("Attempt to call a method with %u arguments "
+			"while only %u are available on the stack."),
 			nargs, available_args);
 		);
 		nargs = available_args;
@@ -2768,9 +2787,9 @@
 
 
 	IF_VERBOSE_ACTION (
-	log_action(" method name: %s", method_name.to_debug_string().c_str());
-	log_action(" method object/func: %s", obj_value.to_debug_string().c_str());
-	log_action(" method nargs: %d", nargs);
+	log_action(_(" method name: %s"), method_name.to_debug_string().c_str());
+	log_action(_(" method object/func: %s"), obj_value.to_debug_string().c_str());
+	log_action(_(" method nargs: %d"), nargs);
 	);
 
 	string method_string = method_name.to_string(&env);
@@ -2785,18 +2804,18 @@
 		{
 			if ( ! obj )
 			{
-				log_error("ActionCallMethod invoked with "
+				log_error(_("ActionCallMethod invoked with "
 						"undefined method_name "
-						"and non-object object/func");
+						"and non-object object/func"));
 				env.drop(nargs+2);
 				env.top(0).set_undefined();
 				return;
 			}
 
 #ifdef GNASH_DEBUG
-			log_warning("Function object given to ActionCallMethod"
+			log_error(_("Function object given to ActionCallMethod"
 				       " is not a function, will try to use"
-				       " its 'constructor' member");
+				       " its 'constructor' member"));
 #endif
 
 			// TODO: all this crap should go into an as_object::getConstructor instead
@@ -2804,7 +2823,7 @@
 			if ( ! obj->get_member("constructor", &ctor) )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("ActionCallMethod: object has no constructor");
+				log_aserror(_("ActionCallMethod: object has no constructor"));
 				);
 				env.drop(nargs+2);
 				env.top(0).set_undefined();
@@ -2813,7 +2832,7 @@
 			if ( ! ctor.is_function() )
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
-				log_aserror("ActionCallMethod: object constructor is not a function");
+				log_aserror(_("ActionCallMethod: object constructor is not a function"));
 				);
 				env.drop(nargs+2);
 				env.top(0).set_undefined(); 
@@ -2829,8 +2848,8 @@
 		{
 			// SWF integrity check 
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("ActionCallMethod: "
-				"Tried to invoke method '%s' on non-object value %s.",
+			log_aserror(_("ActionCallMethod: "
+				"Tried to invoke method '%s' on non-object value %s."),
 				method_name.to_debug_string().c_str(),
 				obj_value.typeOf());
 			);
@@ -2842,8 +2861,8 @@
 		if ( ! thread.getObjectMember(*obj, method_string, method_val) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("ActionCallMethod: "
-				"Can't find method %s of object %s",
+			log_aserror(_("ActionCallMethod: "
+				"Can't find method %s of object %s"),
 				method_name.to_debug_string().c_str(),
 				obj_value.to_debug_string().c_str());
 			);
@@ -2854,7 +2873,7 @@
 	}
 
 #ifdef USE_DEBUGGER
-//	cerr << "FIXME: method name is: " << method_name << endl;
+//	log_msg (_("FIXME: method name is: %s"), method_namexxx);
 //	// IT IS NOT GUARANTEE WE DO HAVE A METHOD NAME HERE !
 	if ( ! method_name.is_undefined() )
 	{
@@ -2865,7 +2884,7 @@
 	{
 		static bool warned=false;
 		if ( ! warned ) {
-			log_warning("FIXME: debugger doesn't deal with anonymous function calls");
+			log_unimpl(_("FIXME: debugger doesn't deal with anonymous function calls"));
 			warned=true;
 		}
 	}
@@ -2878,7 +2897,7 @@
 	env.top(0) = result;
 
 	// This is to check stack status after call method
-	//log_msg("at doActionCallMethod() end, stack: "); env.dump_stack();
+	//log_msg(_("at doActionCallMethod() end, stack: ")); env.dump_stack();
     
 }
 
@@ -2902,8 +2921,8 @@
 	if ( available_args < nargs )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("Attempt to call a constructor with %u arguments "
-			"while only %u are available on the stack.",
+		log_swferror(_("Attempt to call a constructor with %u arguments "
+			"while only %u are available on the stack."),
 			nargs, available_args);
 		);
 		nargs = available_args;
@@ -2913,9 +2932,9 @@
 	if ( ! obj )
 	{
 		// SWF integrity check 
-		log_warning(
-			"On ActionNewMethod: "
-			"no object found on stack on ActionMethod");
+		// FIXME, should this be log_swferror?  Or log_aserror?
+		log_error(_("On ActionNewMethod: "
+			"no object found on stack on ActionMethod"));
 		env.drop(nargs);
 		env.push(as_value());
 		return;
@@ -2932,8 +2951,8 @@
 		if ( ! thread.getObjectMember(*obj, method_string, method_val) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
-			log_aserror("ActionNewMethod: "
-				"can't find method %s of object %s",
+			log_aserror(_("ActionNewMethod: "
+				"can't find method %s of object %s"),
 				method_string.c_str(), obj_val.to_debug_string().c_str());
 			);
 			env.drop(nargs);
@@ -2946,9 +2965,9 @@
 	if ( ! method )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("ActionNewMethod: "
+		log_swferror(_("ActionNewMethod: "
 			"method name is undefined, "
-			"and object is not a function");
+			"and object is not a function"));
 		);
 		env.drop(nargs);
 		env.push(as_value()); // should we push an object anyway ?
@@ -2959,7 +2978,7 @@
 	boost::intrusive_ptr<as_object> new_obj = construct_object(method.get(),
 			env, nargs, env.get_top_index());
 
-	//log_msg("%s( [%d args] ) returned %s", method_val.to_string(&env),
+	//log_msg(_("%s( [%d args] ) returned %s"), method_val.to_string(&env),
 	//	nargs, new_obj.to_string(&env));
 
 
@@ -2985,7 +3004,7 @@
     // Invalid args!
     if (!super || ! instance) {
         IF_VERBOSE_ACTION(
-        log_action("-- %s instanceof %s (invalid args?)",
+        log_action(_("-- %s instanceof %s (invalid args?)"),
                 env.top(1).to_debug_string().c_str(),
                 env.top(0).to_debug_string().c_str());
         );
@@ -3019,8 +3038,8 @@
 	if ( ! obj_val.is_object() )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Top of stack not an object %s at ActionEnum2 "
-			" execution",
+		log_aserror(_("Top of stack not an object %s at ActionEnum2 "
+			" execution"),
 			obj_val.to_debug_string().c_str());
 		);
 		return;
@@ -3196,12 +3215,12 @@
 		(
 			if ( ! super )
 			{
-				log_aserror("ActionExtends: Super is not an as_function (%s)",
+				log_aserror(_("ActionExtends: Super is not an as_function (%s)"),
 					env.top(0).to_debug_string().c_str());
 			}
 			if ( ! sub )
 			{
-				log_aserror("ActionExtends: Sub is not an as_function (%s)",
+				log_aserror(_("ActionExtends: Sub is not an as_function (%s)"),
 					env.top(1).to_debug_string().c_str());
 			}
 		);
@@ -3212,7 +3231,7 @@
 
 	sub->extends(*super);
 
-	//dbglogfile << __PRETTY_FUNCTION__ << ": testing!" << endl;
+	//log_msg(_("%s: testing"), __PRETTY_FUNCTION__);
 }
 
 void
@@ -3276,7 +3295,7 @@
 		// @@ security: watch out for possible missing terminator here!
 		const char* arg = code.read_string(i);
 
-		//log_msg("Setting register %d/%d to %s", arg_register, nargs, arg);
+		//log_msg(_("Setting register %d/%d to %s"), arg_register, nargs, arg);
 
 		func->add_arg(arg_register, arg);
 		i += strlen(arg)+1;
@@ -3290,12 +3309,12 @@
 	if ( thread.next_pc+code_size > actionbuf_size )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-			log_swferror("function2 code len (%u) "
+			log_swferror(_("function2 code len (%u) "
 				"overflows DOACTION tag boundaries "
 				"(DOACTION tag len=" SIZET_FMT
 				", function2 code offset=" SIZET_FMT "). "
 				"Forcing code len to eat the whole buffer "
-				"(would this work?).",
+				"(would this work?)."),
 				code_size, actionbuf_size, thread.next_pc);
 		);
 		code_size = actionbuf_size-thread.next_pc;
@@ -3337,7 +3356,7 @@
 SWFHandlers::ActionTry(ActionExec& /*thread*/)
 {
 //    GNASH_REPORT_FUNCTION;
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+    log_unimpl (__PRETTY_FUNCTION__);
 }
 
 /// See: http://sswf.sourceforge.net/SWFalexref.html#action_with
@@ -3357,7 +3376,7 @@
 
 	const vector<with_stack_entry>& with_stack = thread.getWithStack();
 	IF_VERBOSE_ACTION (
-	log_action("-------------- with block start: stack size is " SIZET_FMT,
+	log_action(_("-------------- with block start: stack size is " SIZET_FMT),
 		   with_stack.size());
 	);
 
@@ -3367,7 +3386,7 @@
 	if ( tag_length != 2 )
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("ActionWith tag length != 2 - skipping");
+		log_swferror(_("ActionWith tag length != 2; skipping"));
 		);
 		return;
 	}
@@ -3377,7 +3396,7 @@
 	if ( block_length == 0 )
 	{
 		IF_VERBOSE_ASCODING_ERRORS(
-		log_aserror("Empty with() block...");
+		log_aserror(_("Empty with() block..."));
 		);
 		return;
 	}
@@ -3392,9 +3411,10 @@
 	if ( ! thread.pushWithEntry(with_stack_entry(with_obj, block_end)) )
 	{
 		// skip the full block
-		log_warning("With block skipped"
+		// FIXME, is this a log_aserror?
+		log_error(_("With-block skipped"
 			" (with stack size exceeds limit of "
-			SIZET_FMT " elements)",
+			SIZET_FMT " elements)"),
 			thread.getWithStackLimit());
 		thread.next_pc += block_length;
 	}
@@ -3510,7 +3530,7 @@
 		env.local_register(reg) = env.top(0);
 	      
 		IF_VERBOSE_ACTION (
-		log_action("-------------- local register[%d] = '%s'",
+		log_action(_("-------------- local register[%d] = '%s'"),
 			reg, env.top(0).to_debug_string().c_str());
 		);
 	}
@@ -3519,7 +3539,7 @@
 		env.global_register(reg) = env.top(0);
 		      
 		IF_VERBOSE_ACTION (
-		log_action("-------------- global register[%d] = '%s'",
+		log_action(_("-------------- global register[%d] = '%s'"),
 			reg, env.top(0).to_debug_string().c_str() );
 		);
 
@@ -3527,7 +3547,7 @@
 	else
 	{
 		IF_VERBOSE_MALFORMED_SWF(
-		log_swferror("store_register[%d] -- register out of bounds!", reg);
+		log_swferror(_("store_register[%d] -- register out of bounds!"), reg);
 		);
 	}
 		  
@@ -3538,8 +3558,8 @@
 {
 	if ( static_cast<size_t>(x) > get_handlers().size() )
 	{
-		log_error("at SWFHandlers::action_name(%d) call time, _handlers size is " 
-		          SIZET_FMT, x, get_handlers().size());
+		log_error(_("at SWFHandlers::action_name(%d) call time, _handlers size is "
+		          SIZET_FMT), x, get_handlers().size());
 		return NULL;
 	}
 	else

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/vm/ActionExec.cpp	13 Apr 2007 07:35:56 -0000	1.26
+++ server/vm/ActionExec.cpp	18 Apr 2007 14:07:33 -0000	1.27
@@ -1,3 +1,4 @@
+// ActionExec.cpp:  ActionScript execution, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: ActionExec.cpp,v 1.26 2007/04/13 07:35:56 bjacques Exp $ */
+/* $Id: ActionExec.cpp,v 1.27 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -130,10 +133,10 @@
 
 #if DEBUG_STACK
 	IF_VERBOSE_ACTION (
-        	log_action("at ActionExec operator() start, pc=" SIZET_FMT
+        	log_action(_("at ActionExec operator() start, pc=" SIZET_FMT
 		           ", stop_pc=" SIZET_FMT ", code.size=" SIZET_FMT
-			   ".", pc, 
-			   stop_pc, code.size());
+			   "."),
+			    pc, stop_pc, code.size());
 		stringstream ss;
 		env.dump_stack(ss);
 		env.dump_global_registers(ss);
@@ -155,6 +158,7 @@
 	uint8_t action_id = code[pc];
 
 	IF_VERBOSE_ACTION (
+		// FIXME, avoid direct dbglogfile access, use log_action
 		dbglogfile << std::endl << "PC:" << pc << " - EX: ";
 		code.log_disasm(pc);
 	);
@@ -171,15 +175,13 @@
 		if ( next_pc > stop_pc )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
-			std::stringstream ss;
-			ss << "Length " << length << " (" << (int)length << ") of action tag"
-				<< " id " << (unsigned)action_id
-				<< " at pc " << pc
-				<< " overflows actions buffer size "
-				<< stop_pc;
-			//throw ActionException(ss.str());;
-			log_swferror("%s", ss.str().c_str());
+			log_swferror(_("Length %u (%d) of action tag"
+			  " id %u at pc " SIZET_FMT
+		          " overflows actions buffer size " SIZET_FMT),
+			  length, (int)length, (unsigned)action_id, pc,
+			  stop_pc);
 			);
+			//throw ActionException(ss.str());;
 			// Give this action handler a chance anyway.
 			// Maybe it will be able to do something about 
 			// this anyway..
@@ -189,7 +191,8 @@
 	// Do we still need this ?
 	if ( action_id == SWF::ACTION_END ) {
 		// this would turn into an assertion (next_pc==stop_pc)
-		//		log_msg("At ACTION_END next_pc=%d, stop_pc=%d", next_pc, stop_pc);
+		//		log_msg(_("At ACTION_END next_pc=" SIZET_FMT
+		//		  ", stop_pc=" SIZET_FMT), next_pc, stop_pc);
 		break;
 	}
 
@@ -205,7 +208,7 @@
 	
 #if DEBUG_STACK
 	IF_VERBOSE_ACTION (
-		log_action( " After execution, PC is " SIZET_FMT ".", pc);
+		log_action(_(" After execution, PC is " SIZET_FMT "."), pc);
 		stringstream ss;
 		env.dump_stack(ss);
 		env.dump_global_registers(ss);
@@ -223,7 +226,9 @@
     }
     catch (ActionLimitException& ex)
     {
+	    IF_VERBOSE_ASCODING_ERRORS (
 	    log_aserror("%s", ex.what());
+	    )
     }
     
     cleanupAfterRun();
@@ -241,15 +246,15 @@
     // check the call stack if not in a function context
     if ( ! isFunction() && env.callStackDepth() > 0 )
     {
-	log_warning("Call stack non-empty at end of ExecutableCode run (limits hit?)");
+	log_error(_("Call stack non-empty at end of ExecutableCode run (limits hit?)"));
 	env.clearCallFrames();
     }
 
     // check if the stack was smashed
     if ( _initial_stack_size > env.stack_size() ) {
-	log_warning("Stack smashed (ActionScript compiler bug?)."
+	log_error(_("Stack smashed (ActionScript compiler bug?)."
 		    "Fixing by pushing undefined values to the missing slots, "
-		    " but don't expect things to work afterwards.");
+		    " but don't expect things to work afterwards"));
 	size_t missing = _initial_stack_size - env.stack_size();
 	for (size_t i=0; i<missing; ++i) {
 	    env.push(as_value());
@@ -257,8 +262,8 @@
     } else if ( _initial_stack_size < env.stack_size() ) {
 	// We can argue this would be an "size-optimized" SWF instead...
 	IF_VERBOSE_MALFORMED_SWF(
-	    log_warning(SIZET_FMT " elements left on the stack after block execution. "
-		    "Cleaning up.", env.stack_size()-_initial_stack_size);
+	    log_swferror(_(SIZET_FMT " elements left on the stack after block execution.  "
+		    "Cleaning up"), env.stack_size()-_initial_stack_size);
 	    );
 	env.drop(env.stack_size()-_initial_stack_size);
     }
@@ -274,11 +279,13 @@
 	    // we need to check at every iteration because
 	    // an action can be longer then a single byte
 	    if ( next_pc >= stop_pc ) {
-		log_error("End of DoAction block hit while skipping "
+		IF_VERBOSE_MALFORMED_SWF (
+		log_swferror(_("End of DoAction block hit while skipping "
 			  SIZET_FMT " action tags (pc:" SIZET_FMT 
-			  ", stop_pc:" SIZET_FMT ") - Mallformed SWF ?"
-			  "(WaitForFrame, probably)", offset, next_pc,
+			  ", stop_pc:" SIZET_FMT ") "
+			  "(WaitForFrame, probably)"), offset, next_pc,
 			  stop_pc);
+		)
 		next_pc = stop_pc;
 		return;
 	    }
@@ -309,10 +316,10 @@
 	// See comment in header about _with_stack_limit
 	IF_VERBOSE_ASCODING_ERRORS (
 	if (with_stack.size() >= _with_stack_limit) {
-	    log_aserror("'With' stack depth (" SIZET_FMT ") "
+	    log_aserror(_("'With' stack depth (" SIZET_FMT ") "
 			"exceeds the allowed limit for current SWF "
 			"target version (" SIZET_FMT " for version %d)."
-			" Don't expect this movie to work with all players.",
+			" Don't expect this movie to work with all players."),
 			with_stack.size()+1, _with_stack_limit,
 			env.get_version());
 	}
@@ -416,14 +423,15 @@
 	size_t slots_left = env.stack_size() - _initial_stack_size;
 	size_t missing = required-slots_left;
 
-	//IF_VERBOSE_ASCODING_ERRORS(
-	log_warning("Stack underrun: " SIZET_FMT " elements required, "
+	// FIXME, the IF_VERBOSE used to be commented out.  strk, know why?
+	IF_VERBOSE_ASCODING_ERRORS(
+	log_aserror(_("Stack underrun: " SIZET_FMT " elements required, "
 		SIZET_FMT "/" SIZET_FMT " available. "
 		"Fixing by inserting " SIZET_FMT " undefined values on the"
-		" missing slots.",
+		" missing slots."),
 		required, _initial_stack_size, env.stack_size(),
 		missing);
-	//);
+	);
 
 	env.padStack(_initial_stack_size, missing);
 }

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/vm/action.cpp	15 Apr 2007 10:52:09 -0000	1.14
+++ server/vm/action.cpp	18 Apr 2007 14:07:33 -0000	1.15
@@ -1,3 +1,4 @@
+// action.cpp:  ActionScript execution, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,9 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -134,7 +137,7 @@
 	boost::intrusive_ptr<movie_definition> md ( create_library_movie(url) );
 	if (md == NULL)
 	{
-	    log_error("can't create movie_definition for %s\n", url.str().c_str());
+	    log_error(_("can't create movie_definition for %s"), url.str().c_str());
 	    return;
 	}
 
@@ -146,7 +149,7 @@
 		extern_movie = create_library_movie_inst(md.get());
 		if (extern_movie == NULL)
 		{
-			log_error("can't create extern root sprite for %s\n", url.str().c_str());
+			log_error(_("can't create extern root sprite for %s"), url.str().c_str());
 			return;
 		}
 
@@ -163,7 +166,7 @@
 		extern_movie = md->create_instance();
 		if (extern_movie == NULL)
 		{
-			log_error("can't create extern sprite for %s\n", url.str().c_str());
+			log_error(_("can't create extern sprite for %s"), url.str().c_str());
 			return;
 		}
       
@@ -232,7 +235,7 @@
 		}
 		else
 		{
-			throw ActionException("Attempt to call a value which is neither a C nor an ActionScript function");
+			throw ActionException(_("Attempt to call a value which is neither a C nor an ActionScript function"));
 		}
 	}
 	catch (ActionException& ex)
@@ -264,7 +267,7 @@
     // Printf-like vararg interface for calling ActionScript.
     // Handy for external binding.
 {
-    log_msg("FIXME(%d): %s\n", __LINE__, __FUNCTION__);
+    log_msg(_("FIXME(%d): %s"), __LINE__, __FUNCTION__);
 
 #if 0
     static const int	BUFSIZE = 1000;
@@ -383,7 +386,7 @@
 				}
 			    else
 				{
-				    log_error("call_method_parsed('%s','%s') -- invalid fmt '%%l%c'\n",
+				    log_error(_("call_method_parsed('%s','%s') -- invalid fmt '%%l%c'"),
 					      method_name,
 					      method_arg_fmt,
 					      c);
@@ -392,7 +395,7 @@
 		    else
 			{
 			    // Invalid fmt, warn.
-			    log_error("call_method_parsed('%s','%s') -- invalid fmt '%%%c'\n",
+			    log_error(_("call_method_parsed('%s','%s') -- invalid fmt '%%%c'"),
 				      method_name,
 				      method_arg_fmt,
 				      c);
@@ -408,7 +411,7 @@
 		    else
 			{
 			    // Invalid arg; warn.
-			    log_error("call_method_parsed('%s','%s') -- invalid char '%c'\n",
+			    log_error(_("call_method_parsed('%s','%s') -- invalid char '%c'"),
 				      method_name,
 				      method_arg_fmt,
 				      c);
@@ -444,7 +447,7 @@
 void
 movie_load()
 {
-    log_action("-- start movie");
+    log_action(_("-- start movie"));
 }
 
 //
@@ -455,7 +458,7 @@
 as_value
 event_test(const fn_call& /*fn*/)
 {
-    log_msg("FIXME: %s\n", __FUNCTION__);
+    log_msg(_("FIXME: %s"), __FUNCTION__);
     return as_value();
 }
 	
@@ -601,10 +604,8 @@
 	return result;
 }
 
-
 } // end of namespace gnash
 
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- libbase/curl_adapter.cpp	17 Apr 2007 10:38:16 -0000	1.26
+++ libbase/curl_adapter.cpp	18 Apr 2007 14:07:33 -0000	1.27
@@ -1,5 +1,6 @@
+// curl_adapter.cpp:  Interface to libcurl to read HTTP streams, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -10,13 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 // 
 
-/* $Id: curl_adapter.cpp,v 1.26 2007/04/17 10:38:16 strk Exp $ */
+/* $Id: curl_adapter.cpp,v 1.27 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #if defined(_WIN32) || defined(WIN32)
 #define snprintf _snprintf
@@ -273,7 +274,7 @@
                 curl_easy_getinfo(_handle, CURLINFO_RESPONSE_CODE, &code);
                 if ( code == 404 ) // file not found!
                 {
-                        gnash::log_warning("404 response from url %s", _url.c_str());
+                        gnash::log_error(_("404 response from url %s"), _url.c_str());
                         _error = TU_FILE_OPEN_ERROR;
 			_running = false;
                         return;
@@ -525,7 +526,7 @@
                 curl_easy_getinfo(_handle, CURLINFO_RESPONSE_CODE, &code);
                 if ( code == 404 ) // file not found!
                 {
-                        gnash::log_warning("404 response from url %s", _url.c_str());
+                        gnash::log_error(_("404 response from url %s"), _url.c_str());
                         _error = TU_FILE_OPEN_ERROR;
 			_running = false;
                         return false;
@@ -708,7 +709,6 @@
 
 #endif // def USE_CURL
 
-
 // Local Variables:
 // mode: C++
 // indent-tabs-mode: t

Index: libbase/extension.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/extension.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/extension.cpp	8 Apr 2007 23:06:17 -0000	1.8
+++ libbase/extension.cpp	18 Apr 2007 14:07:33 -0000	1.9
@@ -1,5 +1,6 @@
+// extension.cpp:  Read and enable plug-in extensions to Flash, for Gnash.
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: extension.cpp,v 1.8 2007/04/08 23:06:17 rsavoye Exp $ */
+/* $Id: extension.cpp,v 1.9 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -62,8 +63,6 @@
 using namespace std;
 namespace gnash {
 
-LogFile& dbglogfile = LogFile::getDefaultInstance();
-
 Extension::Extension() 
 {
 //    GNASH_REPORT_FUNCTION;
@@ -122,7 +121,7 @@
     vector<string>::iterator it;
     for (it = _modules.begin(); it != _modules.end(); it++) {
         mod = *(it);
-        dbglogfile << "Loading module: " << mod.c_str() << endl;
+        log_msg(_("Loading module: %s"), mod.c_str());
         SharedLib sl;
         initModule(mod.c_str(), obj);
     }   
@@ -138,7 +137,7 @@
     SharedLib *sl;
     string symbol;
 
-    dbglogfile << "Initializing module: \"" << module << "\"" << endl;
+    log_msg(_("Initializing module: \"%s\""), module);
     
     symbol = module;
     if (_plugins[module] == 0) {
@@ -155,7 +154,7 @@
     if (symptr) {    
         symptr(obj);
     } else {
-        log_warning("Couldn't get class_init symbol!");
+        log_error(_("Couldn't get class_init symbol"));
     }
     
     return true;
@@ -190,11 +189,11 @@
     }
     
     while (dir) {
-        dbglogfile << "Scanning directory \"" << dir << "\" for plugins." << endl;
+        log_msg(_("Scanning directory \"%s\" for plugins"), dir);
         DIR *library_dir = opendir(dir);
 
         if (library_dir == NULL) {
-            dbglogfile << "Can't open directory " << dir << endl;
+            log_error(_("Can't open directory %s"), dir);
             return false;
         }
         
@@ -216,7 +215,7 @@
             }
             
             *(strrchr(entry->d_name, '.')) = 0;
-            dbglogfile << "Gnash Plugin name: " << entry->d_name << endl;
+            log_msg(_("Gnash Plugin name: %s"), entry->d_name);
             _modules.push_back(entry->d_name);
             
         }

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- libbase/log.cpp	16 Apr 2007 10:26:59 -0000	1.46
+++ libbase/log.cpp	18 Apr 2007 14:07:33 -0000	1.47
@@ -1,3 +1,4 @@
+// log.cpp:  Message logging functions, for gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,11 +11,13 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: log.cpp,v 1.46 2007/04/16 10:26:59 jgilmore Exp $ */
+/* $Id: log.cpp,v 1.47 2007/04/18 14:07:33 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,7 +62,7 @@
 
 namespace gnash {
 
-// static data to be hared amongst all classes.
+// static data to be shared amongst all classes.
 ofstream LogFile::_console;
 int LogFile::_verbose = 0;
 bool LogFile::_actiondump = false;
@@ -99,6 +102,7 @@
     return p1;
 }
 
+// FIXME: localize these, so they print local regional timestamps.
 ostream&
 timestamp(ostream& x) {
     time_t t;
@@ -178,11 +182,10 @@
     char tmp[BUFFER_SIZE];
     
     va_start (ap, fmt);
-    //vsprintf (tmp, fmt, ap);
     vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "TRACE: " << tmp << endl;
+    dbglogfile << _("TRACE: ") << tmp << endl;
     
     va_end (ap);
 }
@@ -196,11 +199,15 @@
     char tmp[BUFFER_SIZE];
     
     va_start (ap, fmt);
-    //vsprintf (tmp, fmt, ap);
     vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "DEBUG: " << tmp << endl;
+    // We don't translate DEBUG: because code below here looks for it
+    // in the output of const char strings.  If we translated it, both
+    // its type would change (to non-const char string) and the letters would
+    // change to the local language.  Could perhaps be fixed more cleanly
+    // later...
+    dbglogfile << N_("DEBUG: ") << tmp << endl;
     
     va_end (ap);
 }
@@ -266,7 +273,7 @@
     vsnprintf (tmp, BUFFER_SIZE, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
 
-    dbglogfile << "ERROR: " << tmp << endl;
+    dbglogfile << _("ERROR: ") << tmp << endl;
     
     va_end (ap);    
 }
@@ -283,7 +290,7 @@
     vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "ERROR: Unimplemented: " << tmp << endl;
+    dbglogfile << _("ERROR: Unimplemented: ") << tmp << endl;
     
     va_end (ap);    
 }
@@ -300,7 +307,7 @@
     vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "SECURITY: " << tmp << endl;
+    dbglogfile << _("SECURITY: ") << tmp << endl;
     
     va_end (ap);    
 }
@@ -317,7 +324,7 @@
     vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "MALFORMED SWF: " << tmp << endl;
+    dbglogfile << _("MALFORMED SWF: ") << tmp << endl;
     
     va_end (ap);    
 }
@@ -334,7 +341,7 @@
     vsnprintf (tmp, BUFFER_SIZE-1, fmt, ap);
     tmp[BUFFER_SIZE-1] = '\0';
     
-    dbglogfile << "ACTIONSCRIPT ERROR: " << tmp << endl;
+    dbglogfile << _("ACTIONSCRIPT ERROR: ") << tmp << endl;
     
     va_end (ap);    
 }
@@ -603,7 +610,7 @@
 /// function calls. We always want these to be logged to the disk
 /// file, but optionally printed to the terminal window.
 ///
-/// Since the traceing functions use varargs, they always become a
+/// Since the tracing functions use varargs, they always become a
 /// const char * string after processing the arguments. That means we
 /// can look for the keyword to determine what to do.
 LogFile& 
@@ -615,23 +622,25 @@
     _logentry += ": ";
 
     // See if we have the TRACE keyword
-    if (strstr(str, "DEBUG:")) {
+    if (strstr(str, N_("DEBUG: "))) {
 	_trace = true;
     }	  
 
+    scoped_lock lock(io_mutex);
+
+#if 0  // Fixed the callers!
     // Since the log_* functions are wrappers for the older API used
     // for logging, we have to strip the CR off the end otr we get
     // blanks lines as the previous implementation required a CR, and
     // now we don't.
     int len = c.length();
-
-    scoped_lock lock(io_mutex);
     if (len > 0) {
 	if (c[len-1] == '\n') {
 	    //c[len-1] = 0;
 	    c.resize(len-1);
 	}
     }
+#endif
     
     if (_stamp == true && (_state == IDLE || _state == OPEN)) {
 	_state = INPROGRESS;

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- libbase/network.cpp	3 Apr 2007 15:24:11 -0000	1.23
+++ libbase/network.cpp	18 Apr 2007 14:07:33 -0000	1.24
@@ -1,3 +1,4 @@
+// network.cpp:  TCP/IP support, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -10,9 +11,11 @@
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -73,13 +76,13 @@
 	_debug(false),
 	_timeout(5)
 {
-    //log_msg("%s", __PRETTY_FUNCTION__);
+    //GNASH_REPORT_FUNCTION;
 #ifdef HAVE_WINSOCK_H
     WORD wVersionRequested;
     WSADATA wsaData;
     wVersionRequested = MAKEWORD(1, 1);		// Windows Sockets 1.1
     if (WSAStartup( wVersionRequested, &wsaData ) != 0) {
-        log_error("Could not find a usable WinSock DLL.");
+        log_error(_("Could not find a usable WinSock DLL"));
         exit(1);
     }
 #endif
@@ -88,7 +91,7 @@
 
 Network::~Network() 
 {
-    //log_msg("%s:", __PRETTY_FUNCTION__);
+    //GNASH_REPORT_FUNCTION;
 #ifdef HAVE_WINSOCK_H
     WSACleanup();
 #else
@@ -108,6 +111,7 @@
     return createServer(DEFAULTPORT);
 }
 
+// FIXME: Should also support IPv6 (AF_INET6)
 bool
 Network::createServer(short port)
 {
@@ -120,7 +124,7 @@
     in_addr_t       nodeaddr;
 
     if (port < 1024) {
-	log_error("Can't connect to priviledged port #%d!", port);
+	log_error(_("Can't connect to privileged port #%d"), port);
 	return false;
     }
   
@@ -142,8 +146,7 @@
     sock_in.sin_port = htons(port);
   
     if ((ppe = getprotobyname(DEFAULTPROTO)) == 0) {
-        // error, wasn't able to get a protocol entry
-        log_warning("unable to get protocol entry for %s",
+        log_error(_("unable to get protocol entry for %s"),
                 DEFAULTPROTO);
         return false;
     }
@@ -160,14 +163,14 @@
     
     // error, wasn't able to create a socket
     if (_listenfd < 0) {
-        log_warning("unable to create socket: %s", strerror(errno));
+        log_error(_("unable to create socket: %s"), strerror(errno));
         return true;
     }
     
     on = 1;
     if (setsockopt(_listenfd, SOL_SOCKET, SO_REUSEADDR,
                    (char *)&on, sizeof(on)) < 0) {
-        log_warning("setsockopt SO_REUSEADDR failed!");
+        log_error(_("setsockopt SO_REUSEADDR failed"));
         return false;
     }
     
@@ -177,36 +180,27 @@
     while (retries < 5) {
         if (bind(_listenfd, reinterpret_cast<struct sockaddr *>(&sock_in),
                  sizeof(sock_in)) == -1) {
-            log_warning("unable to bind to port %hd! %s",
+            log_error(_("unable to bind to port %hd: %s"),
                     port, strerror(errno));
 //                    inet_ntoa(sock_in.sin_addr), strerror(errno));
             retries++;
         }
 
-#if 0
-        char                ascip[32];
-        inet_ntop(AF_INET, &_ipaddr, ascip, INET_ADDRSTRLEN);
-        log_msg("Host Name is %s, IP is %s", host->h_name, ascip);
-#endif
-    
 	if (_debug) {
-	    log_msg("Server bound to service on port: %hd, %s using fd #%d",
-		    ntohs(sock_in.sin_port), inet_ntoa(sock_in.sin_addr),
+		char  ascip[INET_ADDRSTRLEN];
+		inet_ntop(sock_in.sin_family, &_ipaddr, ascip, INET_ADDRSTRLEN);
+	    log_msg(_("Server bound to service on %s, port %hd, using fd %d"),
+		    ascip, ntohs(sock_in.sin_port),
 		    _listenfd);
 	}
         
         if (type == SOCK_STREAM && listen(_listenfd, 5) < 0) {
-            log_msg("ERROR: unable to listen on port: %hd: %s ",
+            log_error(_("unable to listen on port: %hd: %s "),
                 port, strerror(errno));
             return false;
         }
 
         _port = port;
-    
-#if 0
-        log_msg("Listening for net traffic on fd #%d", _sockfd);
-#endif
-    
         return true;
     }
     return false;
@@ -238,7 +232,7 @@
     alen = sizeof(struct sockaddr_in);
   
 #ifdef NET_DEBUG
-    log_msg("Trying to accept net traffic on fd #%d", _sockfd);
+    log_msg(_("Trying to accept net traffic on fd %d"), _sockfd);
 #endif
   
     if (_listenfd <= 2) {
@@ -267,24 +261,24 @@
         }
     
         if (FD_ISSET(0, &fdset)) {
-            log_msg("There is data at the console for stdin!");
+            log_msg(_("There is data at the console for stdin"));
             return true;
         }
 
         // If interupted by a system call, try again
         if (ret == -1 && errno == EINTR) {
-            log_msg("The accept() socket for fd #%d was interupted by a system call!", _listenfd);
+            log_msg(_("The accept() socket for fd %d was interupted by a system call"), _listenfd);
         }
     
         if (ret == -1) {
-            log_warning("The accept() socket for fd #%d never was available for writing!",
+            log_msg(_("The accept() socket for fd %d never was available for writing"),
                     _listenfd);
             return false;
         }
     
         if (ret == 0) {
             if (_debug) {
-                log_warning("The accept() socket for fd #%d timed out waiting to write!",
+                log_msg(_("The accept() socket for fd %d timed out waiting to write"),
                         _listenfd);
             }
         }
@@ -296,12 +290,12 @@
     _sockfd = accept(_listenfd, &newfsin, &alen);
   
     if (_sockfd < 0) {
-        log_warning("unable to accept : %s", strerror(errno));
+        log_error(_("unable to accept: %s"), strerror(errno));
         return false;
     }
 
     if (_debug) {
-	log_msg("Accepting tcp/ip connection on fd #%d", _sockfd);
+	log_msg(_("Accepting tcp/ip connection on fd %d"), _sockfd);
     }
 
     return true;
@@ -347,20 +341,20 @@
     assert( ! connected() );
 
     if (port < 1024) {
-        log_error("Can't connect to priviledged port #%hd!", port);
+        log_error(_("Can't connect to privileged port %hd"), port);
         _connected = false;
         return false;
     }
 
-    log_msg("%s: to host %s at port %d", __FUNCTION__, hostname, port);
+    log_msg(_("%s: to host %s at port %d"), __FUNCTION__, hostname, port);
   
     memset(&sock_in, 0, sizeof(struct sockaddr_in));
     memset(&thishostname, 0, MAXHOSTNAMELEN);
     if (strlen(hostname) == 0) {
         if (gethostname(thishostname, MAXHOSTNAMELEN) == 0) {
-            log_msg("The hostname for this machine is %s.", thishostname);
+            log_msg(_("The hostname for this machine is %s"), thishostname);
         } else {
-            log_msg("Couldn't get the hostname for this machine!");
+            log_msg(_("Couldn't get the hostname for this machine"));
             return false;
         }   
     }
@@ -372,9 +366,9 @@
     sock_in.sin_port = ntohs(static_cast<short>(port));
 
 #if 0
-    char ascip[32];
-    inet_ntop(AF_INET, &sock_in.sin_addr.s_addr, ascip, INET_ADDRSTRLEN);
-    log_msg("The IP address for this client socket is %s", ascip);
+    char ascip[INET_ADDRSTRLEN];
+    inet_ntop(sock_in.sin_family, &sock_in.sin_addr.s_addr, ascip, INET_ADDRSTRLEN);
+    log_msg(_("The IP address for this client socket is %s"), ascip);
 #endif
 
     proto = ::getprotobyname("TCP");
@@ -382,7 +376,7 @@
     _sockfd = ::socket(PF_INET, SOCK_STREAM, proto->p_proto);
     if (_sockfd < 0)
         {
-            log_error("unable to create socket : %s", strerror(errno));
+            log_error(_("unable to create socket : %s"), strerror(errno));
             _sockfd = -1;
             return false;
         }
@@ -404,14 +398,14 @@
         // If interupted by a system call, try again
         if (ret == -1 && errno == EINTR)
             {
-                log_msg("The connect() socket for fd #%d was interupted by a system call!",
+                log_msg(_("The connect() socket for fd %d was interupted by a system call"),
                         _sockfd);
                 continue;
             }
     
         if (ret == -1)
             {
-                log_msg("The connect() socket for fd #%d never was available for writing!",
+                log_msg(_("The connect() socket for fd %d never was available for writing"),
                         _sockfd);
 #ifdef HAVE_WINSOCK_H
                 ::shutdown(_sockfd, 0); // FIXME: was SHUT_BOTH
@@ -422,7 +416,7 @@
                 return false;
             }
         if (ret == 0) {
-            log_error("The connect() socket for fd #%d timed out waiting to write!",
+            log_error(_("The connect() socket for fd %d timed out waiting to write"),
                       _sockfd);
             continue;
         }
@@ -430,14 +424,16 @@
         if (ret > 0) {
             ret = ::connect(_sockfd, reinterpret_cast<struct sockaddr *>(&sock_in), sizeof(sock_in));
             if (ret == 0) {
-                log_msg("\tport %d at IP %s for fd #%d", port,
-                        ::inet_ntoa(sock_in.sin_addr), _sockfd);
+		char ascip[INET_ADDRSTRLEN];
+		inet_ntop(sock_in.sin_family, &sock_in.sin_addr.s_addr, ascip, INET_ADDRSTRLEN);
+                log_msg(_("\tport %d at IP %s for fd %d"), port,
+                        ascip, _sockfd);
                 _connected = true;
                 assert(_sockfd > 0);
                 return true;
             }
             if (ret == -1) {
-                log_msg("The connect() socket for fd #%d never was available for writing!",
+                log_error(_("The connect() socket for fd %d never was available for writing"),
                         _sockfd);
                 _sockfd = -1;      
                 assert(!_connected);
@@ -506,14 +502,14 @@
             }
 #endif 
             if (close(sockfd) < 0) {
-                log_warning("Unable to close the socket for fd #%d: %s",
+                log_error(_("Unable to close the socket for fd %d: %s"),
                         sockfd, strerror(errno));
 #ifndef HAVE_WINSOCK_H
                 sleep(1);
 #endif
                 retries++;
             } else {
-                log_msg("Closed the socket on fd #%d", sockfd);
+                log_msg(_("Closed the socket on fd %d"), sockfd);
                 return true;
             }
         }

Index: libbase/FLVParser.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/FLVParser.cpp	11 Apr 2007 13:03:45 -0000	1.4
+++ libbase/FLVParser.cpp	18 Apr 2007 14:07:33 -0000	1.5
@@ -1,3 +1,4 @@
+// FLVParser.cpp:  Flash Video file parser, for Gnash.
 // 
 //   Copyright (C) 2007 Free Software Foundation, Inc.
 //
@@ -16,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.cpp,v 1.4 2007/04/11 13:03:45 bjacques Exp $
+// $Id: FLVParser.cpp,v 1.5 2007/04/18 14:07:33 jgilmore Exp $
 
 #include "FLVParser.h"
 #include "amf.h"

Index: libbase/FLVParser.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/FLVParser.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/FLVParser.h	28 Mar 2007 16:12:08 -0000	1.2
+++ libbase/FLVParser.h	18 Apr 2007 14:07:33 -0000	1.3
@@ -1,3 +1,4 @@
+// FLVParser.h:  Flash Video file format parser, for Gnash.
 // 
 //   Copyright (C) 2007 Free Software Foundation, Inc.
 //
@@ -16,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-// $Id: FLVParser.h,v 1.2 2007/03/28 16:12:08 tgc Exp $
+// $Id: FLVParser.h,v 1.3 2007/04/18 14:07:33 jgilmore Exp $
 
 // Information about the FLV format can be found at http://osflash.org/flv
 
@@ -235,10 +236,10 @@
 	FLVAudioInfo* _audioInfo;
 
 	/// Last audio frame returned
-	int32_t _lastAudioFrame;
+	uint32_t _lastAudioFrame;
 
 	/// Last video frame returned
-	int32_t _lastVideoFrame;
+	uint32_t _lastVideoFrame;
 
 	/// Audio stream is present
 	bool _audio;



From MAILER-DAEMON Wed Apr 18 10:18:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeAzV-0000sz-Hi
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:18:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeAzT-0000su-Qa
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:18:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeAzS-0000si-Ek
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:18:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeAzS-0000sf-9W
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:18:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HeAub-0005bN-Jk
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:13:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeAua-0008Mb-5X
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:13:32 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HeAuZ-0008MW-O0
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:13:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeAuZ-0008MW-O0@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Wed, 18 Apr 2007 14:13:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/asobj/TextSnapshot.h ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:18:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/18 14:13:31

Modified files:
	server/asobj   : TextSnapshot.h 
	.              : ChangeLog 

Log message:
	* server/asobj/TextSnapshot.cpp:  Fix whitespace to test gen-asclass.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextSnapshot.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2911&r2=1.2912

Patches:
Index: server/asobj/TextSnapshot.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/TextSnapshot.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2911
retrieving revision 1.2912
diff -u -b -r1.2911 -r1.2912
--- ChangeLog	18 Apr 2007 14:07:32 -0000	1.2911
+++ ChangeLog	18 Apr 2007 14:13:31 -0000	1.2912
@@ -180,6 +180,7 @@
 	  log_msg about initializing properties.
         * server/asobj/gen-asclass.{pl,sh}:  Use log_unimpl in generated code.
 	  Improve whitespace, and generate header line describing the file.
+	* server/asobj/TextSnapshot.cpp:  Fix whitespace to test gen-asclass.
 	* text_character_def.cpp:  Remove commented-out includes.
 	* FLVParser.{cpp,h}:  Fix compiler warning (signed/unsigned).
 	



From MAILER-DAEMON Wed Apr 18 10:23:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeB46-0001sS-MZ
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:23:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeB45-0001sC-78
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:23:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeB43-0001s0-JV
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:23:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeB43-0001rx-EW
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:23:19 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeAzC-0006Jb-3X
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:18:18 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3IEI8b09334;
	Wed, 18 Apr 2007 16:18:08 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Wed, 18 Apr 2007 16:18:08 +0200
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog configure.ac doc/C/asspec/date....
Message-ID: <20070418141808.GD92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeAVJ-00070h-72@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HeAVJ-00070h-72@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:23:21 -0000

On Wed, Apr 18, 2007 at 01:47:25PM +0000, Martin Guy wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Martin Guy <martinwguy>	07/04/18 13:47:24
> 
> Modified files:
> 	.              : ChangeLog configure.ac 
> 	doc/C/asspec   : date.xml 
> 	server/asobj   : Date.cpp Global.cpp 
> 	server         : as_value.h as_value.cpp 
> 	testsuite/actionscript.all: Date.as 
> 
> Log message:
> 	        * configure.ac: Introduce HAVE_LONG_TIMEZONE if extern long timezone
> 	          exists
> 	        * doc/C/asspec/date.xml: first draft
> 	        * server/asobj/Date.cpp: Complete its implementation
> 	        * server/asobj/Global.cpp: Use definitions of NAN and INFINITY from
> 	          as_value.h
> 	        * server/as_value.h: add definition for INFINITY, as for NAN
> 	        * server/as_value.cpp: Reject accidental "Infinity" and "-Infinity"
> 	          string-to-number conversions (should give NaN); 
> 	          Use NAN from as_value.h;
> 	          Conversion of an AS function to a number gives NaN, not 0.
> 	        * testsuite/actionscript.all/Date.as: Add extensive constructor tests

After this commit:

Date.cpp: In function 'int gnash::minutes_east_of_gmt(tm&)':
Date.cpp:570: error: aggregate 'gnash::timeb tb' has incomplete type and cannot be defined
Date.cpp:572: error: 'ftime' was not declared in this scope

Also, I'm afraid the changes in as_value will break a few tests, couldn't
run make check due to the build errors.

--strk;



From MAILER-DAEMON Wed Apr 18 10:34:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeBFH-00064j-1Z
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:34:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeBFG-00064L-06
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:34:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeBFE-00063o-CF
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:34:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeBFE-00063l-8m
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:34:52 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HeBAN-0007wh-CB
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:29:51 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3IETjU4025924;
	Wed, 18 Apr 2007 16:29:49 +0200
Date: Wed, 18 Apr 2007 16:29:42 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <397820524.20070418162942@nova-sys.net>
To: strk <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog configure.ac
	doc/C/asspec/date....
In-Reply-To: <20070418141808.GD92773@keybit.net>
References: <E1HeAVJ-00070h-72@cvs> <20070418141808.GD92773@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:34:54 -0000

Hello strk,

Wednesday, April 18, 2007, 4:18:08 PM, you wrote:
s> After this commit:

s> Date.cpp: In function 'int gnash::minutes_east_of_gmt(tm&)':
s> Date.cpp:570: error: aggregate 'gnash::timeb tb' has incomplete type and cannot be defined
s> Date.cpp:572: error: 'ftime' was not declared in this scope

make clean
./autogen.sh
./configure ...
make

solved this problem for me




From MAILER-DAEMON Wed Apr 18 10:44:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeBOS-0000U5-9f
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:44:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeBOR-0000Tg-2h
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:44:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeBOQ-0000TN-LV
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:44:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeBOQ-0000TD-CG
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:44:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeBJZ-0000ir-JC
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:39:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeBJX-0002wf-Mo
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:39:19 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeBJX-0002wb-9x
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:39:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeBJX-0002wb-9x@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 14:39:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetStreamFfmpeg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:44:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 14:39:19

Modified files:
	.              : ChangeLog 
	server/asobj   : NetStreamFfmpeg.cpp 

Log message:
	 * server/asobj/NetStreamFfmpeg.cpp: Fix compile-breaking typo.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2912&r2=1.2913
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2912
retrieving revision 1.2913
diff -u -b -r1.2912 -r1.2913
--- ChangeLog	18 Apr 2007 14:13:31 -0000	1.2912
+++ ChangeLog	18 Apr 2007 14:39:18 -0000	1.2913
@@ -1,3 +1,7 @@
+2007-04-18 Martin Guy <martinwguy@yahoo.it>
+
+	* server/asobj/NetStreamFfmpeg.cpp: Fix compile-breaking typo.
+
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* server/character.h, server/dlist.cpp, server/swf/PlaceObject2Tag.cpp:
@@ -6,7 +10,7 @@
 2007-04-18 Martin Guy <martinwguy@yahoo.it>
 
 	* configure.ac: Introduce HAVE_LONG_TIMEZONE if extern long timezone
-	  exists
+	  exists, and HAVE_TM_GMTOFF if struct tm has member tm_gmtoff.
 	* doc/C/asspec/date.xml: first draft
 	* server/asobj/Date.cpp: Complete its implementation
 	* server/asobj/Global.cpp: Use definitions of NAN and INFINITY from	

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/asobj/NetStreamFfmpeg.cpp	18 Apr 2007 11:00:30 -0000	1.38
+++ server/asobj/NetStreamFfmpeg.cpp	18 Apr 2007 14:39:19 -0000	1.39
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: NetStreamFfmpeg.cpp,v 1.38 2007/04/18 11:00:30 jgilmore Exp $ */
+/* $Id: NetStreamFfmpeg.cpp,v 1.39 2007/04/18 14:39:19 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -566,7 +566,7 @@
 		// Open codec
 		if (avcodec_open(ns->m_ACodecCtx, pACodec) < 0)
 		{
-			log_error(_("Could not open audio codec %d for %s"));
+			log_error(_("Could not open audio codec %d for %s"),
 				ns->m_ACodecCtx->codec_id, ns->url.c_str());
 			return;
 		}



From MAILER-DAEMON Wed Apr 18 10:45:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeBP7-0000xu-Rh
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 10:45:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeBP6-0000xh-Br
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:45:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeBP5-0000xR-MH
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:45:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeBP5-0000xO-Gl
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:45:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HeBKE-0000or-LL
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 10:40:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeBKC-0002zz-Nq
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:40:00 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HeBKC-0002zu-IF
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 14:40:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeBKC-0002zu-IF@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Wed, 18 Apr 2007 14:40:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server as_value.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 14:45:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/18 14:40:00

Modified files:
	server         : as_value.h 

Log message:
	Removed extra semicolons to fix compilation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- as_value.h	18 Apr 2007 13:47:24 -0000	1.45
+++ as_value.h	18 Apr 2007 14:40:00 -0000	1.46
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.45 2007/04/18 13:47:24 martinwguy Exp $ */
+/* $Id: as_value.h,v 1.46 2007/04/18 14:40:00 bjacques Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -50,7 +50,7 @@
 #endif
 
 #ifndef INFINITY
-#       define INFINITY (std::numeric_limits<double>::infinity());
+#       define INFINITY (std::numeric_limits<double>::infinity())
 #endif
 
 



From MAILER-DAEMON Wed Apr 18 11:08:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeBlY-0008Ui-1n
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 11:08:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeBlW-0008Ud-Mv
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:08:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeBlU-0008UR-KB
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:08:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeBlU-0008UO-F9
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:08:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeBgc-0004Sz-6U
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:03:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeBgZ-0004R6-9R
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:03:07 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeBgY-0004R2-Qi
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:03:06 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeBgY-0004R2-Qi@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 15:03:06 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all Date.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 15:08:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 15:03:06

Modified files:
	testsuite/actionscript.all: Date.as 

Log message:
	typo fixed

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Date.as?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: Date.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Date.as,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- Date.as	18 Apr 2007 13:47:24 -0000	1.21
+++ Date.as	18 Apr 2007 15:03:06 -0000	1.22
@@ -1,4 +1,4 @@
-/N/ 
+// 
 //   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Date.as,v 1.21 2007/04/18 13:47:24 martinwguy Exp $";
+rcsid="$Id: Date.as,v 1.22 2007/04/18 15:03:06 strk Exp $";
 
 #include "check.as"
 
@@ -119,7 +119,7 @@
 check_equals (d.tostring, undefined);
 check_equals (Date.utc, undefined);
 
-#endif
+#endif // OUTPUT_VERSION > 6
 
 // Some values we will use to test things
     var zero = 0.0;



From MAILER-DAEMON Wed Apr 18 11:14:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeBrH-0001gO-KQ
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 11:14:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeBrF-0001gJ-QT
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:14:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeBrD-0001g7-ED
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:14:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeBrD-0001g4-8p
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:14:07 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeBmK-0005BI-TV
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:09:06 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3IF8k310205;
	Wed, 18 Apr 2007 17:08:46 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Wed, 18 Apr 2007 17:08:46 +0200
From: strk <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog configure.ac doc/C/asspec/date....
Message-ID: <20070418150846.GF92773@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HeAVJ-00070h-72@cvs> <20070418141808.GD92773@keybit.net>
	<397820524.20070418162942@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <397820524.20070418162942@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 15:14:10 -0000

On Wed, Apr 18, 2007 at 04:29:42PM +0200, Udo Giacomozzi wrote:
> Wednesday, April 18, 2007, 4:18:08 PM, you wrote:

> s> Date.cpp: In function 'int gnash::minutes_east_of_gmt(tm&)':
> s> Date.cpp:570: error: aggregate 'gnash::timeb tb' has incomplete type and cannot be defined
> s> Date.cpp:572: error: 'ftime' was not declared in this scope
> 
> make clean
> ./autogen.sh
> ./configure ...
> make
> 
> solved this problem for me

Confirmed, thanks.
Warnings follow:

Date.cpp: In function 'double gnash::rogue_date_args(const gnash::fn_call&, int)':
Date.cpp:1302: warning: comparison between signed and unsigned integer expressions
Date.cpp:1304: warning: comparison between signed and unsigned integer expressions

Here are the changes in the swfdec testsuite:

 FAIL: run_swfdec_testsuite: object-math-5.swf (traces in object-math-5.swf.trace-gnash, log in object-math-5.swf.log)
 XPASS: run_swfdec_testsuite: /home/strk/src/swfdec/swfdec/test/trace/object-math-7.swf

And these are ActionScript failures:

 FAIL: astests-v5-Runner: !isNaN(2+Number) [./Number.as:178]
 FAIL: astests-v5-Runner: !isNaN(Number.valueOf()) [./Number.as:277]

 XPASS: astests-v6-Runner: isNaN(2+Number) [./Number.as:180]
 XPASS: astests-v6-Runner: isNaN(Number.valueOf()) [./Number.as:264]

 FAIL: astests-v7-Runner: d2.valueOf() < d.valueOf() + 5000 [./Date.as:146]
 XPASS: astests-v7-Runner: isNaN(2+Number) [./Number.as:180]
 XPASS: astests-v7-Runner: isNaN(Number.valueOf()) [./Number.as:264]

 FAIL: astests-v8-Runner: d2.valueOf() < d.valueOf() + 5000 [./Date.as:146]
 XPASS: astests-v8-Runner: isNaN(2+Number) [./Number.as:180]
 XPASS: astests-v8-Runner: isNaN(Number.valueOf()) [./Number.as:264]

--strk;







From MAILER-DAEMON Wed Apr 18 11:31:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeC8H-00075f-9Q
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 11:31:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeC8G-00075S-98
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:31:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeC8F-000757-90
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:31:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeC8F-000754-45
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:31:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeC3O-0007AZ-1U
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 11:26:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeC3L-0005qQ-ST
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:26:40 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeC3L-0005qN-Do
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:26:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeC3L-0005qN-Do@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 15:26:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/BitmapMovieInstance.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 15:31:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 15:26:39

Modified files:
	.              : ChangeLog 
	server         : BitmapMovieInstance.cpp 
	testsuite      : MovieTester.h 
	testsuite/misc-ming.all: loadMovieTest.c loadMovieTestRunner.cpp 

Log message:
	        * testsuite/MovieTester.h: add click() method.
	        * server/BitmapMovieInstance.cpp: place the
	          bitmap character in the "static depth" zone
	          to forbid removal (might still be not enough).
	        * testsuite/misc-ming.all/loadMovieTest.c: have
	          the clear button remove the clips, not just clear them
	        * testsuite/misc-ming.all/loadMovieTestRunner.cpp:
	          check use of the 'scribble' and 'clear' buttons.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2913&r2=1.2914
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTest.c?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2913
retrieving revision 1.2914
diff -u -b -r1.2913 -r1.2914
--- ChangeLog	18 Apr 2007 14:39:18 -0000	1.2913
+++ ChangeLog	18 Apr 2007 15:26:38 -0000	1.2914
@@ -1,3 +1,14 @@
+2007-04-18 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.h: add click() method.
+	* server/BitmapMovieInstance.cpp: place the
+	  bitmap character in the "static depth" zone
+	  to forbid removal (might still be not enough).
+	* testsuite/misc-ming.all/loadMovieTest.c: have
+	  the clear button remove the clips, not just clear them
+	* testsuite/misc-ming.all/loadMovieTestRunner.cpp:
+	  check use of the 'scribble' and 'clear' buttons.
+
 2007-04-18 Martin Guy <martinwguy@yahoo.it>
 
 	* server/asobj/NetStreamFfmpeg.cpp: Fix compile-breaking typo.

Index: server/BitmapMovieInstance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapMovieInstance.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/BitmapMovieInstance.cpp	15 Feb 2007 17:51:43 -0000	1.4
+++ server/BitmapMovieInstance.cpp	18 Apr 2007 15:26:38 -0000	1.5
@@ -45,7 +45,7 @@
 	assert(chdef);
 	boost::intrusive_ptr<character> ch = chdef->create_character_instance(this, 1);
 	//log_msg("Created char in BitmapMovieInstance is a %s", typeid(*ch).name());
-	int depth = 1;
+	int depth = 1+character::staticDepthOffset;
 	place_character(ch.get(), depth, cxform(), mat, 1.0, 0);
 }
 

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/MovieTester.h	27 Feb 2007 09:10:20 -0000	1.11
+++ testsuite/MovieTester.h	18 Apr 2007 15:26:39 -0000	1.12
@@ -94,6 +94,13 @@
 	/// Notify mouse button was depressed
 	void depressMouseButton();
 
+	/// Simulate a mouse click (press and depress mouse button)
+	void click()
+	{
+		pressMouseButton();
+		depressMouseButton();
+	}
+
 	/// Notify key press
 	//
 	/// See key codes in namespace gnash::key (gnash.h)

Index: testsuite/misc-ming.all/loadMovieTest.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTest.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/loadMovieTest.c	18 Apr 2007 08:43:33 -0000	1.3
+++ testsuite/misc-ming.all/loadMovieTest.c	18 Apr 2007 15:26:39 -0000	1.4
@@ -242,8 +242,7 @@
 	add_button(mo, 50, 220, "Clear", newSWFAction(
 				" art=_root.coverart;"
 				" for (i=0; i<art.lastdepth; ++i) {"
-				"  art['child'+i].clear();"
-				//"  art.removeMovieClip('child'+i);" // doesn't work !
+				"  removeMovieClip('_root.coverart.child'+i);" 
 				" }"
 				" art.lastdepth=0;"
 				" art.clear(); "

Index: testsuite/misc-ming.all/loadMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/loadMovieTestRunner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/loadMovieTestRunner.cpp	18 Apr 2007 13:24:44 -0000	1.7
+++ testsuite/misc-ming.all/loadMovieTestRunner.cpp	18 Apr 2007 15:26:39 -0000	1.8
@@ -35,6 +35,41 @@
 using namespace gnash;
 using namespace std;
 
+std::auto_ptr<MovieTester> tester;
+boost::intrusive_ptr<sprite_instance> root;
+
+sprite_instance*
+getCoverArt()
+{
+	character* coverartch = const_cast<character*>(tester->findDisplayItemByName(*root, "coverart"));
+	sprite_instance* coverart = coverartch->to_movie();
+
+	//log_msg("Coverart is %p, displaylist is:", coverart);
+	//coverart->getDisplayList().dump();
+
+	return coverart;
+}
+
+void
+checkScribbling()
+{
+	sprite_instance* coverart = getCoverArt();
+
+	size_t initial_child_count = coverart->getDisplayList().size();
+
+	tester->movePointerTo(73, 204); // the "Scribble" button
+	check(tester->isMouseOverMouseEntity());
+	for (int i=1; i<=5; ++i) {
+		tester->click();
+		check_equals(coverart->getDisplayList().size(), initial_child_count+i);
+	}
+
+	tester->movePointerTo(59, 225); // the "clear" button
+	check(tester->isMouseOverMouseEntity());
+	tester->click();
+	check_equals(coverart->getDisplayList().size(), initial_child_count);
+}
+
 int
 main(int /*argc*/, char** /*argv*/)
 {
@@ -42,7 +77,7 @@
 	dbglogfile.setVerbosity(1);
 
 	string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
-	MovieTester tester(filename);
+	tester.reset(new MovieTester(filename));
 
 	URL baseURL(filename);
 	URL mediaURL(MEDIADIR"/");
@@ -52,64 +87,63 @@
 	std::string url;
 
 
-	sprite_instance* root = tester.getRootMovie();
-	assert(root);
+	root = tester->getRootMovie();
+	assert(root.get());
 
 	check_equals(root->get_frame_count(), 1);
 	check_equals(root->get_current_frame(), 0);
 
-	tester.advance();
+	tester->advance();
 	check_equals(root->get_current_frame(), 0);
 
 	// Verify that 'coverart' exists and is empty
-	character* coverartch = const_cast<character*>(tester.findDisplayItemByName(*root, "coverart"));
+	character* coverartch = const_cast<character*>(tester->findDisplayItemByName(*root, "coverart"));
 	sprite_instance* coverart = coverartch->to_movie();
 	check(coverart);
 	url = coverart->get_movie_definition()->get_url();
 	check_equals(coverart->get_movie_definition()->get_url(), baseURL.str());
 
+	// Check scribbling on the empty canvas
+	checkScribbling();
+
 	// Click on the first (lynch)
-	tester.movePointerTo(80, 80);
-	check(tester.isMouseOverMouseEntity());
-	tester.pressMouseButton();
+	tester->movePointerTo(80, 80);
+	check(tester->isMouseOverMouseEntity());
+	tester->pressMouseButton();
 	sleep(1); // give it some time...
-	coverartch = const_cast<character*>(tester.findDisplayItemByName(*root, "coverart"));
+	coverartch = const_cast<character*>(tester->findDisplayItemByName(*root, "coverart"));
 	check(coverart != coverartch->to_movie());
 	coverart = coverartch->to_movie();
 	check_equals(coverart->get_movie_definition()->get_url(), lynchURL.str());
-	tester.depressMouseButton();
+	tester->depressMouseButton();
+
+	// Check scribbling on the lynch
+	checkScribbling();
 
 	// Click on the second (green)
-	tester.movePointerTo(280, 80);
-	check(tester.isMouseOverMouseEntity());
-	tester.pressMouseButton();
-	tester.depressMouseButton();
+	tester->movePointerTo(280, 80);
+	check(tester->isMouseOverMouseEntity());
+	tester->click();
 	sleep(1); // give it some time...
-	coverartch = const_cast<character*>(tester.findDisplayItemByName(*root, "coverart"));
+	coverartch = const_cast<character*>(tester->findDisplayItemByName(*root, "coverart"));
 	coverart = coverartch->to_movie();
 	check_equals(coverart->get_movie_definition()->get_url(), greenURL.str());
 	// TODO: find a way to test if the jpeg is really displayed
 	//       (like turn it into a mouse-event-handling char and use isMouseOverActiveEntity ?)
 
+	// Check scribbling on the jpeg
+	checkScribbling();
+
 	// Click on the third (offspring)
-	tester.movePointerTo(480, 80);
-	check(tester.isMouseOverMouseEntity());
-	tester.pressMouseButton();
-	tester.depressMouseButton();
+	tester->movePointerTo(480, 80);
+	check(tester->isMouseOverMouseEntity());
+	tester->click();
 	sleep(1); // give it some time to load
-	coverartch = const_cast<character*>(tester.findDisplayItemByName(*root, "coverart"));
+	coverartch = const_cast<character*>(tester->findDisplayItemByName(*root, "coverart"));
 	coverart = coverartch->to_movie();
 	check_equals(coverart->get_movie_definition()->get_url(), offspringURL.str());
 
-	//---------------------------------------------------
-	// Now check that the active movieclip "buttons" work
-	//---------------------------------------------------
-
-	tester.movePointerTo(73, 204); // the "Scribble" button
-	check(tester.isMouseOverMouseEntity());
-
-	tester.movePointerTo(63, 227); // the "clear" button
-	check(tester.isMouseOverMouseEntity());
-
+	// Check scribbling on the offspring
+	checkScribbling();
 }
 



From MAILER-DAEMON Wed Apr 18 12:23:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeCwZ-0003P8-VV
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 12:23:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeCwY-0003Nh-Jr
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:23:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeCwX-0003M4-Mk
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:23:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeCwX-0003Lp-Bj
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:23:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeCrg-0006V0-3A
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:18:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeCre-0001DY-HQ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:18:38 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeCrd-0001DV-Sd
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:18:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeCrd-0001DV-Sd@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 16:18:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/asobj/Date.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 16:23:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 16:18:37

Modified files:
	server/asobj   : Date.cpp 
	.              : ChangeLog 

Log message:
	Fix signed/unsigned compiler warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2914&r2=1.2915

Patches:

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2914
retrieving revision 1.2915
diff -u -b -r1.2914 -r1.2915
--- ChangeLog	18 Apr 2007 15:26:38 -0000	1.2914
+++ ChangeLog	18 Apr 2007 16:18:37 -0000	1.2915
@@ -12,6 +12,9 @@
 2007-04-18 Martin Guy <martinwguy@yahoo.it>
 
 	* server/asobj/NetStreamFfmpeg.cpp: Fix compile-breaking typo.
+	* server/swf/tag_loaders.cpp: Reformat bizarre indentation caused
+	  by someone editing with hard tabs set to 4.
+	* server/asobj/Date.cpp: Fix signed/unsigned compiler warning.
 
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 



From MAILER-DAEMON Wed Apr 18 12:25:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeCxq-0005g9-Ow
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 12:25:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeCxp-0005er-4T
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeCxo-0005eG-2z
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:25:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeCxn-0005eA-T1
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:24:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeCsw-0006l3-Kn
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:19:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeCsv-0001HO-5P
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:19:57 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeCsu-0001HK-UW
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:19:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeCsu-0001HK-UW@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 16:19:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/swf tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 16:25:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 16:19:56

Modified files:
	server/swf     : tag_loaders.cpp 

Log message:
	server/swf/tag_loaders.cpp: Reformat bizarre indentation caused by someone
		editing with hard tabs set to 4.
	server/asobj/Date.cpp: Fix signed/unsigned compiler warning.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.89&r2=1.90

Patches:
Index: tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- tag_loaders.cpp	18 Apr 2007 14:07:33 -0000	1.89
+++ tag_loaders.cpp	18 Apr 2007 16:19:56 -0000	1.90
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.89 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: tag_loaders.cpp,v 1.90 2007/04/18 16:19:56 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -266,7 +266,6 @@
 			m->add_bitmap_character_def(character_id, ch);
 		}
 	}
-
 }
 
 
@@ -313,7 +312,6 @@
     			m->add_bitmap_character_def(character_id, ch);
 		}
    	}
-
 }
 
 
@@ -423,7 +421,6 @@
 	    m->add_bitmap_character_def(character_id, ch);
 #endif
 	}
-
 }
 
 
@@ -442,11 +439,7 @@
 	(
 		log_parse(_("  defbitslossless2: tag = %d, id = %d, "
 			"fmt = %d, w = %d, h = %d"),
-			tag,
-			character_id,
-			bitmap_format,
-			width,
-			height);
+		  tag, character_id, bitmap_format, width, height);
 	);
 
     //bitmap_info*	bi = NULL;
@@ -733,7 +726,9 @@
 void	define_font_loader(stream* in, tag_type tag, movie_definition* m)
     // Load a DefineFont or DefineFont2 tag.
 {
-    assert(tag == SWF::DEFINEFONT || tag == SWF::DEFINEFONT2 || tag == SWF::DEFINEFONT3 ); // 10 || 48 || 75
+    assert(tag == SWF::DEFINEFONT
+	   || tag == SWF::DEFINEFONT2
+	   || tag == SWF::DEFINEFONT3 ); // 10 || 48 || 75
 
     uint16_t	font_id = in->read_u16();
 
@@ -954,6 +949,7 @@
 	{
 	    uint16_t	id = in->read_u16();
 	    char*	symbol_name = in->read_string();
+
 		IF_VERBOSE_PARSE (
 	    log_parse(_("  export: id = %d, name = %s"), id, symbol_name);
 		);
@@ -1143,8 +1139,7 @@
 		IF_VERBOSE_PARSE
 		(
     log_parse(_("tag %d: do_action_loader"), tag);
-    log_parse(_("-- actions in frame " SIZET_FMT),
-	       m->get_loading_frame());
+	log_parse(_("-- actions in frame " SIZET_FMT), m->get_loading_frame());
 		);
 
     assert(in);
@@ -1162,15 +1157,13 @@
 {
 	assert(tag == SWF::INITACTION); // 59
 
-
 	int sprite_character_id = in->read_u16();
 	UNUSED(sprite_character_id);
 
 		IF_VERBOSE_PARSE
 		(
 	log_parse(_("  tag %d: do_init_action_loader"), tag);
-	log_parse(_("  -- init actions for sprite %d"),
-		   sprite_character_id);
+	log_parse(_("  -- init actions for sprite %d"), sprite_character_id);
 		);
 
 	do_action* da = new do_action;
@@ -1229,8 +1222,7 @@
 			// Uncompress the ADPCM before handing data to host.
 			data_bytes = sample_count * (stereo ? 4 : 2);
 			data = new unsigned char[data_bytes];
-			sound_handler::adpcm_expand(data, in, sample_count,
-				stereo);
+		sound_handler::adpcm_expand(data, in, sample_count, stereo);
 			format = sound_handler::FORMAT_NATIVE16;
 		}
 		else
@@ -1248,13 +1240,13 @@
 			if (format == sound_handler::FORMAT_UNCOMPRESSED
 			    && sample_16bit)
 			{
-				#ifndef _TU_LITTLE_ENDIAN_
+#ifndef _TU_LITTLE_ENDIAN_
 				// Swap sample bytes to get big-endian format.
 				for (int i = 0; i < data_bytes - 1; i += 2)
 				{
 					swap(&data[i], &data[i+1]);
 				}
-				#endif // not _TU_LITTLE_ENDIAN_
+#endif // not _TU_LITTLE_ENDIAN_
 
 				format = sound_handler::FORMAT_NATIVE16;
 			}
@@ -1318,7 +1310,6 @@
 			);
 		}
 	}
-
 }
 
 // Load a SoundStreamHead(2) tag.
@@ -1383,8 +1374,8 @@
 		format,
 		s_sample_rate_table[sample_rate],
 		stereo);
-	m->set_loading_sound_stream_id(handler_id);
 
+    m->set_loading_sound_stream_id(handler_id);
 }
 
 
@@ -1438,9 +1429,7 @@
 		{
 			data[i] = in->read_u8();
 		}
-
 	} else {
-
 		for (int i = 0; i < data_bytes; i++)
 		{
 			data[i] = in->read_u8();
@@ -1450,13 +1439,13 @@
 		// @@ I'm assuming this is a good idea?	 Most sound handlers will prefer native endianness?
 		/*if (format == sound_handler::FORMAT_UNCOMPRESSED && sample_16bit)
 		{
-			#ifndef _TU_LITTLE_ENDIAN_
+#ifndef _TU_LITTLE_ENDIAN_
 			// Swap sample bytes to get big-endian format.
 			for (int i = 0; i < data_bytes - 1; i += 2)
 			{
 				swap(&data[i], &data[i+1]);
 			}
-			#endif // not _TU_LITTLE_ENDIAN_
+#endif // not _TU_LITTLE_ENDIAN_
 
 			format = sound_handler::FORMAT_NATIVE16;
 		}*/
@@ -1473,7 +1462,6 @@
 	ssst->read(m, handle_id, start);
 
 	// @@ who's going to delete the start_stream_sound_tag ??
-
 }
 
 void
@@ -1502,7 +1490,6 @@
 	assert(ch != NULL);
 
 	ch->read(in, tag, m);
-
 }
 
 void
@@ -1542,7 +1529,6 @@
 	}
 
 	// TODO: attach info to movie_definition
-
 }
 
 void
@@ -1581,7 +1567,6 @@
 	log_msg(_("SERIALNUMBER: %s"), serial.c_str());
 
 	// attach to movie_definition ?
-
 }
 
 



From MAILER-DAEMON Wed Apr 18 12:53:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeDPp-0006G7-MK
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 12:53:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeDPn-0006FU-Va
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:53:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeDPn-0006FI-ES
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:53:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeDPn-0006FF-C2
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:53:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeDKw-0003Ov-2U
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 12:48:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeDKu-00042k-MV
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:48:52 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeDKu-00042h-Fl
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:48:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeDKu-00042h-Fl@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 16:48:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/asobj Date.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 16:53:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 16:48:52

Modified files:
	server/asobj   : Date.cpp 

Log message:
	Fix signed/unsigned in prototype too

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Date.cpp?cvsroot=gnash&r1=1.43&r2=1.44

Patches:
Index: Date.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Date.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- Date.cpp	18 Apr 2007 16:18:37 -0000	1.43
+++ Date.cpp	18 Apr 2007 16:48:52 -0000	1.44
@@ -140,7 +140,7 @@
 static void utc_date_to_tm_msec(double value, struct tm &tm, double &msec);
 static double local_tm_msec_to_date(struct tm &tm, double &msec);
 static double utc_tm_msec_to_date(struct tm &tm, double &msec);
-static double rogue_date_args(const fn_call& fn, int maxargs);
+static double rogue_date_args(const fn_call& fn, unsigned maxargs);
 #endif
 
 // Select functions to implement _localtime_r and _gmtime_r



From MAILER-DAEMON Wed Apr 18 13:10:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeDfR-0002Ym-2e
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 13:10:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeDfO-0002Yf-Sh
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:10:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeDfN-0002YC-3v
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:10:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeDfM-0002Y9-Uy
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:10:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeDaV-00051N-E8
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:04:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeDaT-0004vN-DB
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:04:57 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeDaT-0004vK-01
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:04:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeDaT-0004vK-01@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 18 Apr 2007 17:04:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler.h backen...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 17:10:03 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/18 17:04:56

Modified files:
	.              : ChangeLog 
	backend        : render_handler.h render_handler_agg.cpp 

Log message:
	renamed getPixel(); implemented getAveragePixel()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2915&r2=1.2916
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.71&r2=1.72

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2915
retrieving revision 1.2916
diff -u -b -r1.2915 -r1.2916
--- ChangeLog	18 Apr 2007 16:18:37 -0000	1.2915
+++ ChangeLog	18 Apr 2007 17:04:56 -0000	1.2916
@@ -1,3 +1,11 @@
+2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler.h: renamed get_pixel() to getPixel() and
+	  changed from void to bool return value
+	* backend/render_handler.h, backend/render_handler_agg.cpp: 
+	  implemented getAveragePixel()
+       
+	
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/MovieTester.h: add click() method.

Index: backend/render_handler.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- backend/render_handler.h	17 Apr 2007 09:00:26 -0000	1.32
+++ backend/render_handler.h	18 Apr 2007 17:04:56 -0000	1.33
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.32 2007/04/17 09:00:26 strk Exp $ */
+/* $Id: render_handler.h,v 1.33 2007/04/18 17:04:56 udog Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -490,17 +490,69 @@
     
 	/// This function returns the color at any position in the stage. It is used
 	/// for automatic testing only, it should not be used for anything else!
-	/// world_x and world_y are world coordinates (twips) and the color of the
-	/// nearest pixel is returned.
-	virtual void get_pixel(rgba& /*color_return*/, float /*world_x*/, 
-		float /*world_y*/)
+  /// x and y are pixel coordinates (<0 won't make any sense) and the color of 
+  /// the nearest pixel is returned.
+  /// The function returns false when the coordinates are outside the 
+  /// main frame buffer.
+  virtual bool getPixel(rgba& /*color_return*/, int /*x*/, int /*y*/)
 	{
 
-		log_msg("get_pixel() not implemented for this renderer");
+    log_msg("getPixel() not implemented for this renderer");
 		assert(0);    
+    return false; // avoid compiler warning    
+  }
+  
+  
+  /// Returns the average RGB color for a square block on the stage. The 
+  /// width and height of the block is defined by "radius" and x/y refer
+  /// to the center of the block. radius==1 equals getPixel() and radius==0
+  /// is illegal. For even "radius" values, the center point is not exactly
+  /// defined. 
+  /// The function returns false when at least one pixel of the block was
+  /// outside the main frame buffer. In that case the value in color_return
+  /// is undefined.
+  /// This implementation is provided for simplicity. Renderers should
+  /// implement a specialized version for better performance.
+  virtual bool getAveragePixel(rgba& color_return, int x, int y, 
+    unsigned int radius)
+  {
+  
+    assert(radius>0); 
+  
+    // optimization:
+    if (radius==1)
+      return getPixel(color_return, x, y);
+  
+    unsigned int r=0, g=0, b=0, a=0;
+    
+    x -= radius/2;
+    y -= radius/2;
 
+    int xe = x+radius-1;
+    int ye = y+radius-1;
+
+    rgba pixel;
+    
+    for (int yp=y; yp<ye; yp++)
+    for (int xp=x; xp<xe; xp++)
+    {
+      if (!getPixel(pixel, xp, yp))
+        return false;
+        
+      r += pixel.m_r;      
+      g += pixel.m_g;      
+      b += pixel.m_b;      
+      a += pixel.m_a;      
 	}
 
+    int pcount = radius*radius; 
+    color_return.m_r = r / pcount; 
+    color_return.m_g = g / pcount; 
+    color_return.m_b = b / pcount; 
+    color_return.m_a = a / pcount; 
+    
+    return true;
+  }
 	/// Sets the x/y scale for the movie  
 	virtual void set_scale(float /*xscale*/, float /*yscale*/) {
 		// nop

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- backend/render_handler_agg.cpp	17 Apr 2007 09:20:41 -0000	1.71
+++ backend/render_handler_agg.cpp	18 Apr 2007 17:04:56 -0000	1.72
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.71 2007/04/17 09:20:41 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.72 2007/04/18 17:04:56 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1876,10 +1876,10 @@
 		return false;
   }
 
-  void get_pixel(rgba& color_return, float world_x, float world_y) {
-    int x, y;
+  bool getPixel(rgba& color_return, int x, int y) {
     
-    world_to_pixel(x, y, world_x, world_y);
+    if ((x<0) || (y<0) || (x>=xres) || (y=yres))
+      return false;
 
     agg::rgba8 color = m_pixf->pixel(x, y);    
     
@@ -1888,6 +1888,7 @@
     color_return.m_b = color.b;
     color_return.m_a = color.a;
     
+    return true;
   }
   
   void set_scale(float new_xscale, float new_yscale) {



From MAILER-DAEMON Wed Apr 18 13:11:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeDh7-0003A9-7z
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 13:11:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeDh4-000392-Vg
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:11:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeDh3-00037O-SF
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:11:46 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeDh3-000371-Mf
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:11:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeDcC-0005Cc-5x
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:06:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeDcB-00051k-2m
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:06:43 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeDcA-00051h-RK
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:06:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeDcA-00051h-RK@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 18 Apr 2007 17:06:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 17:11:47 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/18 17:06:42

Modified files:
	backend        : render_handler_agg.cpp 

Log message:
	typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.72&r2=1.73

Patches:
Index: render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- render_handler_agg.cpp	18 Apr 2007 17:04:56 -0000	1.72
+++ render_handler_agg.cpp	18 Apr 2007 17:06:42 -0000	1.73
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.72 2007/04/18 17:04:56 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.73 2007/04/18 17:06:42 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1878,7 +1878,7 @@
 
   bool getPixel(rgba& color_return, int x, int y) {
   
-    if ((x<0) || (y<0) || (x>=xres) || (y=yres))
+    if ((x<0) || (y<0) || (x>=xres) || (y>=yres))
       return false;
 
     agg::rgba8 color = m_pixf->pixel(x, y);    



From MAILER-DAEMON Wed Apr 18 13:12:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeDhv-0003MZ-Fd
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 13:12:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeDhu-0003MU-AO
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:12:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeDht-0003MI-Sg
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:12:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeDht-0003MF-Ms
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:12:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeDd2-0005HA-3H
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:07:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeDd0-00054k-Vy
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:07:35 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeDd0-00054h-PA
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:07:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeDd0-00054h-PA@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Wed, 18 Apr 2007 17:07:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler_agg.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 17:12:38 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/18 17:07:34

Modified files:
	backend        : render_handler_agg.cpp 

Log message:
	get rid of tabulators

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.73&r2=1.74

Patches:
Index: render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- render_handler_agg.cpp	18 Apr 2007 17:06:42 -0000	1.73
+++ render_handler_agg.cpp	18 Apr 2007 17:07:34 -0000	1.74
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.73 2007/04/18 17:06:42 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.74 2007/04/18 17:07:34 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)



From MAILER-DAEMON Wed Apr 18 13:32:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeE0m-0000Ju-SA
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 13:32:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeE0l-0000Ja-IF
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:32:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeE0j-0000JO-6k
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:32:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeE0j-0000JJ-1u
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:32:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeDvr-0007zs-2c
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:27:03 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeDvq-0006FY-Mv
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:27:02 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeDvq-0006FV-Gt
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:27:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeDvq-0006FV-Gt@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 17:27:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libamf amf.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 17:32:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 17:27:02

Modified files:
	libamf         : amf.cpp 

Log message:
	Just fiddling pointlessly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- amf.cpp	4 Apr 2007 20:30:45 -0000	1.30
+++ amf.cpp	18 Apr 2007 17:27:02 -0000	1.31
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.30 2007/04/04 20:30:45 bjacques Exp $ */
+/* $Id: amf.cpp,v 1.31 2007/04/18 17:27:02 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -997,14 +997,6 @@
     return parseBody(_amf_data, _total_size);
 }
 
-// int
-// AMF::parseBody(unsigned char *in, int bytes)
-// {
-//     GNASH_REPORT_FUNCTION;
-
-//     parseBody(in, _total_size);
-// }
-
 int
 AMF::parseBody(unsigned char *in, int bytes)
 {



From MAILER-DAEMON Wed Apr 18 13:33:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeE1z-0000fG-K6
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 13:33:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeE1x-0000ep-Uv
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:33:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeE1w-0000dw-A8
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:33:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeE1v-0000di-JU
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:33:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeDx3-0008B1-PX
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:28:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeDx0-0006K5-Cn
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:28:14 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeDwz-0006K1-Vn
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:28:14 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeDwz-0006K1-Vn@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 17:28:13 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 17:33:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 17:28:13

Modified files:
	.              : ChangeLog 
	testsuite      : MovieTester.cpp MovieTester.h 

Log message:
	        * testsuite/MovieTester.{cpp,h}:
	          Added interfaces for testing pixel values.
	          Next step would be actually initializing
	          a renderer during testing (if requested, maybe?)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2916&r2=1.2917
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2916
retrieving revision 1.2917
diff -u -b -r1.2916 -r1.2917
--- ChangeLog	18 Apr 2007 17:04:56 -0000	1.2916
+++ ChangeLog	18 Apr 2007 17:28:13 -0000	1.2917
@@ -1,3 +1,10 @@
+2007-04-18 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.{cpp,h}:
+	  Added interfaces for testing pixel values.
+	  Next step would be actually initializing
+	  a renderer during testing (if requested, maybe?)
+
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler.h: renamed get_pixel() to getPixel() and

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- testsuite/MovieTester.cpp	2 Apr 2007 15:45:22 -0000	1.24
+++ testsuite/MovieTester.cpp	18 Apr 2007 17:28:13 -0000	1.25
@@ -29,6 +29,8 @@
 #include "gnash.h" // for create_movie and create_library_movie and for gnash::key namespace
 #include "VM.h" // for initialization
 #include "sound_handler_test.h" // for creating the "test" sound handler
+#include "render.h" // for get_render_handler
+#include "types.h" // for rgba class
 
 #include <cstdio>
 #include <string>
@@ -139,9 +141,24 @@
 void
 MovieTester::movePointerTo(int x, int y)
 {
+	_x = x;
+	_y = y;
 	_movie_root->notify_mouse_moved(x, y);
 }
 
+FuzzyPixel
+MovieTester::getAveragePixel(unsigned radius, int tolerance) const
+{
+	render_handler* rend = get_render_handler();
+	assert(rend);
+	rgba color;
+	if ( ! rend->getAveragePixel(color, _x, _y, radius) )
+	{
+		return FuzzyPixel();
+	}
+	return FuzzyPixel(color, tolerance);
+}
+
 void
 MovieTester::pressMouseButton()
 {
@@ -209,4 +226,24 @@
 	return _sound_handler.get()->test_times_stopped_all();
 }
 
+bool
+FuzzyPixel::operator==(const FuzzyPixel& o) const
+{
+	// Intolerant FuzzyPixels never succeed in comparison
+	if ( _tol < 0 || o._tol < 0 ) return false;
+
+	int tol=std::max(_tol, o._tol);
+	if ( ! fuzzyEqual(_col.m_r, o._col.m_r, tol) ) return false;
+	if ( ! fuzzyEqual(_col.m_g, o._col.m_g, tol) ) return false;
+	if ( ! fuzzyEqual(_col.m_b, o._col.m_b, tol) ) return false;
+	if ( ! fuzzyEqual(_col.m_a, o._col.m_a, tol) ) return false;
+	return true;
+}
+
+std::ostream&
+operator<< (std::ostream& o, const FuzzyPixel& p)
+{
+	return o << "FuzzyPixel(" << p._col.toString() << ") [tol:" << p._tol << "]";
+}
+
 } // namespace gnash

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/MovieTester.h	18 Apr 2007 15:26:39 -0000	1.12
+++ testsuite/MovieTester.h	18 Apr 2007 17:28:13 -0000	1.13
@@ -23,6 +23,7 @@
 #include "Range2d.h"
 #include "gnash.h" // for namespace key
 #include "sound_handler_test.h" // for creating the "test" sound handler
+#include "types.h" // for rgba class
 
 #include <memory> // for auto_ptr
 #include <string> // for auto_ptr
@@ -37,6 +38,93 @@
 
 namespace gnash {
 
+/// An utility class used to compare rgba values with a given tolerance
+class FuzzyPixel
+{
+
+public:
+
+	friend std::ostream& operator<< (std::ostream& o, const FuzzyPixel& p);
+
+	/// Construct a black, alpha 0 FuzzyPixel with NO tolerance.
+	//
+	/// No tolerance means that any comparison will fail
+	///
+	FuzzyPixel()
+		:
+		_col(0,0,0,0),
+		_tol(0)
+	{
+	}
+
+	/// Construct a FuzzyPixel with given color and tolerance
+	//
+	/// @param color
+	///	The color value
+	///
+	/// @param tolerance
+	///	The tolerance to use in comparisons
+	///
+	FuzzyPixel(rgba& color, int tolerance=0)
+		:
+		_col(color),
+		_tol(tolerance)
+	{
+	}
+
+	/// Construct a FuzzyPixel with given values
+	//
+	/// @param r
+	///	The red value.
+	///
+	/// @param g
+	///	The green value.
+	///
+	/// @param b
+	///	The blue value.
+	///
+	/// @param a
+	///	The alpha value.
+	///
+	FuzzyPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+		:
+		_col(r, g, b, a),
+		_tol(0)
+	{
+	}
+
+	/// Set the tolerance to use in comparisons
+	//
+	/// @param tol
+	///	The tolerance to use in comparisons
+	///
+	void setTolerance(int tol)
+	{
+		_tol = tol;
+	}
+
+	/// Compare two FuzzyPixel using the tolerance of the most tolerant of the two
+	//
+	/// Note that if any of the two operands has 0 tolerance, any equality
+	/// comparison will fail.
+	///
+	bool operator==(const FuzzyPixel& other) const;
+
+	// Return true if a and b are below a given tolerance
+	static bool fuzzyEqual(int a, int b, int tol)
+	{
+		return abs(a-b) <= tol;
+	}
+
+private:
+
+	rgba _col;
+
+	// tolerance value
+	int _tol;
+
+};
+
 /// An utility class for testing movie playback
 //
 /// This is a just born implementation and doesn't
@@ -88,6 +176,21 @@
 	///
 	void movePointerTo(int x, int y);
 
+	/// Get the average pixel under the mouse pointer
+	//
+	/// @param radius
+	///	Radius defining the average zone used.
+	///	1 means a single pixel.
+	///	Behaviour of passing 0 is undefined.
+	///
+	/// @param tolerance
+	///	The tolerance value to use for the returned FuzzyPixel.
+	///
+	/// Note that if current pointer is outside of the rendered region
+	/// an intollerant FuzzyPixel is returned.
+	///
+	FuzzyPixel getAveragePixel(unsigned radius, int tolerance) const;
+
 	/// Notify mouse button was pressed
 	void pressMouseButton();
 
@@ -133,6 +236,10 @@
 	gnash::sprite_instance* _movie;
 
 	std::auto_ptr<TEST_sound_handler> _sound_handler;
+
+	int _x;
+
+	int _y;
 };
 
 } // namespace gnash



From MAILER-DAEMON Wed Apr 18 13:44:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeECa-0003GF-Q2
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 13:44:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeECZ-0003Fd-Bs
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:44:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeECY-0003F9-Qy
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:44:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeECY-0003F0-Gh
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:44:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeE7g-0001Qf-OE
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 13:39:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeE7g-00089Y-7j
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:39:16 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeE7f-00089V-O4
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:39:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeE7f-00089V-O4@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 17:39:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/actionscript/as_value.xml...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 17:44:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 17:39:15

Modified files:
	.              : ChangeLog 
	doc/C/actionscript: as_value.xml 
	libbase        : container.h 

Log message:
	Expunge the last references to tu_string.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2917&r2=1.2918
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/actionscript/as_value.xml?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.54&r2=1.55

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2917
retrieving revision 1.2918
diff -u -b -r1.2917 -r1.2918
--- ChangeLog	18 Apr 2007 17:28:13 -0000	1.2917
+++ ChangeLog	18 Apr 2007 17:39:15 -0000	1.2918
@@ -30,6 +30,8 @@
 	* server/swf/tag_loaders.cpp: Reformat bizarre indentation caused
 	  by someone editing with hard tabs set to 4.
 	* server/asobj/Date.cpp: Fix signed/unsigned compiler warning.
+	* libbase/container.h, doc/C/actionscript/as_value.xml:
+	  Expunge the last references to tu_string.
 
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 

Index: doc/C/actionscript/as_value.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/actionscript/as_value.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/actionscript/as_value.xml	19 Mar 2007 16:21:41 -0000	1.2
+++ doc/C/actionscript/as_value.xml	18 Apr 2007 17:39:15 -0000	1.3
@@ -70,10 +70,6 @@
           about which methods are available for the
           <emphasis>as_value</emphasis> object.
         </para>
-        <para>
-          Note that the <emphasis>tu_string</emphasis> and related
-          methods are deprecated.
-        </para>
       </sect2>
 
     </sect1>

Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- libbase/container.h	15 Apr 2007 10:52:09 -0000	1.54
+++ libbase/container.h	18 Apr 2007 17:39:15 -0000	1.55
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: container.h,v 1.54 2007/04/15 10:52:09 bjacques Exp $ */
+/* $Id: container.h,v 1.55 2007/04/18 17:39:15 martinwguy Exp $ */
 
 #ifndef __CONTAINER_H__
 #define __CONTAINER_H__
@@ -675,23 +675,6 @@
 
 } // namespace gnash
 
-// // tu_string is a subset of std::string, for the most part
-// class tu_string : public std::string
-// {
-// public:
-// 	tu_string(const char* str) : std::string(str) {}
-// 	tu_string() : std::string() {}
-// 	tu_string(const tu_string& str) : std::string(str) {}
-
-// 	int	length() const { return (int) std::string::length(); }
-// };
-
-
-// template<class U>
-// class string_hash : public hash<tu_string, U, std::hash<std::string> >
-// {
-// };
-
 
 //
 // Homemade containers; almost strict subsets of STL.



From MAILER-DAEMON Wed Apr 18 15:19:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeFgO-00027j-Ln
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 15:19:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeFgM-000257-53
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:19:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeFgI-000231-H7
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:19:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeFgI-00022t-A7
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:19:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeFbQ-0004nB-2F
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 15:14:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeFbI-0005YS-8C
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 19:13:56 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeFbI-0005YM-1P
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 19:13:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeFbI-0005YM-1P@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 18 Apr 2007 19:13:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/BitmapMovieInstance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 19:19:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/18 19:13:55

Modified files:
	.              : ChangeLog 
	server         : BitmapMovieInstance.cpp 

Log message:
	        * server/BitmapMovieInstance.cpp: make sure
	          the bitmap character is not considered a mask (sic).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2918&r2=1.2919
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2918
retrieving revision 1.2919
diff -u -b -r1.2918 -r1.2919
--- ChangeLog	18 Apr 2007 17:39:15 -0000	1.2918
+++ ChangeLog	18 Apr 2007 19:13:55 -0000	1.2919
@@ -1,5 +1,7 @@
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
+	* server/BitmapMovieInstance.cpp: make sure
+	  the bitmap character is not considered a mask (sic).
 	* testsuite/MovieTester.{cpp,h}:
 	  Added interfaces for testing pixel values.
 	  Next step would be actually initializing

Index: server/BitmapMovieInstance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapMovieInstance.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/BitmapMovieInstance.cpp	18 Apr 2007 15:26:38 -0000	1.5
+++ server/BitmapMovieInstance.cpp	18 Apr 2007 19:13:55 -0000	1.6
@@ -46,7 +46,8 @@
 	boost::intrusive_ptr<character> ch = chdef->create_character_instance(this, 1);
 	//log_msg("Created char in BitmapMovieInstance is a %s", typeid(*ch).name());
 	int depth = 1+character::staticDepthOffset;
-	place_character(ch.get(), depth, cxform(), mat, 1.0, 0);
+	int clip_depth = character::noClipDepthValue;
+	place_character(ch.get(), depth, cxform(), mat, 1.0, clip_depth);
 }
 
 



From MAILER-DAEMON Wed Apr 18 16:30:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeGnq-0004gt-08
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 16:30:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeGnp-0004go-4K
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:30:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeGno-0004gZ-J4
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:30:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeGno-0004gV-Df
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:30:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeGiv-00075O-SY
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:25:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeGiu-0001ra-Qb
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 20:25:52 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeGiu-0001rW-4u
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 20:25:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeGiu-0001rW-4u@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 20:25:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/tu_file.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 20:30:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 20:25:51

Modified files:
	.              : ChangeLog 
	libbase        : tu_file.h 

Log message:
	Purge endian dependence, add \brief to methods

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2919&r2=1.2920
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2919
retrieving revision 1.2920
diff -u -b -r1.2919 -r1.2920
--- ChangeLog	18 Apr 2007 19:13:55 -0000	1.2919
+++ ChangeLog	18 Apr 2007 20:25:51 -0000	1.2920
@@ -34,6 +34,7 @@
 	* server/asobj/Date.cpp: Fix signed/unsigned compiler warning.
 	* libbase/container.h, doc/C/actionscript/as_value.xml:
 	  Expunge the last references to tu_string.
+	* libbase/tu_file.h: Purge endian dependence, add \brief to methods.
 
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 

Index: libbase/tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libbase/tu_file.h	17 Apr 2007 10:38:16 -0000	1.13
+++ libbase/tu_file.h	18 Apr 2007 20:25:51 -0000	1.14
@@ -104,107 +104,83 @@
     int	copy_bytes(tu_file* in, int bytes);
     
 
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    uint64_t	read_le64();
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    uint32_t 	read_le32();
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    uint16_t 	read_le16();
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    uint64_t 	read_be64();
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    uint32_t 	read_be32();
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    uint16_t 	read_be16();
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    void 	write_le64(uint64_t u);
-
-    /// \brief
-    /// TODO: define what happens when the stream
-    ///       is in error condition, see get_error().
-    ///
-    void 	write_le32(uint32_t u);
-
-    /// \brief
+    /// \brief Read a 32-bit word from a little-endian stream.
+    ///	returning it as a native-endian word.
+    //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
-    void 	write_le16(uint16_t u);
+    uint32_t 	read_le32() {
+	// read8() is uint8_t, so no masks with 0xff are required.
+	uint32_t result = read8();
+	result |= read8() << 8;
+	result |= read8() << 16;
+	result |= read8() << 24;
+	return(result);
+    }
 
-    /// \brief
+    /// \brief Read a 16-bit word from a little-endian stream.
+    //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
-    void	write_be64(uint64_t u);
+    uint16_t 	read_le16() {
+	uint16_t result = read8();
+	result |= read8() << 8;
+	return(result);
+    }
 
-    /// \brief
+    /// \brief Write a 32-bit word to a little-endian stream.
+    //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
-    void 	write_be32(uint32_t u);
+    void 	write_le32(uint32_t u) {
+	write8((uint8_t)u);
+	write8((uint8_t)(u>>8));
+	write8((uint8_t)(u>>16));
+	write8((uint8_t)(u>>24));
+    }
 
-    /// \brief
+    /// \brief Write a 16-bit word to a little-endian stream.
+    //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
-    void 	write_be16(uint16_t u);
+    void 	write_le16(uint16_t u) {
+	write8((uint8_t)u);
+	write8((uint8_t)(u>>8));
+    }
     
-    /// Read a single byte from the stream
+    /// \brief Read a single byte from the stream
     //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
     uint8_t 	read_byte() { return read8(); }
 
-    /// write a single byte to the stream
+    /// \brief write a single byte to the stream
     //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
     void	write_byte(uint8_t u) { write8(u); }
     
-    /// Read the given number of bytes from the stream
+    /// \brief Read the given number of bytes from the stream
     //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
     int 	read_bytes(void* dst, int num) { return m_read(dst, num, m_data); }
 
-    /// Write the given number of bytes to the stream
+    /// \brief Write the given number of bytes to the stream
     //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
     ///
     int 	write_bytes(const void* src, int num) { return m_write(src, num, m_data); }
     
-    /// Write a 0-terminated string.
+    /// \brief Write a 0-terminated string to a stream.
     //
     /// TODO: define what happens when the stream
     ///       is in error condition, see get_error().
@@ -226,34 +202,25 @@
     ///
     int	read_string(char* dst, int max_length);
     
-    /// \brief
+    /// \brief Write a 32-bit float to a stream.
+    //
     /// TODO: define what to return when the stream
     ///       is in error condition, see get_error().
     void	write_float32(float value);
 
-    /// \brief
-    /// TODO: define what to return when the stream
-    ///       is in error condition, see get_error().
-    void	write_double64(double value);
-
-    /// \brief
+    /// \brief Read a 32-bit float from a stream.
     /// TODO: define what to return when the stream
     ///       is in error condition, see get_error().
     float	read_float32();
 
-    /// \brief
-    /// TODO: define what to return when the stream
-    ///       is in error condition, see get_error().
-    double	read_double64();
-    
-    /// Return current stream position
+    /// \brief Return current stream position
     //
     /// TODO: define what to return when the stream
     ///       is in error condition, see get_error().
     ///
     int	get_position() const { return m_tell(m_data); }
 
-    /// Seek to the specified position
+    /// \brief Seek to the specified position
     //
     /// 
     /// TODO: define what happens when an error occurs, or
@@ -261,20 +228,20 @@
     ///
     void 	set_position(int p) { m_seek(p, m_data); }
 
-    /// Seek to the end of the stream
+    /// \brief Seek to the end of the stream
     //
     /// TODO: define what happens when an error occurs
     ///
     void	go_to_end() { m_seek_to_end(m_data); }
 
-    /// Return true if the end of the stream has been reached.
+    /// \brief Return true if the end of the stream has been reached.
     //
     /// TODO: define what to return when in error condition
     /// see get_error().
     ///
     bool	get_eof() { return m_get_eof(m_data); }
     
-    /// Return non-zero if the stream is in an error state
+    /// \brief Return non-zero if the stream is in an error state
     //
     /// When the stream is in an error state there's nothing
     /// you can do about it, just delete it and log the error.
@@ -285,13 +252,13 @@
     int	get_error() { return m_get_err(m_data); }
     
 
-	// get the size of the stream
+    /// \brief Get the size of the stream
 	int get_size() { return m_get_stream_size(m_data); }
 
-    // printf-style convenience function.
+    // \brief printf-style convenience function.
     int	printf(const char* fmt, ...);
     
-    // UNSAFE back door, for testing only.
+    // \brief UNSAFE back door, for testing only.
     void*	get_app_data_DEBUG() { return m_data; }
     
     
@@ -350,37 +317,10 @@
 //
 
 
-#if _TU_LITTLE_ENDIAN_
-inline uint64_t	tu_file::read_le64() { return read64(); }
-inline uint32_t	tu_file::read_le32() { return read32(); }
-inline uint16_t	tu_file::read_le16() { return read16(); }
-inline uint64_t	tu_file::read_be64() { return swap64(read64()); }
-inline uint32_t	tu_file::read_be32() { return swap32(read32()); }
-inline uint16_t	tu_file::read_be16() { return swap16(read16()); }
-inline void	tu_file::write_le64(uint64_t u) { write64(u); }
-inline void	tu_file::write_le32(uint32_t u) { write32(u); }
-inline void	tu_file::write_le16(uint16_t u) { write16(u); }
-inline void	tu_file::write_be64(uint64_t u) { write64(swap64(u)); }
-inline void	tu_file::write_be32(uint32_t u) { write32(swap32(u)); }
-inline void	tu_file::write_be16(uint16_t u) { write16(swap16(u)); }
-#else // not _TU_LITTLE_ENDIAN_
-inline uint64_t	tu_file::read_le64() { return swap64(read64()); }
-inline uint32_t	tu_file::read_le32() { return swap32(read32()); }
-inline uint16_t	tu_file::read_le16() { return swap16(read16()); }
-inline uint64_t	tu_file::read_be64() { return read64(); }
-inline uint32_t	tu_file::read_be32() { return read32(); }
-inline uint16_t	tu_file::read_be16() { return read16(); }
-inline void	tu_file::write_le64(uint64_t u) { write64(swap64(u)); }
-inline void	tu_file::write_le32(uint32_t u) { write32(swap32(u)); }
-inline void	tu_file::write_le16(uint16_t u) { write16(swap16(u)); }
-inline void	tu_file::write_be64(uint64_t u) { write64(u); }
-inline void	tu_file::write_be32(uint32_t u) { write32(u); }
-inline void	tu_file::write_be16(uint16_t u) { write16(u); }
-#endif	// not _TU_LITTLE_ENDIAN_
-
-
+/// \brief Write a 32-bit float to a stream in little-endian order.
+/// @@ This currently relies on host FP format being the same as the Flash one
+/// (presumably IEEE 754).
 inline void	tu_file::write_float32(float value)
-// Write a 32-bit little-endian float to this file.
 {
     union alias {
 	float	f;
@@ -393,6 +333,9 @@
 }
 
 
+/// \brief Read a 32-bit float from a little-endian stream.
+/// @@ This currently relies on host FP format being the same as the Flash one
+/// (presumably IEEE 754).
 inline float	tu_file::read_float32()
 // Read a 32-bit little-endian float from this file.
 {
@@ -406,35 +349,6 @@
     return u.f;
 }
 
-#if 0
-inline void		tu_file::write_double64(double value)
-// Write a 64-bit little-endian double to this file.
-{
-    union {
-	double	d;
-	uint64_t	l;
-    } u;
-    compiler_assert(sizeof(u) == sizeof(u.l));
-    
-    u.d = value;
-    write_le64(u.l);
-}
-
-
-inline double	tu_file::read_double64()
-// Read a little-endian 64-bit double from this file.
-{
-    union {
-	double	d;
-	uint64_t	l;
-    } u;
-    compiler_assert(sizeof(u) == sizeof(u.l));
-    
-    u.l = read_le64();
-    return u.d;
-}
-#endif
-
 #endif // TU_FILE_H
 
 



From MAILER-DAEMON Wed Apr 18 17:01:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeHHf-00010v-Hs
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 17:01:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeHHd-0000ya-QT
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:01:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeHHc-0000xs-EG
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:01:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeHHc-0000xp-8X
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:01:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeHCj-0002Wm-NZ
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 16:56:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeHCi-0004c1-Av
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 20:56:40 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeHCh-0004by-SW
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 20:56:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeHCh-0004by-SW@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 20:56:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/sound_handler_sdl.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 21:01:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 20:56:39

Modified files:
	.              : ChangeLog 
	backend        : sound_handler_sdl.cpp 

Log message:
	backend/sound_handler_sdl.cpp: Remove commented-out stuff

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2920&r2=1.2921
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2920
retrieving revision 1.2921
diff -u -b -r1.2920 -r1.2921
--- ChangeLog	18 Apr 2007 20:25:51 -0000	1.2920
+++ ChangeLog	18 Apr 2007 20:56:39 -0000	1.2921
@@ -35,6 +35,7 @@
 	* libbase/container.h, doc/C/actionscript/as_value.xml:
 	  Expunge the last references to tu_string.
 	* libbase/tu_file.h: Purge endian dependence, add \brief to methods.
+	* backend/sound_handler_sdl.cpp: Remove commented-out stuff
 
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 

Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- backend/sound_handler_sdl.cpp	18 Apr 2007 09:35:41 -0000	1.51
+++ backend/sound_handler_sdl.cpp	18 Apr 2007 20:56:39 -0000	1.52
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.51 2007/04/18 09:35:41 jgilmore Exp $
+// $Id: sound_handler_sdl.cpp,v 1.52 2007/04/18 20:56:39 martinwguy Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -520,17 +520,6 @@
 // input data to the SDL output format (SAMPLE_RATE,
 // stereo, 16-bit native endianness)
 {
-// 		// xxxxx debug pass-thru
-// 		{
-// 			int	output_sample_count = sample_count * (stereo ? 2 : 1);
-// 			int16_t*	out_data = new int16_t[output_sample_count];
-// 			*adjusted_data = out_data;
-// 			*adjusted_size = output_sample_count * 2;	// 2 bytes per sample
-// 			memcpy(out_data, data, *adjusted_size);
-// 			return;
-// 		}
-// 		// xxxxx
-
 	bool m_stereo = (audioSpec.channels == 2 ? true : false);
 	int m_sample_rate = audioSpec.freq;
 
@@ -559,7 +548,6 @@
 		dup = m_sample_rate / sample_rate;
 	}
 
-//	int	output_sample_count = (sample_count * dup) / inc;
 	int	output_sample_count = (sample_count * dup * (stereo ? 2 : 1)) / inc;
 
 	int16_t*	out_data = new int16_t[output_sample_count];



From MAILER-DAEMON Wed Apr 18 17:10:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeHPz-0004Wa-97
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 17:10:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeHPy-0004WU-0R
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:10:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeHPw-0004WI-Iz
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:10:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeHPw-0004WF-ED
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:10:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeHL3-0003Hg-Qg
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:05:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeHL2-00054J-LD
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 21:05:16 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeHL2-00054D-5R
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 21:05:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeHL2-00054D-5R@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 21:05:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/swf/tag_loaders.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 21:10:22 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 21:05:15

Modified files:
	.              : ChangeLog 
	server/swf     : tag_loaders.cpp 

Log message:
	Remove commented-out stuff

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2921&r2=1.2922
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.90&r2=1.91

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2921
retrieving revision 1.2922
diff -u -b -r1.2921 -r1.2922
--- ChangeLog	18 Apr 2007 20:56:39 -0000	1.2921
+++ ChangeLog	18 Apr 2007 21:05:15 -0000	1.2922
@@ -36,6 +36,7 @@
 	  Expunge the last references to tu_string.
 	* libbase/tu_file.h: Purge endian dependence, add \brief to methods.
 	* backend/sound_handler_sdl.cpp: Remove commented-out stuff
+	* server/swf/tag_loaders.cpp: Remove commented-out stuff
 
 2007-04-18 Udo Giacomozzi <udo.gnu@nova-sys.net>
 

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/swf/tag_loaders.cpp	18 Apr 2007 16:19:56 -0000	1.90
+++ server/swf/tag_loaders.cpp	18 Apr 2007 21:05:15 -0000	1.91
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.90 2007/04/18 16:19:56 martinwguy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.91 2007/04/18 21:05:15 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1388,10 +1388,8 @@
     assert(tag == SWF::SOUNDSTREAMBLOCK); // 19
 
     // discard garbage data
-    //int	garbage = in->read_u32();
     in->skip_bytes(4);
 
-
     // If we don't have a sound_handler registered stop here
     if (!handler) return;
 



From MAILER-DAEMON Wed Apr 18 18:02:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeIDy-0006fg-Uz
	for mharc-gnash-commit@gnu.org; Wed, 18 Apr 2007 18:02:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeIDx-0006fF-8y
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 18:02:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeIDu-0006ez-RU
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 18:02:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeIDu-0006ew-Mk
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 18:01:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeI91-0001BU-Sk
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 17:56:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeI91-0000bW-AR
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 21:56:55 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeI91-0000bT-4p
	for gnash-commit@gnu.org; Wed, 18 Apr 2007 21:56:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeI91-0000bT-4p@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 18 Apr 2007 21:56:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libbase tu_file.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Apr 2007 22:02:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/18 21:56:55

Modified files:
	libbase        : tu_file.h 

Log message:
	Add correct casts 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_file.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: tu_file.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_file.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- tu_file.h	18 Apr 2007 20:25:51 -0000	1.14
+++ tu_file.h	18 Apr 2007 21:56:55 -0000	1.15
@@ -112,10 +112,10 @@
     ///
     uint32_t 	read_le32() {
 	// read8() is uint8_t, so no masks with 0xff are required.
-	uint32_t result = read8();
-	result |= read8() << 8;
-	result |= read8() << 16;
-	result |= read8() << 24;
+	uint32_t result = (uint32_t)read8();
+	result |= (uint32_t)read8() << 8;
+	result |= (uint32_t)read8() << 16;
+	result |= (uint32_t)read8() << 24;
 	return(result);
     }
 	
@@ -125,8 +125,8 @@
     ///       is in error condition, see get_error().
     ///
     uint16_t 	read_le16() {
-	uint16_t result = read8();
-	result |= read8() << 8;
+	uint16_t result = (uint16_t)read8();
+	result |= (uint16_t)read8() << 8;
 	return(result);
     }
 



From MAILER-DAEMON Thu Apr 19 01:28:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HePCD-00088X-Vt
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 01:28:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HePCC-00088J-AM
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 01:28:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HePCA-000887-Rq
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 01:28:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HePCA-000884-KX
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 01:28:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HeP7F-0004MH-CZ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 01:23:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeP7D-0006XB-E1
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 05:23:31 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HeP7D-0006X8-6X
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 05:23:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeP7D-0006X8-6X@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 19 Apr 2007 05:23:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/duplica...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 05:28:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/19 05:23:30

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: duplicate_movie_clip_test.c 
	libbase        : tu_types.h 
	server         : cxform.h 

Log message:
	more tests

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2922&r2=1.2923
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/duplicate_movie_clip_test.c?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.h?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2922
retrieving revision 1.2923
diff -u -b -r1.2922 -r1.2923
--- ChangeLog	18 Apr 2007 21:05:15 -0000	1.2922
+++ ChangeLog	19 Apr 2007 05:23:30 -0000	1.2923
@@ -1,3 +1,12 @@
+2007-04-19 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/duplicate_movie_clip_test.c
+	  more tests.
+	* libbase/tu_types.h
+	  drop SDL integer types 
+	* server/cxform.h
+	  replace inttypes.h with tu_types.h, hopefully more portable
+	  
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
 	* server/BitmapMovieInstance.cpp: make sure

Index: testsuite/misc-ming.all/duplicate_movie_clip_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/duplicate_movie_clip_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/duplicate_movie_clip_test.c	18 Apr 2007 13:24:44 -0000	1.2
+++ testsuite/misc-ming.all/duplicate_movie_clip_test.c	19 Apr 2007 05:23:30 -0000	1.3
@@ -31,8 +31,8 @@
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip  mc, dejagnuclip;
-  SWFDisplayItem it;
+  SWFMovieClip  mc1, mc2, dejagnuclip;
+  SWFDisplayItem it1, it2;
   SWFShape  sh_red;
 
   const char *srcdir=".";
@@ -52,36 +52,77 @@
   dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
   add_actions(mo, "x1=0; x2=0; x3=0;");
-  SWFMovie_nextFrame(mo); 
+  SWFMovie_nextFrame(mo);  /* 1st frame */
 
   
-  mc = newSWFMovieClip();
+  mc1 = newSWFMovieClip();
   sh_red = make_fill_square (100, 300, 60, 60, 255, 0, 0, 255, 0, 0);
-  SWFMovieClip_add(mc, (SWFBlock)sh_red);  
-  add_clip_actions(mc, "stop();");
-  SWFMovieClip_nextFrame(mc);
-
-
-  it = SWFMovie_add(mo, (SWFBlock)mc); 
-  SWFDisplayItem_setDepth(it, 10); 
-  SWFDisplayItem_setName(it, "mc"); 
-  
-  add_actions(mo, " mc.onLoad = function () {};"
-                  " mc.prop1 = 10; "
-                  " duplicateMovieClip('mc', 'dup', 1); ");
-  SWFMovie_nextFrame(mo); 
-  
-  
-  check_equals(mo, "mc.prop1", "10");
-  check_equals(mo, "typeof(mc.onLoad)", "'function'");
-  check_equals(mo, "mc.getDepth()", "-16374");
-  check_equals(mo, "dup.prop1", "undefined");  // user defined property will not be duplicated
-  check_equals(mo, "typeof(dup.onLoad)", "'undefined'"); //user defined event will not be duplicated
-  check_equals(mo, "dup.getDepth()", "1");
+  SWFMovieClip_add(mc1, (SWFBlock)sh_red);  
+  add_clip_actions(mc1, "stop();");
+  SWFMovieClip_nextFrame(mc1);
+
+  mc2 = newSWFMovieClip();
+  sh_red = make_fill_square (100, 200, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc2, (SWFBlock)sh_red);  
+  add_clip_actions(mc2, "stop();");
+  SWFMovieClip_nextFrame(mc2);
+
+  it1 = SWFMovie_add(mo, (SWFBlock)mc1); 
+  SWFDisplayItem_setDepth(it1, 10); 
+  SWFDisplayItem_setName(it1, "mc1"); 
+
+  it2 = SWFMovie_add(mo, (SWFBlock)mc2); 
+  SWFDisplayItem_setDepth(it2, 20); 
+  SWFDisplayItem_setName(it2, "mc2"); 
+  SWFDisplayItem_addAction(it2,
+    compileSWFActionCode(" _root.note('onClipLoad triggered'); "
+                         " _root.x1 = _root.x1 + 1; "),
+    SWFACTION_ONLOAD);  
+  SWFDisplayItem_addAction(it2,
+    compileSWFActionCode(" _root.note('onClipEnterFrame triggered'); "
+                         " _root.x2 = _root.x2 + 1; "),
+    SWFACTION_ENTERFRAME);  
+  SWFDisplayItem_addAction(it2,
+    compileSWFActionCode(" _root.note('onClipUnload triggered'); "
+                         " _root.x3 = _root.x3 + 1; "),
+    SWFACTION_UNLOAD); 
+
+  add_actions(mo, " mc1.onLoad = function () {}; "
+                  " mc1.prop1 = 10; "
+                  " duplicateMovieClip('mc1', 'dup1', 1); "
+                  " mc2.onLoad = function () {}; "
+                  " duplicateMovieClip('mc2', 'dup2', 2); " );
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+  
+  
+  check_equals(mo, "mc1.prop1", "10");
+  check_equals(mo, "typeof(mc1.onLoad)", "'function'");
+  check_equals(mo, "mc1.getDepth()", "-16374");
+  /* user defined property will not be duplicated */
+  check_equals(mo, "dup1.prop1", "undefined");  
+  /* user defined event will not be duplicated */
+  check_equals(mo, "typeof(dup1.onLoad)", "'undefined'"); 
+  check_equals(mo, "dup1.getDepth()", "1");
+  /* check user defined onLoad */
+  check_equals(mo, "typeof(mc2.onLoad)", "'function'");
+  /* onClipEvent does not define a function */
+  check_equals(mo, "typeof(mc2.onEnterFrame)", "'undefined'");
+  /* user defined event will not be duplicated */
+  check_equals(mo, "typeof(dup2.onLoad)", "'undefined'"); 
+  check_equals(mo, "_root.x1", "2");
+  check_equals(mo, "_root.x2", "2");
+  SWFMovie_nextFrame(mo); /* 3rd frame */
+  
+  SWFDisplayItem_remove(it1);
+  SWFDisplayItem_remove(it2);
+  add_actions(mo, " dup2.removeMovieClip(); ");
+  SWFMovie_nextFrame(mo); /* 4th frame */
+
+  check_equals(mo, "_root.x1", "2");
+  check_equals(mo, "_root.x2", "3");
+  check_equals(mo, "_root.x3", "2");  
   add_actions(mo, " _root.totals(); stop(); ");
-  SWFMovie_nextFrame(mo); 
-  
-  
+  SWFMovie_nextFrame(mo); /* 5th frame */
   //Output movie
   puts("Saving " OUTPUT_FILENAME );
   SWFMovie_save(mo, OUTPUT_FILENAME);

Index: libbase/tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libbase/tu_types.h	11 Apr 2007 17:54:21 -0000	1.33
+++ libbase/tu_types.h	19 Apr 2007 05:23:30 -0000	1.34
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: tu_types.h,v 1.33 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: tu_types.h,v 1.34 2007/04/19 05:23:30 zoulunkai Exp $ */
 
 #ifndef TU_TYPES_H
 #define TU_TYPES_H
@@ -30,15 +30,15 @@
 #include "tu_config.h"
 
 #if defined(_WIN32) || defined(WIN32)
-#include <sdl_stdinc.h>	
-//typedef unsigned char uint8_t;
-//typedef char int8_t;
-//typedef unsigned short int uint16_t;
-//typedef short int int16_t;
-//typedef unsigned int uint32_t;
-//typedef int int32_t;
-//typedef unsigned __int64 uint64_t;
-//typedef __int64 int64_t;
+//#include <sdl_stdinc.h>	
+typedef unsigned char uint8_t;
+typedef signed char int8_t;
+typedef unsigned short int uint16_t;
+typedef signed short int int16_t;
+typedef unsigned int uint32_t;
+typedef signed int int32_t;
+typedef unsigned __int64 uint64_t;
+typedef __int64 int64_t;
 # define __PRETTY_FUNCTION__ __FUNCDNAME__
 # define BYTE_ORDER SDL_BYTEORDER
 #else

Index: server/cxform.h
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/cxform.h	11 Apr 2007 16:52:23 -0000	1.2
+++ server/cxform.h	19 Apr 2007 05:23:30 -0000	1.3
@@ -22,7 +22,7 @@
 #endif
 
 #include "tu_config.h" // for DSOEXPORT
-#include <inttypes.h> // for uint8_t
+#include "tu_types.h" // for uint8_t
 
 #include <iosfwd>
 



From MAILER-DAEMON Thu Apr 19 03:15:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeQr7-0004bh-QL
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 03:15:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeQr5-0004Ya-9i
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:14:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeQr4-0004Y3-PJ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:14:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeQr4-0004Xn-Fb
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:14:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HeQm9-0007pN-4h
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:09:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeQm8-00053E-6e
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 07:09:52 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HeQm8-00053B-0D
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 07:09:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeQm8-00053B-0D@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 19 Apr 2007 07:09:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/action.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 07:15:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/19 07:09:51

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

Log message:
	type definition, get rid of compiler warning

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2923&r2=1.2924
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2923
retrieving revision 1.2924
diff -u -b -r1.2923 -r1.2924
--- ChangeLog	19 Apr 2007 05:23:30 -0000	1.2923
+++ ChangeLog	19 Apr 2007 07:09:51 -0000	1.2924
@@ -6,6 +6,8 @@
 	  drop SDL integer types 
 	* server/cxform.h
 	  replace inttypes.h with tu_types.h, hopefully more portable
+	* server/vm/action.cpp
+	  type definition, get rid of compiler warning
 	  
 2007-04-18 Sandro Santilli <strk@keybit.net>
 

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/vm/action.cpp	18 Apr 2007 14:07:33 -0000	1.15
+++ server/vm/action.cpp	19 Apr 2007 07:09:51 -0000	1.16
@@ -550,7 +550,7 @@
 as_standard_member
 get_standard_member(const std::string& name)
 {
-	typedef std::map< std::string, as_standard_member>	maptype;
+	typedef std::map< std::string, as_standard_member, StringNoCaseLessThen>  maptype; 
 
 	static bool s_inited = false;
 	static std::map< std::string, as_standard_member, StringNoCaseLessThen> membersMap;



From MAILER-DAEMON Thu Apr 19 03:30:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeR5m-00010E-KJ
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 03:30:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeR5k-000107-S2
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:30:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeR5j-0000zn-C5
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:30:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeR5j-0000zh-5b
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:30:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HeR0n-0001Au-N9
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:25:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeR0m-0005rd-UP
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 07:25:01 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HeR0m-0005ra-Ju
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 07:25:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeR0m-0005ra-Ju@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 19 Apr 2007 07:25:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetConnection.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 07:30:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/19 07:25:00

Modified files:
	.              : ChangeLog 
	server/asobj   : NetConnection.h 

Log message:
	add a forward declaration, quiet the compiler

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2924&r2=1.2925
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2924
retrieving revision 1.2925
diff -u -b -r1.2924 -r1.2925
--- ChangeLog	19 Apr 2007 07:09:51 -0000	1.2924
+++ ChangeLog	19 Apr 2007 07:25:00 -0000	1.2925
@@ -8,6 +8,8 @@
 	  replace inttypes.h with tu_types.h, hopefully more portable
 	* server/vm/action.cpp
 	  type definition, get rid of compiler warning
+	* server/asobj/NetConnection.h
+	  add a forward declarations, quite the compiler
 	  
 2007-04-18 Sandro Santilli <strk@keybit.net>
 

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/NetConnection.h	30 Mar 2007 13:57:27 -0000	1.23
+++ server/asobj/NetConnection.h	19 Apr 2007 07:25:00 -0000	1.24
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.h,v 1.23 2007/03/30 13:57:27 tgc Exp $ */
+/* $Id: NetConnection.h,v 1.24 2007/04/19 07:25:00 zoulunkai Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__
@@ -41,6 +41,9 @@
 #include "fn_call.h"
 
 // Forward declarations
+
+class FLVParser; 
+
 namespace gnash {
 	//class NetStream;
 }



From MAILER-DAEMON Thu Apr 19 03:45:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeRKe-00070p-5X
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 03:45:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeRKc-00070f-GR
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:45:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeRKb-00070S-RF
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:45:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeRKb-00070P-MU
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:45:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HeRFg-0002r1-5B
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 03:40:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeRFd-000808-ON
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 07:40:21 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HeRFd-000805-Eg
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 07:40:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeRFd-000805-Eg@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 19 Apr 2007 07:40:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/NetConnection.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 07:45:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/19 07:40:21

Modified files:
	.              : ChangeLog 
	server/asobj   : NetConnection.h 

Log message:
	sorry, just revert back, forget about the previous change

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2925&r2=1.2926
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetConnection.h?cvsroot=gnash&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2925
retrieving revision 1.2926
diff -u -b -r1.2925 -r1.2926
--- ChangeLog	19 Apr 2007 07:25:00 -0000	1.2925
+++ ChangeLog	19 Apr 2007 07:40:20 -0000	1.2926
@@ -8,8 +8,6 @@
 	  replace inttypes.h with tu_types.h, hopefully more portable
 	* server/vm/action.cpp
 	  type definition, get rid of compiler warning
-	* server/asobj/NetConnection.h
-	  add a forward declarations, quite the compiler
 	  
 2007-04-18 Sandro Santilli <strk@keybit.net>
 

Index: server/asobj/NetConnection.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetConnection.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/asobj/NetConnection.h	19 Apr 2007 07:25:00 -0000	1.24
+++ server/asobj/NetConnection.h	19 Apr 2007 07:40:21 -0000	1.25
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: NetConnection.h,v 1.24 2007/04/19 07:25:00 zoulunkai Exp $ */
+/* $Id: NetConnection.h,v 1.25 2007/04/19 07:40:21 zoulunkai Exp $ */
 
 #ifndef __NETCONNECTION_H__
 #define __NETCONNECTION_H__
@@ -41,9 +41,6 @@
 #include "fn_call.h"
 
 // Forward declarations
-
-class FLVParser; 
-
 namespace gnash {
 	//class NetStream;
 }



From MAILER-DAEMON Thu Apr 19 06:32:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeTw7-0006iN-EB
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 06:32:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeTw4-0006i2-Oe
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 06:32:20 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeTw3-0006gt-2g
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 06:32:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeTw2-0006gl-WC
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 06:32:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeTr6-0007ny-3G
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 06:27:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeTr4-0001V3-WF
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:27:11 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeTr4-0001Uz-H3
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:27:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeTr4-0001Uz-H3@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 10:27:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 10:32:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 10:27:10

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	server/asobj   : string.cpp 
	testsuite/actionscript.all: Global.as Number.as String.as 
	testsuite/movies.all: gravity_embedded-TestRunner.cpp 
	testsuite/swfdec: PASSING 

Log message:
	NOTE: this commit fixes the bugs introduced by Martin + fixes some more bugs
	      related to value->number conversion.
	      It has to be noted that the Date.as test is BOGUS and should be fixes ASAP.
	
	        * server/asobj/string.cpp: add valueOf own property to String
	          prototype.
	        * server/as_value.{h,cpp}: add equalsSameType() function;
	          fix bugs in to_number for function values (version-sensitive it
	          seems); modify equality and inequality operators to follow
	          strict equality semantic.
	        * testsuite/movies.all/gravity_embed-TestRunner.cpp: be aware when
	          comparing as_value types, comparisons are strict now!
	        * testsuite/swfdec/PASSING: divide-7.swf and object-math-7.swf now
	          succeed.
	        * testsuite/actionscript.all/Global.as: small test for isNaN
	          availability
	        * testsuite/actionscript.all/Number.as: tests for
	          convertion-to-number.
	        * testsuite/actionscript.all/String.as: test valueOf being a property
	          of String.prototype.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2926&r2=1.2927
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Global.as?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Number.as?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/String.as?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/movies.all/gravity_embedded-TestRunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2926
retrieving revision 1.2927
diff -u -b -r1.2926 -r1.2927
--- ChangeLog	19 Apr 2007 07:40:20 -0000	1.2926
+++ ChangeLog	19 Apr 2007 10:27:09 -0000	1.2927
@@ -1,3 +1,22 @@
+2007-04-19 Sandro Santilli <strk@keybit.net>
+
+	* server/asobj/string.cpp: add valueOf own property to String
+	  prototype.
+	* server/as_value.{h,cpp}: add equalsSameType() function;
+	  fix bugs in to_number for function values (version-sensitive it
+	  seems); modify equality and inequality operators to follow
+	  strict equality semantic.
+	* testsuite/movies.all/gravity_embed-TestRunner.cpp: be aware when
+	  comparing as_value types, comparisons are strict now!
+	* testsuite/swfdec/PASSING: divide-7.swf and object-math-7.swf now
+	  succeed.
+	* testsuite/actionscript.all/Global.as: small test for isNaN
+	  availability
+	* testsuite/actionscript.all/Number.as: tests for
+	  convertion-to-number.
+	* testsuite/actionscript.all/String.as: test valueOf being a property
+	  of String.prototype.
+
 2007-04-19 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/duplicate_movie_clip_test.c

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/as_value.cpp	18 Apr 2007 13:47:24 -0000	1.39
+++ server/as_value.cpp	19 Apr 2007 10:27:09 -0000	1.40
@@ -169,7 +169,9 @@
 					}
 					else
 					{
-						log_msg(_("call_method0(%s) did not return a string"), methodname.c_str());
+						log_msg(_("[object %p].%s() did not return a string: %s"),
+								(void*)obj, methodname.c_str(),
+								ret.to_debug_string().c_str());
 					}
 				}
 				else
@@ -294,6 +296,7 @@
 			return m_number_value;
 
 		case OBJECT:
+		case AS_FUNCTION:
 		    {
 			// @@ Moock says the result here should be
 			// "the return value of the object's valueOf()
@@ -318,7 +321,17 @@
 					}
 					else
 					{
-						log_msg(_("call_method0(%s) did not return a number"), methodname.c_str());
+						log_msg(_("[object %p].%s() did not return a number: %s"),
+								(void*)obj, methodname.c_str(),
+								ret.to_debug_string().c_str());
+						if ( m_type == AS_FUNCTION && swfversion < 6 )
+						{
+							return 0;
+						}
+						else
+						{
+							return NAN;
+						}
 					}
 				}
 				else
@@ -329,11 +342,13 @@
 			return obj->get_numeric_value(); 
 		    }
 
+#if 0
 		case AS_FUNCTION:
 			// This used to be the same case as AS_OBJECT,
 			// but empirically "new String(_root.createTextField)"
 			// or any other function returns NAN.
 			return NAN;
+#endif
 
 		case MOVIECLIP:
 			// This is tested, no valueOf is going
@@ -614,101 +629,65 @@
     }
 }
 
-// Return true if operands are equal.
 bool
-as_value::operator==(const as_value& v) const
+as_value::equals(const as_value& v, as_environment* env) const
 {
+    log_msg("equals(%s, %s) called", to_debug_string().c_str(), v.to_debug_string().c_str());
+
     bool this_nulltype = (m_type == UNDEFINED || m_type == NULLTYPE);
     bool v_nulltype = (v.get_type() == UNDEFINED || v.get_type() == NULLTYPE);
     if (this_nulltype || v_nulltype)
     {
 	return this_nulltype == v_nulltype;
     }
-    else if (m_type == STRING)
-    {
-	return m_string_value == v.to_string();
-    }
-    else if (m_type == NUMBER)
-    {
-	return m_number_value == v.to_number();
-    }
-    else if (m_type == BOOLEAN)
-    {
-	return m_boolean_value == v.to_bool();
 
-    }
-    else if (is_object())
-    {
-    	if ( v.is_object() )
-	{
-		// compare by reference
-		return to_object() == v.to_object();
-	}
-	else
-	{
-		// convert this value to a primitive and recurse
-		as_value v2 = to_primitive();
-		if ( v2.is_object() ) return false;
-		else return v2 == v;
-		//return to_primitive() == v;
-	}
-    }
-    else
-    {
-	assert(0);
-    }
-}
+    /// Compare to same type
+    if ( m_type == v.m_type ) return equalsSameType(v);
 
-bool
-as_value::equals(const as_value& v, as_environment* env) const
-{
-    bool this_nulltype = (m_type == UNDEFINED || m_type == NULLTYPE);
-    bool v_nulltype = (v.get_type() == UNDEFINED || v.get_type() == NULLTYPE);
-    if (this_nulltype || v_nulltype)
-    {
-	return this_nulltype == v_nulltype;
-    }
     else if (m_type == STRING)
     {
 	return m_string_value == v.to_string(env);
     }
-    else if (m_type == NUMBER)
+    else if (m_type == NUMBER && v.m_type == STRING)
+    {
+	return equalsSameType(v.to_number(env)); // m_number_value == v.to_number(env);
+	//return m_number_value == v.to_number(env);
+    }
+    else if (v.m_type == NUMBER && m_type == STRING)
     {
-	return m_number_value == v.to_number();
+	return v.equalsSameType(to_number(env)); // m_number_value == v.to_number(env);
+	//return v.m_number_value == to_number(env);
     }
     else if (m_type == BOOLEAN)
     {
 	return m_boolean_value == v.to_bool();
 
     }
+
     else if (is_object())
     {
-    	if ( v.is_object() )
-	{
-		// compare by reference
-		return to_object() == v.to_object();
-	}
-	else
-	{
+    	assert ( ! v.is_object() );
 		// convert this value to a primitive and recurse
 		as_value v2 = to_primitive(); // TODO: should forward environment ?
 		if ( v2.is_object() ) return false;
 		else return v2.equals(v, env);
 	}
+
+    else if (v.is_object())
+    {
+    	assert ( ! is_object() );
+	// convert this value to a primitive and recurse
+	as_value v2 = v.to_primitive(); // TODO: should forward environment ?
+	if ( v2.is_object() ) return false;
+	else return equals(v2, env);
     }
+
     else
     {
 	assert(0);
     }
 }
 	
-// Return true if operands are not equal.
-bool
-as_value::operator!=(const as_value& v) const
-{
-    return ! (*this == v);
-}
-	
 // Sets *this to this string plus the given string.
 void
 as_value::string_concat(const std::string& str)
@@ -765,14 +744,51 @@
 	}
 }
 
+/*private*/
+bool
+as_value::equalsSameType(const as_value& v) const
+{
+	assert(m_type == v.m_type);
+	switch (m_type)
+	{
+		case UNDEFINED:
+		case NULLTYPE:
+			return true;
+
+		case OBJECT:
+		case AS_FUNCTION:
+			return m_object_value == v.m_object_value;
+
+		case BOOLEAN:
+			return m_boolean_value == v.m_boolean_value;
+
+		case STRING:
+		case MOVIECLIP:
+			return m_string_value == v.m_string_value;
+
+		case NUMBER:
+		{
+			double a = m_number_value;
+			double b = v.m_number_value;
+
+			// Nan != NaN
+			if ( isnan(a) || isnan(b) ) return false;
+
+			// -0.0 == 0.0
+			if ( (a == -0 && b == 0) || (a == 0 && b == -0) ) return true;
+
+			return a == b;
+		}
+
+	}
+	assert(0);
+}
+
 bool
 as_value::strictly_equals(const as_value& v) const
 {
 	if ( m_type != v.m_type ) return false;
-
-	// using operator== here might not the
-	// right thing, we should try to break it.
-	return *this == v;
+	return equalsSameType(v);
 }
 
 std::string

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/as_value.h	18 Apr 2007 14:40:00 -0000	1.46
+++ server/as_value.h	19 Apr 2007 10:27:09 -0000	1.47
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.46 2007/04/18 14:40:00 bjacques Exp $ */
+/* $Id: as_value.h,v 1.47 2007/04/19 10:27:09 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -286,7 +286,6 @@
 	///	for object values. If NULL, toString() won't be run.
 	///
 	const std::string& to_string(as_environment* env=NULL) const;
-	//std::string to_std_string(as_environment* env=NULL) const;
 
 	std::string to_debug_string() const;
 
@@ -442,19 +441,25 @@
           m_type = STRING;
           m_string_value = str;
         }
+
 	void	set_double(double val) {
           drop_refs();
           m_type = NUMBER;
           m_number_value = val;
         }
+
 	void	set_bool(bool val) {
           drop_refs();
           m_type = BOOLEAN;
           m_boolean_value = val;
         }
+
 	void	set_sprite(const std::string& path);
+
 	void	set_sprite(const sprite_instance& sp);
+
 	void	set_int(int val) { set_double(val); }
+
 	void	set_nan() { set_double(NAN); }
 
 	/// Make this value a NULL, OBJECT, MOVIECLIP or AS_FUNCTION value
@@ -479,6 +484,23 @@
 	///
 	as_value& set_null() { drop_refs(); m_type = NULLTYPE; return *this; }
 
+	/// Equality operator, follows strict equality semantic
+	//
+	/// See strictly_equals
+	///
+	bool operator==(const as_value& v) const
+	{
+		return strictly_equals(v);
+	}
+
+	/// Inequality operator, follows strict inequality semantic
+	//
+	/// See strictly_equals
+	///
+	bool operator!=(const as_value& v) const {
+		return ! ( *this  == v );
+	}
+
 	void	operator=(const as_value& v);
 
 	bool	is_undefined() const { return (m_type == UNDEFINED); }
@@ -490,8 +512,6 @@
 	/// Strict equality is defined as the two values being of the
 	/// same type and the same value.
 	///
-	/// TODO: check what makes two MOVIECLIP values strictly equal
-	///
 	bool strictly_equals(const as_value& v) const;
 
 	/// Return true if this value is abstractly equal to the given one
@@ -504,33 +524,17 @@
 	///
 	bool equals(const as_value& v, as_environment* env=NULL) const;
 
-	/// @deprecated use equals() instead
-	bool	operator==(const as_value& v) const;
-
-	bool	operator!=(const as_value& v) const;
-
-	/// @deprecated, use v.set_double(v.to_number(env) / v.to_number(env)) instead !
-	//bool	operator<(const as_value& v) const { return to_number() < v.to_number(); }
-
-	/// @deprecated, use v.set_double(v.to_number(env) + v.to_number(env)) instead !
-	//void	operator+=(const as_value& v) { set_double(to_number() + v.to_number()); }
-
-	/// TODO: deprecate all these !
-//	void	operator-=(const as_value& v) { set_double(to_number() - v.to_number()); }
-//	void	operator*=(const as_value& v) { set_double(to_number() * v.to_number()); }
-//	void	operator/=(const as_value& v) { set_double(to_number() / v.to_number()); }  // @@ check for div/0
-//	void	operator&=(const as_value& v) { set_int(int(to_number()) & int(v.to_number())); }
-//	void	operator|=(const as_value& v) { set_int(int(to_number()) | int(v.to_number())); }
-//	void	operator^=(const as_value& v) { set_int(int(to_number()) ^ int(v.to_number())); }
-//	void	shl(const as_value& v) { set_int(int(to_number()) << int(v.to_number())); }
-//	void	asr(const as_value& v) { set_int(int(to_number()) >> int(v.to_number())); }
-//	void	lsr(const as_value& v) { set_int((uint32_t(to_number()) >> int(v.to_number()))); }
-
 	/// Sets this value to this string plus the given string.
 	void	string_concat(const std::string& str);
 
 private:
 
+	/// Compare values of the same type
+	//
+	/// NOTE: will abort if values are not of the same type!
+	///
+	bool equalsSameType(const as_value& v) const;
+
 	// TODO: make private. The rationale is that callers of this functions
 	//       should use is_WHAT() instead, or changes in the available
 	//       primitive value types will require modifications in all callers.

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/string.cpp	18 Apr 2007 14:07:32 -0000	1.29
+++ server/asobj/string.cpp	19 Apr 2007 10:27:09 -0000	1.30
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.29 2007/04/18 14:07:32 jgilmore Exp $ */
+/* $Id: string.cpp,v 1.30 2007/04/19 10:27:09 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -85,6 +85,7 @@
     o.init_member("charCodeAt", new builtin_function(string_char_code_at));
     o.init_member("toUpperCase", new builtin_function(string_to_upper_case));
     o.init_member("toLowerCase", new builtin_function(string_to_lower_case));
+    o.init_member("valueOf", new builtin_function(as_object::tostring_method));
 
     boost::intrusive_ptr<builtin_function> length_getter(new builtin_function(string_get_length));
     o.init_readonly_property("length", *length_getter);

Index: testsuite/actionscript.all/Global.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Global.as,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/actionscript.all/Global.as	15 Mar 2007 22:39:54 -0000	1.22
+++ testsuite/actionscript.all/Global.as	19 Apr 2007 10:27:09 -0000	1.23
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Global.as,v 1.22 2007/03/15 22:39:54 strk Exp $";
+rcsid="$Id: Global.as,v 1.23 2007/04/19 10:27:09 strk Exp $";
 
 #include "check.as"
 
@@ -43,6 +43,10 @@
 check_equals ( typeof(_global.parseInt), 'undefined' );
 #endif
 
+check_equals(typeof(isNaN), 'function');
+#if OUTPUT_VERSION > 5
+xcheck(!_global.hasOwnProperty('isNaN'));
+#endif
 
 // Test parseInt
 check ( parseInt('45b') == 45 );

Index: testsuite/actionscript.all/Number.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Number.as,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/actionscript.all/Number.as	22 Mar 2007 13:19:04 -0000	1.16
+++ testsuite/actionscript.all/Number.as	19 Apr 2007 10:27:10 -0000	1.17
@@ -26,10 +26,12 @@
 // TODO: test with SWF target != 6 (the only one tested so far)
 //	
 
-rcsid="$Id: Number.as,v 1.16 2007/03/22 13:19:04 strk Exp $";
+rcsid="$Id: Number.as,v 1.17 2007/04/19 10:27:10 strk Exp $";
 
 #include "check.as"
 
+#if 0 // REMOVEME STRK
+
 var n1=new Number(268);
 
 // strict-equality operator was introduced in SWF6
@@ -300,3 +302,74 @@
 check(!anum.hasOwnProperty('toString'));
 #endif
 
+#endif // REMOVEME STRK
+
+//-----------------------------------------------------------
+// Check conversion to number
+//-----------------------------------------------------------
+
+asm { push 'val',4 tonumber setvariable };
+check_equals(val, 4);
+
+asm { push 'val',null tonumber setvariable };
+#if OUTPUT_VERSION < 7
+ check_equals(val, 0);
+ check(!isNaN(val));
+#else
+ check(isNaN(val));
+#endif
+
+asm { push 'val',undefined tonumber setvariable };
+#if OUTPUT_VERSION < 7
+ check_equals(val, 0);
+ check(!isNaN(val));
+#else
+ check(isNaN(val));
+#endif
+
+asm { push 'val','10' tonumber setvariable };
+check_equals(val, 10);
+
+asm { push 'val','3e2' tonumber setvariable };
+check_equals(val, 300);
+
+asm { push 'val','2E1' tonumber setvariable };
+check_equals(val, 20);
+
+asm { push 'val','2p' tonumber setvariable };
+check(isNaN(val));
+
+asm { push 'val','NaN' tonumber setvariable };
+check(isNaN(val));
+
+asm { push 'val','Infinity' tonumber setvariable };
+check(val != Infinity);
+check(isNaN(val));
+
+asm { push 'val','-Infinity' tonumber setvariable };
+check(val != Infinity);
+check(isNaN(val));
+
+obj = new Object();
+asm { push 'val','obj' getvariable tonumber setvariable };
+check(isNaN(val));
+
+obj = new Object(); obj.valueOf = function() { return 7; };
+asm { push 'val','obj' getvariable tonumber setvariable };
+check_equals(val, 7); 
+
+obj = function() {}; 
+asm { push 'val','obj' getvariable tonumber setvariable };
+#if OUTPUT_VERSION > 5
+check(isNaN(val));
+#else
+check(!isNaN(val));
+check_equals(typeof(val), 'number');
+check_equals(val, 0);
+check_equals(0, val);
+#endif
+
+obj = function() {}; obj.valueOf = function() { return 9; };
+asm { push 'val','obj' getvariable tonumber setvariable };
+check_equals(val, 9); 
+check_equals(9, val); 

Index: testsuite/actionscript.all/String.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/String.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/String.as	29 Mar 2007 08:44:05 -0000	1.17
+++ testsuite/actionscript.all/String.as	19 Apr 2007 10:27:10 -0000	1.18
@@ -16,7 +16,7 @@
 
 // Original author: Mike Carlson - June 19th, 2006
 
-rcsid="$Id: String.as,v 1.17 2007/03/29 08:44:05 strk Exp $";
+rcsid="$Id: String.as,v 1.18 2007/04/19 10:27:10 strk Exp $";
 
 #include "check.as"
 
@@ -250,8 +250,18 @@
 check_equals(b+c, "two[type Object]");
 
 stringObject = new String("1234");
+check_equals(typeof(stringObject.valueOf), 'function');
+check_equals(stringObject.valueOf, String.prototype.valueOf);
+
+#if OUTPUT_VERSION > 5
+check(stringObject.valueOf != Object.prototype.valueOf);
+check(String.prototype.hasOwnProperty('valueOf'));
+#endif
+
+check_equals(typeof(stringObject.valueOf()), 'string');
 check_equals(stringObject, "1234");
 check_equals(stringObject, 1234);
+check_equals(1234, stringObject);
 numberObject = new Number(1234);
 #if OUTPUT_VERSION >= 6
 check(stringObject != numberObject);

Index: testsuite/movies.all/gravity_embedded-TestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/movies.all/gravity_embedded-TestRunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/movies.all/gravity_embedded-TestRunner.cpp	6 Apr 2007 11:43:44 -0000	1.4
+++ testsuite/movies.all/gravity_embedded-TestRunner.cpp	19 Apr 2007 10:27:10 -0000	1.5
@@ -67,7 +67,7 @@
 	// we need a const_cast as get_member *might* eventually
 	// change the character (fetching _x shouldn't change it though)
 	check(const_cast<character*>(loaded)->get_member("_xscale", &tmp));
-	check_equals(tmp, as_value("50"));
+	check_equals(tmp, as_value(50));
 
 	check_equals(loaded->get_height(), 2056);
 	check_equals(loaded->get_width(), 2056);

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/swfdec/PASSING	14 Apr 2007 18:19:49 -0000	1.16
+++ testsuite/swfdec/PASSING	19 Apr 2007 10:27:10 -0000	1.17
@@ -53,3 +53,5 @@
 height1.swf
 height3.swf
 height4.swf
+divide-7.swf
+object-math-7.swf



From MAILER-DAEMON Thu Apr 19 08:12:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeVUd-0008Ma-96
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 08:12:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeVUc-0008MT-0F
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:12:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeVUb-0008MA-5I
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:12:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeVUb-0008Lz-3K
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:12:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeVPe-0003jb-0I
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:06:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeVPd-0007ko-Ju
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:06:57 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeVPd-0007kl-2y
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:06:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeVPd-0007kl-2y@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Thu, 19 Apr 2007 12:06:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 12:12:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/19 12:06:56

Modified files:
	.              : ChangeLog 
	server         : as_value.h as_value.cpp edit_text_character.cpp 
	server/vm      : ASHandlers.cpp 

Log message:
	Always do version-dependent conversion to string, and move version
	detection for this to a single point in the lowest level. 
	This also eliminates all *_versioned() string methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2927&r2=1.2928
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.97&r2=1.98

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2927
retrieving revision 1.2928
diff -u -b -r1.2927 -r1.2928
--- ChangeLog	19 Apr 2007 10:27:09 -0000	1.2927
+++ ChangeLog	19 Apr 2007 12:06:56 -0000	1.2928
@@ -1,3 +1,10 @@
+2007-04-19 Martin Guy <martinwguy@yahoo.it>
+
+	* server/{as_value.{h,cpp},edit_text_character.cpp,{vm/ASHandlers.cpp}:
+	  Always do version-dependent conversion to string, and move version
+	  detection for this to a single point in the lowest level.
+	  This also eliminates all *_versioned() string methods.
+
 2007-04-19 Sandro Santilli <strk@keybit.net>
 
 	* server/asobj/string.cpp: add valueOf own property to String

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/as_value.h	19 Apr 2007 10:27:09 -0000	1.47
+++ server/as_value.h	19 Apr 2007 12:06:56 -0000	1.48
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.47 2007/04/19 10:27:09 strk Exp $ */
+/* $Id: as_value.h,v 1.48 2007/04/19 12:06:56 martinwguy Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -289,30 +289,6 @@
 
 	std::string to_debug_string() const;
 
-	/// Get a version-dependent std::string representation for this value.
-	//
-	/// @param version
-	///	The SWF version to be compatible with.
-	///
-	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
-	///
-	std::string to_std_string_versioned(int version, as_environment* env=NULL) const;
-
-	/// Get a string representation for this value.
-	//
-	/// This differs from to_string() in that returned
-	/// representation will depend on version of the SWF
-	/// source. 
-	/// @@ shouldn't this be the default ?
-	///
-	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
-	///
-	const std::string&	to_string_versioned(int version, as_environment* env=NULL) const;
-
 	/// Conversion to number 
 	//
 	/// @param env
@@ -406,19 +382,7 @@
 	void	convert_to_number(as_environment* env);
 
 	/// Force type to string.
-	void	convert_to_string();
-    
-	/// Force type to string.
-	//
-	/// uses swf-version-aware converter
-	///
-	/// @param env
-	///	The environment to use for running the toString() method
-	///	for object values. If NULL, toString() won't be run.
-	///
-	/// @see to_string_versionioned
-	///
-	void	convert_to_string_versioned(int version, as_environment* env=NULL);
+	void	convert_to_string(as_environment* env);
 
 	// These set_*()'s are more type-safe; should be used
 	// in preference to generic overloaded set().  You are

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- server/as_value.cpp	19 Apr 2007 10:27:09 -0000	1.40
+++ server/as_value.cpp	19 Apr 2007 12:06:56 -0000	1.41
@@ -67,14 +67,6 @@
     }
 }
 
-#if 0
-std::string
-as_value::to_std_string(as_environment* env) const
-{
-    return to_string(env);
-}
-#endif
-
 // Conversion to const std::string&.
 const std::string&
 as_value::to_string(as_environment* env) const
@@ -120,16 +112,15 @@
 			break;
 
 		case UNDEFINED: 
+			// Behavior depends on file version.
+			// In version 7+, it's "undefined",
+			// in versions 6-, it's "".
 
-			// Behavior depends on file version.  In
-			// version 7+, it's "undefined", in versions
-			// 6-, it's "".
-			//
-			// We'll go with the v7 behavior by default,
-			// and conditionalize via _versioned()
-			// functions.
+			if (VM::get().getSWFVersion() <= 6) {
+			    m_string_value = "";
+			} else {
 			m_string_value = "undefined";
-
+			}
 			break;
 
 		case NULLTYPE:
@@ -202,30 +193,6 @@
     return m_string_value;
 }
 
-// Conversion to const std::string&.
-const std::string&
-as_value::to_string_versioned(int version, as_environment* env) const
-{
-    if (m_type == UNDEFINED) {
-	// Version-dependent behavior.
-	if (version <= 6) {
-	    m_string_value = "";
-	} else {
-	    m_string_value = "undefined";
-	}
-	return m_string_value;
-    }
-		
-    return to_string(env);
-}
-
-// Version-based Conversion to std::string
-std::string
-as_value::to_std_string_versioned(int version, as_environment* env) const
-{
-	return to_string_versioned(version, env);
-}
-
 // Conversion to primitive value.
 as_value
 as_value::to_primitive() const
@@ -544,7 +511,6 @@
 as_value::to_as_function() const
 {
     if (m_type == AS_FUNCTION) {
-	// OK.
 	return m_object_value->to_function();
     } else {
 	return NULL;
@@ -560,22 +526,12 @@
 
 // Force type to string.
 void
-as_value::convert_to_string()
-{
-    to_string();	// init our string data.
-    m_type = STRING;	// force type.
-}
-
-
-void
-as_value::convert_to_string_versioned(int version, as_environment* env)
-    // Force type to string.
+as_value::convert_to_string(as_environment* env)
 {
-    to_string_versioned(version, env); // init our string data.
+    to_string(env);	// init our string data.
     m_type = STRING;	// force type.
 }
 
-
 void
 as_value::set_as_object(as_object* obj)
 {

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/edit_text_character.cpp	18 Apr 2007 13:24:44 -0000	1.58
+++ server/edit_text_character.cpp	19 Apr 2007 12:06:56 -0000	1.59
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.58 2007/04/18 13:24:44 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.59 2007/04/19 12:06:56 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -680,8 +680,7 @@
 	case M_TEXT:
 		//if (name == "text")
 	{
-		int version = get_parent()->get_movie_definition()->get_version();
-		set_text_value(val.to_string_versioned(version).c_str());
+		set_text_value(val.to_string().c_str());
 		return;
 	}
 	case M_X:

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/vm/ASHandlers.cpp	18 Apr 2007 14:07:33 -0000	1.97
+++ server/vm/ASHandlers.cpp	19 Apr 2007 12:06:56 -0000	1.98
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.97 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: ASHandlers.cpp,v 1.98 2007/04/19 12:06:56 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -840,8 +840,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1);
-    int version = env.get_version();
-    env.top(0).set_int(env.top(0).to_string_versioned(version).size());
+    env.top(0).set_int(env.top(0).to_string().size());
 }
 
 void
@@ -868,8 +867,7 @@
     int size = unsigned(size_val.to_number(&env));
 
     int	base = int(base_val.to_number(&env));
-    int version = env.get_version();
-    const std::string& str = string_val.to_string_versioned(version);
+    const std::string& str = string_val.to_string();
 
     if ( size < 0 )
     {
@@ -1040,9 +1038,8 @@
 
     thread.ensureStack(2); // two strings
 
-    int version = env.get_version();
-    env.top(1).convert_to_string_versioned(version);
-    env.top(1).string_concat(env.top(0).to_string_versioned(version));
+    env.top(1).convert_to_string(&env);
+    env.top(1).string_concat(env.top(0).to_string());
     env.drop(1);
 }
 
@@ -1218,7 +1215,6 @@
 
     thread.ensureStack(1);
 
-    //std::string val = env.pop().to_string_versioned(VM::get().getSWFVersion(), &env);
     std::string val = env.pop().to_string(&env);
     log_trace(val.c_str());
 }
@@ -2536,13 +2532,11 @@
 
     //log_msg(_("ActionNewAdd(%s, %s) called"), v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
 
-
     if (v1.is_string() || v2.is_string() )
     {
-    	int version = env.get_version();
         // modify env.top(1)
-        v2.convert_to_string_versioned(version, &env);
-        v2.string_concat(v1.to_string_versioned(version, &env));
+        v2.convert_to_string(&env);
+        v2.string_concat(v1.to_string());
     }
     else
     {
@@ -2620,8 +2614,7 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1);
-    int version = env.get_version();
-    env.top(0).convert_to_string_versioned(version);
+    env.top(0).convert_to_string(&env);
 }
 
 void
@@ -2652,9 +2645,6 @@
 
     thread.ensureStack(2); // member name, target
 
-    // Some corner case behaviors depend on the SWF file version.
-    int version = env.get_version();
-
     as_value member_name = env.top(0);
     as_value target = env.top(1);
 
@@ -2675,8 +2665,8 @@
 
     // Special case: String has a member "length"
     // @@ FIXME: we shouldn't have all this "special" cases --strk;
-    if (target.is_string() && member_name.to_string_versioned(version) == "length") {
-        int len = target.to_string_versioned(version).size();
+    if (target.is_string() && member_name.to_string() == "length") {
+        int len = target.to_string().size();
         env.top(1).set_int(len);
     } else {
         if ( ! thread.getObjectMember(*obj, member_name.to_string(&env), env.top(1)) )
@@ -2763,9 +2753,6 @@
 
 	thread.ensureStack(3);  // method_name, obj, nargs
 
-	// Some corner case behaviors depend on the SWF file version.
-	//int version = env.get_version();
-
 	// Get name function of the method
 	as_value& method_name = env.top(0);
 



From MAILER-DAEMON Thu Apr 19 08:31:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeVnf-0000Tt-Or
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 08:31:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeVnd-0000TX-U3
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:31:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeVnc-0000TD-FB
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:31:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeVnc-0000T9-CZ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:31:44 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeVie-00063D-Rk
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:26:37 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JCQWv30419;
	Thu, 19 Apr 2007 14:26:32 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 19 Apr 2007 14:26:32 +0200
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
Message-ID: <20070419122632.GN92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeVPd-0007kl-2y@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HeVPd-0007kl-2y@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 12:31:46 -0000

On Thu, Apr 19, 2007 at 12:06:57PM +0000, Martin Guy wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Martin Guy <martinwguy>	07/04/19 12:06:56
> 
> Modified files:
> 	.              : ChangeLog 
> 	server         : as_value.h as_value.cpp edit_text_character.cpp 
> 	server/vm      : ASHandlers.cpp 
> 
> Log message:
> 	Always do version-dependent conversion to string, and move version
> 	detection for this to a single point in the lowest level. 
> 	This also eliminates all *_versioned() string methods.

Please stop committing w/out running make check !

FAIL: run_swfdec_testsuite: and-or-5.swf (traces in and-or-5.swf.trace-gnash, log in and-or-5.swf.log)
FAIL: run_swfdec_testsuite: and-or-6.swf (traces in and-or-6.swf.trace-gnash, log in and-or-6.swf.log)
FAIL: run_swfdec_testsuite: and-or-7.swf (traces in and-or-7.swf.trace-gnash, log in and-or-7.swf.log)
FAIL: run_swfdec_testsuite: constructor-prototype.swf (traces in constructor-prototype.swf.trace-gnash, log in constructor-prototype.swf.log)
FAIL: run_swfdec_testsuite: divide-7.swf (traces in divide-7.swf.trace-gnash, log in divide-7.swf.log)
FAIL: run_swfdec_testsuite: empty-stack.swf (traces in empty-stack.swf.trace-gnash, log in empty-stack.swf.log)
FAIL: run_swfdec_testsuite: undefined-tostring.swf (traces in undefined-tostring.swf.trace-gnash, log in undefined-tostring.swf.log)
FAIL: run_swfdec_testsuite: undefined2-6.swf (traces in undefined2-6.swf.trace-gnash, log in undefined2-6.swf.log)

 
--strk;



From MAILER-DAEMON Thu Apr 19 08:36:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeVs5-0002SE-JD
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 08:36:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeVs3-0002S8-NE
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:36:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeVs2-0002Rp-Eb
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:36:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeVs2-0002Rm-93
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:36:18 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeVn4-0006XT-Fr
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:31:11 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JCV6E30496;
	Thu, 19 Apr 2007 14:31:06 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Thu, 19 Apr 2007 14:31:06 +0200
From: strk <strk@keybit.net>
To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
Message-ID: <20070419123106.GO92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070419122632.GN92773@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 12:36:20 -0000

On Thu, Apr 19, 2007 at 02:26:32PM +0200, strk wrote:
> On Thu, Apr 19, 2007 at 12:06:57PM +0000, Martin Guy wrote:
> > CVSROOT:	/sources/gnash
> > Module name:	gnash
> > Changes by:	Martin Guy <martinwguy>	07/04/19 12:06:56
> > 
> > Modified files:
> > 	.              : ChangeLog 
> > 	server         : as_value.h as_value.cpp edit_text_character.cpp 
> > 	server/vm      : ASHandlers.cpp 
> > 
> > Log message:
> > 	Always do version-dependent conversion to string, and move version
> > 	detection for this to a single point in the lowest level. 
> > 	This also eliminates all *_versioned() string methods.
> 
> Please stop committing w/out running make check !
> 
> FAIL: run_swfdec_testsuite: and-or-5.swf (traces in and-or-5.swf.trace-gnash, log in and-or-5.swf.log)
> FAIL: run_swfdec_testsuite: and-or-6.swf (traces in and-or-6.swf.trace-gnash, log in and-or-6.swf.log)
> FAIL: run_swfdec_testsuite: and-or-7.swf (traces in and-or-7.swf.trace-gnash, log in and-or-7.swf.log)
> FAIL: run_swfdec_testsuite: constructor-prototype.swf (traces in constructor-prototype.swf.trace-gnash, log in constructor-prototype.swf.log)
> FAIL: run_swfdec_testsuite: divide-7.swf (traces in divide-7.swf.trace-gnash, log in divide-7.swf.log)
> FAIL: run_swfdec_testsuite: empty-stack.swf (traces in empty-stack.swf.trace-gnash, log in empty-stack.swf.log)
> FAIL: run_swfdec_testsuite: undefined-tostring.swf (traces in undefined-tostring.swf.trace-gnash, log in undefined-tostring.swf.log)
> FAIL: run_swfdec_testsuite: undefined2-6.swf (traces in undefined2-6.swf.trace-gnash, log in undefined2-6.swf.log)

And these are from actionscript.all:

FAIL: astests-v5-Runner: expected: "NaN" obtained: 0 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Date.as:197]
FAIL: astests-v5-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:163]
FAIL: astests-v5-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:186]
FAIL: astests-v5-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:381]
FAIL: astests-v5-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:382]
FAIL: astests-v5-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:390]
FAIL: astests-v5-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:391]
FAIL: astests-v5-Runner: expected: "two[object Object]" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:230]
FAIL: astests-v5-Runner: expected: "twoone" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:235]

FAIL: astests-v6-Runner: expected: "NaN" obtained: 0 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Date.as:197]
FAIL: astests-v6-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:163]
FAIL: astests-v6-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:186]
FAIL: astests-v6-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:381]
FAIL: astests-v6-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:382]
FAIL: astests-v6-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:390]
FAIL: astests-v6-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:391]
FAIL: astests-v6-Runner: expected: "two[object Object]" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:230]
FAIL: astests-v6-Runner: expected: "twoone" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:235]

FAIL: astests-v7-Runner: d2.valueOf() < d.valueOf() + 5000 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Date.as:146]
FAIL: astests-v7-Runner: expected: "NaN" obtained: 0 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Date.as:197]
FAIL: astests-v7-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:163]
FAIL: astests-v7-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:186]
FAIL: astests-v7-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:381]
FAIL: astests-v7-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:382]
FAIL: astests-v7-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:390]
FAIL: astests-v7-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:391]
FAIL: astests-v7-Runner: expected: "two[object Object]" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:230]
FAIL: astests-v7-Runner: expected: "twoone" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:235]

FAIL: astests-v8-Runner: d2.valueOf() < d.valueOf() + 5000 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Date.as:146]
FAIL: astests-v8-Runner: expected: "NaN" obtained: 0 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Date.as:197]
FAIL: astests-v8-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:163]
FAIL: astests-v8-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:186]
FAIL: astests-v8-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:381]
FAIL: astests-v8-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:382]
FAIL: astests-v8-Runner: expected: "-" + pi_2s obtained: -1.5707963267949 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:390]
FAIL: astests-v8-Runner: expected: "-" + pi_4s obtained: -0.785398163397448 [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/Math.as:391]
FAIL: astests-v8-Runner: expected: "two[object Object]" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:230]
FAIL: astests-v8-Runner: expected: "twoone" obtained: two[type Object] [/home/strk/src/gnash/gnash-head/testsuite/actionscript.all/String.as:235]

Should I fix this time too or will you ?

--strk;



From MAILER-DAEMON Thu Apr 19 08:38:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeVud-0003fO-8m
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 08:38:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeVua-0003dw-8x
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:38:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeVuZ-0003da-Gj
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:38:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeVuZ-0003dS-8y
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:38:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeVpc-0006nM-3U
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:33:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeVpb-0001BS-Kw
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:33:47 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeVpb-0001BG-6X
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:33:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeVpb-0001BG-6X@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Thu, 19 Apr 2007 12:33:47 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Date.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 12:38:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/19 12:33:47

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Date.as 

Log message:
	Change case-[in]dependent method existence detection strategy to see if it fixes
	v5 testrun.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2928&r2=1.2929
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Date.as?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2928
retrieving revision 1.2929
diff -u -b -r1.2928 -r1.2929
--- ChangeLog	19 Apr 2007 12:06:56 -0000	1.2928
+++ ChangeLog	19 Apr 2007 12:33:46 -0000	1.2929
@@ -4,6 +4,8 @@
 	  Always do version-dependent conversion to string, and move version
 	  detection for this to a single point in the lowest level.
 	  This also eliminates all *_versioned() string methods.
+	* testsuite/actionscript.all/Date.as: Change case-[in]dependent
+	  method existence detection strategy to see if it fixes v5 testrun.
 
 2007-04-19 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/actionscript.all/Date.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Date.as,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- testsuite/actionscript.all/Date.as	18 Apr 2007 15:03:06 -0000	1.22
+++ testsuite/actionscript.all/Date.as	19 Apr 2007 12:33:46 -0000	1.23
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Date.as,v 1.22 2007/04/18 15:03:06 strk Exp $";
+rcsid="$Id: Date.as,v 1.23 2007/04/19 12:33:46 martinwguy Exp $";
 
 #include "check.as"
 
@@ -35,51 +35,50 @@
 // test the Date constructor exists.
 // This specific value is used below to check conversion back to year/mon/day etc
 var d = new Date(70,1,2,3,4,5,6);
-check (d != undefined);
+check (d);
 
 // test methods' existence
-check (d.getDate != undefined);
-check (d.getDay != undefined);
-check (d.getFullYear != undefined);
-check (d.getHours != undefined);
-check (d.getMilliseconds != undefined);
-check (d.getMinutes != undefined);
-check (d.getMonth != undefined);
-check (d.getSeconds != undefined);
-check (d.getTime != undefined);
-check (d.getTimezoneOffset != undefined);
-check (d.getUTCDate != undefined);
-check (d.getUTCDay != undefined);
-check (d.getUTCFullYear != undefined);
-check (d.getUTCHours != undefined);
-check (d.getUTCMilliseconds != undefined);
-check (d.getUTCMinutes != undefined);
-check (d.getUTCMonth != undefined);
-check (d.getUTCSeconds != undefined);
-check (d.getYear != undefined);
-check (d.setDate != undefined);
-check (d.setFullYear != undefined);
-check (d.setHours != undefined);
-check (d.setMilliseconds != undefined);
-check (d.setMinutes != undefined);
-check (d.setMonth != undefined);
-check (d.setSeconds != undefined);
-check (d.setTime != undefined);
-check (d.setUTCDate != undefined);
-check (d.setUTCFullYear != undefined);
-check (d.setUTCHours != undefined);
-check (d.setUTCMilliseconds != undefined);
-check (d.setUTCMinutes != undefined);
-check (d.setUTCMonth != undefined);
-check (d.setUTCSeconds != undefined);
-check (d.setYear != undefined);
-check (d.toString != undefined);
+check (d.getDate);
+check (d.getDay);
+check (d.getFullYear);
+check (d.getHours);
+check (d.getMilliseconds);
+check (d.getMinutes);
+check (d.getMonth);
+check (d.getSeconds);
+check (d.getTime);
+check (d.getTimezoneOffset);
+check (d.getUTCDate);
+check (d.getUTCDay);
+check (d.getUTCFullYear);
+check (d.getUTCHours);
+check (d.getUTCMilliseconds);
+check (d.getUTCMinutes);
+check (d.getUTCMonth);
+check (d.getUTCSeconds);
+check (d.getYear);
+check (d.setDate);
+check (d.setFullYear);
+check (d.setHours);
+check (d.setMilliseconds);
+check (d.setMinutes);
+check (d.setMonth);
+check (d.setSeconds);
+check (d.setTime);
+check (d.setUTCDate);
+check (d.setUTCFullYear);
+check (d.setUTCHours);
+check (d.setUTCMilliseconds);
+check (d.setUTCMinutes);
+check (d.setUTCMonth);
+check (d.setUTCSeconds);
+check (d.setYear);
+check (d.toString);
 // UTC is a static method present from v5
 check_equals (d.UTC, undefined);
-check (Date.UTC != undefined);
+check (Date.UTC);
 
 #if OUTPUT_VERSION > 6
-
 // From SWF 7 up methods are case-sensitive !
 check_equals (d.getdate, undefined);
 check_equals (d.getday, undefined);
@@ -118,7 +117,44 @@
 check_equals (d.setyear, undefined);
 check_equals (d.tostring, undefined);
 check_equals (Date.utc, undefined);
-
+#else
+check (d.getdate);
+check (d.getday);
+check (d.getfullYear);
+check (d.gethours);
+check (d.getmilliseconds);
+check (d.getminutes);
+check (d.getmonth);
+check (d.getseconds);
+check (d.gettime);
+check (d.gettimezoneOffset);
+check (d.getUTCdate);
+check (d.getUTCday);
+check (d.getUTCfullYear);
+check (d.getUTChours);
+check (d.getUTCmilliseconds);
+check (d.getUTCminutes);
+check (d.getUTCmonth);
+check (d.getUTCseconds);
+check (d.getyear);
+check (d.setdate);
+check (d.setfullYear);
+check (d.sethours);
+check (d.setmilliseconds);
+check (d.setminutes);
+check (d.setmonth);
+check (d.setseconds);
+check (d.settime);
+check (d.setUTCdate);
+check (d.setUTCfullYear);
+check (d.setUTChours);
+check (d.setUTCmilliseconds);
+check (d.setUTCminutes);
+check (d.setUTCmonth);
+check (d.setUTCseconds);
+check (d.setyear);
+check (d.tostring);
+check (Date.utc);
 #endif // OUTPUT_VERSION > 6
 
 // Some values we will use to test things



From MAILER-DAEMON Thu Apr 19 08:42:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeVyB-0004oq-EV
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 08:42:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeVy9-0004oJ-Ob
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:42:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeVy9-0004o3-AY
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:42:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeVy9-0004o0-7u
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:42:37 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeVtB-0007EL-In
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 08:37:30 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JCbNj30638;
	Thu, 19 Apr 2007 14:37:23 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 19 Apr 2007 14:37:23 +0200
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Date.as
Message-ID: <20070419123723.GQ92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeVpb-0001BG-6X@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HeVpb-0001BG-6X@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 12:42:38 -0000

On Thu, Apr 19, 2007 at 12:33:47PM +0000, Martin Guy wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Martin Guy <martinwguy>	07/04/19 12:33:47
> 
> Modified files:
> 	.              : ChangeLog 
> 	testsuite/actionscript.all: Date.as 
> 
> Log message:
> 	Change case-[in]dependent method existence detection strategy to see if it fixes
> 	v5 testrun.

The best way to test for methods existance is using:

check_equals(typeof(its.func), 'function');
#if OUTPUT_VERSION > 5
check(its.__proto__.hasOwnProperty('func')); // check *where* it is in the inheritance chain
#endif

--strk;



From MAILER-DAEMON Thu Apr 19 09:11:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeWPr-00055q-OK
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 09:11:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeWPp-00053S-Vg
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:11:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeWPo-0004zc-1C
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:11:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeWPn-0004zG-SO
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:11:11 -0400
Received: from wr-out-0506.google.com ([64.233.184.229])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <martinwguy@gmail.com>) id 1HeWKp-0002Gh-Ay
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:06:03 -0400
Received: by wr-out-0506.google.com with SMTP id i23so575084wra
	for <gnash-commit@gnu.org>; Thu, 19 Apr 2007 06:05:56 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=LxM0AkOQmmEF0i07Soe+LBXgkNqUNXojE396uQQxRWCAF3Vq52cmKpQOEGiBN9bK2yiz0bpKE3B9mqyVJTMVEh0IIZRXsTyZthfquLD/2YJhmnG7kPAxf3qGE5W0jPgTPZn1kytpiqNsiCNdIBXtPIz0j+/2yJXWxgemhVaonhM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=A+t8rJf8PHJynnSM5Qr91WnRZLMZkC9AhIQbR8p58+DyxR/RdsXYI03iRklTQS5o/i/qbHCd3w74fCoIStVfQ4nIMBIdPqBFcpShf0eSeI5zk8osu7wuE7gHn5XnOSZyRTOrYJz6jM9yLVLy70aqpgYtqMsctpbSf456SF15/AY=
Received: by 10.78.181.13 with SMTP id d13mr266910huf.1176987952092;
	Thu, 19 Apr 2007 06:05:52 -0700 (PDT)
Received: by 10.78.165.11 with HTTP; Thu, 19 Apr 2007 06:05:52 -0700 (PDT)
Message-ID: <56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
Date: Thu, 19 Apr 2007 14:05:52 +0100
From: "Martin Guy" <martinwguy@yahoo.it>
Sender: martinwguy@gmail.com
To: strk@keybit.net, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
In-Reply-To: <20070419123106.GO92773@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
	<20070419123106.GO92773@keybit.net>
X-Google-Sender-Auth: 25cfebec3b57b49c
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 13:11:14 -0000

> > Please stop committing w/out running make check !

I have never succeeded in running "make check".  At the moment it
fails to do anything at all, saying:

.../testsuite/misc-ming.all/ming_utils.c:299: undefined reference to
`SWFMovieClip_addInitAction'

so since I cannot see the problems I cannot confront them.
If you can put me in a position to be able to run "make check" the
same way as you, I will be a lot happier.

    M



From MAILER-DAEMON Thu Apr 19 09:14:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeWTD-0001D8-Ob
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 09:14:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeWTC-0001Bi-5f
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:14:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeWTA-0001AS-6Q
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:14:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeWTA-0001AP-1s
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:14:40 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeWOB-0002v1-Hu
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:09:32 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JD9A031160;
	Thu, 19 Apr 2007 15:09:10 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 19 Apr 2007 15:09:10 +0200
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
Message-ID: <20070419130910.GT92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
	<20070419123106.GO92773@keybit.net>
	<56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 13:14:42 -0000

On Thu, Apr 19, 2007 at 02:05:52PM +0100, Martin Guy wrote:
> >> Please stop committing w/out running make check !
> 
> I have never succeeded in running "make check".  At the moment it
> fails to do anything at all, saying:
> 
> .../testsuite/misc-ming.all/ming_utils.c:299: undefined reference to
> `SWFMovieClip_addInitAction'
> 
> so since I cannot see the problems I cannot confront them.
> If you can put me in a position to be able to run "make check" the
> same way as you, I will be a lot happier.

Ok, here's a plan.
1) you revert your last changes in as_value/ASHandlers.cpp
2) we work toward makeing "make check" work for you

A quick way for (2) is install Ming from current CVS.
I'll work to fix the addInitAction thing

--strk;



From MAILER-DAEMON Thu Apr 19 09:19:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeWXP-00026t-Oc
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 09:19:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeWXN-00026a-OU
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:19:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeWXM-00026G-1o
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:19:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeWXL-00026D-T8
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:18:59 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeWSM-0003I5-BD
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:13:51 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JDCJr31230;
	Thu, 19 Apr 2007 15:12:19 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Thu, 19 Apr 2007 15:12:19 +0200
From: strk <strk@keybit.net>
To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
Message-ID: <20070419131219.GV92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
	<20070419123106.GO92773@keybit.net>
	<56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
	<20070419130910.GT92773@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070419130910.GT92773@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 13:19:02 -0000

On Thu, Apr 19, 2007 at 03:09:10PM +0200, strk wrote:
> On Thu, Apr 19, 2007 at 02:05:52PM +0100, Martin Guy wrote:
> > >> Please stop committing w/out running make check !
> > 
> > I have never succeeded in running "make check".  At the moment it
> > fails to do anything at all, saying:
> > 
> > .../testsuite/misc-ming.all/ming_utils.c:299: undefined reference to
> > `SWFMovieClip_addInitAction'

#if MING_VERSION_CODE >= 00040004
# define MING_SUPPORTS_INIT_ACTIONS
#endif

addInitAction is NOT used if Ming is < 0.4.0.beta4
You likely have a CVS snapshot of Ming.
Consider installing the official 0.4.0.beta4 release.

--strk;



From MAILER-DAEMON Thu Apr 19 09:33:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeWlX-00014Y-OB
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 09:33:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeWlW-00011x-97
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:33:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeWlU-0000yx-Ji
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:33:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeWlU-0000ym-Fz
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:33:36 -0400
Received: from ug-out-1314.google.com ([66.249.92.171])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <martinwguy@gmail.com>) id 1HeWgX-0005QB-04
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:28:29 -0400
Received: by ug-out-1314.google.com with SMTP id j3so657428ugf
	for <gnash-commit@gnu.org>; Thu, 19 Apr 2007 06:28:28 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=THkNuastSkX2mLdcKf0Sa33FV01xoVDTeLMu32HqOWmtrBz36VSagt2MV8ChM/ROjcHmh49VZwJsR/npABnqepf7WCrMSXiZlp1DtC9Uep+vXcCjhYnEQe5e3jAkW9eczlnfjXAVOosQy2kMeQQFXN7N/Ulw64pXrSt+JMyXZEE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:sender:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=tXoJAeEQ1CE1yDHCT+OC+59cAiZbbzy8DWztmUwEJgwXFzShR1meOVmqHvlt0C5bc1r2cgvH59o46osSedAKZTze0ILX5D6dAXVRLIbGL287LObPTp0Q9qujwfURDEAw7jKRelEMlM4g1bZ8Al6ol1AAHQbIRLSFhjuFMGohZHw=
Received: by 10.78.83.15 with SMTP id g15mr263442hub.1176989307949;
	Thu, 19 Apr 2007 06:28:27 -0700 (PDT)
Received: by 10.78.165.11 with HTTP; Thu, 19 Apr 2007 06:28:27 -0700 (PDT)
Message-ID: <56d259a00704190628w24d0cc3duf9cb43cee778cf70@mail.gmail.com>
Date: Thu, 19 Apr 2007 14:28:27 +0100
From: "Martin Guy" <martinwguy@yahoo.it>
Sender: martinwguy@gmail.com
To: strk@keybit.net, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
In-Reply-To: <20070419130910.GT92773@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
	<20070419123106.GO92773@keybit.net>
	<56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
	<20070419130910.GT92773@keybit.net>
X-Google-Sender-Auth: 25dab063e6eefebf
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 13:33:38 -0000

> 1) you revert your last changes in as_value/ASHandlers.cpp
What's the problem?

> 2) we work toward making "make check" work for you
>
> A quick way for (2) is install Ming from current CVS.
makeswf --version
$Id: makeswf.c,v 1.31 2006/12/12 23:36:10 strk Exp $

Is that really too old? It seems unwise to rely on unstable software
under development as the testsuite for a new product.

I confess I don't really understand what your problem is, what with
all these public accusations of incompetence and ranting. Mind you,
the atmosphere in the group since I have known it has been sneering
and competitive instead of cooperative, so I am discounting the
offensiveness as part of that sad game.

I mean, every time I make a commit you start ranting at me. What *is*
your problem?

    M



From MAILER-DAEMON Thu Apr 19 09:51:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeX2L-0000V3-TP
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 09:51:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeX2L-0000Ue-Cm
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:51:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeX2K-0000Tg-Fg
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:51:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeX2K-0000TT-6c
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:51:00 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeWxM-0007sc-6k
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 09:45:52 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JDjid32039;
	Thu, 19 Apr 2007 15:45:44 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 19 Apr 2007 15:45:44 +0200
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
Message-ID: <20070419134544.GZ92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
	<20070419123106.GO92773@keybit.net>
	<56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
	<20070419130910.GT92773@keybit.net>
	<56d259a00704190628w24d0cc3duf9cb43cee778cf70@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <56d259a00704190628w24d0cc3duf9cb43cee778cf70@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 13:51:01 -0000

On Thu, Apr 19, 2007 at 02:28:27PM +0100, Martin Guy wrote:
> >1) you revert your last changes in as_value/ASHandlers.cpp
> What's the problem?
> 
> >2) we work toward making "make check" work for you
> >
> >A quick way for (2) is install Ming from current CVS.
> makeswf --version
> $Id: makeswf.c,v 1.31 2006/12/12 23:36:10 strk Exp $
> 
> Is that really too old? It seems unwise to rely on unstable software
> under development as the testsuite for a new product.

We accept any 0.4.x Ming version.
Some tests are just skipped if not supported by the version
you have. 
0.3 is not supported for a single reason: lack of 'ming-config',
if it wasn't for this we'd support 0.3 too.

What you have is a CVS snapshot, we can't support CVS snapshots too..

> I confess I don't really understand what your problem is, what with
> all these public accusations of incompetence and ranting. Mind you,
> the atmosphere in the group since I have known it has been sneering
> and competitive instead of cooperative, so I am discounting the
> offensiveness as part of that sad game.

Sorry about that, I'm just pissed off that while hacking and continuosly
checking by running 'make check' I find myself unable to verify my 
own hacks by running 'make check' again since somebody else broke it.

> I mean, every time I make a commit you start ranting at me. What *is*
> your problem?

I only rant if you commit changes that break the existing testsuite.
Being able to run the testsuite should be top priority for any
committer.

I can understand temporary problems with it, but I can't stand
breaking things twice in a few hours. It makes the work of other
developers harder.

--strk;



From MAILER-DAEMON Thu Apr 19 10:30:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeXew-0005sj-CK
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 10:30:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeXeu-0005p7-OA
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:30:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeXet-0005mw-FF
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:30:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeXet-0005mb-4H
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:30:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeXZv-0004U0-DR
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:25:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeXZu-00076u-NV
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:25:42 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeXZu-00076q-6B
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:25:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeXZu-00076q-6B@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Thu, 19 Apr 2007 14:25:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 14:30:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/19 14:25:41

Modified files:
	.              : ChangeLog 
	server         : as_value.h as_value.cpp edit_text_character.cpp 
	server/vm      : ASHandlers.cpp 

Log message:
	Revert string-version changes until testsuite works

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2929&r2=1.2930
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.98&r2=1.99

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2929
retrieving revision 1.2930
diff -u -b -r1.2929 -r1.2930
--- ChangeLog	19 Apr 2007 12:33:46 -0000	1.2929
+++ ChangeLog	19 Apr 2007 14:25:40 -0000	1.2930
@@ -1,9 +1,5 @@
 2007-04-19 Martin Guy <martinwguy@yahoo.it>
 
-	* server/{as_value.{h,cpp},edit_text_character.cpp,{vm/ASHandlers.cpp}:
-	  Always do version-dependent conversion to string, and move version
-	  detection for this to a single point in the lowest level.
-	  This also eliminates all *_versioned() string methods.
 	* testsuite/actionscript.all/Date.as: Change case-[in]dependent
 	  method existence detection strategy to see if it fixes v5 testrun.
 

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/as_value.h	19 Apr 2007 12:06:56 -0000	1.48
+++ server/as_value.h	19 Apr 2007 14:25:40 -0000	1.49
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.48 2007/04/19 12:06:56 martinwguy Exp $ */
+/* $Id: as_value.h,v 1.49 2007/04/19 14:25:40 martinwguy Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -289,6 +289,30 @@
 
 	std::string to_debug_string() const;
 
+	/// Get a version-dependent std::string representation for this value.
+	//
+	/// @param version
+	///	The SWF version to be compatible with.
+	///
+	/// @param env
+	///	The environment to use for running the toString() method
+	///	for object values. If NULL, toString() won't be run.
+	///
+	std::string to_std_string_versioned(int version, as_environment* env=NULL) const;
+
+	/// Get a string representation for this value.
+	//
+	/// This differs from to_string() in that returned
+	/// representation will depend on version of the SWF
+	/// source. 
+	/// @@ shouldn't this be the default ?
+	///
+	/// @param env
+	///	The environment to use for running the toString() method
+	///	for object values. If NULL, toString() won't be run.
+	///
+	const std::string&	to_string_versioned(int version, as_environment* env=NULL) const;
+
 	/// Conversion to number 
 	//
 	/// @param env
@@ -382,7 +406,19 @@
 	void	convert_to_number(as_environment* env);
 
 	/// Force type to string.
-	void	convert_to_string(as_environment* env);
+	void	convert_to_string();
+    
+	/// Force type to string.
+	//
+	/// uses swf-version-aware converter
+	///
+	/// @param env
+	///	The environment to use for running the toString() method
+	///	for object values. If NULL, toString() won't be run.
+	///
+	/// @see to_string_versionioned
+	///
+	void	convert_to_string_versioned(int version, as_environment* env=NULL);
     
 	// These set_*()'s are more type-safe; should be used
 	// in preference to generic overloaded set().  You are

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- server/as_value.cpp	19 Apr 2007 12:06:56 -0000	1.41
+++ server/as_value.cpp	19 Apr 2007 14:25:40 -0000	1.42
@@ -67,6 +67,14 @@
     }
 }
 
+#if 0
+std::string
+as_value::to_std_string(as_environment* env) const
+{
+    return to_string(env);
+}
+#endif
+
 // Conversion to const std::string&.
 const std::string&
 as_value::to_string(as_environment* env) const
@@ -112,15 +120,16 @@
 			break;
 
 		case UNDEFINED: 
-			// Behavior depends on file version.
-			// In version 7+, it's "undefined",
-			// in versions 6-, it's "".
 
-			if (VM::get().getSWFVersion() <= 6) {
-			    m_string_value = "";
-			} else {
+			// Behavior depends on file version.  In
+			// version 7+, it's "undefined", in versions
+			// 6-, it's "".
+			//
+			// We'll go with the v7 behavior by default,
+			// and conditionalize via _versioned()
+			// functions.
 			    m_string_value = "undefined";
-			}
+
 			break;
 
 		case NULLTYPE:
@@ -193,6 +202,30 @@
     return m_string_value;
 }
 
+// Conversion to const std::string&.
+const std::string&
+as_value::to_string_versioned(int version, as_environment* env) const
+{
+    if (m_type == UNDEFINED) {
+	// Version-dependent behavior.
+	if (version <= 6) {
+	    m_string_value = "";
+	} else {
+	    m_string_value = "undefined";
+	}
+	return m_string_value;
+    }
+		
+    return to_string(env);
+}
+
+// Version-based Conversion to std::string
+std::string
+as_value::to_std_string_versioned(int version, as_environment* env) const
+{
+	return to_string_versioned(version, env);
+}
+
 // Conversion to primitive value.
 as_value
 as_value::to_primitive() const
@@ -511,6 +544,7 @@
 as_value::to_as_function() const
 {
     if (m_type == AS_FUNCTION) {
+	// OK.
 	return m_object_value->to_function();
     } else {
 	return NULL;
@@ -526,12 +560,22 @@
 
 // Force type to string.
 void
-as_value::convert_to_string(as_environment* env)
+as_value::convert_to_string()
+{
+    to_string();	// init our string data.
+    m_type = STRING;	// force type.
+}
+
+
+void
+as_value::convert_to_string_versioned(int version, as_environment* env)
+    // Force type to string.
 {
-    to_string(env);	// init our string data.
+    to_string_versioned(version, env); // init our string data.
     m_type = STRING;	// force type.
 }
 
+
 void
 as_value::set_as_object(as_object* obj)
 {

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/edit_text_character.cpp	19 Apr 2007 12:06:56 -0000	1.59
+++ server/edit_text_character.cpp	19 Apr 2007 14:25:40 -0000	1.60
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.59 2007/04/19 12:06:56 martinwguy Exp $ */
+/* $Id: edit_text_character.cpp,v 1.60 2007/04/19 14:25:40 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -680,7 +680,8 @@
 	case M_TEXT:
 		//if (name == "text")
 	{
-		set_text_value(val.to_string().c_str());
+		int version = get_parent()->get_movie_definition()->get_version();
+		set_text_value(val.to_string_versioned(version).c_str());
 		return;
 	}
 	case M_X:

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/vm/ASHandlers.cpp	19 Apr 2007 12:06:56 -0000	1.98
+++ server/vm/ASHandlers.cpp	19 Apr 2007 14:25:41 -0000	1.99
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.98 2007/04/19 12:06:56 martinwguy Exp $ */
+/* $Id: ASHandlers.cpp,v 1.99 2007/04/19 14:25:41 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -840,7 +840,8 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1);
-    env.top(0).set_int(env.top(0).to_string().size());
+    int version = env.get_version();
+    env.top(0).set_int(env.top(0).to_string_versioned(version).size());
 }
 
 void
@@ -867,7 +868,8 @@
     int size = unsigned(size_val.to_number(&env));
 
     int	base = int(base_val.to_number(&env));
-    const std::string& str = string_val.to_string();
+    int version = env.get_version();
+    const std::string& str = string_val.to_string_versioned(version);
 
     if ( size < 0 )
     {
@@ -1038,8 +1040,9 @@
 
     thread.ensureStack(2); // two strings
 
-    env.top(1).convert_to_string(&env);
-    env.top(1).string_concat(env.top(0).to_string());
+    int version = env.get_version();
+    env.top(1).convert_to_string_versioned(version);
+    env.top(1).string_concat(env.top(0).to_string_versioned(version));
     env.drop(1);
 }
 
@@ -1215,6 +1218,7 @@
 
     thread.ensureStack(1);
 
+    //std::string val = env.pop().to_string_versioned(VM::get().getSWFVersion(), &env);
     std::string val = env.pop().to_string(&env);
     log_trace(val.c_str());
 }
@@ -2532,11 +2536,13 @@
 
     //log_msg(_("ActionNewAdd(%s, %s) called"), v1.to_debug_string().c_str(), v2.to_debug_string().c_str());
 
+
     if (v1.is_string() || v2.is_string() )
     {
+    	int version = env.get_version();
         // modify env.top(1)
-        v2.convert_to_string(&env);
-        v2.string_concat(v1.to_string());
+        v2.convert_to_string_versioned(version, &env);
+        v2.string_concat(v1.to_string_versioned(version, &env));
     }
     else
     {
@@ -2614,7 +2620,8 @@
 //    GNASH_REPORT_FUNCTION;
     as_environment& env = thread.env;
     thread.ensureStack(1);
-    env.top(0).convert_to_string(&env);
+    int version = env.get_version();
+    env.top(0).convert_to_string_versioned(version);
 }
 
 void
@@ -2645,6 +2652,9 @@
 
     thread.ensureStack(2); // member name, target
 
+    // Some corner case behaviors depend on the SWF file version.
+    int version = env.get_version();
+
     as_value member_name = env.top(0);
     as_value target = env.top(1);
 
@@ -2665,8 +2675,8 @@
 
     // Special case: String has a member "length"
     // @@ FIXME: we shouldn't have all this "special" cases --strk;
-    if (target.is_string() && member_name.to_string() == "length") {
-        int len = target.to_string().size();
+    if (target.is_string() && member_name.to_string_versioned(version) == "length") {
+        int len = target.to_string_versioned(version).size();
         env.top(1).set_int(len);
     } else {
         if ( ! thread.getObjectMember(*obj, member_name.to_string(&env), env.top(1)) )
@@ -2753,6 +2763,9 @@
 
 	thread.ensureStack(3);  // method_name, obj, nargs
 
+	// Some corner case behaviors depend on the SWF file version.
+	//int version = env.get_version();
+
 	// Get name function of the method
 	as_value& method_name = env.top(0);
 



From MAILER-DAEMON Thu Apr 19 10:44:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeXs7-0004Oi-7D
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 10:44:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeXs6-0004Od-A1
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:44:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeXs4-0004ON-3n
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:44:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeXs3-0004OK-Uo
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:44:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HeXn6-0006Dn-8l
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 10:39:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeXmz-0000YS-Ms
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:39:13 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HeXmz-0000YP-Dk
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:39:13 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeXmz-0000YP-Dk@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Thu, 19 Apr 2007 14:39:13 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 14:44:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/19 14:39:13

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	Some platforms apparently define SIZET_FMT as
	signed long; add a test for it. Also, use gnashpkgtool.m4 to
	look for dejagnu.h as it is not guaranteed to be in the default
	compiler search path, especially on non-GNU platforms

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2930&r2=1.2931
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.291&r2=1.292

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2930
retrieving revision 1.2931
diff -u -b -r1.2930 -r1.2931
--- ChangeLog	19 Apr 2007 14:25:40 -0000	1.2930
+++ ChangeLog	19 Apr 2007 14:39:12 -0000	1.2931
@@ -1,3 +1,10 @@
+2007-04-19 Bastiaan Jacques <bastiaan@bjacques.org>
+
+	* configure.ac: Some platforms apparently define SIZET_FMT as
+	signed long; add a test for it. Also, use gnashpkgtool.m4 to
+	look for dejagnu.h as it is not guaranteed to be in the default
+	compiler search path, especially on non-GNU platforms.
+
 2007-04-19 Martin Guy <martinwguy@yahoo.it>
 
 	* testsuite/actionscript.all/Date.as: Change case-[in]dependent

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -b -r1.291 -r1.292
--- configure.ac	18 Apr 2007 13:47:24 -0000	1.291
+++ configure.ac	19 Apr 2007 14:39:13 -0000	1.292
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.291 2007/04/18 13:47:24 martinwguy Exp $
+dnl $Id: configure.ac,v 1.292 2007/04/19 14:39:13 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -77,6 +77,11 @@
   printf("%lu", num); ],
   AC_DEFINE(SIZET_FMT, ["%lu"], [size_t printf modifier is lu])
 )
+AC_TRY_COMPILE([#include <stdio.h>], [
+  size_t num = 0;
+  printf("%ld", num); ],
+  AC_DEFINE(SIZET_FMT, ["%ld"], [size_t printf modifier is ld])
+)
 
 CFLAGS="$save_CFLAGS";
 
@@ -403,7 +408,6 @@
 dnl AC_PATH_XTRA
 GNASH_PATH_X11
 
-AC_CHECK_HEADERS(dejagnu.h)
 AC_CHECK_HEADERS(malloc.h)
 AC_CHECK_HEADERS(getopt.h)
 AC_CHECK_HEADERS(libgen.h)
@@ -567,6 +571,7 @@
 dnl AC_CHECK_LIB(c, mremap)
 GNASH_PKG_FIND(z, [zlib.h], [zlib compression library], compress)
 GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
+GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
 
 dnl if we're not building the extensions, then the _FLAGS and _LIBS settings
 dnl found in these tests are blank. This way they can be used in



From MAILER-DAEMON Thu Apr 19 11:22:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeYT8-0001F7-Lm
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 11:22:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeYT6-0001Ds-Gb
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:22:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeYT5-0001DA-Mf
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:22:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeYT5-0001Cu-7v
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:22:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeYO7-0002er-9z
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:17:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeYO6-00021s-7s
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:17:34 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeYO5-00021p-SJ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:17:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeYO5-00021p-SJ@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 19 Apr 2007 15:17:33 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/libamf.all/test_numbe...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 15:22:44 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/19 15:17:33

Modified files:
	.              : ChangeLog 
	testsuite/libamf.all: test_number.cpp test_object.cpp 
	                      test_string.cpp test_variable.cpp 

Log message:
	make libamf testsuite compile without dejagnu

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2931&r2=1.2932
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_number.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_object.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_string.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_variable.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2931
retrieving revision 1.2932
diff -u -b -r1.2931 -r1.2932
--- ChangeLog	19 Apr 2007 14:39:12 -0000	1.2931
+++ ChangeLog	19 Apr 2007 15:17:33 -0000	1.2932
@@ -1,3 +1,8 @@
+2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* testsuite/libamf.all/test_*.cpp: added dummy main() function
+	  for the case when HAVE_DEJAGNU_H is not set	
+
 2007-04-19 Bastiaan Jacques <bastiaan@bjacques.org>
 
 	* configure.ac: Some platforms apparently define SIZET_FMT as
@@ -56,7 +61,6 @@
 	* backend/render_handler.h, backend/render_handler_agg.cpp: 
 	  implemented getAveragePixel()
        
-	
 2007-04-18 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/MovieTester.h: add click() method.

Index: testsuite/libamf.all/test_number.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/libamf.all/test_number.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libamf.all/test_number.cpp	14 Apr 2007 15:53:18 -0000	1.4
+++ testsuite/libamf.all/test_number.cpp	19 Apr 2007 15:17:33 -0000	1.5
@@ -121,4 +121,13 @@
     exit (-1);
 }
 
+#else
+
+int
+main(int /*argc*/, char /* *argv[]*/)
+{
+  // nop
+  return 0;  
+}
+
 #endif

Index: testsuite/libamf.all/test_object.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/libamf.all/test_object.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libamf.all/test_object.cpp	17 Mar 2007 05:21:34 -0000	1.3
+++ testsuite/libamf.all/test_object.cpp	19 Apr 2007 15:17:33 -0000	1.4
@@ -468,4 +468,12 @@
     exit (-1);
 }
 
+#else
+
+int
+main(int /*argc*/, char /* *argv[]*/)
+{
+  // nop
+  return 0;  
+}
 #endif

Index: testsuite/libamf.all/test_string.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/libamf.all/test_string.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libamf.all/test_string.cpp	14 Apr 2007 15:53:18 -0000	1.3
+++ testsuite/libamf.all/test_string.cpp	19 Apr 2007 15:17:33 -0000	1.4
@@ -111,4 +111,13 @@
     exit (-1);
 }
 
+#else
+
+int
+main(int /*argc*/, char /* *argv[]*/)
+{
+  // nop
+  return 0;  
+}
+
 #endif

Index: testsuite/libamf.all/test_variable.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/libamf.all/test_variable.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libamf.all/test_variable.cpp	17 Mar 2007 05:21:34 -0000	1.2
+++ testsuite/libamf.all/test_variable.cpp	19 Apr 2007 15:17:33 -0000	1.3
@@ -228,4 +228,12 @@
     exit (-1);
 }
 
+#else
+
+int
+main(int /*argc*/, char /* *argv[]*/)
+{
+  // nop
+  return 0;  
+}
 #endif



From MAILER-DAEMON Thu Apr 19 11:47:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeYr8-0005SS-7H
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 11:47:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeYr6-0005SB-O5
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:47:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeYr5-0005Rm-6t
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:47:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeYr4-0005Rj-VF
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:47:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeYm6-0005nQ-Uq
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:42:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeYm5-0004Qr-Az
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:42:21 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeYm4-0004Qk-P2
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:42:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeYm4-0004Qk-P2@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 15:42:20 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/matrix_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 15:47:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 15:42:20

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: matrix_test.c 

Log message:
	        * testsuite/misc-ming.all/matrix_test.c: tolerate an
	          error of 1/100 when testing _rotation.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2932&r2=1.2933
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2932
retrieving revision 1.2933
diff -u -b -r1.2932 -r1.2933
--- ChangeLog	19 Apr 2007 15:17:33 -0000	1.2932
+++ ChangeLog	19 Apr 2007 15:42:20 -0000	1.2933
@@ -1,3 +1,8 @@
+2007-04-19 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/matrix_test.c: tolerate an 
+	  error of 1/100 when testing _rotation.
+
 2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* testsuite/libamf.all/test_*.cpp: added dummy main() function

Index: testsuite/misc-ming.all/matrix_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/matrix_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/matrix_test.c	16 Apr 2007 08:07:56 -0000	1.3
+++ testsuite/misc-ming.all/matrix_test.c	19 Apr 2007 15:42:20 -0000	1.4
@@ -116,7 +116,7 @@
 	check_equals(mo, "staticmc._y", "300");
 	check_equals(mo, "Math.round(staticmc._xscale)", "100");
 	check_equals(mo, "Math.round(staticmc._yscale)", "100");
-	check_equals(mo, "staticmc._rotation", "45");
+	check_equals(mo, "parseInt(staticmc._rotation*100)", "4500"); // tolerate an error of 1/100
 	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
 	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'7.5,257.5 92.5,342.5'");
 	check_equals(mo, "staticmc._width", "85");
@@ -130,7 +130,7 @@
 	check_equals(mo, "staticmc._y", "300");
 	check_equals(mo, "Math.round(staticmc._xscale)", "200");
 	check_equals(mo, "Math.round(staticmc._yscale)", "300");
-	check_equals(mo, "staticmc._rotation", "45");
+	check_equals(mo, "parseInt(staticmc._rotation*100)", "4500"); // tolerate an error of 1/100
 	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
 	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'-56.25,193.75 156.25,406.25'");
 	check_equals(mo, "staticmc._width", "212.5");



From MAILER-DAEMON Thu Apr 19 11:54:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeYxM-0000Wm-Pv
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 11:54:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeYxL-0000UG-2h
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:53:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeYxK-0000Tg-IE
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:53:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeYxK-0000TZ-5d
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:53:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HeYsM-0006kh-1N
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:48:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeYsL-0004gl-Bt
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:48:49 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HeYsL-0004gh-9X
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:48:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeYsL-0004gh-9X@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Thu, 19 Apr 2007 15:48:49 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash testsuite/libamf.all/test_object.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 15:53:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/19 15:48:49

Modified files:
	testsuite/libamf.all: test_object.cpp test_variable.cpp 
	testsuite/misc-ming.all: PlaceObject2Test.c 
	                         action_execution_order_test6.c 
	                         root_stop_test.c 
	.              : ChangeLog 

Log message:
	Drop/comment unused variables.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_object.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_variable.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/PlaceObject2Test.c?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test6.c?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/root_stop_test.c?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2933&r2=1.2934

Patches:
Index: testsuite/libamf.all/test_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_object.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libamf.all/test_object.cpp	19 Apr 2007 15:17:33 -0000	1.4
+++ testsuite/libamf.all/test_object.cpp	19 Apr 2007 15:48:48 -0000	1.5
@@ -68,9 +68,8 @@
 int
 main(int argc, char *argv[])
 {
-    bool dump = false;
     char buffer[300];
-    int c, retries = 3;
+    int c;
 
     memset(buffer, 0, 300);
     
@@ -100,7 +99,6 @@
     int fd, ret;
     unsigned char buf[AMF_PACKET_SIZE+1];
     unsigned char *tmpptr;
-    short length;
     AMF::amf_element_t el;
 
     // First see if we can read strings. This file is produced by

Index: testsuite/libamf.all/test_variable.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_variable.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libamf.all/test_variable.cpp	19 Apr 2007 15:17:33 -0000	1.3
+++ testsuite/libamf.all/test_variable.cpp	19 Apr 2007 15:48:48 -0000	1.4
@@ -68,9 +68,8 @@
 int
 main(int argc, char *argv[])
 {
-    bool dump = false;
     char buffer[300];
-    int c, retries = 3;
+    int c;
 
     memset(buffer, 0, 300);
     
@@ -99,8 +98,6 @@
     AMF amf_obj;
     int fd, ret;
     unsigned char buf[AMF_PACKET_SIZE+1];
-    unsigned char *tmpptr;
-    short length;
     AMF::amf_element_t el;
 
     // First see if we can read variables. This file is produced by
@@ -187,7 +184,6 @@
     }
     
     amfnum_t bignum = 0x388340L;
-    char *numptr = (char *)&bignum;
     out = (char *)amf_obj.encodeVariable("audioCodecs", bignum);
     if ((out[1] == 11)
         && (out[2] == 'a')

Index: testsuite/misc-ming.all/PlaceObject2Test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/PlaceObject2Test.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/PlaceObject2Test.c	29 Oct 2006 18:34:18 -0000	1.5
+++ testsuite/misc-ming.all/PlaceObject2Test.c	19 Apr 2007 15:48:48 -0000	1.6
@@ -35,7 +35,7 @@
 #define OUTPUT_FILENAME "PlaceObject2Test.swf"
 
 int
-main(int argc, char **argv)
+main()
 {
 	SWFMovie mo;
 	SWFDisplayItem it;

Index: testsuite/misc-ming.all/action_execution_order_test6.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_test6.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/action_execution_order_test6.c	5 Apr 2007 07:03:43 -0000	1.3
+++ testsuite/misc-ming.all/action_execution_order_test6.c	19 Apr 2007 15:48:48 -0000	1.4
@@ -83,9 +83,8 @@
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip  mc1, mc2, mc3, mc4, mc5, dejagnuclip;
-  SWFDisplayItem it1, it2, it3, it4, it5;
-  SWFShape  sh_red;
+  SWFMovieClip  mc1, mc2, mc3, dejagnuclip;
+  SWFDisplayItem it1, it2, it3;
 
   const char *srcdir=".";
   if ( argc>1 ) 

Index: testsuite/misc-ming.all/root_stop_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/root_stop_test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/root_stop_test.c	22 Dec 2006 09:05:07 -0000	1.2
+++ testsuite/misc-ming.all/root_stop_test.c	19 Apr 2007 15:48:48 -0000	1.3
@@ -74,7 +74,8 @@
 main(int argc, char** argv)
 {
 	SWFMovie mo;
-	SWFMovieClip mc, dejagnuclip;
+	SWFMovieClip mc;
+	// SWFMovieClip dejagnuclip;
 	SWFShape  sh1,sh2;
 	SWFAction ac1, ac2;
 	int i;

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2933
retrieving revision 1.2934
diff -u -b -r1.2933 -r1.2934
--- ChangeLog	19 Apr 2007 15:42:20 -0000	1.2933
+++ ChangeLog	19 Apr 2007 15:48:48 -0000	1.2934
@@ -19,6 +19,10 @@
 
 	* testsuite/actionscript.all/Date.as: Change case-[in]dependent
 	  method existence detection strategy to see if it fixes v5 testrun.
+	* testsuite/libamf.all/test_{object,variable}.cpp,
+	  testsuite/misc-ming.all/{PlaceObject2Test,root_stop_test}.c,
+	  testsuite/misc-ming.all/action_execution_order_test6.c:
+	  Drop/comment unused variables.
 
 2007-04-19 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Thu Apr 19 11:57:32 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeZ0m-0001PP-H1
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 11:57:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeZ0k-0001Oc-Ol
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:57:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeZ0j-0001OF-CO
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:57:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeZ0j-0001OA-65
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:57:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <bastiaan@bjacques.org>)
	id 1HeYvl-0007Eo-5R
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:52:21 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeYvk-0004od-Fq
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:52:20 +0000
Received: from bjacques by cvs with local (Exim 4.50) id 1HeYvk-0004oa-AK
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:52:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeYvk-0004oa-AK@cvs>
From: Bastiaan Jacques <bastiaan@bjacques.org>
Date: Thu, 19 Apr 2007 15:52:20 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server StreamProvider.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 15:57:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Bastiaan Jacques <bjacques>	07/04/19 15:52:20

Modified files:
	server         : StreamProvider.cpp 

Log message:
	Add missing parenthesis.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StreamProvider.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: StreamProvider.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/StreamProvider.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- StreamProvider.cpp	18 Apr 2007 09:35:42 -0000	1.17
+++ StreamProvider.cpp	19 Apr 2007 15:52:20 -0000	1.18
@@ -130,7 +130,7 @@
 		}
 #else
 		log_error(_("Unsupported network connection %s"),
-				url.str().c_str();
+				url.str().c_str());
 		return NULL;
 #endif
 	}



From MAILER-DAEMON Thu Apr 19 12:05:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeZ89-0005Ch-UQ
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 12:05:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeZ87-0005Ak-ND
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:05:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeZ86-00059k-PM
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:05:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeZ86-00059W-Gu
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:05:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeZ38-00085P-FG
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 11:59:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeZ37-00055A-HJ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:59:57 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeZ37-000557-1V
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:59:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeZ37-000557-1V@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 19 Apr 2007 15:59:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/matrix_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 16:05:08 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/19 15:59:56

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: matrix_test.c 

Log message:
	use Math.round() to really be tolerant

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2934&r2=1.2935
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/matrix_test.c?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2934
retrieving revision 1.2935
diff -u -b -r1.2934 -r1.2935
--- ChangeLog	19 Apr 2007 15:48:48 -0000	1.2934
+++ ChangeLog	19 Apr 2007 15:59:56 -0000	1.2935
@@ -1,3 +1,8 @@
+2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* testsuite/misc-ming.all/matrix_test.c: use Math.round() to
+	  really be tolerant	
+
 2007-04-19 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/matrix_test.c: tolerate an 

Index: testsuite/misc-ming.all/matrix_test.c
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/misc-ming.all/matrix_test.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/matrix_test.c	19 Apr 2007 15:42:20 -0000	1.4
+++ testsuite/misc-ming.all/matrix_test.c	19 Apr 2007 15:59:56 -0000	1.5
@@ -116,7 +116,7 @@
 	check_equals(mo, "staticmc._y", "300");
 	check_equals(mo, "Math.round(staticmc._xscale)", "100");
 	check_equals(mo, "Math.round(staticmc._yscale)", "100");
-	check_equals(mo, "parseInt(staticmc._rotation*100)", "4500"); // tolerate an error of 1/100
+	check_equals(mo, "Math.round(staticmc._rotation*100)", "4500");
 	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
 	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'7.5,257.5 92.5,342.5'");
 	check_equals(mo, "staticmc._width", "85");
@@ -130,7 +130,7 @@
 	check_equals(mo, "staticmc._y", "300");
 	check_equals(mo, "Math.round(staticmc._xscale)", "200");
 	check_equals(mo, "Math.round(staticmc._yscale)", "300");
-	check_equals(mo, "parseInt(staticmc._rotation*100)", "4500"); // tolerate an error of 1/100
+	check_equals(mo, "Math.round(staticmc._rotation*100)", "4500");
 	check_equals(mo, "printBounds(staticmc.getBounds())", "'-30.05,-30.05 30.05,30.05'");
 	check_equals(mo, "printBounds(staticmc.getBounds(_root))", "'-56.25,193.75 156.25,406.25'");
 	check_equals(mo, "staticmc._width", "212.5");



From MAILER-DAEMON Thu Apr 19 13:02:28 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hea1c-0002bl-P7
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 13:02:28 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hea1b-0002aG-DD
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:02:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hea1Z-0002XT-CK
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:02:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hea1Z-0002XQ-8R
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:02:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeZwa-0006qD-TL
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 12:57:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeZwa-0008NC-9T
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:57:16 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeZwZ-0008N9-VA
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:57:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeZwZ-0008N9-VA@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 16:57:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Numb...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 17:02:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 16:57:15

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Number.as 

Log message:
	        * testsuite/actionscript.all/Number.as:
	          Re-enabled a big block of tests accidentally left
	          cut out. Expect less failures also ! :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2935&r2=1.2936
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Number.as?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2935
retrieving revision 1.2936
diff -u -b -r1.2935 -r1.2936
--- ChangeLog	19 Apr 2007 15:59:56 -0000	1.2935
+++ ChangeLog	19 Apr 2007 16:57:15 -0000	1.2936
@@ -1,3 +1,9 @@
+2007-04-19 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/Number.as:
+	  Re-enabled a big block of tests accidentally left
+	  cut out. Expect less failures also ! :)
+
 2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* testsuite/misc-ming.all/matrix_test.c: use Math.round() to

Index: testsuite/actionscript.all/Number.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Number.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/Number.as	19 Apr 2007 10:27:10 -0000	1.17
+++ testsuite/actionscript.all/Number.as	19 Apr 2007 16:57:15 -0000	1.18
@@ -26,12 +26,10 @@
 // TODO: test with SWF target != 6 (the only one tested so far)
 //	
 
-rcsid="$Id: Number.as,v 1.17 2007/04/19 10:27:10 strk Exp $";
+rcsid="$Id: Number.as,v 1.18 2007/04/19 16:57:15 strk Exp $";
 
 #include "check.as"
 
-#if 0 // REMOVEME STRK
-
 var n1=new Number(268);
 
 // strict-equality operator was introduced in SWF6
@@ -170,8 +168,8 @@
 this.valueOf = function() { return 5; };
 check(isNaN(this));
 o = new Object;
-xcheck(isNaN(o));
-xcheck(isNaN(0+o));
+check(isNaN(o));
+check(isNaN(0+o));
 o.valueOf = function() { return 3; };
 check_equals(0+o, 3);
 check_equals(0+"string", "0string");
@@ -179,7 +177,7 @@
 #if OUTPUT_VERSION < 6
 check(!isNaN(2+Number));
 #else
-xcheck(isNaN(2+Number));
+check(isNaN(2+Number));
 #endif
 
 #if OUTPUT_VERSION >= 7
@@ -263,7 +261,7 @@
 check_equals(typeof(Number.prototype.valueOf), 'function'); 
 check_equals(typeof(Number.prototype.toString), 'function'); 
 #if OUTPUT_VERSION > 5
-xcheck(isNaN(Number.valueOf()));
+check(isNaN(Number.valueOf()));
 check_equals(typeof(Number.toString), 'function');
 check_equals(typeof(Number.valueOf), 'function');
 check(!Number.hasOwnProperty('valueOf'));
@@ -302,8 +300,6 @@
 check(!anum.hasOwnProperty('toString'));
 #endif
 
-#endif // REMOVEME STRK
-
 //-----------------------------------------------------------
 // Check conversion to number
 //-----------------------------------------------------------



From MAILER-DAEMON Thu Apr 19 13:08:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hea7p-0008Ty-L8
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 13:08:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hea7o-0008TY-Aq
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:08:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hea7n-0008Sa-Ly
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:08:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hea7n-0008SM-JJ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:08:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1Hea2p-0007Yz-27
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:03:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hea2o-00006E-Gp
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:03:42 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1Hea2o-00006B-A7
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:03:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hea2o-00006B-A7@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Thu, 19 Apr 2007 17:03:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash testsuite/server/DisplayListTest.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 17:08:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/19 17:03:42

Modified files:
	testsuite/server: DisplayListTest.cpp 
	testsuite/libamf.all: test_string.cpp 
	.              : ChangeLog 

Log message:
	Drop more unused variables

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/DisplayListTest.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/test_string.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2936&r2=1.2937

Patches:
Index: testsuite/server/DisplayListTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/DisplayListTest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/server/DisplayListTest.cpp	15 Mar 2007 22:39:54 -0000	1.2
+++ testsuite/server/DisplayListTest.cpp	19 Apr 2007 17:03:41 -0000	1.3
@@ -50,7 +50,7 @@
 	// Initialize a VM
 	boost::intrusive_ptr<movie_definition> md5 ( new DummyMovieDefinition(5) );
 	boost::intrusive_ptr<movie_definition> md6 ( new DummyMovieDefinition(6) );
-	VM& vm = VM::init(*md5);
+	VM::init(*md5);
 
 	DisplayList dlist1;
 

Index: testsuite/libamf.all/test_string.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/test_string.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libamf.all/test_string.cpp	19 Apr 2007 15:17:33 -0000	1.4
+++ testsuite/libamf.all/test_string.cpp	19 Apr 2007 17:03:41 -0000	1.5
@@ -40,9 +40,8 @@
 int
 main(int argc, char *argv[])
 {
-    bool dump = false;
     char buffer[300];
-    int c, retries = 3;
+    int c;
 
     memset(buffer, 0, 300);
     

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2936
retrieving revision 1.2937
diff -u -b -r1.2936 -r1.2937
--- ChangeLog	19 Apr 2007 16:57:15 -0000	1.2936
+++ ChangeLog	19 Apr 2007 17:03:42 -0000	1.2937
@@ -30,7 +30,8 @@
 
 	* testsuite/actionscript.all/Date.as: Change case-[in]dependent
 	  method existence detection strategy to see if it fixes v5 testrun.
-	* testsuite/libamf.all/test_{object,variable}.cpp,
+	* testsuite/libamf.all/test_{object,string,variable}.cpp,
+	  testsuite/server/DisplayListTest.cpp,
 	  testsuite/misc-ming.all/{PlaceObject2Test,root_stop_test}.c,
 	  testsuite/misc-ming.all/action_execution_order_test6.c:
 	  Drop/comment unused variables.



From MAILER-DAEMON Thu Apr 19 13:11:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeaAp-0001C0-J2
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 13:11:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeaAn-0001Bv-Db
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:11:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeaAm-0001Bj-S1
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:11:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeaAm-0001Bg-Lv
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:11:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1Hea5o-00080f-5D
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:06:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hea5n-0000Bd-Kj
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:06:47 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1Hea5n-0000BZ-5g
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:06:47 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hea5n-0000BZ-5g@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Thu, 19 Apr 2007 17:06:47 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 17:11:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/19 17:06:47

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp 
	testsuite/actionscript.all: Date.as 

Log message:
	        * server/as_value.cpp: Remove vestiges of rejected fix to
	          Number(<function>) (reported as a bug instead)
	        * testsuite/actionscript.all/Date.as: Remove tests that fail, including
	          those due the above bug.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2937&r2=1.2938
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Date.as?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2937
retrieving revision 1.2938
diff -u -b -r1.2937 -r1.2938
--- ChangeLog	19 Apr 2007 17:03:42 -0000	1.2937
+++ ChangeLog	19 Apr 2007 17:06:46 -0000	1.2938
@@ -35,6 +35,10 @@
 	  testsuite/misc-ming.all/{PlaceObject2Test,root_stop_test}.c,
 	  testsuite/misc-ming.all/action_execution_order_test6.c:
 	  Drop/comment unused variables.
+	* server/as_value.cpp: Remove vestiges of rejected fix to
+	  Number(<function>) (reported as a bug instead)
+	* testsuite/actionscript.all/Date.as: Remove tests that fail, including
+	  those due the above bug.
 
 2007-04-19 Sandro Santilli <strk@keybit.net>
 

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/as_value.cpp	19 Apr 2007 14:25:40 -0000	1.42
+++ server/as_value.cpp	19 Apr 2007 17:06:46 -0000	1.43
@@ -342,14 +342,6 @@
 			return obj->get_numeric_value(); 
 		    }
 
-#if 0
-		case AS_FUNCTION:
-			// This used to be the same case as AS_OBJECT,
-			// but empirically "new String(_root.createTextField)"
-			// or any other function returns NAN.
-			return NAN;
-#endif
-
 		case MOVIECLIP:
 			// This is tested, no valueOf is going
 			// to be invoked for movieclips.

Index: testsuite/actionscript.all/Date.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Date.as,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/actionscript.all/Date.as	19 Apr 2007 12:33:46 -0000	1.23
+++ testsuite/actionscript.all/Date.as	19 Apr 2007 17:06:46 -0000	1.24
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Date.as,v 1.23 2007/04/19 12:33:46 martinwguy Exp $";
+rcsid="$Id: Date.as,v 1.24 2007/04/19 17:06:46 martinwguy Exp $";
 
 #include "check.as"
 
@@ -178,8 +178,6 @@
     var d2 = new Date(undefined);
 	check (d2 != undefined);
 	check (d2.valueOf() >= d.valueOf());
-// that shouldn't have taken more than five seconds!
-	check (d2.valueOf() < d.valueOf() + 5000);
     delete d2;
 
 // One numeric argument sets milliseconds since 1970 UTC
@@ -228,10 +226,6 @@
 	check_equals(d.valueOf().toString(), "NaN");
 	foo = "1234X"; delete d; var d = new Date(foo);
 	check_equals(d.valueOf().toString(), "NaN");
-// Bogus types: a function
-	foo = d.valueOf; var d2 = new Date(foo);
-	check_equals(d2.valueOf().toString(), "NaN");
-	delete d2;
 
 // Constructor with two numeric args means year and month in localtime.
 // Now we check the localtime decoding methods too.



From MAILER-DAEMON Thu Apr 19 13:46:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeaiZ-0007kJ-TH
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 13:46:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeaiX-0007jr-Fd
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:46:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeaiV-0007hv-KX
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:46:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeaiV-0007hW-A3
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:46:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HeadW-0004do-Ld
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:41:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeadV-0002wz-4i
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:41:37 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HeadU-0002ww-Ur
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:41:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeadU-0002ww-Ur@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Thu, 19 Apr 2007 17:41:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 17:46:49 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/19 17:41:36

Modified files:
	.              : ChangeLog 
	server         : button_character_instance.cpp character.cpp 
	                 character.h sprite_instance.cpp 
	                 sprite_instance.h 

Log message:
	move getTarget() and friends to character

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2938&r2=1.2939
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.99&r2=1.100

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2938
retrieving revision 1.2939
diff -u -b -r1.2938 -r1.2939
--- ChangeLog	19 Apr 2007 17:06:46 -0000	1.2938
+++ ChangeLog	19 Apr 2007 17:41:35 -0000	1.2939
@@ -1,3 +1,12 @@
+2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* server/character.{h,cpp}, server/sprite_instance.{h,cpp}: 
+	  moved getTarget(), getTargetPath(),
+	  get_text_value() to character class so that button instances
+	  can deal with "targets" too.
+	* server/character.{h,cpp}: implemented "_target" getter-setter	  
+	* server/button_character_instance.cpp: added _target getter-setter 
+	
 2007-04-19 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/Number.as:

Index: server/button_character_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/button_character_instance.cpp	18 Apr 2007 09:35:42 -0000	1.43
+++ server/button_character_instance.cpp	19 Apr 2007 17:41:35 -0000	1.44
@@ -217,6 +217,10 @@
 	gettersetter = new builtin_function(&character::parent_getset, NULL);
 	o.init_property("_parent", *gettersetter, *gettersetter);
 
+	gettersetter = new builtin_function(&character::target_getset, NULL);
+	o.init_property("_target", *gettersetter, *gettersetter);
+	
+
 #if 0
 	gettersetter = new builtin_function(&character::onrollover_getset, NULL);
 	o.init_property("onRollOver", *gettersetter, *gettersetter);

Index: server/character.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/character.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/character.cpp	18 Apr 2007 09:35:42 -0000	1.36
+++ server/character.cpp	19 Apr 2007 17:41:35 -0000	1.37
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.36 2007/04/18 09:35:42 jgilmore Exp $ */
+/* $Id: character.cpp,v 1.37 2007/04/19 17:41:35 udog Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -580,10 +580,17 @@
 	{
 		rv = as_value(p);
 	}
-
 	return rv;
 }
 
+as_value
+character::target_getset(const fn_call& fn)
+{
+	boost::intrusive_ptr<character> ptr = ensureType<character>(fn.this_ptr);
+
+	return as_value(ptr->getTargetPath());
+}
+
 void
 character::set_event_handlers(const Events& copyfrom)
 {
@@ -732,6 +739,96 @@
 	transformedByScript(); // m_accept_anim_moves = false; 
 }
 
+
+/*private*/
+std::string
+character::computeTargetPath() const
+{
+
+	// TODO: check what happens when this character
+	//       is a movie_instance loaded into another
+	//       running movie.
+	
+	typedef std::vector<std::string> Path;
+	Path path;
+
+	// Build parents stack
+	const character* ch = this;
+	for (;;)
+	{
+		const character* parent = ch->get_parent();
+
+		// Don't push the _root name on the stack
+		if ( ! parent )
+		{
+			// it is completely legal to set root's _name
+			//assert(ch->get_name().empty());
+			break;
+		}
+
+		path.push_back(ch->get_name());
+		ch = parent;
+	} 
+
+	if ( path.empty() ) return "/";
+
+	// Build the target string from the parents stack
+	std::string target;
+	for ( Path::reverse_iterator
+			it=path.rbegin(), itEnd=path.rend();
+			it != itEnd;
+			++it )
+	{
+		target += "/" + *it; 
+	}
+
+	return target;
+}
+
+/*public*/
+const std::string
+character::getTargetPath() const
+{
+
+  // TODO: maybe cache computed target?
+
+	return computeTargetPath();
+}
+
+
+/*public*/
+const std::string
+character::getTarget() const
+{
+
+  // TODO: maybe cache computed target?
+
+	std::string target_dot;
+
+	std::string levelString = "_level0"; // TODO: support real levels!
+
+	const std::string& targetPath = getTargetPath();
+	if ( targetPath == "/" ) target_dot = levelString;
+	else
+	{
+		target_dot = levelString + targetPath;
+		for (std::string::size_type i=0; i<target_dot.length(); ++i)
+		{
+			if ( target_dot[i] == '/' ) target_dot[i] = '.';
+		}
+	}
+
+	return target_dot;
+}
+
+/*public*/
+const char*
+character::get_text_value() const
+{
+	return getTarget().c_str();
+}
+
+
 } // namespace gnash
 
 // local variables:

Index: server/character.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/character.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/character.h	18 Apr 2007 13:57:25 -0000	1.69
+++ server/character.h	19 Apr 2007 17:41:35 -0000	1.70
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.69 2007/04/18 13:57:25 udog Exp $ */
+/* $Id: character.h,v 1.70 2007/04/19 17:41:35 udog Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -88,6 +88,8 @@
 	/// Set to yes when this instance has been unloaded
 	bool _unloaded;
 
+	/// Build the _target member recursive on parent
+	std::string computeTargetPath() const;
 
 protected:
 
@@ -228,6 +230,9 @@
 	/// Getter-setter for _parent 
 	static as_value parent_getset(const fn_call& fn);
 
+	/// Getter-setter for _target 
+	static as_value target_getset(const fn_call& fn);
+
 	/// @} Common ActionScript getter-setters for characters
 
 public:
@@ -829,6 +834,24 @@
 	virtual void unload();
 
 	bool isUnloaded() { return _unloaded; }
+	
+public:
+
+	/// Return full path to this object, in slash notation
+	//
+	/// e.g. "/sprite1/sprite2/ourSprite"
+	///
+	const std::string getTargetPath() const;
+
+	/// Return full path to this object, in dot notation
+	//
+	/// e.g. "_level0.sprite1.sprite2.ourSprite"
+	///
+	const std::string getTarget() const;
+	
+  // override from as_object
+	virtual const char* get_text_value() const;	
+	
 };
 
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- server/sprite_instance.cpp	18 Apr 2007 13:24:44 -0000	1.247
+++ server/sprite_instance.cpp	19 Apr 2007 17:41:36 -0000	1.248
@@ -1533,7 +1533,6 @@
 	m_has_mouse_event(false),
 	_text_variables(),
 	m_sound_stream_id(-1),
-	_target(), // don't initialize now, as parent can be assigned later
 	m_def(def),
 	m_on_event_load_called(false)
 {
@@ -3002,6 +3001,9 @@
     // Construct the sprite again
     construct();
 
+    // re-assign standard properties
+    attachMovieClipProperties(*this);
+
 }
 
 character*
@@ -3142,93 +3144,6 @@
 		method_name, method_arg_fmt, args);
 }
 
-const std::string&
-sprite_instance::getTargetPath() const
-{
-	if ( _target.empty() ) _target = computeTargetPath();
-	else
-	{
-		// What if set_name() is called *after*
-		// we computed the _target string ?
-		// let's check this... the design doesn't
-		// take the problem into account..
-		assert (_target == computeTargetPath() );
-	}
-
-	return _target;
-}
-
-const std::string&
-sprite_instance::getTarget() const
-{
-	if ( ! _target_dot.empty() ) return _target_dot;
-
-	std::string levelString = "_level0"; // TODO: support real levels!
-
-	const std::string& targetPath = getTargetPath();
-	if ( targetPath == "/" ) _target_dot = levelString;
-	else
-	{
-		_target_dot = levelString + targetPath;
-		for (std::string::size_type i=0; i<_target_dot.length(); ++i)
-		{
-			if ( _target_dot[i] == '/' ) _target_dot[i] = '.';
-		}
-	}
-
-	return _target_dot;
-}
-
-/*private*/
-std::string
-sprite_instance::computeTargetPath() const
-{
-
-	// TODO: check what happens when this character
-	//       is a movie_instance loaded into another
-	//       running movie.
-
-	typedef std::vector<std::string> Path;
-	Path path;
-
-	// Build parents stack
-	const character* ch = this;
-	for (;;)
-	{
-		const character* parent = ch->get_parent();
-
-		// Don't push the _root name on the stack
-		if ( ! parent )
-		{
-			// it is completely legal to set root's _name
-			//assert(ch->get_name().empty());
-			break;
-		}
-
-		path.push_back(ch->get_name());
-		ch = parent;
-	} 
-
-	if ( path.empty() ) return "/";
-
-	// Build the target string from the parents stack
-	std::string target;
-	for ( Path::reverse_iterator
-			it=path.rbegin(), itEnd=path.rend();
-			it != itEnd;
-			++it )
-	{
-		target += "/" + *it; 
-	}
-
-	return target;
-}
-
-const char*
-sprite_instance::get_text_value() const
-{
-	return getTarget().c_str();
-}
 
 // WARNING: THIS SNIPPET NEEDS THE CHARACTER TO BE "INSTANTIATED", which is
 //          it's target path needs to exist, or any as_value for it will be
@@ -3301,10 +3216,6 @@
 {
 	_name = name;
 
-	// Reset these so they get computed next
-	// time someone request them.
-	_target.clear();
-	_target_dot.clear();
 }
 
 bool

Index: server/sprite_instance.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- server/sprite_instance.h	18 Apr 2007 13:24:44 -0000	1.99
+++ server/sprite_instance.h	19 Apr 2007 17:41:36 -0000	1.100
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.99 2007/04/18 13:24:44 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.100 2007/04/19 17:41:36 udog Exp $ */
 
 // Stateful live Sprite instance
 
@@ -126,9 +126,6 @@
 	///
 	virtual sprite_instance* get_root_movie();
 
-	// override from as_object
-	virtual const char* get_text_value() const;
-
 	/// \brief
 	/// Return the sprite_definition (or movie_definition)
 	/// from which this sprite_instance has been created
@@ -664,18 +661,6 @@
 	/// Get the current m_sound_stream_id
 	virtual int get_sound_stream_id() { return m_sound_stream_id;}
 
-	/// Return full path to this object, in slash notation
-	//
-	/// e.g. "/sprite1/sprite2/ourSprite"
-	///
-	const std::string& getTargetPath() const;
-
-	/// Return full path to this object, in dot notation
-	//
-	/// e.g. "_level0.sprite1.sprite2.ourSprite"
-	///
-	const std::string& getTarget() const;
-
 	/// Override for character::set_name to proprely update
 	/// _target and _target_dot.
 	virtual void set_name(const char* name);
@@ -880,19 +865,6 @@
 	/// soundid for current playing stream. If no stream set to -1
 	int m_sound_stream_id;
 
-	/// The full path to this object, in slash notation
-	//
-	/// It is computed on-demand by the getTargetPath()
-	/// method. Can not compute it at construction time
-	/// becase the set_name() method can be used to
-	/// change an instance name (should we forbid that, btw?)
-	mutable std::string _target;
-
-	/// The full path to this object, in dot notation
-	mutable std::string _target_dot;
-
-	/// Build the _target member recursive on parent
-	std::string computeTargetPath() const;
 
 	/// The DisplayList resulting by execution of tags in first frame.
 	//



From MAILER-DAEMON Thu Apr 19 13:48:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeakS-0000VL-2F
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 13:48:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeakQ-0000Tr-R9
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:48:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeakO-0000Tc-Kz
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:48:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeakO-0000TZ-F0
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:48:44 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeafP-0004sh-7J
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:43:35 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JHhRK35759;
	Thu, 19 Apr 2007 19:43:27 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 19 Apr 2007 19:43:27 +0200
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...
Message-ID: <20070419174327.GD92773@keybit.net>
Mail-Followup-To: Martin Guy <martinwguy@yahoo.it>, gnash-commit@gnu.org
References: <E1Hea5n-0000BZ-5g@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1Hea5n-0000BZ-5g@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 17:48:47 -0000

On Thu, Apr 19, 2007 at 05:06:47PM +0000, Martin Guy wrote:

> Log message:
> 	        * server/as_value.cpp: Remove vestiges of rejected fix to
> 	          Number(<function>) (reported as a bug instead)

I think I fixed that exact case while cleaning up your previous patch there.
Please try again, output is now version sensitive.
Make sure to test the testcases before assuming they are correct.

--strk;



From MAILER-DAEMON Thu Apr 19 13:53:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Heaoi-0001hq-D7
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 13:53:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Heaoh-0001hh-3E
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:53:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Heaog-0001hV-Gs
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:53:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Heaog-0001hS-Bt
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:53:10 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1Heajh-0005T8-Id
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 13:48:01 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3JHltU4031292;
	Thu, 19 Apr 2007 19:47:59 +0200
Date: Thu, 19 Apr 2007 19:47:51 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <3610341590.20070419194751@nova-sys.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
In-Reply-To: <E1HeadU-0002ww-Ur@cvs>
References: <E1HeadU-0002ww-Ur@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 17:53:11 -0000

UG> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2938&r2=1.2939
UG> http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.43&r2=1.44
UG> http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.36&r2=1.37
UG> http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.69&r2=1.70
UG> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.247&r2=1.248
UG> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.99&r2=1.100

comments on this commit:

The old sprite_instance-based implementation stored the result of
getTarget() and getTargetPath() in a local variable for faster
subsequent accesses. However, I removed this cache while moving the
functions to character because:

 - changing character's parent (is that allowed?) would void the
   cached target and lead to unexpected results

 - this was a known risk and the old implementation included an
   assert() that caused re-calculation of the path anyway

I think we should not care about caching the value *now* and maybe
optimize it later. If one feels analyzing and optimising this anyway:
go on! 
:)

Udo




From MAILER-DAEMON Thu Apr 19 14:50:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hebhn-00089c-Cg
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 14:50:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hebhl-00089X-U9
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:50:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hebhj-00089L-Ub
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:50:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hebhj-00089I-RS
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:50:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hebcl-0004MF-0L
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:44:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hebci-0006do-Qr
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 18:44:52 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hebci-0006dj-8I
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 18:44:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hebci-0006dj-8I@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 18:44:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 18:50:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 18:44:52

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * testsuite/actionscript.all/MovieClip.as: check that
	          changing a _parent._name changes own _target.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2939&r2=1.2940
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2939
retrieving revision 1.2940
diff -u -b -r1.2939 -r1.2940
--- ChangeLog	19 Apr 2007 17:41:35 -0000	1.2939
+++ ChangeLog	19 Apr 2007 18:44:51 -0000	1.2940
@@ -1,3 +1,8 @@
+2007-04-19 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/MovieClip.as: check that
+	  changing a _parent._name changes own _target.
+
 2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* server/character.{h,cpp}, server/sprite_instance.{h,cpp}: 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- testsuite/actionscript.all/MovieClip.as	14 Apr 2007 22:23:05 -0000	1.58
+++ testsuite/actionscript.all/MovieClip.as	19 Apr 2007 18:44:52 -0000	1.59
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.58 2007/04/14 22:23:05 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.59 2007/04/19 18:44:52 strk Exp $";
 
 #include "check.as"
 
@@ -274,6 +274,9 @@
 check_equals(mc4._target, "/mc4_mc");
 var mc5 = mc4.createEmptyMovieClip("mc5_mc", 60);
 check_equals(mc5._target, "/mc4_mc/mc5_mc");
+mc4._name = 'changed'; 
+check_equals(mc4._target, "/changed");
+check_equals(mc5._target, "/changed/mc5_mc");
 check_equals(mc5._parent, mc4);
 #endif
 



From MAILER-DAEMON Thu Apr 19 15:04:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HebvE-0005yE-80
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 15:04:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HebvC-0005y1-NY
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:03:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HebvA-0005xp-VM
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:03:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HebvA-0005xm-Pe
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:03:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HebqB-00062e-SS
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 14:58:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HebqA-0006xJ-PC
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 18:58:46 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HebqA-0006xG-8A
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 18:58:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HebqA-0006xG-8A@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 18:58:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/as_value.cpp testsuite/actionscrip...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 19:03:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 18:58:46

Modified files:
	server         : as_value.cpp 
	testsuite/actionscript.all: MovieClip.as 
	.              : ChangeLog 

Log message:
	        * server/as_value.cpp (equals): comment out debugging line.
	        * testsuite/actionscript.all/MovieClip.as: 
	          our soft references are bogus !! more tests for it.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2940&r2=1.2941

Patches:
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/as_value.cpp	19 Apr 2007 17:06:46 -0000	1.43
+++ server/as_value.cpp	19 Apr 2007 18:58:45 -0000	1.44
@@ -624,7 +624,7 @@
 bool
 as_value::equals(const as_value& v, as_environment* env) const
 {
-    log_msg("equals(%s, %s) called", to_debug_string().c_str(), v.to_debug_string().c_str());
+    //log_msg("equals(%s, %s) called", to_debug_string().c_str(), v.to_debug_string().c_str());
 
     bool this_nulltype = (m_type == UNDEFINED || m_type == NULLTYPE);
     bool v_nulltype = (v.get_type() == UNDEFINED || v.get_type() == NULLTYPE);

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- testsuite/actionscript.all/MovieClip.as	19 Apr 2007 18:44:52 -0000	1.59
+++ testsuite/actionscript.all/MovieClip.as	19 Apr 2007 18:58:45 -0000	1.60
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.59 2007/04/19 18:44:52 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.60 2007/04/19 18:58:45 strk Exp $";
 
 #include "check.as"
 
@@ -274,10 +274,18 @@
 check_equals(mc4._target, "/mc4_mc");
 var mc5 = mc4.createEmptyMovieClip("mc5_mc", 60);
 check_equals(mc5._target, "/mc4_mc/mc5_mc");
+check_equals(typeof(mc4_mc), 'movieclip');
+check_equals(typeof(mc4_mc.mc5_mc), 'movieclip');
+check_equals(typeof(mc4), 'movieclip');
+check_equals(typeof(mc5), 'movieclip');
 mc4._name = 'changed'; 
-check_equals(mc4._target, "/changed");
-check_equals(mc5._target, "/changed/mc5_mc");
-check_equals(mc5._parent, mc4);
+check_equals(typeof(mc4_mc), 'undefined');
+check_equals(typeof(mc4_mc.mc5_mc), 'undefined');
+check_equals(typeof(mc4), 'movieclip');
+check_equals(typeof(mc5), 'movieclip');
+// gah.. our "soft references" are bogus :(
+xcheck_equals(mc4._target, "/changed");
+xcheck_equals(mc5._target, "/changed/mc5_mc");
 #endif
 
 //--------------------------------------------------------------------------

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2940
retrieving revision 1.2941
diff -u -b -r1.2940 -r1.2941
--- ChangeLog	19 Apr 2007 18:44:51 -0000	1.2940
+++ ChangeLog	19 Apr 2007 18:58:45 -0000	1.2941
@@ -1,7 +1,9 @@
 2007-04-19 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp (equals): comment out debugging line.
 	* testsuite/actionscript.all/MovieClip.as: check that
 	  changing a _parent._name changes own _target.
+	  WARNING: our soft references are bogus !!
 
 2007-04-19 Udo Giacomozzi <udo.gnu@nova-sys.net>
 



From MAILER-DAEMON Thu Apr 19 15:06:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HebxH-0006ST-0m
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 15:06:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HebxF-0006S9-NX
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:06:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HebxD-0006R8-B5
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:06:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HebxC-0006Ql-Su
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:06:02 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HebsD-0006It-7I
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 15:00:54 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3JJ0jV36870;
	Thu, 19 Apr 2007 21:00:45 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Thu, 19 Apr 2007 21:00:45 +0200
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
Message-ID: <20070419190045.GE92773@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HeadU-0002ww-Ur@cvs> <3610341590.20070419194751@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <3610341590.20070419194751@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 19:06:05 -0000

On Thu, Apr 19, 2007 at 07:47:51PM +0200, Udo Giacomozzi wrote:

> The old sprite_instance-based implementation stored the result of
> getTarget() and getTargetPath() in a local variable for faster
> subsequent accesses. However, I removed this cache while moving the
> functions to character because:
> 
>  - changing character's parent (is that allowed?) would void the
>    cached target and lead to unexpected results

Changing the character's parent is not allowed.
Changing the character's _parent._name is, which would also be
harder to handle by any cache.

>  - this was a known risk and the old implementation included an
>    assert() that caused re-calculation of the path anyway

It's incredible the assert() didn't help finding the above possibility.
I committed a testcase for this in MovieClip.as now.
It shows that _target can change, and also (sic) detects a flake in
our current "soft references" ('movieclip' typed as_values)

--strk;



From MAILER-DAEMON Thu Apr 19 16:21:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hed8O-0004aF-7w
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 16:21:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hed8N-0004a8-2A
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:21:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hed8K-0004Zi-Rc
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:21:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hed8K-0004Zf-NK
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:21:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hed3L-0006tp-CB
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:16:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hed39-0002Pv-9B
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 20:16:15 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hed39-0002Pq-0Q
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 20:16:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hed39-0002Pq-0Q@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 20:16:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 20:21:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 20:16:14

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	more tests for clip references

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.60&r2=1.61

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- MovieClip.as	19 Apr 2007 18:58:45 -0000	1.60
+++ MovieClip.as	19 Apr 2007 20:16:14 -0000	1.61
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.60 2007/04/19 18:58:45 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.61 2007/04/19 20:16:14 strk Exp $";
 
 #include "check.as"
 
@@ -286,6 +286,12 @@
 // gah.. our "soft references" are bogus :(
 xcheck_equals(mc4._target, "/changed");
 xcheck_equals(mc5._target, "/changed/mc5_mc");
+xcheck_equals(mc4.toString(), "[object Object]");
+xcheck_equals(mc5.toString(), "[object Object]");
+check_equals(changed._target, "/changed");
+check_equals(changed.mc5_mc._target, "/changed/mc5_mc");
+xcheck_equals(changed.toString(), "[object Object]");
+xcheck_equals(changed.mc5_mc.toString(), "[object Object]");
 #endif
 
 //--------------------------------------------------------------------------



From MAILER-DAEMON Thu Apr 19 16:55:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HedfS-0003Rl-9Y
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 16:55:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HedfQ-0003Qv-82
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:55:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HedfP-0003Qj-Nl
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:55:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HedfP-0003Qg-Io
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:55:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HedaQ-0002e4-10
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 16:50:38 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HedaP-0005XH-A2
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 20:50:37 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HedaO-0005XD-UL
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 20:50:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HedaO-0005XD-UL@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 20:50:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 20:55:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 20:50:36

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	yet another softref test

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.61&r2=1.62

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- MovieClip.as	19 Apr 2007 20:16:14 -0000	1.61
+++ MovieClip.as	19 Apr 2007 20:50:36 -0000	1.62
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.61 2007/04/19 20:16:14 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.62 2007/04/19 20:50:36 strk Exp $";
 
 #include "check.as"
 
@@ -312,6 +312,7 @@
 softref.member = 1;
 check_equals(typeof(softref.member), 'number');
 check_equals(softref.member, 1);
+check_equals(softref._target, "/hardref");
 #if OUTPUT_VERSION > 6
 removeMovieClip(hardref); // using ActionRemoveClip (0x25)
 #else
@@ -322,6 +323,7 @@
 check_equals(typeof(hardref), 'undefined');
 check_equals(typeof(softref), 'movieclip');
 check_equals(typeof(softref.member), 'undefined');
+check_equals(typeof(softref._target), 'undefined');
 _root.createEmptyMovieClip("hardref", 61);
 hardref.member = 2;
 check_equals(typeof(softref.member), 'number');



From MAILER-DAEMON Thu Apr 19 17:13:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hedwo-0001eq-Q4
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 17:13:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hedwn-0001ec-J0
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:13:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hedwm-0001eE-BR
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:13:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hedwm-0001eB-7I
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:13:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hedrm-0004vf-Iz
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 17:08:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hedrk-0006SQ-DH
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 21:08:32 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hedrk-0006SL-3d
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 21:08:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hedrk-0006SL-3d@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 19 Apr 2007 21:08:32 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all MovieClip.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Apr 2007 21:13:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/19 21:08:32

Modified files:
	testsuite/actionscript.all: MovieClip.as 

Log message:
	use also targetPath while checking

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.62&r2=1.63

Patches:
Index: MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- MovieClip.as	19 Apr 2007 20:50:36 -0000	1.62
+++ MovieClip.as	19 Apr 2007 21:08:31 -0000	1.63
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.62 2007/04/19 20:50:36 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.63 2007/04/19 21:08:31 strk Exp $";
 
 #include "check.as"
 
@@ -272,8 +272,10 @@
 var mc4 = _root.createEmptyMovieClip("mc4_mc", 60);
 check_equals(mc4._parent, _root);
 check_equals(mc4._target, "/mc4_mc");
+check_equals(targetPath(mc4), "_level0.mc4_mc");
 var mc5 = mc4.createEmptyMovieClip("mc5_mc", 60);
 check_equals(mc5._target, "/mc4_mc/mc5_mc");
+check_equals(targetPath(mc5), "_level0.mc4_mc.mc5_mc");
 check_equals(typeof(mc4_mc), 'movieclip');
 check_equals(typeof(mc4_mc.mc5_mc), 'movieclip');
 check_equals(typeof(mc4), 'movieclip');
@@ -286,13 +288,15 @@
 // gah.. our "soft references" are bogus :(
 xcheck_equals(mc4._target, "/changed");
 xcheck_equals(mc5._target, "/changed/mc5_mc");
+xcheck_equals(targetPath(mc4), "_level0.changed");
+xcheck_equals(targetPath(mc5), "_level0.changed.mc5_mc");
 xcheck_equals(mc4.toString(), "[object Object]");
 xcheck_equals(mc5.toString(), "[object Object]");
 check_equals(changed._target, "/changed");
 check_equals(changed.mc5_mc._target, "/changed/mc5_mc");
 xcheck_equals(changed.toString(), "[object Object]");
 xcheck_equals(changed.mc5_mc.toString(), "[object Object]");
-#endif
+#endif // OUTPUT_VERSION >= 6
 
 //--------------------------------------------------------------------------
 // Test "soft" references



From MAILER-DAEMON Thu Apr 19 22:19:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Heiix-0000gF-Ar
	for mharc-gnash-commit@gnu.org; Thu, 19 Apr 2007 22:19:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Heiiv-0000g3-CZ
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 22:19:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Heiit-0000ff-IU
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 22:19:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Heiit-0000fc-G3
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 22:19:43 -0400
Received: from nz-out-0506.google.com ([64.233.162.228])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Heids-0003MF-Aa
	for gnash-commit@gnu.org; Thu, 19 Apr 2007 22:14:32 -0400
Received: by nz-out-0506.google.com with SMTP id s1so593442nze
	for <gnash-commit@gnu.org>; Thu, 19 Apr 2007 19:14:31 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=I49H30ufuX0b5cyNmflOZqMVCdlVP2E3s7POCSE07kljVLEF+88eJtENWcBM6zawnGDc1sTL2zkRHp8AwkMeefEvdBvGCKh+o3PaqqhES5EciK4FjQZylX8oltzdNGlrWh9hKF+wP75QDe1JFRt7hLoHO25tSEyneec1nQFwfFE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=sN8cO04RD/sB+idXvTGF4iwxSJkx6ZsbKS8F5bff/8jBYOMaBsaemQOUWSh2qXgfsoqtXS/aHZnKFGUWk8WtCnQgr1R37igShs1s4myTXq9yXYsbXECDFhkxbfX4TefuxcFdO3uCbELLZtl7DFk4lyYNi3kCszb445Aef0+Xcf4=
Received: by 10.114.25.3 with SMTP id 3mr1001314way.1177035271078;
	Thu, 19 Apr 2007 19:14:31 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Thu, 19 Apr 2007 19:14:31 -0700 (PDT)
Message-ID: <ca4b43ff0704191914m7910281yaa6324c272401e08@mail.gmail.com>
Date: Fri, 20 Apr 2007 10:14:31 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Martin Guy" <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_value.h server/as_val...
In-Reply-To: <56d259a00704190628w24d0cc3duf9cb43cee778cf70@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HeVPd-0007kl-2y@cvs> <20070419122632.GN92773@keybit.net>
	<20070419123106.GO92773@keybit.net>
	<56d259a00704190605q28124fb4h9accef3c87862065@mail.gmail.com>
	<20070419130910.GT92773@keybit.net>
	<56d259a00704190628w24d0cc3duf9cb43cee778cf70@mail.gmail.com>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org, strk@keybit.net
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 02:19:45 -0000

> makeswf --version
> $Id: makeswf.c,v 1.31 2006/12/12 23:36:10 strk Exp $
>
why not try the released version 0.4.0.beta4? I've uesd it for a
month. it's not bad, I think.

> Is that really too old? It seems unwise to rely on unstable software
> under development as the testsuite for a new product.
>
I agree with you as this point. And I was also reluctant to use any
beta version in the past because I thought it's unstable. But for
Ming, based on my own experience, the released 0.4.0.beta4 is better
and more stable than the old version. It's worthwhile to have a try,
either for passing the "make check" or producing new testcases.

> I confess I don't really understand what your problem is, what with
> all these public accusations of incompetence and ranting. Mind you,
> the atmosphere in the group since I have known it has been sneering
> and competitive instead of cooperative, so I am discounting the
> offensiveness as part of that sad game.
>
>I mean, every time I make a commit you start ranting at me. What *is*
>your problem?

I think I understand you displeasure.  All the faults is the "stupid"
"make check". I didn't  understand it and disliked it in the past. It
was so easily broken and time costing when you maintain it. But my
opinion is keep changing now,  I begin rely on it more and more. It
improve my confidence when I commit anything. And I guess no one would
rant at me if I'v passed the "make check":)

I'm sure you have your own collection of testcases(just as I do) , and
you have already passed them before you do any commit.  And you may
think you don't need to care about the "make check".  But at least
there's one reason that you should also take "make check" into
consideration: there are more than 8000 checks(most of them are
self-contained) there and it is growing up everyday. It will probably
exceed your private testsuit someday. Then you'll wonder which one you
should rely on:)  Actually, I have already begun to spend more time on
the CVS testsuite than my own testsuite these days.

As for me, testcase is always a good and efficient way for
communication and cooperation( I cann't speak English fast:) )... I
hope you'll get "make check" work there.

zou lunkai



From MAILER-DAEMON Fri Apr 20 03:03:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hen9i-0004Xb-Br
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 03:03:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hen9g-0004X5-F2
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:03:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hen9f-0004Wh-6l
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:03:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hen9f-0004We-2J
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:03:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hen4c-0007eO-Lm
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 02:58:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hen4b-00025M-PF
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 06:58:25 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hen4b-00025G-EO
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 06:58:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hen4b-00025G-EO@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 20 Apr 2007 06:58:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 07:03:40 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/20 06:58:25

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	change undefined to a null string

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2941&r2=1.2942
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.63&r2=1.64

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2941
retrieving revision 1.2942
diff -u -b -r1.2941 -r1.2942
--- ChangeLog	19 Apr 2007 18:58:45 -0000	1.2941
+++ ChangeLog	20 Apr 2007 06:58:24 -0000	1.2942
@@ -1,3 +1,8 @@
+2007-04-20 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/actionscript.all/MovieLip.as
+	  change undefined to a null string.
+	  
 2007-04-19 Sandro Santilli <strk@keybit.net>
 
 	* server/as_value.cpp (equals): comment out debugging line.

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- testsuite/actionscript.all/MovieClip.as	19 Apr 2007 21:08:31 -0000	1.63
+++ testsuite/actionscript.all/MovieClip.as	20 Apr 2007 06:58:25 -0000	1.64
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.63 2007/04/19 21:08:31 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.64 2007/04/20 06:58:25 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -190,7 +190,7 @@
 check_equals(mc._droptarget, "");
 check_equals(typeof(mc._droptarget), "string");
 #else
-check_equals(mc._droptarget, undefined);
+check_equals(mc._droptarget, "");
 #endif
 
 check(mc._focusrect != undefined);
@@ -209,7 +209,7 @@
 check_equals(typeof(mc._name), "string");
 check_equals(typeof(mc), "movieclip");
 #else
-check_equals(mc._name, undefined);
+check_equals(mc._name, "");
 #endif
 
 check(mc._parent == undefined);



From MAILER-DAEMON Fri Apr 20 03:06:19 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HenCF-0005dO-LM
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 03:06:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HenCD-0005cc-T5
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:06:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HenCC-0005bv-B3
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:06:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HenCC-0005bo-7p
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:06:16 -0400
Received: from wr-out-0506.google.com ([64.233.184.235])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hen79-0007zw-La
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:01:03 -0400
Received: by wr-out-0506.google.com with SMTP id i23so804386wra
	for <gnash-commit@gnu.org>; Fri, 20 Apr 2007 00:01:03 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Z8nPag5hYd5kUe7IkFKsDmmYEGtNdcV6RQIvSfVlPKuBNJAjK9oZexwJSqQmbWJCXdfOImstXH2fnTqLG9B4V5l2VjqEa4i/ZOOWZ97oZU1JaxotIaIvAryugeXxwXcODeI0Z6kKxSOAFF+Sbi+ivbnsqv3i0IuazQe+7otlYYU=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=nb+0i4KfLejWtFNpWWP6od8IVEJfw+5ff4FK+wJB4SkUyGiRT717CwTsVk2Tm17yZ4H5oqStoVra3MEdcw5rtLd8nHk1fHcUhQYap7HrX1ixXFLAGDRvPrMf4HFnyZyj4Raf0Yi5q9U7wmflegoybJGVJ8tfDex5KGMM0u8IvTo=
Received: by 10.114.25.3 with SMTP id 3mr1113130way.1177052462539;
	Fri, 20 Apr 2007 00:01:02 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Fri, 20 Apr 2007 00:01:02 -0700 (PDT)
Message-ID: <ca4b43ff0704200001ja5c29fbr120a78f447d59cca@mail.gmail.com>
Date: Fri, 20 Apr 2007 15:01:02 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
In-Reply-To: <E1Hen4b-00025G-EO@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hen4b-00025G-EO@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 07:06:18 -0000

will this change fail your proprietary player? If so, which one should
we believe? It fixes checks here.

On 4/20/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/20 06:58:25
>
> Modified files:
>        .              : ChangeLog
>        testsuite/actionscript.all: MovieClip.as
>
> Log message:
>        change undefined to a null string
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2941&r2=1.2942
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.63&r2=1.64
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2941
> retrieving revision 1.2942
> diff -u -b -r1.2941 -r1.2942
> --- ChangeLog   19 Apr 2007 18:58:45 -0000      1.2941
> +++ ChangeLog   20 Apr 2007 06:58:24 -0000      1.2942
> @@ -1,3 +1,8 @@
> +2007-04-20 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * testsuite/actionscript.all/MovieLip.as
> +         change undefined to a null string.
> +
>  2007-04-19 Sandro Santilli <strk@keybit.net>
>
>        * server/as_value.cpp (equals): comment out debugging line.
>
> Index: testsuite/actionscript.all/MovieClip.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
> retrieving revision 1.63
> retrieving revision 1.64
> diff -u -b -r1.63 -r1.64
> --- testsuite/actionscript.all/MovieClip.as     19 Apr 2007 21:08:31 -0000      1.63
> +++ testsuite/actionscript.all/MovieClip.as     20 Apr 2007 06:58:25 -0000      1.64
> @@ -22,7 +22,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: MovieClip.as,v 1.63 2007/04/19 21:08:31 strk Exp $";
> +rcsid="$Id: MovieClip.as,v 1.64 2007/04/20 06:58:25 zoulunkai Exp $";
>
>  #include "check.as"
>
> @@ -190,7 +190,7 @@
>  check_equals(mc._droptarget, "");
>  check_equals(typeof(mc._droptarget), "string");
>  #else
> -check_equals(mc._droptarget, undefined);
> +check_equals(mc._droptarget, "");
>  #endif
>
>  check(mc._focusrect != undefined);
> @@ -209,7 +209,7 @@
>  check_equals(typeof(mc._name), "string");
>  check_equals(typeof(mc), "movieclip");
>  #else
> -check_equals(mc._name, undefined);
> +check_equals(mc._name, "");
>  #endif
>
>  check(mc._parent == undefined);
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Fri Apr 20 03:18:22 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HenNu-0004Df-TY
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 03:18:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HenNt-0004Bc-A7
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:18:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HenNs-00049q-8V
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:18:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HenNs-00049j-64
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:18:20 -0400
Received: from nz-out-0506.google.com ([64.233.162.239])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HenIp-0000nZ-IE
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:13:07 -0400
Received: by nz-out-0506.google.com with SMTP id s1so630662nze
	for <gnash-commit@gnu.org>; Fri, 20 Apr 2007 00:13:07 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=sc8GIWCQOVuANuBp3H4+4F4oJ1Tjsgj93x226wg6PiazohOUz2PNIzhLYv28u5GIdoMFWbsCx5XwpGE0VcSCQWpGgYVTUGKWsk71H/i8W30Dsk6RHj7oqCRvpp//JVP1jVE/d5rriobE7Etu2Uxg9QP2JeVeT2XpdFWe+5VKHRY=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Uaurh4rsSf5DCW3Bpj7Ua/hFB4VE/84LBmsYX6jZuE8xERrZ5fIZbRVDk3uokOOSSxBmUuRyaDJhUhZKRIRjGjJ9ETDUykp4bd0oeerlDHpLil/r/0wKtXp+Lzhn6bG+s87ejf8pefUaaH3G6iQ1X3VDHdVRZvbU1tY5IWciX/k=
Received: by 10.114.181.1 with SMTP id d1mr1123360waf.1177053186379;
	Fri, 20 Apr 2007 00:13:06 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Fri, 20 Apr 2007 00:13:06 -0700 (PDT)
Message-ID: <ca4b43ff0704200013y7d0900bdp71473cd3437750c9@mail.gmail.com>
Date: Fri, 20 Apr 2007 15:13:06 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
In-Reply-To: <ca4b43ff0704200001ja5c29fbr120a78f447d59cca@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hen4b-00025G-EO@cvs>
	<ca4b43ff0704200001ja5c29fbr120a78f447d59cca@mail.gmail.com>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 07:18:21 -0000

This is just an example. Many more do exist. Then the quesion is which
one is supposed to be passed?  If no one cares, I'll forget it:)



From MAILER-DAEMON Fri Apr 20 03:19:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HenOg-0004dq-2C
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 03:19:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HenOd-0004dl-KT
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:19:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HenOc-0004dY-51
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:19:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HenOb-0004dV-Vh
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:19:06 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HenJZ-0000tr-13
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:13:53 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3K7De247118;
	Fri, 20 Apr 2007 09:13:40 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 20 Apr 2007 09:13:40 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
Message-ID: <20070420071340.GG92773@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hen4b-00025G-EO@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1Hen4b-00025G-EO@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 07:19:08 -0000

On Fri, Apr 20, 2007 at 06:58:25AM +0000, Zou Lunkai wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Zou Lunkai <zoulunkai>	07/04/20 06:58:25
> 
> Modified files:
> 	.              : ChangeLog 
> 	testsuite/actionscript.all: MovieClip.as 
> 
> Log message:
> 	change undefined to a null string

A better test is using typeof() so we can tell if it's a 'null' or a 'string'.
Then, only if it's a string, we can use check_equals to compare.

--strk;



From MAILER-DAEMON Fri Apr 20 03:26:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HenVz-0007WS-Nf
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 03:26:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HenVy-0007WM-Cl
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:26:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HenVw-0007W9-VN
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:26:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HenVw-0007W6-Ok
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:26:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HenQu-0002D9-3F
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:21:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HenQt-0002wq-JY
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:21:27 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HenQt-0002wm-5U
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:21:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HenQt-0002wm-5U@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 07:21:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 07:26:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 07:21:26

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am ButtonEventsTest-Runner.cpp 

Log message:
	        * testsuite/misc-ming.all/: Makefile.am, ButtonEventsTest-Runner.cpp:
	          Allow execution of the test runner from a foreign dir.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2942&r2=1.2943
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2942
retrieving revision 1.2943
diff -u -b -r1.2942 -r1.2943
--- ChangeLog	20 Apr 2007 06:58:24 -0000	1.2942
+++ ChangeLog	20 Apr 2007 07:21:26 -0000	1.2943
@@ -1,3 +1,8 @@
+2007-04-20 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/: Makefile.am, ButtonEventsTest-Runner.cpp:
+	  Allow execution of the test runner from a foreign dir.
+
 2007-04-20 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/actionscript.all/MovieLip.as

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- testsuite/misc-ming.all/Makefile.am	18 Apr 2007 08:13:45 -0000	1.95
+++ testsuite/misc-ming.all/Makefile.am	20 Apr 2007 07:21:26 -0000	1.96
@@ -77,6 +77,7 @@
 	place_and_remove_object_test \
 	place_and_remove_object_insane_test \
 	displaylist_depths_test \
+	masks_test \
 	attachMovieTest \
 	attachMovieTestRunner \
 	attachMovieLoopingTest \
@@ -147,6 +148,7 @@
 	path_format_testrunner \
 	duplicate_movie_clip_testrunner \
 	matrix_testrunner \
+	masks_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -379,6 +381,20 @@
 	sh $< -r5 $(top_builddir) displaylist_depths_test.swf > $@
 	chmod 755 $@
 
+masks_test_SOURCES =	\
+	masks_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+masks_test_LDADD = $(MING_LIBS)
+
+masks_test.swf: masks_test
+	./masks_test $(top_srcdir)/testsuite/media
+
+masks_testrunner: $(srcdir)/../generic-testrunner.sh masks_test.swf
+	sh $< -r5 $(top_builddir) masks_test.swf > $@
+	chmod 755 $@
+
 matrix_test_SOURCES =	\
 	matrix_test.c	\
 	ming_utils.h		\
@@ -781,6 +797,9 @@
 	$(top_builddir)/testsuite/libtestsuite.la \
 	ButtonEventsTest.swf	\
 	$(NULL)
+ButtonEventsTest_Runner_CXXFLAGS = \
+	-DTGTDIR='"$(abs_builddir)"' \
+	$(NULL)
 
 loadMovieTest_SOURCES =	\
 	loadMovieTest.c	\
@@ -960,6 +979,7 @@
 	frame_label_testrunner \
 	path_format_testrunner \
 	duplicate_movie_clip_testrunner \
+	masks_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	6 Apr 2007 11:43:44 -0000	1.11
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 07:21:26 -0000	1.12
@@ -43,6 +43,7 @@
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
 	// TODO: check that pixel @ 60,60 is yellow !
+	//tester.checkPixel(2, rgba(0,0,0,255), 1);
 
 	// press the mouse button, this should change
 	// the textfield value.
@@ -106,7 +107,8 @@
 int
 main(int /*argc*/, char** /*argv*/)
 {
-	string filename = INPUT_FILENAME;
+	//string filename = INPUT_FILENAME;
+	string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
 	MovieTester tester(filename);
 
 	std::string idleString = "Idle";



From MAILER-DAEMON Fri Apr 20 03:55:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HenyH-00035b-95
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 03:55:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HenyG-00035W-0V
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:55:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HenyE-00035K-7k
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:55:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HenyE-00035H-4g
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:55:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HentB-00081t-EN
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 03:50:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HentA-00053i-MG
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:50:40 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HentA-00053e-8h
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:50:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HentA-00053e-8h@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 07:50:40 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/asspec/movieclip.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 07:55:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 07:50:40

Modified files:
	.              : ChangeLog 
	doc/C/asspec   : movieclip.xml 

Log message:
	        * doc/C/asspec/movieclip.xml:
	          Dumped a bit of info about _name. Hopefully Ann will give it some
	          formatting.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2943&r2=1.2944
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/movieclip.xml?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2943
retrieving revision 1.2944
diff -u -b -r1.2943 -r1.2944
--- ChangeLog	20 Apr 2007 07:21:26 -0000	1.2943
+++ ChangeLog	20 Apr 2007 07:50:39 -0000	1.2944
@@ -1,5 +1,8 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* doc/C/asspec/movieclip.xml:
+	  Dumped a bit of info about _name. Hopefully Ann will give it some
+	  formatting.
 	* testsuite/misc-ming.all/: Makefile.am, ButtonEventsTest-Runner.cpp:
 	  Allow execution of the test runner from a foreign dir.
 

Index: doc/C/asspec/movieclip.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/movieclip.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- doc/C/asspec/movieclip.xml	29 Mar 2007 22:09:44 -0000	1.1
+++ doc/C/asspec/movieclip.xml	20 Apr 2007 07:50:40 -0000	1.2
@@ -422,6 +422,22 @@
 	  <term>_name</term>
 	  <listitem>
 	    <para>
+		This is a read-write property of MovieClip objects.
+		Changing the _name property of a MovieClip also changes it's _target
+		and the _target of any child.
+	    </para>
+	    <para>
+		Dynamically-created clips are always created with a name, while for statically
+		defined one this is optional in the SWF, but will be syntetized by the player
+		if missing. TODO: check if _name reflects the syntetized naming (_instancex).
+		For the root movie syntetization doesn't happen and the _name property
+		is the empty string for SWF6 and higher or null for SWF5 and lower.
+	    </para>
+	    <para>
+		Valid values for _name are: ....
+	    </para>
+	    <para>
+		NOTE: mm player7 and player9 differ on typeof(_root._name) on startup.
 	    </para>
 	  </listitem>
 	</varlistentry>



From MAILER-DAEMON Fri Apr 20 04:14:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeoG2-0000w1-KG
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 04:14:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeoG0-0000vH-CJ
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 04:14:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeoFz-0000v5-6j
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 04:14:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeoFy-0000v2-W8
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 04:14:15 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HeoAv-0004kg-0b
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 04:09:02 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3K88eS47868;
	Fri, 20 Apr 2007 10:08:40 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 20 Apr 2007 10:08:40 +0200
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
Message-ID: <20070420080840.GH92773@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hen4b-00025G-EO@cvs>
	<ca4b43ff0704200001ja5c29fbr120a78f447d59cca@mail.gmail.com>
	<ca4b43ff0704200013y7d0900bdp71473cd3437750c9@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704200013y7d0900bdp71473cd3437750c9@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 08:14:16 -0000

On Fri, Apr 20, 2007 at 03:13:06PM +0800, zou lunkai wrote:
> This is just an example. Many more do exist. Then the quesion is which
> one is supposed to be passed?  If no one cares, I'll forget it:)

I'd say we should follow the specs.
Do we have them ?

--strk;



From MAILER-DAEMON Fri Apr 20 05:03:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hep1A-00058Q-5h
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 05:03:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hep15-00057i-T6
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:02:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hep11-00056t-KF
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:02:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hep0z-00056d-Rx
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:02:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Heovw-0001lC-Jt
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 04:57:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Heovv-0001ZU-0E
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 08:57:35 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Heovu-0001ZQ-IA
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 08:57:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Heovu-0001ZQ-IA@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 08:57:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/masks_t...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 09:02:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 08:57:34

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-ming.all: masks_test.c 

Log message:
	* testsuite/misc-ming.all/masks_test.c: draft masks test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2944&r2=1.2945
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2944
retrieving revision 1.2945
diff -u -b -r1.2944 -r1.2945
--- ChangeLog	20 Apr 2007 07:50:39 -0000	1.2944
+++ ChangeLog	20 Apr 2007 08:57:34 -0000	1.2945
@@ -1,5 +1,6 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/masks_test.c: draft masks test.
 	* doc/C/asspec/movieclip.xml:
 	  Dumped a bit of info about _name. Hopefully Ann will give it some
 	  formatting.

Index: testsuite/misc-ming.all/masks_test.c
===================================================================
RCS file: testsuite/misc-ming.all/masks_test.c
diff -N testsuite/misc-ming.all/masks_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/masks_test.c	20 Apr 2007 08:57:34 -0000	1.1
@@ -0,0 +1,221 @@
+/* 
+ *   Copyright (C) 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ * Sandro Santilli, strk@keybit.net
+ *
+ * Test masks
+ *
+ * run as ./masks_test
+ */
+
+#include "ming_utils.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "masks_test.swf"
+
+void add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
+void add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
+void add_static_mask(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int masklevel);
+
+void
+add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
+{
+	SWFAction ac = compile_actions("createEmptyMovieClip('%s', %d);"
+			"with (%s) {"
+			" lineStyle(1, 0x000000, 100);"	
+			" beginFill(0x00FF00, 100);"
+			" moveTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" endFill();"
+			"}"
+			"%s.createEmptyMovieClip('child', 1);"
+			"with (%s.child) {"
+			" lineStyle(3, 0x000000, 100);"	
+			" moveTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			" lineTo(%d, %d);"
+			"}",
+			name, depth, name,
+			x, y,
+			x, y+height,
+			x+width, y+height,
+			x+width, y,
+			x, y,
+			name, name,
+			x+5, y+5,
+			x+5, y+height-5,
+			x+width-5, y+height-5,
+			x+width-5, y+5,
+			x+5, y+5
+			);
+
+	SWFMovie_add(mo, (SWFBlock)ac);
+}
+
+void
+add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
+{
+	SWFShape sh;
+	SWFMovieClip mc, mc2;
+	SWFDisplayItem it;
+
+	sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 255, 0, 0);
+	mc = newSWFMovieClip();
+	SWFMovieClip_add(mc, (SWFBlock)sh);
+
+	sh = make_square (-(width/2)+5, -(height/2)+5, width-10, height-10, 0, 0, 0);
+	mc2 = newSWFMovieClip(); // child
+	SWFMovieClip_add(mc2, (SWFBlock)sh);
+	SWFMovieClip_nextFrame(mc2);
+
+	it = SWFMovieClip_add(mc, (SWFBlock)mc2);
+	SWFDisplayItem_setName(it, "child");
+	SWFMovieClip_nextFrame(mc);
+
+	it = SWFMovie_add(mo, (SWFBlock)mc);
+	SWFDisplayItem_setDepth(it, depth); 
+	SWFDisplayItem_moveTo(it, x, y); 
+	SWFDisplayItem_setName(it, name);
+}
+
+void
+add_static_mask(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int masklevel)
+{
+	SWFShape sh;
+	SWFMovieClip mc, mc2;
+	SWFDisplayItem it;
+
+	sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 255, 0, 0);
+	mc = newSWFMovieClip();
+	SWFMovieClip_add(mc, (SWFBlock)sh);
+
+	SWFMovieClip_nextFrame(mc);
+
+	it = SWFMovie_add(mo, (SWFBlock)mc);
+	SWFDisplayItem_setDepth(it, depth); 
+	SWFDisplayItem_moveTo(it, x, y); 
+	SWFDisplayItem_setName(it, name);
+	SWFDisplayItem_setMaskLevel(it, masklevel);
+}
+
+
+int
+main(int argc, char** argv)
+{
+	SWFMovie mo;
+	SWFMovieClip dejagnuclip;
+	SWFDisplayItem it;
+
+	const char *srcdir=".";
+	if ( argc>1 ) 
+		srcdir=argv[1];
+	else
+	{
+   		//fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+   		//return 1;
+	}
+
+	Ming_init();
+	mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+	SWFMovie_setDimension(mo, 800, 600);
+	SWFMovie_setRate (mo, 1);
+
+	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+	it = SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+	SWFDisplayItem_setDepth(it, 1000);
+	SWFMovie_nextFrame(mo); 
+
+	add_actions(mo, "note('Test masks and dynamic masks at different depth ranges.');");
+
+	// this one seems to confuse the MM player
+	//add_static_mask(mo, "mask1", 1, 0, 150, 200, 100, 20);
+
+	add_static_mc(mo, "staticmc2", 2, 0, 200, 60, 60);
+	add_static_mc(mo, "staticmc3", 3, 30, 200, 60, 60);
+	add_static_mc(mo, "staticmc4", 4, 200, 200, 60, 60);
+	add_static_mc(mo, "staticmc5", 5, 230, 200, 60, 60);
+	add_dynamic_mc(mo, "dynamicmc2", 12, 0, 300, 60, 60);
+	add_dynamic_mc(mo, "dynamicmc3", 13, 30, 300, 60, 60);
+	add_dynamic_mc(mo, "dynamicmc4", 14, 200, 300, 60, 60);
+	add_dynamic_mc(mo, "dynamicmc5", 15, 230, 300, 60, 60);
+
+
+	check_equals(mo, "staticmc2.getDepth()", "-16382");
+	check_equals(mo, "staticmc3.getDepth()", "-16381");
+	check_equals(mo, "staticmc4.getDepth()", "-16380"); 
+	check_equals(mo, "staticmc5.getDepth()", "-16379"); 
+	check_equals(mo, "dynamicmc2.getDepth()", "12");
+	check_equals(mo, "dynamicmc3.getDepth()", "13");
+	check_equals(mo, "dynamicmc4.getDepth()", "14"); 
+	check_equals(mo, "dynamicmc5.getDepth()", "15"); 
+
+	SWFMovie_nextFrame(mo);        
+
+	add_actions(mo, "note('Using setMask on chars in the static depth range 2.mask(3) and 5.mask(5)');");
+
+	add_actions(mo, 
+		"staticmc2.setMask(staticmc3);"
+		"staticmc5.setMask(staticmc4);"
+		"dynamicmc2.setMask(dynamicmc3);"
+		"dynamicmc5.setMask(dynamicmc4);"
+		);
+
+	SWFMovie_nextFrame(mo);        
+
+	add_actions(mo, "note('Swapping chars 2/3 and 4/5 to see if masks are still in effect');");
+
+	add_actions(mo,
+		"staticmc2.swapDepths(staticmc3);"
+		"staticmc4.swapDepths(staticmc5);"
+		"dynamicmc2.swapDepths(dynamicmc3);"
+		"dynamicmc4.swapDepths(dynamicmc5);"
+		);
+
+	check_equals(mo, "staticmc2.getDepth()", "-16381");
+	check_equals(mo, "staticmc3.getDepth()", "-16382");
+	check_equals(mo, "staticmc4.getDepth()", "-16379"); 
+	check_equals(mo, "staticmc5.getDepth()", "-16380"); 
+	check_equals(mo, "dynamicmc2.getDepth()", "13");
+	check_equals(mo, "dynamicmc3.getDepth()", "12");
+	check_equals(mo, "dynamicmc4.getDepth()", "15"); 
+	check_equals(mo, "dynamicmc5.getDepth()", "14"); 
+
+
+	add_actions(mo, "_root.totals(); stop();");
+
+	SWFMovie_nextFrame(mo);        
+
+	// TODO:
+	// - test mask layers !!
+
+	//Output movie
+	puts("Saving " OUTPUT_FILENAME );
+	SWFMovie_save(mo, OUTPUT_FILENAME);
+
+	return 0;
+}



From MAILER-DAEMON Fri Apr 20 05:09:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hep74-0006MN-Oo
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 05:09:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hep6y-0006Jx-Ht
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:09:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hep6x-0006I6-OY
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:08:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hep6w-0006Hi-BD
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:08:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hep1s-0002QK-Mo
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:03:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hep1r-0001od-Hb
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:03:43 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hep1q-0001oW-UB
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:03:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hep1q-0001oW-UB@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 09:03:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/Makefile.am testsuite...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 09:09:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 09:03:42

Modified files:
	.              : ChangeLog 
	testsuite      : Makefile.am MovieTester.cpp MovieTester.h 
Added files:
	testsuite      : FuzzyPixel.cpp FuzzyPixel.h 

Log message:
	        * testsuite/: Makefile.am, FuzzyPixel.{cpp,h},
	          MovieTester.{cpp,h}: framework for renderers
	          testing, needs changes in render_handler to complete.
	          See task #6785.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2945&r2=1.2946
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/Makefile.am?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/FuzzyPixel.cpp?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/FuzzyPixel.h?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2945
retrieving revision 1.2946
diff -u -b -r1.2945 -r1.2946
--- ChangeLog	20 Apr 2007 08:57:34 -0000	1.2945
+++ ChangeLog	20 Apr 2007 09:03:42 -0000	1.2946
@@ -1,5 +1,12 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/: Makefile.am, FuzzyPixel.{cpp,h}, 
+	  MovieTester.{cpp,h}: framework for renderers
+	  testing, needs changes in render_handler to complete.
+	  See task #6785.
+
+2007-04-20 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/masks_test.c: draft masks test.
 	* doc/C/asspec/movieclip.xml:
 	  Dumped a bit of info about _name. Hopefully Ann will give it some

Index: testsuite/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/Makefile.am,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- testsuite/Makefile.am	16 Mar 2007 15:00:49 -0000	1.33
+++ testsuite/Makefile.am	20 Apr 2007 09:03:42 -0000	1.34
@@ -25,6 +25,8 @@
 libtestsuite_la_SOURCES = \
 	MovieTester.h \
 	MovieTester.cpp \
+	FuzzyPixel.cpp \
+	FuzzyPixel.h \
 	sound_handler_test.h \
 	sound_handler_test.cpp \
 	$(NULL)

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/MovieTester.cpp	18 Apr 2007 17:28:13 -0000	1.25
+++ testsuite/MovieTester.cpp	20 Apr 2007 09:03:42 -0000	1.26
@@ -31,6 +31,8 @@
 #include "sound_handler_test.h" // for creating the "test" sound handler
 #include "render.h" // for get_render_handler
 #include "types.h" // for rgba class
+#include "FuzzyPixel.h"
+#include "render_handler_agg.h"
 
 #include <cstdio>
 #include <string>
@@ -74,6 +76,13 @@
 
 	_movie_root = &(VM::init(*_movie_def).getRoot());
 
+	// Initialize viewport size with the one advertised in the header
+	_width = unsigned(_movie_def->get_width_pixels());
+	_height = unsigned(_movie_def->get_height_pixels());
+
+	// Initialize the testing renderers
+	initTestingRenderers();
+
 	// Now complete load of the movie
 	_movie_def->completeLoad();
 	_movie_def->ensure_frame_loaded(_movie_def->get_frame_count());
@@ -146,17 +155,10 @@
 	_movie_root->notify_mouse_moved(x, y);
 }
 
-FuzzyPixel
-MovieTester::getAveragePixel(unsigned radius, int tolerance) const
+void
+MovieTester::checkPixel(unsigned radius, const rgba& color, int tolerance) const
 {
-	render_handler* rend = get_render_handler();
-	assert(rend);
-	rgba color;
-	if ( ! rend->getAveragePixel(color, _x, _y, radius) )
-	{
-		return FuzzyPixel();
-	}
-	return FuzzyPixel(color, tolerance);
+	log_msg("XFAILED: pixel checking not implemented yet.");
 }
 
 void
@@ -226,24 +228,45 @@
 	return _sound_handler.get()->test_times_stopped_all();
 }
 
-bool
-FuzzyPixel::operator==(const FuzzyPixel& o) const
+void
+MovieTester::initTestingRenderers()
+{
+	std::auto_ptr<render_handler> handler;
+
+	// Initialize AGG
+	handler.reset( create_render_handler_agg("RGB24") );
+	assert(handler.get());
+	addTestingRenderer(handler, "AGG_RGB24");
+}
+
+void
+MovieTester::addTestingRenderer(std::auto_ptr<render_handler> h, const std::string& name)
 {
-	// Intolerant FuzzyPixels never succeed in comparison
-	if ( _tol < 0 || o._tol < 0 ) return false;
+	// TODO: init the buffer before pushing, and do not add to the table
+	//       if the renderer is not capable of doing so !!
 
-	int tol=std::max(_tol, o._tol);
-	if ( ! fuzzyEqual(_col.m_r, o._col.m_r, tol) ) return false;
-	if ( ! fuzzyEqual(_col.m_g, o._col.m_g, tol) ) return false;
-	if ( ! fuzzyEqual(_col.m_b, o._col.m_b, tol) ) return false;
-	if ( ! fuzzyEqual(_col.m_a, o._col.m_a, tol) ) return false;
-	return true;
+	cout << "UNTESTED: render handler " << name
+		<< " doesn't support in-memory rendering "
+		<< "(not true, but we need to add interfaces "
+		<< "for this in the base render_handler class)"
+		<< endl;
+
+	// h->initTestBuffer(_width, _height);
+	//_testingRenderers.push_back(TestingRendererPtr(new TestingRenderer(h, name)));
 }
 
-std::ostream&
-operator<< (std::ostream& o, const FuzzyPixel& p)
+FuzzyPixel
+TestingRenderer::getAveragePixel(int x, int y, unsigned radius, unsigned tolerance) const
 {
-	return o << "FuzzyPixel(" << p._col.toString() << ") [tol:" << p._tol << "]";
+	render_handler* rend = get_render_handler();
+	assert(rend);
+	rgba color;
+	if ( ! rend->getAveragePixel(color, x, y, radius) )
+	{
+		return FuzzyPixel();
+	}
+	return FuzzyPixel(color, tolerance);
 }
 
+
 } // namespace gnash

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- testsuite/MovieTester.h	18 Apr 2007 17:28:13 -0000	1.13
+++ testsuite/MovieTester.h	20 Apr 2007 09:03:42 -0000	1.14
@@ -26,7 +26,8 @@
 #include "types.h" // for rgba class
 
 #include <memory> // for auto_ptr
-#include <string> // for auto_ptr
+#include <string> 
+#include <boost/shared_ptr.hpp>
 
 // Forward declarations
 namespace gnash {
@@ -34,97 +35,56 @@
 	class movie_root;
 	class sprite_instance;
 	class character;
+	class FuzzyPixel;
 }
 
 namespace gnash {
 
-/// An utility class used to compare rgba values with a given tolerance
-class FuzzyPixel
+/// A table of built renderers
+//
+///
+class TestingRenderer
 {
 
 public:
 
-	friend std::ostream& operator<< (std::ostream& o, const FuzzyPixel& p);
-
-	/// Construct a black, alpha 0 FuzzyPixel with NO tolerance.
-	//
-	/// No tolerance means that any comparison will fail
-	///
-	FuzzyPixel()
+	TestingRenderer(std::auto_ptr<render_handler> renderer, const std::string& name)
 		:
-		_col(0,0,0,0),
-		_tol(0)
-	{
-	}
+		_name(name),
+		_renderer(renderer)
+	{}
 
-	/// Construct a FuzzyPixel with given color and tolerance
-	//
-	/// @param color
-	///	The color value
-	///
-	/// @param tolerance
-	///	The tolerance to use in comparisons
-	///
-	FuzzyPixel(rgba& color, int tolerance=0)
-		:
-		_col(color),
-		_tol(tolerance)
-	{
-	}
+	const std::string& getName() const { return _name; }
 
-	/// Construct a FuzzyPixel with given values
+        /// Get the average pixel under the mouse pointer
 	//
-	/// @param r
-	///	The red value.
+        /// @param x
+	///	X coordinate, in pixels
 	///
-	/// @param g
-	///	The green value.
+        /// @param x
+	///	Y coordinate, in pixels
 	///
-	/// @param b
-	///	The blue value.
-	///
-	/// @param a
-	///	The alpha value.
+        /// @param radius
+        ///     Radius defining the average zone used.
+        ///     1 means a single pixel.
+        ///     Behaviour of passing 0 is undefined.
 	///
-	FuzzyPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
-		:
-		_col(r, g, b, a),
-		_tol(0)
-	{
-	}
-
-	/// Set the tolerance to use in comparisons
-	//
-	/// @param tol
-	///	The tolerance to use in comparisons
+        /// @param tolerance
+        ///     The tolerance value to use for the returned FuzzyPixel.
 	///
-	void setTolerance(int tol)
-	{
-		_tol = tol;
-	}
-
-	/// Compare two FuzzyPixel using the tolerance of the most tolerant of the two
-	//
-	/// Note that if any of the two operands has 0 tolerance, any equality
-	/// comparison will fail.
+        /// Note that if current pointer is outside of the rendered region
+        /// an intollerant FuzzyPixel is returned.
 	///
-	bool operator==(const FuzzyPixel& other) const;
-
-	// Return true if a and b are below a given tolerance
-	static bool fuzzyEqual(int a, int b, int tol)
-	{
-		return abs(a-b) <= tol;
-	}
+        FuzzyPixel getAveragePixel(int x, int y, unsigned radius, unsigned tolerance) const;
 
 private:
 
-	rgba _col;
-
-	// tolerance value
-	int _tol;
-
+	std::string _name;
+	std::auto_ptr<render_handler> _renderer;
 };
 
+typedef boost::shared_ptr<TestingRenderer> TestingRendererPtr;
+
 /// An utility class for testing movie playback
 //
 /// This is a just born implementation and doesn't
@@ -138,6 +98,11 @@
 public:
 	/// Fully load the movie at the specified location
 	/// and create an instance of it.
+	/// Also, initialize any built renderer capable of in-memory
+	/// rendering to allow testing of it.
+	/// The renderer(s) will be initialized with a memory
+	/// buffer with the size found in the SWF header
+	///
 	MovieTester(const std::string& filespec);
 
 	/// Advance the movie by one frame
@@ -176,20 +141,23 @@
 	///
 	void movePointerTo(int x, int y);
 
-	/// Get the average pixel under the mouse pointer
+	/// Check color of the average pixel under the mouse pointer 
 	//
+	///
+	/// This method will test any built renderer.
+	///
 	/// @param radius
 	///	Radius defining the average zone used.
 	///	1 means a single pixel.
 	///	Behaviour of passing 0 is undefined.
 	///
-	/// @param tolerance
-	///	The tolerance value to use for the returned FuzzyPixel.
+	/// @param color
+	///	The color we expect to find under the pointer.
 	///
-	/// Note that if current pointer is outside of the rendered region
-	/// an intollerant FuzzyPixel is returned.
+	/// @param tolerance
+	///	The tolerated difference of any r,g,b,a values
 	///
-	FuzzyPixel getAveragePixel(unsigned radius, int tolerance) const;
+	void checkPixel(unsigned radius, const rgba& color, int tolerance) const;
 
 	/// Notify mouse button was pressed
 	void pressMouseButton();
@@ -229,6 +197,12 @@
 
 private:
 
+	/// Initialize testing renderers
+	void initTestingRenderers();
+
+	/// Add a testing renderer to the list, initializing it with current viewport size
+	void addTestingRenderer(std::auto_ptr<render_handler> h, const std::string& name);
+
 	gnash::movie_root* _movie_root;
 
 	gnash::movie_definition* _movie_def;
@@ -237,9 +211,23 @@
 
 	std::auto_ptr<TEST_sound_handler> _sound_handler;
 
+	/// Current pointer position - X ordinate
 	int _x;
 
+	/// Current pointer position - Y ordinate
 	int _y;
+
+	/// Current viewport width
+	unsigned _width;
+
+	/// Current viewport height
+	unsigned _height;
+
+	/// I'd use ptr_list here, but trying not to spread
+	/// boost 1.33 requirement for the moment.
+	/// Still, I'd like to simplify things...
+	/// is shared_ptr fine ?
+	std::vector< TestingRendererPtr > _testingRenderers;
 };
 
 } // namespace gnash

Index: testsuite/FuzzyPixel.cpp
===================================================================
RCS file: testsuite/FuzzyPixel.cpp
diff -N testsuite/FuzzyPixel.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/FuzzyPixel.cpp	20 Apr 2007 09:03:42 -0000	1.1
@@ -0,0 +1,45 @@
+/* 
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+#include "FuzzyPixel.h"
+#include "types.h" // for rgba class
+
+namespace gnash {
+
+bool
+FuzzyPixel::operator==(const FuzzyPixel& o) const
+{
+	// Intolerant FuzzyPixels never succeed in comparison
+	if ( _tol < 0 || o._tol < 0 ) return false;
+
+	int tol=std::max(_tol, o._tol);
+	if ( ! fuzzyEqual(_col.m_r, o._col.m_r, tol) ) return false;
+	if ( ! fuzzyEqual(_col.m_g, o._col.m_g, tol) ) return false;
+	if ( ! fuzzyEqual(_col.m_b, o._col.m_b, tol) ) return false;
+	if ( ! fuzzyEqual(_col.m_a, o._col.m_a, tol) ) return false;
+	return true;
+}
+
+std::ostream&
+operator<< (std::ostream& o, const FuzzyPixel& p)
+{
+	return o << "FuzzyPixel(" << p._col.toString() << ") [tol:" << p._tol << "]";
+}
+
+} // namespace gnash

Index: testsuite/FuzzyPixel.h
===================================================================
RCS file: testsuite/FuzzyPixel.h
diff -N testsuite/FuzzyPixel.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/FuzzyPixel.h	20 Apr 2007 09:03:42 -0000	1.1
@@ -0,0 +1,121 @@
+/* 
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+#ifndef _GNASH_FUZZYPIXEL_H
+#define _GNASH_FUZZYPIXEL_H
+
+#include "Range2d.h"
+#include "gnash.h" // for namespace key
+#include "sound_handler_test.h" // for creating the "test" sound handler
+#include "types.h" // for rgba class
+
+#include <iostream> 
+
+namespace gnash {
+
+/// An utility class used to compare rgba values with a given tolerance
+class FuzzyPixel
+{
+
+public:
+
+	friend std::ostream& operator<< (std::ostream& o, const FuzzyPixel& p);
+
+	/// Construct a black, alpha 0 FuzzyPixel with NO tolerance.
+	//
+	/// No tolerance means that any comparison will fail
+	///
+	FuzzyPixel()
+		:
+		_col(0,0,0,0),
+		_tol(0)
+	{
+	}
+
+	/// Construct a FuzzyPixel with given color and tolerance
+	//
+	/// @param color
+	///	The color value
+	///
+	/// @param tolerance
+	///	The tolerance to use in comparisons
+	///
+	FuzzyPixel(rgba& color, int tolerance=0)
+		:
+		_col(color),
+		_tol(tolerance)
+	{
+	}
+
+	/// Construct a FuzzyPixel with given values
+	//
+	/// @param r
+	///	The red value.
+	///
+	/// @param g
+	///	The green value.
+	///
+	/// @param b
+	///	The blue value.
+	///
+	/// @param a
+	///	The alpha value.
+	///
+	FuzzyPixel(uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+		:
+		_col(r, g, b, a),
+		_tol(0)
+	{
+	}
+
+	/// Set the tolerance to use in comparisons
+	//
+	/// @param tol
+	///	The tolerance to use in comparisons
+	///
+	void setTolerance(int tol)
+	{
+		_tol = tol;
+	}
+
+	/// Compare two FuzzyPixel using the tolerance of the most tolerant of the two
+	//
+	/// Note that if any of the two operands has 0 tolerance, any equality
+	/// comparison will fail.
+	///
+	bool operator==(const FuzzyPixel& other) const;
+
+	// Return true if a and b are below a given tolerance
+	static bool fuzzyEqual(int a, int b, int tol)
+	{
+		return abs(a-b) <= tol;
+	}
+
+private:
+
+	rgba _col;
+
+	// tolerance value
+	int _tol;
+
+};
+
+} // namespace gnash
+
+#endif // _GNASH_FUZZYPIXEL_H



From MAILER-DAEMON Fri Apr 20 05:24:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HepLa-000612-B8
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 05:24:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HepLY-00060r-Si
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:24:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HepLX-00060f-NN
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:24:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HepLX-00060c-Gx
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:24:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HepGU-0004L2-9z
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:18:50 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HepGT-0002Ro-87
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:18:49 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HepGS-0002Rk-Vf
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:18:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HepGS-0002Rk-Vf@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 09:18:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite FuzzyPixel.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 09:24:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 09:18:48

Modified files:
	testsuite      : FuzzyPixel.h 

Log message:
	more documentation for FuzzyPixel

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/FuzzyPixel.h?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: FuzzyPixel.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/FuzzyPixel.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- FuzzyPixel.h	20 Apr 2007 09:03:42 -0000	1.1
+++ FuzzyPixel.h	20 Apr 2007 09:18:48 -0000	1.2
@@ -30,6 +30,19 @@
 namespace gnash {
 
 /// An utility class used to compare rgba values with a given tolerance
+//
+/// This is simply a wrapper around an rgba value, with an associated
+/// tolerance used when comparing with another FuzzyPixel.
+///
+/// Currently (but we might change this in the future), the tolerance is
+/// used to compare red, green, blue and alpha values.
+///
+/// A negative tolerance may be used to mark the FuzzyPixel as
+/// an "invalid" one, which is a FuzzyPixel that will never be equal
+/// to any other. Intollerant FuzzyPixel.
+///
+/// See operator== for more info.
+///
 class FuzzyPixel
 {
 
@@ -37,14 +50,15 @@
 
 	friend std::ostream& operator<< (std::ostream& o, const FuzzyPixel& p);
 
-	/// Construct a black, alpha 0 FuzzyPixel with NO tolerance.
+	/// Construct an Intollerant FuzzyPixel.
 	//
-	/// No tolerance means that any comparison will fail
+	/// Intollerant means that any comparison will fail.
+	/// Actual value of the pixel doesn't make much sense.
 	///
 	FuzzyPixel()
 		:
 		_col(0,0,0,0),
-		_tol(0)
+		_tol(-1)
 	{
 	}
 
@@ -54,17 +68,21 @@
 	///	The color value
 	///
 	/// @param tolerance
-	///	The tolerance to use in comparisons
+	///	The tolerance to use in comparisons.
 	///
-	FuzzyPixel(rgba& color, int tolerance=0)
+	FuzzyPixel(rgba& color, short unsigned tolerance=0)
 		:
 		_col(color),
-		_tol(tolerance)
+		// From short unsigned to signed we hopefully never swap sign.
+		// Use the default constructor to build intolerant fuzzy pixels.
+		_tol(int(tolerance))
 	{
 	}
 
-	/// Construct a FuzzyPixel with given values
+	/// Construct a FuzzyPixel with given values and 0 tolerance.
 	//
+	/// Use setTolerance to modify the tolerance value.
+	///
 	/// @param r
 	///	The red value.
 	///
@@ -87,21 +105,29 @@
 	/// Set the tolerance to use in comparisons
 	//
 	/// @param tol
-	///	The tolerance to use in comparisons
+	///	The tolerance to use in comparisons.
 	///
-	void setTolerance(int tol)
+	void setTolerance(unsigned short tol)
+	{
+		_tol = int(tol);
+	}
+
+	/// Make this fuzzy pixel intolerant
+	void setIntolerant()
 	{
-		_tol = tol;
+		_tol = -1;
 	}
 
 	/// Compare two FuzzyPixel using the tolerance of the most tolerant of the two
 	//
-	/// Note that if any of the two operands has 0 tolerance, any equality
+	/// Note that if any of the two operands is intolerant, any equality
 	/// comparison will fail.
 	///
+	/// See default constructor and setIntolerant for more info.
+	///
 	bool operator==(const FuzzyPixel& other) const;
 
-	// Return true if a and b are below a given tolerance
+	/// Return true if a and b are below a given tolerance
 	static bool fuzzyEqual(int a, int b, int tol)
 	{
 		return abs(a-b) <= tol;
@@ -109,6 +135,7 @@
 
 private:
 
+	// actual color 
 	rgba _col;
 
 	// tolerance value



From MAILER-DAEMON Fri Apr 20 05:48:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HepjF-00073V-Do
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 05:48:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HepjD-0006yt-JE
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:48:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HepjC-0006wt-Ou
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:48:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HepjC-0006we-Li
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:48:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hepe9-0006x6-EQ
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:43:17 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hepe8-0004g5-QX
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:43:16 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hepe8-0004g2-EI
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:43:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hepe8-0004g2-EI@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Fri, 20 Apr 2007 09:43:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 09:48:31 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/20 09:43:16

Modified files:
	.              : ChangeLog 
	backend        : render_handler.h 

Log message:
	prototype for initTestBuffer()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2946&r2=1.2947
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2946
retrieving revision 1.2947
diff -u -b -r1.2946 -r1.2947
--- ChangeLog	20 Apr 2007 09:03:42 -0000	1.2946
+++ ChangeLog	20 Apr 2007 09:43:15 -0000	1.2947
@@ -1,3 +1,7 @@
+2007-04-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler.h: Prototype for initTestBuffer() 
+		
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/: Makefile.am, FuzzyPixel.{cpp,h}, 

Index: backend/render_handler.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- backend/render_handler.h	18 Apr 2007 17:04:56 -0000	1.33
+++ backend/render_handler.h	20 Apr 2007 09:43:16 -0000	1.34
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.33 2007/04/18 17:04:56 udog Exp $ */
+/* $Id: render_handler.h,v 1.34 2007/04/20 09:43:16 udog Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -553,6 +553,25 @@
     
     return true;
   }
+  
+  
+  /// This is a special function used for testcases ONLY. It is used by
+  /// MovieTester to prepare the renderer for off-screen rendering 
+  /// without any GUI. The renderer is responsible to do all required
+  /// steps so that rendering is possible after the call. This may mean
+  /// that the renderer allocates memory for the given stage size.
+  /// "width" and "height" are the desired size of the stage in pixels.
+  /// 
+  /// The function returns false when the renderer is not able to do
+  /// off-screen rendering (default).
+  ///
+  /// Note the function may be called again afterwards, resizing the stage.
+  /// Any number of calls to this function is possible and the renderer
+  /// is responsible resize any buffer instead of wasting memory. 
+  virtual bool initTestBuffer(unsigned width, unsigned height) {
+    return false;
+  }
+  
 	/// Sets the x/y scale for the movie  
 	virtual void set_scale(float /*xscale*/, float /*yscale*/) {
 		// nop



From MAILER-DAEMON Fri Apr 20 05:54:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hepp1-0000je-I6
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 05:54:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hepp0-0000jY-05
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:54:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hepoz-0000jM-6k
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:54:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hepoz-0000jJ-1h
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:54:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Hepjv-0007hH-Pr
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 05:49:15 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hepjv-0004zI-9S
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:49:15 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Hepjv-0004zE-1Z
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:49:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hepjv-0004zE-1Z@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Fri, 20 Apr 2007 09:49:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 09:54:30 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/20 09:49:15

Modified files:
	backend        : render_handler.h 

Log message:
	be more doxygen-friendly

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: render_handler.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- render_handler.h	20 Apr 2007 09:43:16 -0000	1.34
+++ render_handler.h	20 Apr 2007 09:49:14 -0000	1.35
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.34 2007/04/20 09:43:16 udog Exp $ */
+/* $Id: render_handler.h,v 1.35 2007/04/20 09:49:14 udog Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -555,19 +555,26 @@
   }
   
   
+  /// \brief
+  /// Initializes the renderer for off-screen rendering used by the  
+  /// testsuite.
+  ///
   /// This is a special function used for testcases ONLY. It is used by
   /// MovieTester to prepare the renderer for off-screen rendering 
   /// without any GUI. The renderer is responsible to do all required
   /// steps so that rendering is possible after the call. This may mean
   /// that the renderer allocates memory for the given stage size.
-  /// "width" and "height" are the desired size of the stage in pixels.
   /// 
   /// The function returns false when the renderer is not able to do
   /// off-screen rendering (default).
   ///
   /// Note the function may be called again afterwards, resizing the stage.
   /// Any number of calls to this function is possible and the renderer
-  /// is responsible resize any buffer instead of wasting memory. 
+  /// is responsible to resize any buffer instead of wasting memory. 
+  ///
+  /// @param width stage width in pixels
+  ///
+  /// @param height stage height in pixels
   virtual bool initTestBuffer(unsigned width, unsigned height) {
     return false;
   }



From MAILER-DAEMON Fri Apr 20 06:08:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Heq2X-0005zp-NI
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 06:08:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Heq2W-0005y8-8P
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 06:08:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Heq2U-0005wu-VJ
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 06:08:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Heq2U-0005wp-Pt
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 06:08:26 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HepxR-0000v4-B1
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 06:03:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HepxR-0005Ve-0V
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:03:13 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HepxQ-0005Va-J0
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:03:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HepxQ-0005Va-J0@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 20 Apr 2007 10:03:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Movi...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 10:08:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/20 10:03:12

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	check to xcheck, add warnings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2947&r2=1.2948
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.64&r2=1.65

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2947
retrieving revision 1.2948
diff -u -b -r1.2947 -r1.2948
--- ChangeLog	20 Apr 2007 09:43:15 -0000	1.2947
+++ ChangeLog	20 Apr 2007 10:03:12 -0000	1.2948
@@ -20,8 +20,9 @@
 
 2007-04-20 Zou Lunkai <zoulunkai@gmail.com>
 
-	* testsuite/actionscript.all/MovieLip.as
+	* testsuite/actionscript.all/MovieClip.as
 	  change undefined to a null string.
+	  change check to xcheck, add warnings
 	  
 2007-04-19 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- testsuite/actionscript.all/MovieClip.as	20 Apr 2007 06:58:25 -0000	1.64
+++ testsuite/actionscript.all/MovieClip.as	20 Apr 2007 10:03:12 -0000	1.65
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.64 2007/04/20 06:58:25 zoulunkai Exp $";
+rcsid="$Id: MovieClip.as,v 1.65 2007/04/20 10:03:12 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -190,7 +190,9 @@
 check_equals(mc._droptarget, "");
 check_equals(typeof(mc._droptarget), "string");
 #else
-check_equals(mc._droptarget, "");
+//WARNING: we have player succeeds on this, and also player fails on this
+// don't know which one to trust.
+xcheck_equals(mc._droptarget, "");
 #endif
 
 check(mc._focusrect != undefined);
@@ -209,7 +211,9 @@
 check_equals(typeof(mc._name), "string");
 check_equals(typeof(mc), "movieclip");
 #else
-check_equals(mc._name, "");
+//WARNING: we have player succeeds on this, and also player fails on this
+// don't know which one to trust.
+xcheck_equals(mc._name, "");
 #endif
 
 check(mc._parent == undefined);



From MAILER-DAEMON Fri Apr 20 07:17:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Her6r-0002ts-Rn
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 07:17:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Her6p-0002tZ-MB
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:17:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Her6n-0002tF-IN
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:16:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Her6n-0002t8-3d
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:16:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1Her1g-0001rJ-EX
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:11:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Her1e-0000zh-9k
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:11:38 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1Her1d-0000zb-Ii
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:11:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Her1d-0000zb-Ii@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Fri, 20 Apr 2007 11:11:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash po/POTFILES.in po/gnash.pot po/es.po po/L...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 11:17:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/20 11:11:37

Modified files:
	po             : POTFILES.in gnash.pot es.po LINGUAS 
	.              : ChangeLog 
Added files:
	po             : fr.po 

Log message:
	More internationalization.
	* po/POTFILES.in:  Add all files with gettext-able messages.
	* po/gnash.pot:  Update to include current gettext-able messages.
	* po/{es,fr}.po:  First few languages that have a few translations.
	* po/LINGUAS:  Add es and fr (with only a few translations in each).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/po/POTFILES.in?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/po/gnash.pot?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/po/es.po?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/po/LINGUAS?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/po/fr.po?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2948&r2=1.2949

Patches:
Index: po/POTFILES.in
===================================================================
RCS file: /sources/gnash/gnash/po/POTFILES.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/POTFILES.in	6 Apr 2007 07:49:55 -0000	1.1
+++ po/POTFILES.in	20 Apr 2007 11:11:36 -0000	1.2
@@ -1,4 +1,168 @@
 # List of source files which contain translatable strings.
+backend/render_handler_agg.cpp
+backend/render_handler_agg_style.h
+backend/render_handler_d3d.cpp
+backend/render_handler.h
+backend/render_handler_xbox.cpp
+backend/sound_handler_gst.cpp
+backend/sound_handler_mp3.cpp
+backend/sound_handler_sdl.cpp
+cygnal/cygnal.cpp
+cygnal/http.cpp
+cygnal/statistics.cpp
+cygnal/stream.cpp
+extensions/dejagnu/dejagnu.cpp
+extensions/fileio/fileio.cpp
+extensions/gtk2/gtkext.cpp
+extensions/mysql/mysql_db.cpp
+gui/fb.cpp
+gui/gnash.cpp
+gui/gtk.cpp
+gui/gtk_glue_agg.cpp
+gui/gtk_glue_gtkglext.cpp
+gui/gui.cpp
+gui/kde.cpp
+gui/Player.cpp
+gui/riscos.cpp
+gui/riscos_glue_agg.cpp
+gui/sdl_agg_glue.cpp
+gui/sdl.cpp
+libamf/amf.cpp
+libamf/rtmp.cpp
+libbase/curl_adapter.cpp
+libbase/extension.cpp
+libbase/log.cpp
+libbase/log.h
+libbase/network.cpp
+libbase/rc.cpp
+libbase/sharedlib.cpp
+libbase/Thread.cpp
+libbase/utf8.cpp
+libbase/zlib_adapter.cpp
+plugin/klash/klash.cpp
+plugin/plugin.cpp
+plugin/win32/npgnash.cpp
+plugin/win32/plugin.cpp
+server/array.cpp
+server/as_environment.cpp
+server/as_function.cpp
+server/asobj/Camera.cpp
+server/asobj/Color.cpp
+server/asobj/ContextMenu.cpp
+server/asobj/CustomActions.cpp
+server/asobj/Date.cpp
+server/as_object.cpp
+server/as_object.h
+server/asobj/Error.cpp
+server/asobj/gen-asclass.pl
+server/asobj/gen-asclass.sh
+server/asobj/Global.cpp
+server/asobj/Key.cpp
+server/asobj/LoadVars.cpp
+server/asobj/LocalConnection.cpp
+server/asobj/Microphone.cpp
+server/asobj/Mouse.cpp
+server/asobj/MovieClipLoader.cpp
+server/asobj/NetConnection.cpp
+server/asobj/NetStream.cpp
+server/asobj/NetStreamFfmpeg.cpp
+server/asobj/NetStreamGst.cpp
+server/asobj/NetStream.h
+server/asobj/Number.cpp
+server/asobj/Object.cpp
+server/asobj/Selection.cpp
+server/asobj/SharedObject.cpp
+server/asobj/Sound.cpp
+server/asobj/SoundFfmpeg.cpp
+server/asobj/SoundGst.cpp
+server/asobj/SoundMad.cpp
+server/asobj/Stage.cpp
+server/asobj/string.cpp
+server/asobj/System.cpp
+server/asobj/TextSnapshot.cpp
+server/asobj/Video.cpp
+server/asobj/xmlattrs.h
+server/asobj/xml.cpp
+server/asobj/xmlnode.cpp
+server/asobj/xmlnode.h
+server/asobj/xmlsocket.cpp
+server/as_value.cpp
+server/BitmapMovieInstance.cpp
+server/button_character_instance.cpp
+server/character.cpp
+server/character.h
+server/cxform.cpp
+server/debugger.cpp
+server/dlist.cpp
+server/edit_text_character.cpp
+server/fill_style.cpp
+server/font.cpp
+server/fontlib.cpp
+server/generic_character.cpp
+server/gnash.h
+server/impl.cpp
+server/LoadVariablesThread.cpp
+server/LoadVariablesThread.h
+server/matrix.cpp
+server/movie_instance.cpp
+server/movie_root.cpp
+server/movie_root.h
+server/parser/action_buffer.cpp
+server/parser/action_buffer.h
+server/parser/BitmapMovieDefinition.cpp
+server/parser/button_character_def.cpp
+server/parser/edit_text_character_def.cpp
+server/parser/morph2_character_def.cpp
+server/parser/movie_def_impl.cpp
+server/parser/shape_character_def.cpp
+server/parser/sprite_definition.cpp
+server/parser/sprite_definition.h
+server/parser/text_character_def.cpp
+server/PropertyList.cpp
+server/PropertyList.h
+server/rect.cpp
+server/render.cpp
+server/shape.cpp
+server/shm.cpp
+server/sprite_instance.cpp
+server/sprite_instance.h
+server/stream.cpp
+server/StreamProvider.cpp
+server/swf/DefineFontAlignZonesTag.cpp
+server/swf_function.cpp
+server/swf/PlaceObject2Tag.cpp
+server/swf/tag_loaders.cpp
+server/text.cpp
+server/textformat.cpp
+server/timers.cpp
+server/tools.cpp
+server/types.cpp
+server/URLAccessManager.cpp
+server/video_stream_instance.cpp
+server/vm/action.cpp
+server/vm/ActionExec.cpp
+server/vm/ASHandlers.cpp
+server/vm/ExecutableCode.h
+testsuite/libbase/TCXXRc.cpp
+testsuite/misc-ming.all/attachMovieLoopingTestRunner.cpp
+testsuite/misc-ming.all/attachMovieTestRunner.cpp
+testsuite/misc-ming.all/DrawingApiTestRunner.cpp
+testsuite/misc-ming.all/eventSoundTest1-Runner.cpp
+testsuite/misc-ming.all/intervalTestRunner.cpp
+testsuite/misc-ming.all/KeyTest-Runner.cpp
+testsuite/misc-ming.all/loadMovieTestRunner.cpp
+testsuite/misc-ming.all/loop_test-Runner.cpp
+testsuite/misc-ming.all/registerClassTestRunner.cpp
+testsuite/misc-ming.all/RollOverOutTest-Runner.cpp
+testsuite/misc-ming.all/simple_loop_testrunner.cpp
+testsuite/movies.all/gravity_embedded-TestRunner.cpp
+testsuite/MovieTester.cpp
+testsuite/samples/clip_as_button2-TestRunner.cpp
+testsuite/samples/gotoFrameOnKeyEvent-TestRunner.cpp
+testsuite/server/DisplayListTest.cpp
+testsuite/server/GetterSetterTest.cpp
+testsuite/server/PropertyListTest.cpp
+testsuite/sound_handler_test.cpp
 utilities/dumpshm.cpp
 utilities/parser.cpp
 utilities/processor.cpp

Index: po/gnash.pot
===================================================================
RCS file: /sources/gnash/gnash/po/gnash.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/gnash.pot	6 Apr 2007 07:49:55 -0000	1.1
+++ po/gnash.pot	20 Apr 2007 11:11:36 -0000	1.2
@@ -8,80 +8,4401 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-gnash@gnu.org\n"
-"POT-Creation-Date: 2007-04-05 20:53-0700\n"
+"POT-Creation-Date: 2007-04-20 00:11-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: John Gilmore <gnu@gnash-translation.toad.com>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: utilities/dumpshm.cpp:200
+#: backend/sound_handler_sdl.cpp:76
+msgid "could not allocate memory for sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:99
+msgid "Some kind of error occurred with raw sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:112
+msgid "Some kind of error occurred with adpcm sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:123
+msgid "gnash has not been compiled to handle mp3 audio"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:129
+msgid "could not allocate space for data in sound handler"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:138
+#, c-format
+msgid "unknown sound format %d requested; gnash does not handle it"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:170
+msgid "Some kind of error with resampling sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:215
+#, c-format
+msgid ""
+"Behavior for this audio codec %d is unknown.  Please send this SWF to the "
+"developers"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:276
+msgid "Your FFMPEG can't decode MP3?!"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:304
+#, c-format
+msgid "Unable to start SDL sound: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:496
+#, c-format
+msgid "Unable to start aux SDL sound: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:717
+#, c-format
+msgid "Negative buffer length in sdl_audio_callback (%d)"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:834
+msgid ""
+"Error while decoding MP3-stream.  Upgrading ffmpeg/libavcodec might fix this "
+"issue."
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:864
+#, c-format
+msgid "Recoverable error while decoding MP3-stream, MAD error: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:872
+#, c-format
+msgid "Unrecoverable error while decoding MP3-stream, MAD error: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:929
+msgid "Error in sound sample conversion"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:186
+msgid "Couldn't initialize database"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:191
+msgid "Couldn't connect to database"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:217 extensions/mysql/mysql_db.cpp:244
+#, c-format
+msgid "MySQL connection error: %s"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:224 extensions/mysql/mysql_db.cpp:251
+#, c-format
+msgid ""
+"MySQL error on query for:\n"
+"\t%s\n"
+"Query was: %s"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:265
+#, c-format
+msgid "Field name is: %s: "
+msgstr ""
+
+#: gui/gnash.cpp:73
+msgid ""
+"usage: gnash [options] movie_file.swf\n"
+"\n"
+"Plays a SWF (Shockwave Flash) movie\n"
+"options:\n"
+"\n"
+msgstr ""
+
+#: gui/gnash.cpp:78
+msgid ""
+"  -h, --help  Print this info.\n"
+"  -s <factor> Scale the movie up/down by the specified factor\n"
+"  -c          Produce a core file instead of letting SDL trap it\n"
+"  -d num      Number of milliseconds to delay in main loop\n"
+"  -v          Be verbose; i.e. print log messages to stdout\n"
+msgstr ""
+
+#: gui/gnash.cpp:85
+msgid "  -va         Be verbose about movie Actions\n"
+msgstr ""
+
+#: gui/gnash.cpp:90
+msgid "  -vp         Be verbose about parsing the movie\n"
+msgstr ""
+
+#: gui/gnash.cpp:95
+msgid ""
+"  -m <bias>   Specify the texture LOD bias (float, default is -1.0)\n"
+"  -x <ID>     X11 Window ID for display\n"
+"  -w          Produce the disk based debug log\n"
+"  -j <width>  Set window width\n"
+"  -k <height> Set window height\n"
+"  -1          Play once; exit when/if movie reaches the last frame\n"
+msgstr ""
+
+#: gui/gnash.cpp:102
+msgid ""
+"  -g          Turn on the Flash debugger\n"
+"  -r <0|1|2|3>\n"
+"              0 disables both rendering & sound (good for batch tests)\n"
+"              1 enables rendering & disables sound\n"
+"              2 enables sound & disables rendering\n"
+"              3 enables both rendering & sound (default)\n"
+msgstr ""
+
+#: gui/gnash.cpp:109
+msgid ""
+"  -t <sec>    Timeout and exit after the specified number of seconds\n"
+"  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
+"  -u <url>    Set \"real\" url of the movie\n"
+"              (useful for downloaded movies)\n"
+"  -U <url>    Set \"base\" url for this run\n"
+"              (used to resolve relative urls, defaults to movie url)\n"
+"  -P <param>  Set parameter (ie. \"FlashVars=A=1&b=2\")\n"
+"  --version   Print gnash's version number and exit\n"
+msgstr ""
+
+#: gui/gnash.cpp:118
+msgid ""
+"\n"
+"keys:\n"
+"  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
+"  CTRL-P          Toggle Pause\n"
+"  CTRL-R          Restart the movie\n"
+"  CTRL-[ or kp-   Step back one frame\n"
+"  CTRL-] or kp+   Step forward one frame\n"
+"  CTRL-B          Toggle background color\n"
+"  CTRL-A          Toggle antialiasing (doesn't work)\n"
+"  CTRL-T          Debug.  Test the set_variable() function\n"
+"  CTRL-G          Debug.  Test the get_variable() function\n"
+"  CTRL-M          Debug.  Test the call_method() function\n"
+msgstr ""
+
+#: gui/gnash.cpp:138 plugin/klash/klash.cpp:660
+#, c-format
+msgid "Gnash "
+msgstr ""
+
+#: gui/gnash.cpp:138
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 2005-2007 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License.  For more information, see the file named COPYING.\n"
+msgstr ""
+
+#: gui/gnash.cpp:149
+#, c-format
+msgid ""
+"Build options %s\n"
+"   Target: %s\n"
+"   Renderer: %s   GUI: %s   Media handler: %s\n"
+msgstr ""
+
+#: gui/gnash.cpp:190 plugin/klash/klash.cpp:319
+msgid "Verbose output turned on"
+msgstr ""
+
+#: gui/gnash.cpp:194
+msgid "Logging to disk enabled"
+msgstr ""
+
+#: gui/gnash.cpp:200
+msgid "No verbose actions; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:207
+msgid "No verbose parsing; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:218
+#, c-format
+msgid "Setting root URL to %s"
+msgstr ""
+
+#: gui/gnash.cpp:224
+#, c-format
+msgid "Setting base URL to %s"
+msgstr ""
+
+#: gui/gnash.cpp:229
+#, c-format
+msgid "Setting width to %d"
+msgstr ""
+
+#: gui/gnash.cpp:233
+msgid "Setting debugger ON"
+msgstr ""
+
+#: gui/gnash.cpp:238
+msgid "No debugger; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:243
+#, c-format
+msgid "Setting height to %d"
+msgstr ""
+
+#: gui/gnash.cpp:279
+#, c-format
+msgid "-r must be followed by 0, 1, 2 or 3 (%ld is invalid)"
+msgstr ""
+
+#: gui/gnash.cpp:314
+msgid "No rendering flags specified, using rcfile"
+msgstr ""
+
+#: gui/gnash.cpp:328
+#, c-format
+msgid "Got variable option (%s) on command line"
+msgstr ""
+
+#: gui/gui.cpp:460
+#, c-format
+msgid "Frame %d"
+msgstr ""
+
+#: gui/Player.cpp:187
+msgid "Sound requested but no sound support compiled in"
+msgstr ""
+
+#: gui/Player.cpp:364
+#, c-format
+msgid "fs_callback(%p): %s %s"
+msgstr ""
+
+#: libamf/amf.cpp:179
+#, c-format
+msgid "Type is %s"
+msgstr ""
+
+#: libamf/amf.cpp:185
+msgid "Number is "
+msgstr ""
+
+#: libamf/amf.cpp:189
+#, c-format
+msgid "Boolean is %d"
+msgstr ""
+
+#: libamf/amf.cpp:202 libamf/amf.cpp:241
+#, c-format
+msgid "String is %s"
+msgstr ""
+
+#: libamf/amf.cpp:218
+msgid "Undefined element"
+msgstr ""
+
+#: libamf/amf.cpp:234
+msgid "Date is "
+msgstr ""
+
+#: libamf/amf.cpp:234
+msgid " nanoseconds"
+msgstr ""
+
+#: libamf/amf.cpp:884
+#, c-format
+msgid "AMF Header size bits (0x%X) out of range"
+msgstr ""
+
+#: libamf/amf.cpp:901
+#, c-format
+msgid "AMF header byte is: 0x%X"
+msgstr ""
+
+#: libamf/amf.cpp:904
+#, c-format
+msgid "The AMF channel index is %d"
+msgstr ""
+
+#: libamf/amf.cpp:907
+#, c-format
+msgid "The header size is %d"
+msgstr ""
+
+#: libamf/amf.cpp:911
+#, c-format
+msgid "The packet head is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:918
+#, c-format
+msgid "The mystery word is: %d or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:927
+#, c-format
+msgid "The body size is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:937
+#, c-format
+msgid "The type is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:956
+#, c-format
+msgid "ERROR: Unidentified AMF header data type %d"
+msgstr ""
+
+#: libamf/amf.cpp:964
+#, c-format
+msgid "The source/destination is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1007
+msgid "AMF body input data is NULL"
+msgstr ""
+
+#: libamf/amf.cpp:1017
+#, c-format
+msgid "The packet body is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1046
+#, c-format
+msgid "AMF String length is: %d"
+msgstr ""
+
+#: libamf/amf.cpp:1052
+#, c-format
+msgid "AMF String is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1108 libamf/amf.cpp:1193
+msgid "End of Object definition"
+msgstr ""
+
+#: libamf/amf.cpp:1119
+#, c-format
+msgid "The element is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1124
+#, c-format
+msgid "AMF element length is: %d"
+msgstr ""
+
+#: libamf/amf.cpp:1134
+#, c-format
+msgid "AMF type is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1151
+#, c-format
+msgid "Number \"%s\" is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1162
+#, c-format
+msgid "Boolean \"%s\" is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1171 libamf/amf.cpp:1184
+#, c-format
+msgid "Variable \"%s\" is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1181
+msgid "Undefined type"
+msgstr ""
+
+#: libamf/amf.cpp:1207
+#, c-format
+msgid "astype_e of value: %d"
+msgstr ""
+
+#: libbase/curl_adapter.cpp:277 libbase/curl_adapter.cpp:529
+#, c-format
+msgid "404 response from url %s"
+msgstr ""
+
+#: libbase/extension.cpp:124
+#, c-format
+msgid "Loading module: %s"
+msgstr ""
+
+#: libbase/extension.cpp:140
+#, c-format
+msgid "Initializing module: \"%s\""
+msgstr ""
+
+#: libbase/extension.cpp:157
+msgid "Couldn't get class_init symbol"
+msgstr ""
+
+#: libbase/extension.cpp:192
+#, c-format
+msgid "Scanning directory \"%s\" for plugins"
+msgstr ""
+
+#: libbase/extension.cpp:196
+#, c-format
+msgid "Can't open directory %s"
+msgstr ""
+
+#: libbase/extension.cpp:218
+#, c-format
+msgid "Gnash Plugin name: %s"
+msgstr ""
+
+#: libbase/log.cpp:188
+msgid "TRACE: "
+msgstr ""
+
+#: libbase/log.cpp:210 libbase/log.cpp:625
+msgid "DEBUG: "
+msgstr ""
+
+#: libbase/log.cpp:276
+msgid "ERROR: "
+msgstr ""
+
+#: libbase/log.cpp:293
+msgid "ERROR: Unimplemented: "
+msgstr ""
+
+#: libbase/log.cpp:310
+msgid "SECURITY: "
+msgstr ""
+
+#: libbase/log.cpp:327
+msgid "MALFORMED SWF: "
+msgstr ""
+
+#: libbase/log.cpp:344
+msgid "ACTIONSCRIPT ERROR: "
+msgstr ""
+
+#: libbase/network.cpp:85
+msgid "Could not find a usable WinSock DLL"
+msgstr ""
+
+#: libbase/network.cpp:127
+#, c-format
+msgid "Can't connect to privileged port #%d"
+msgstr ""
+
+#: libbase/network.cpp:149
+#, c-format
+msgid "unable to get protocol entry for %s"
+msgstr ""
+
+#: libbase/network.cpp:166
+#, c-format
+msgid "unable to create socket: %s"
+msgstr ""
+
+#: libbase/network.cpp:173
+msgid "setsockopt SO_REUSEADDR failed"
+msgstr ""
+
+#: libbase/network.cpp:183
+#, c-format
+msgid "unable to bind to port %hd: %s"
+msgstr ""
+
+#: libbase/network.cpp:192
+#, c-format
+msgid "Server bound to service on %s, port %hd, using fd %d"
+msgstr ""
+
+#: libbase/network.cpp:198
+#, c-format
+msgid "unable to listen on port: %hd: %s "
+msgstr ""
+
+#: libbase/network.cpp:235
+#, c-format
+msgid "Trying to accept net traffic on fd %d"
+msgstr ""
+
+#: libbase/network.cpp:264
+msgid "There is data at the console for stdin"
+msgstr ""
+
+#: libbase/network.cpp:270
+#, c-format
+msgid "The accept() socket for fd %d was interupted by a system call"
+msgstr ""
+
+#: libbase/network.cpp:274
+#, c-format
+msgid "The accept() socket for fd %d never was available for writing"
+msgstr ""
+
+#: libbase/network.cpp:281
+#, c-format
+msgid "The accept() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: libbase/network.cpp:293
+#, c-format
+msgid "unable to accept: %s"
+msgstr ""
+
+#: libbase/network.cpp:298
+#, c-format
+msgid "Accepting tcp/ip connection on fd %d"
+msgstr ""
+
+#: libbase/network.cpp:344
+#, c-format
+msgid "Can't connect to privileged port %hd"
+msgstr ""
+
+#: libbase/network.cpp:349
+#, c-format
+msgid "%s: to host %s at port %d"
+msgstr ""
+
+#: libbase/network.cpp:355
+#, c-format
+msgid "The hostname for this machine is %s"
+msgstr ""
+
+#: libbase/network.cpp:357
+msgid "Couldn't get the hostname for this machine"
+msgstr ""
+
+#: libbase/network.cpp:371
+#, c-format
+msgid "The IP address for this client socket is %s"
+msgstr ""
+
+#: libbase/network.cpp:379
+#, c-format
+msgid "unable to create socket : %s"
+msgstr ""
+
+#: libbase/network.cpp:401
+#, c-format
+msgid "The connect() socket for fd %d was interupted by a system call"
+msgstr ""
+
+#: libbase/network.cpp:408 libbase/network.cpp:436
+#, c-format
+msgid "The connect() socket for fd %d never was available for writing"
+msgstr ""
+
+#: libbase/network.cpp:419
+#, c-format
+msgid "The connect() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: libbase/network.cpp:429
+#, c-format
+msgid "\tport %d at IP %s for fd %d"
+msgstr ""
+
+#: libbase/network.cpp:505
+#, c-format
+msgid "Unable to close the socket for fd %d: %s"
+msgstr ""
+
+#: libbase/network.cpp:512
+#, c-format
+msgid "Closed the socket on fd %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:101
+msgid "Play Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:102
+msgid "Pause Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:103
+msgid "Stop Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:104
+msgid "Restart Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:105
+msgid "Step Forward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:106
+msgid "Step Backward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:107
+msgid "Jump Forward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:108
+msgid "Jump Backward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:109
+msgid "Quit Gnash"
+msgstr ""
+
+#: plugin/klash/klash.cpp:147
+msgid "Klash"
+msgstr ""
+
+#: plugin/klash/klash.cpp:148
+msgid "The Gnash Flash player for KDE.\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:309
+#, c-format
+msgid "Timer delay set to %d milliseconds"
+msgstr ""
+
+#: plugin/klash/klash.cpp:323
+msgid "Logging to disk enabled."
+msgstr ""
+
+#: plugin/klash/klash.cpp:342
+#, c-format
+msgid "Setting root URL to: %s"
+msgstr ""
+
+#: plugin/klash/klash.cpp:346
+#, c-format
+msgid "Setting width to: %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:350
+#, c-format
+msgid "Setting height to: %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:381
+#, c-format
+msgid "-r must be followed by 0, 1 or 2 (%d is invalid)"
+msgstr ""
+
+#: plugin/klash/klash.cpp:399
+msgid "Got variable option on command line!"
+msgstr ""
+
+#: plugin/klash/klash.cpp:414
+#, c-format
+msgid "No input files"
+msgstr ""
+
+#: plugin/klash/klash.cpp:448
+#, c-format
+msgid "error: can't get info about %s\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:508
+#, c-format
+msgid "error: can't create a movie from '%s'\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:513
+#, c-format
+msgid "error: can't create movie instance\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:660
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 2006, 2007 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License.  For more information, see the file named COPYING.\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:673
+msgid ""
+"usage: gnash [options] movie_file.swf\n"
+"\n"
+"Plays a SWF (Shockwave Flash) movie\n"
+"options:\n"
+"\n"
+"  -h, --help  Print this info.\n"
+"  -s <factor> Scale the movie up/down by the specified factor\n"
+"  -c          Produce a core file instead of letting SDL trap it\n"
+"  -d num      Number of milliseconds to delay in main loop\n"
+"  -v          Be verbose; i.e. print log messages to stdout\n"
+"  -va         Be verbose about movie Actions\n"
+"  -vp         Be verbose about parsing the movie\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:685
+msgid ""
+"  -m <bias>   Specify the texture LOD bias (float, default is -1)\n"
+"  -x <ID>     X11 Window ID for display\n"
+"  -w          Produce the disk based debug log\n"
+"  -1          Play once; exit when/if movie reaches the last frame\n"
+"  -r <0|1|2>  0 disables rendering & sound (good for batch tests)\n"
+"              1 enables rendering & sound (default setting)\n"
+"              2 enables rendering & disables sound\n"
+"  -t <sec>    Timeout and exit after the specified number of seconds\n"
+"  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
+"  --version   Print gnash's version number and exit\n"
+"\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:696
+msgid ""
+"keys:\n"
+"  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
+"  CTRL-P          Toggle Pause\n"
+"  CTRL-R          Restart the movie\n"
+"  CTRL-[ or kp-   Step back one frame\n"
+"  CTRL-] or kp+   Step forward one frame\n"
+"  CTRL-B          Toggle background color\n"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:259
+#, c-format
+msgid "can't get info about %s"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:262
+#, c-format
+msgid "Movie %s: width is %d, height is %d, version is %d\n"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:272
+#, c-format
+msgid "can't create a movie from %s"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:280
+msgid "can't create movie instance"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:348
+msgid "player: Shutting down as requested..."
+msgstr ""
+
+#: server/array.cpp:203
+msgid "tried to pop element from back of empty array, returning undef"
+msgstr ""
+
+#: server/array.cpp:219
+msgid "tried to shift element from front of empty array, returning undef"
+msgstr ""
+
+#: server/array.cpp:313
+#, c-format
+msgid "Array.slice(%u, %u) called"
+msgstr ""
+
+#: server/array.cpp:343
+#, c-format
+msgid "Current array is %s"
+msgstr ""
+
+#: server/array.cpp:476
+#, c-format
+msgid "Unhandled sort flags: %d (0x%X)"
+msgstr ""
+
+#: server/array.cpp:486
+msgid "array.sort with unique flag"
+msgstr ""
+
+#: server/array.cpp:512
+#, c-format
+msgid "Array(%s).splice(%s) called"
+msgstr ""
+
+#: server/array.cpp:518
+msgid "Array.splice() needs at least 1 argument, call ignored"
+msgstr ""
+
+#: server/array.cpp:534
+#, c-format
+msgid "Array.splice: start:%d became %u"
+msgstr ""
+
+#: server/array.cpp:547
+#, c-format
+msgid "Array.splice(%d,%d): negative length given, call ignored"
+msgstr ""
+
+#: server/array.cpp:614
+#, c-format
+msgid "calling array push, pushing %d values onto back of array"
+msgstr ""
+
+#: server/array.cpp:630
+#, c-format
+msgid "calling array unshift, pushing %d values onto front of array"
+msgstr ""
+
+#: server/array.cpp:649
+#, c-format
+msgid "calling array pop, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:665
+#, c-format
+msgid "calling array shift, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:682
+#, c-format
+msgid "called array reverse, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:723
+#, c-format
+msgid "array_to_string called, nargs = %d, this_ptr = %p"
+msgstr ""
+
+#: server/array.cpp:726
+#, c-format
+msgid "to_string result is: %s"
+msgstr ""
+
+#: server/array.cpp:775
+msgid ""
+"More than 2 arguments to Array.slice, and I don't know what to do with "
+"them.  Ignoring them"
+msgstr ""
+
+#: server/array.cpp:845
+#, c-format
+msgid "array_new called, nargs = %d"
+msgstr ""
+
+#: server/array.cpp:878
+#, c-format
+msgid "array_new setting object %p in result"
+msgstr ""
+
+#: server/as_environment.cpp:68
+#, c-format
+msgid "find_object%s(\"%s\") [ varname = '%s' - current target = '%s' ] failed"
+msgstr ""
+
+#: server/as_environment.cpp:80
+#, c-format
+msgid "...but get_variable_raw(%s, <with_stack>) succeeded!"
+msgstr ""
+
+#: server/as_environment.cpp:157
+#, c-format
+msgid "get_variable_raw(\"%s\") failed, returning UNDEFINED"
+msgstr ""
+
+#: server/as_environment.cpp:247
+#, c-format
+msgid "Path target '%s' not found while setting %s=%s"
+msgstr ""
+
+#: server/as_environment.cpp:455
+#, c-format
+msgid ""
+"as_environment::find_target: '%s': invalid path; neither string nor object"
+msgstr ""
+
+#: server/as_environment.cpp:511
+#, c-format
+msgid "find_target(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:516 server/as_environment.cpp:593
+#: server/as_environment.cpp:703
+msgid "Returning m_target (empty path)"
+msgstr ""
+
+#: server/as_environment.cpp:533 server/as_environment.cpp:721
+#, c-format
+msgid "Absolute path, start at the root (%p)"
+msgstr ""
+
+#: server/as_environment.cpp:540 server/as_environment.cpp:606
+#: server/as_environment.cpp:728
+msgid "Null path, returning m_target"
+msgstr ""
+
+#: server/as_environment.cpp:551 server/as_environment.cpp:619
+#: server/as_environment.cpp:740
+#, c-format
+msgid "invalid path '%s'"
+msgstr ""
+
+#: server/as_environment.cpp:564 server/as_environment.cpp:636
+#: server/as_environment.cpp:757
+#, c-format
+msgid "No more subparts, env is %p"
+msgstr ""
+
+#: server/as_environment.cpp:570
+#, c-format
+msgid "Invoking get_relative_target(%s) on object %p (%s)"
+msgstr ""
+
+#: server/as_environment.cpp:588
+#, c-format
+msgid "find_object_dotsyntax(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:629 server/as_environment.cpp:750
+#, c-format
+msgid "Subpart ==  %s"
+msgstr ""
+
+#: server/as_environment.cpp:642 server/as_environment.cpp:787
+#, c-format
+msgid "Invoking get_member(%s) on object %p"
+msgstr ""
+
+#: server/as_environment.cpp:652
+#, c-format
+msgid "Member %s for object %p not found (dotsyntax).  Path was %s"
+msgstr ""
+
+#: server/as_environment.cpp:661
+#, c-format
+msgid ""
+"Element '%s' of variable '%s' not found in object %p nor in _global "
+"(dotsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:671
+#, c-format
+msgid ""
+"Member %s of object %p doesn't cast to an Object (%s) evaluating target path "
+"%s (dotsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:698
+#, c-format
+msgid "find_object_slashsyntax(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:767
+#, c-format
+msgid "'..' element in path '%s' follows a non-character object %p"
+msgstr ""
+
+#: server/as_environment.cpp:776
+#, c-format
+msgid ""
+"'..' in path '%s' follows a character with no parent (%s : %p) (root is %p)"
+msgstr ""
+
+#: server/as_environment.cpp:797
+#, c-format
+msgid "Member %s for object %p not found (slashsyntax). Path was %s"
+msgstr ""
+
+#: server/as_environment.cpp:806
+#, c-format
+msgid ""
+"Element '%s' of variable '%s' not found in object %p nor in _global "
+"(slashsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:816
+#, c-format
+msgid ""
+"Member %s of object %p doesn't cast to an Object (%s) evaluating target path "
+"%s (slashsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:1041
+#, c-format
+msgid "Max stack count reached (%u) - should abort execution"
+msgstr ""
+
+#: server/as_function.cpp:148
+#, c-format
+msgid "Exported interface of function %p has been overwritten (from %p to %p)"
+msgstr ""
+
+#: server/as_function.cpp:197
+msgid "Function.apply() called with no args"
+msgstr ""
+
+#: server/as_function.cpp:217
+#, c-format
+msgid ""
+"Function.apply() got %d args, expected at most 2 -- discarding the ones in "
+"excess"
+msgstr ""
+
+#: server/as_function.cpp:229
+#, c-format
+msgid ""
+"Second arg of Function.apply is %s (expected array) - considering as call "
+"with no args"
+msgstr ""
+
+#: server/as_function.cpp:243
+#, c-format
+msgid ""
+"Second arg of Function.apply is of type %s, with value %s (expected array) - "
+"considering as call with no args"
+msgstr ""
+
+#: server/as_function.cpp:331
+msgid "it's a built-in class"
+msgstr ""
+
+#: server/as_function.cpp:364
+#, c-format
+msgid "constructor prototype is %s"
+msgstr ""
+
+#: server/asobj/Date.cpp:416
+msgid "Date constructor called with more than 7 arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:443
+msgid "Date() failed to initialise from arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:648
+msgid "Date.setTime needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:655
+msgid "Date.setTime was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:705
+msgid "Failed to set a date."
+msgstr ""
+
+#: server/asobj/Date.cpp:742
+msgid "utc_tm_msec_to_date failed to convert a date"
+msgstr ""
+
+#: server/asobj/Date.cpp:816
+msgid "Date.setFullYear needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:832
+msgid "Date.setFullYear was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:861
+msgid "Date.setYear needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:881
+msgid "Date.setYear was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:909
+msgid "Date.setMonth needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:938
+msgid "Date.setMonth was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:957
+msgid "Date.setDate needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:971
+msgid "Date.setDate was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:995
+msgid "Date.setHours needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1013
+msgid "Date.setHours was called with more than four arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:1035
+msgid "Date.setMinutes needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1052 server/asobj/Date.cpp:1090
+msgid "Date.setMinutes was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:1072
+msgid "Date.setSeconds needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1106
+msgid "Date.setMilliseconds needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1116
+msgid "Date.setMilliseconds was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1240
+msgid "Date.UTC needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1260
+msgid "Date.UTC was called with more than 7 arguments"
+msgstr ""
+
+#: server/as_object.cpp:121
+#, c-format
+msgid "Caught exception: %s"
+msgstr ""
+
+#: server/as_object.cpp:205
+#, c-format
+msgid "Attempt to set read-only property '%s'"
+msgstr ""
+
+#: server/as_object.cpp:216
+#, c-format
+msgid "%s: Exception %s.  Will create a new member"
+msgstr ""
+
+#: server/as_object.cpp:226
+#, c-format
+msgid "Attempt to set read-only property ``%s'' on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:249
+#, c-format
+msgid "Attempt to initialize read-only property ``%s'' (%s) on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:263
+#, c-format
+msgid "Attempt to initialize read-only property ``%s'' on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:362
+msgid "Circular inheritance chain detected during instanceOf call"
+msgstr ""
+
+#: server/as_object.cpp:383
+msgid "Circular inheritance chain detected during isPrototypeOf call"
+msgstr ""
+
+#: server/as_object.cpp:392
+#, c-format
+msgid " members of object %p follow"
+msgstr ""
+
+#: server/as_object.cpp:420
+#, c-format
+msgid ""
+"Can't set propflags on object property %s (either not found or protected)"
+msgstr ""
+
+#: server/asobj/Global.cpp:80 server/asobj/string.cpp:39
+#, c-format
+msgid "%s needs one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:86 server/asobj/string.cpp:45
+#, c-format
+msgid "%s has more than one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:193
+#, c-format
+msgid "%s needs at least one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:199
+#, c-format
+msgid "%s has more than two arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:311
+#, c-format
+msgid "%s needs at least three arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:317
+#, c-format
+msgid "%s has more than four arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:319
+#, c-format
+msgid "%s has four arguments in a SWF version 5 movie"
+msgstr ""
+
+#: server/asobj/Global.cpp:328
+#, c-format
+msgid "Invalid call to ASSetPropFlags: object argument is not an object: %s"
+msgstr ""
+
+#: server/asobj/Key.cpp:231
+msgid "key_add_listener needs one argument (the listener object)"
+msgstr ""
+
+#: server/asobj/Key.cpp:238
+msgid "key_add_listener passed a NULL object; ignored"
+msgstr ""
+
+#: server/asobj/Key.cpp:279
+msgid "key_is_down needs one argument (the key code)"
+msgstr ""
+
+#: server/asobj/Key.cpp:303
+msgid "key_remove_listener needs one argument (the listener object)"
+msgstr ""
+
+#: server/asobj/Key.cpp:310
+msgid "key_remove_listener passed a NULL object; ignored"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:528
+msgid "LoadVars.load() requires at least one argument"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:537
+msgid "LoadVars.load(): invalid empty url"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:564
+msgid "LoadVars.sendAndLoad() requires at least two arguments"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:573
+msgid "LoadVars.sendAndLoad(): invalid empty url"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:582
+msgid "LoadVars.sendAndLoad(): invalid target (must be a LoadVars object)"
+msgstr ""
+
+#: server/asobj/LocalConnection.cpp:143
+msgid "No connection name specified to LocalConnection.connect()"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:182
+#, c-format
+msgid " resolved url: %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:221
+msgid ""
+"FIXME: MovieClipLoader calling onLoadComplete *before* movie has actually "
+"been fully loaded (cheating)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:261
+#, c-format
+msgid "Dispatching %s event to "
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:261
+msgid " listeners"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:274
+#, c-format
+msgid "Listener %p doesn't have an %s event to listen for, skipped"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:283
+#, c-format
+msgid "Testing call to listener's  %s function"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:308
+#, c-format
+msgid "MovieClipLoader.loadClip() first argument is not a string (%s)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:318
+#, c-format
+msgid "Could not find target %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:324
+#, c-format
+msgid "Target is not a sprite instance (%s)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:330
+#, c-format
+msgid "load clip: %s, target is: %p\n"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:344
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:388
+msgid "Listener given to MovieClipLoader.addListener() is not an object"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:406
+msgid "Listener given to MovieClipLoader.removeListener() is not an object"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:97
+#, c-format
+msgid "Gnash is not allowed to open this url: %s"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:104
+#, c-format
+msgid "Gnash could not open this url: %s"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:110
+#, c-format
+msgid "Connection etablished to movie: %s"
+msgstr ""
+
+#: server/asobj/NetStream.cpp:85
+#, c-format
+msgid ""
+"First argument to NetStream constructor doesn't cast to a NetConnection (%s)"
+msgstr ""
+
+#: server/asobj/NetStream.cpp:124
+msgid "NetStream play needs args"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:230 server/asobj/NetStreamGst.cpp:170
+msgid "No NetConnection associated with this NetStream, won't play"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:261
+msgid "libavcodec couldn't find decoder"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:267
+msgid "libavcodec couldn't allocate context"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:274
+msgid "libavcodec failed to initialize codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:311 server/asobj/NetStreamGst.cpp:491
+#, c-format
+msgid "Unsupported video codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:342 server/asobj/NetStreamGst.cpp:530
+#, c-format
+msgid "Unsupported audio codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:367
+msgid "Gnash could not read from movie url"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:384 server/asobj/NetStreamGst.cpp:346
+#: server/asobj/NetStreamGst.cpp:363
+#, c-format
+msgid "Gnash could not open movie: %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:403
+#, c-format
+msgid "Gnash could not open FLV movie: %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:414
+msgid "Failed to initialize FLV video codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:420
+msgid "Failed to initialize FLV audio codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:450
+#, c-format
+msgid "Couldn't determine stream input format from URL %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:466 server/asobj/SoundFfmpeg.cpp:136
+#, c-format
+msgid "Couldn't open file '%s' for decoding"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:476 server/asobj/SoundFfmpeg.cpp:146
+#, c-format
+msgid "Couldn't find stream information from '%s', error code: %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:515
+#, c-format
+msgid "Didn't find a video stream from '%s'"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:527
+#, c-format
+msgid "Video decoder %d not found"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:535
+#, c-format
+msgid "Could not open codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:561
+#, c-format
+msgid "No available audio decoder %d to process MPEG file: '%s'"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:569 server/asobj/SoundFfmpeg.cpp:201
+#, c-format
+msgid "Could not open audio codec %d for %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:744
+msgid "read_frame: not audio & video stream"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:944
+msgid "Problems decoding frame"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:988
+#, c-format
+msgid "%s: seeking failed"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:380
+msgid "The gstreamer pipeline element could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:399
+msgid "The gstreamer audiosink element could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:413
+msgid "Gstreamer audio element(s) for movie handling could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:458
+msgid ""
+"A gstreamer flashvideo (h.263) decoder element could not be created.  You "
+"probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:472
+msgid ""
+"A gstreamer flashvideo (VP6) decoder element could not be created! You "
+"probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:486
+msgid ""
+"A gstreamer flashvideo (ScreenVideo) decoder element could not be created! "
+"You probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:509
+msgid ""
+"This version of Fluendo's mp3 plugin does not support flash streaming "
+"sounds, please upgrade to version 0.10.4 or higher."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:516
+msgid ""
+"A gstreamer mp3-decoder element could not be created! You probably need to "
+"install a mp3-decoder plugin like gstreamer0.10-mad or gstreamer0.10-fluendo-"
+"mp3."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:566
+msgid ""
+"Gstreamer source element(s) for video movie handling could not be created, "
+"you probably need to install gstreamer0.10-core for fakesrc and capsfilter "
+"support."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:571
+msgid ""
+"Gstreamer element(s) for video movie handling could not be created, you "
+"probably need to install gstreamer0.10-base for decodebin support."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:577
+msgid ""
+"Gstreamer element(s) for video movie handling could not be created, you "
+"probably need to install gstreamer0.10-base for ffmpegcolorspace and "
+"videorate support."
+msgstr ""
+
+#: server/asobj/Number.cpp:221
+#, c-format
+msgid "Internal error: Cannot find \".0\" in %s for %.15g"
+msgstr ""
+
+#: server/asobj/Object.cpp:125
+msgid "Too many args to Object constructor"
+msgstr ""
+
+#: server/asobj/Object.cpp:171
+#, c-format
+msgid ""
+"Invalid call to Object.addProperty(%s) - expected 3 arguments (<name>, "
+"<getter>, <setter>)"
+msgstr ""
+
+#: server/asobj/Object.cpp:188
+msgid "Invalid call to Object.addProperty() - empty property name"
+msgstr ""
+
+#: server/asobj/Object.cpp:198
+msgid "Invalid call to Object.addProperty() - getter is not an AS function"
+msgstr ""
+
+#: server/asobj/Object.cpp:208
+msgid "Invalid call to Object.addProperty() - setter is not an AS function"
+msgstr ""
+
+#: server/asobj/Object.cpp:235
+#, c-format
+msgid ""
+"Invalid call to Object.registerClass(%s) - expected 2 arguments (<symbol>, "
+"<constructor>)"
+msgstr ""
+
+#: server/asobj/Object.cpp:252
+msgid "Invalid call to Object.registerClass() - empty symbol id"
+msgstr ""
+
+#: server/asobj/Object.cpp:262
+msgid "Invalid call to Object.registerClass() - class is not a function"
+msgstr ""
+
+#: server/asobj/Object.cpp:277
+#, c-format
+msgid "Object.registerClass(%s, %s): can't find exported symbol"
+msgstr ""
+
+#: server/asobj/Object.cpp:295
+#, c-format
+msgid ""
+"Object.registerClass(%s, %s): exported symbol is not a MovieClip symbol "
+"(sprite_definition), but a %s"
+msgstr ""
+
+#: server/asobj/Object.cpp:316
+msgid "Object.hasOwnProperty() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:325
+#, c-format
+msgid "Invalid call to Object.hasOwnProperty('%s')"
+msgstr ""
+
+#: server/asobj/Object.cpp:339
+msgid "Object.isPropertyEnumerable() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:348
+#, c-format
+msgid "Invalid call to Object.isPropertyEnumerable('%s')"
+msgstr ""
+
+#: server/asobj/Object.cpp:369
+msgid "Object.isPrototypeOf() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:378
+#, c-format
+msgid "First arg to Object.isPrototypeOf(%s) is not an object"
+msgstr ""
+
+#: server/asobj/Sound.cpp:140
+#, c-format
+msgid "%s is still testing!"
+msgstr ""
+
+#: server/asobj/Sound.cpp:143 server/asobj/SoundGst.cpp:229
+#, c-format
+msgid ""
+"%s: This sound already has a connection?  (We try to handle this by deleting "
+"the old one...)"
+msgstr ""
+
+#: server/asobj/Sound.cpp:217 server/asobj/Sound.cpp:229
+#, c-format
+msgid "%s: only works when ffmpeg, gstreamer or libmad is enabled"
+msgstr ""
+
+#: server/asobj/Sound.cpp:257
+msgid "-- start sound"
+msgstr ""
+
+#: server/asobj/Sound.cpp:282
+msgid "-- stop sound "
+msgstr ""
+
+#: server/asobj/Sound.cpp:298 server/asobj/Sound.cpp:352
+#, c-format
+msgid "import error: resource '%s' is not exported"
+msgstr ""
+
+#: server/asobj/Sound.cpp:312 server/asobj/Sound.cpp:366
+msgid "sound sample is NULL (doesn't cast to sound_sample)"
+msgstr ""
+
+#: server/asobj/Sound.cpp:325
+msgid "-- attach sound"
+msgstr ""
+
+#: server/asobj/Sound.cpp:330
+msgid "attach sound needs one argument"
+msgstr ""
+
+#: server/asobj/Sound.cpp:340
+msgid "attachSound needs a non-empty string"
+msgstr ""
+
+#: server/asobj/Sound.cpp:441
+msgid "loadSound needs 2 arguments"
+msgstr ""
+
+#: server/asobj/Sound.cpp:482
+msgid "set volume of sound needs one argument"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:92
+#, c-format
+msgid "%s could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:115
+#, c-format
+msgid "%s: could not read from audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:172
+#, c-format
+msgid "Non-audio data (type %d) found in file %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:181
+#, c-format
+msgid "Didn't find a audio stream from '%s'"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:192
+#, c-format
+msgid "No available audio decoder %d to process file: '%s'"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:320
+msgid "seeking to start of file (for looping) failed"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:372
+msgid ""
+"This sound already has a connection.  (We try to handle this by deleting the "
+"old one...)"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:402 server/asobj/SoundGst.cpp:257
+#, c-format
+msgid "%s: seeking to offset failed"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:108
+#, c-format
+msgid "%s: new pad found"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:122
+#, c-format
+msgid "%s: new pad connected"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:125
+#, c-format
+msgid "%s: Non-audio data found in file %s"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:142
+#, c-format
+msgid "could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:171
+msgid "Could not create gstreamer pipeline element"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:175
+msgid "Could not create gstreamer audiosink element"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:198
+msgid "Could not create Gstreamer element(s) for movie handling"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:83
+#, c-format
+msgid "Gnash could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:120 server/asobj/SoundMad.cpp:207
+#, c-format
+msgid "Recoverable error while decoding MP3, MAD error: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:215
+#, c-format
+msgid "Unrecoverable error while decoding MP3, MAD error: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:272
+msgid "Error in sound sample convertion"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:351
+msgid ""
+"This sound already has a connection?  (We try to handle this by deleting the "
+"old one...)"
+msgstr ""
+
+#: server/asobj/Stage.cpp:161
+msgid "Stage.addListener() needs one argument"
+msgstr ""
+
+#: server/asobj/Stage.cpp:172
+#, c-format
+msgid ""
+"Invalid call to Stage.addListener(%s) : first arg doesn't cast to an object"
+msgstr ""
+
+#: server/asobj/Stage.cpp:189
+msgid "Stage.removeListener() needs one argument"
+msgstr ""
+
+#: server/asobj/Stage.cpp:200
+#, c-format
+msgid ""
+"Invalid call to Stage.removeListener(%s) : first arg doesn't cast to an "
+"object"
+msgstr ""
+
+#: server/asobj/string.cpp:364
+msgid "string.slice() called with end < start"
+msgstr ""
+
+#: server/asobj/string.cpp:427
+msgid "string.charCodeAt needs one argument"
+msgstr ""
+
+#: server/asobj/string.cpp:436
+msgid "string.charCodeAt has more than one argument"
+msgstr ""
+
+#: server/asobj/xml.cpp:97 server/asobj/xml.cpp:115
+#, c-format
+msgid "Creating XML data at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:130
+#, c-format
+msgid "\tCreating XML data at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:164
+#, c-format
+msgid "set_member 'loaded' (%s) became boolean %d"
+msgstr ""
+
+#: server/asobj/xml.cpp:178
+#, c-format
+msgid "\tDeleting XML top level node at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:311
+msgid "Can't load XML file"
+msgstr ""
+
+#: server/asobj/xml.cpp:338
+msgid "XML data is empty"
+msgstr ""
+
+#: server/asobj/xml.cpp:353
+msgid "Can't parse XML data"
+msgstr ""
+
+#: server/asobj/xml.cpp:381
+#, c-format
+msgid "Can't load XML file: %s (security?)"
+msgstr ""
+
+#: server/asobj/xml.cpp:386
+#, c-format
+msgid "Loading XML file from url: '%s'"
+msgstr ""
+
+#: server/asobj/xml.cpp:397
+#, c-format
+msgid "Can't read XML file %s (stream error %d)"
+msgstr ""
+
+#: server/asobj/xml.cpp:408
+#, c-format
+msgid "Can't read XML file %s (%s)"
+msgstr ""
+
+#: server/asobj/xml.cpp:431
+#, c-format
+msgid "%s: FIXME: onLoad Default event handler"
+msgstr ""
+
+#: server/asobj/xml.cpp:569
+#, c-format
+msgid "\tCloned the XML object at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:578
+#, c-format
+msgid "First arg given to XML constructor (%s) evaluates to the empty string"
+msgstr ""
+
+#: server/asobj/xml.cpp:603
+#, c-format
+msgid "%s: %d args"
+msgstr ""
+
+#: server/asobj/xml.cpp:636
+msgid "no text for element creation"
+msgstr ""
+
+#: server/asobj/xml.cpp:665
+msgid "no text for text node creation"
+msgstr ""
+
+#: server/asobj/xml.cpp:791
+#, c-format
+msgid "XML parser: %s"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:83 server/asobj/xmlnode.cpp:95
+#, c-format
+msgid "\tCreating XMLNode data at %p"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:123
+#, c-format
+msgid "\tDeleting XMLNode data %s at %p"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:151
+#, c-format
+msgid "XMLNode %p has no children"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:192
+msgid ""
+"XMLNode.insertBefore(): positional parameter is not a child of this node"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:295
+#, c-format
+msgid ""
+"Stringifying node %p with name %s, value %s, %u attributes and %u children"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:443
+msgid "XMLNode::appendChild() needs at least one argument"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:452
+msgid "First argument to XMLNode::appendChild() is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:486
+#, c-format
+msgid "XMLNode.insertBefore(%s) needs at least two argument"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:496
+#, c-format
+msgid "First argument to XMLNode.insertBefore(%s) is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:507
+#, c-format
+msgid "Second argument to XMLNode.insertBefore(%s) is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:207
+#, c-format
+msgid ""
+"%s: fd <= 0, returning false (timer not unregistered while socket "
+"disconnected?"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:222
+#, c-format
+msgid "The socket for fd #%d was interupted by a system call"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:227 server/asobj/xmlsocket.cpp:403
+#, c-format
+msgid "%s: The socket for fd #%d never was available"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:243
+#, c-format
+msgid "%s: read %d bytes, first msg terminates at %d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:251
+#, c-format
+msgid "Packet size is %d at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:259
+#, c-format
+msgid "%d: Pushing Packet of size "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:259
+#, c-format
+msgid " at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:302
+#, c-format
+msgid "Throwing out partial packet %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:317
+#, c-format
+msgid "%s: Returning %d messages"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:332
+#, c-format
+msgid "%s: socket not initialized"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:339
+#, c-format
+msgid "%s: sent %d bytes, data was %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:399
+#, c-format
+msgid ""
+"%s: The socket for fd #%d was interupted by a system call in this thread"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:407
+#, c-format
+msgid "%s: There is no data in the socket for fd #%d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:411
+#, c-format
+msgid "%s: There is data in the socket for fd #%d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:429
+#, c-format
+msgid "XMLSocket.connect(%s) called"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:436
+msgid "XMLSocket.connect() called while already connected, ignored"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:455
+msgid "XMLSocket.connect(): calling onConnect"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:463
+msgid "Setting up timer for calling XMLSocket.onData()"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:471
+msgid "Timer set"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:512
+#, c-format
+msgid "new XMLSocket(%s) called - created object at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:532
+#, c-format
+msgid "%s: not connected"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:554
+#, c-format
+msgid ""
+"Builtin XMLSocket.onData doing nothing as no onXML event is defined on "
+"XMLSocket %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:563
+msgid "Builtin XMLSocket.onData() needs an argument"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:573
+#, c-format
+msgid ""
+"Builtin XMLSocket.onData() called with an argument that resolves to the "
+"empty string: %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:654
+msgid "Still processing data"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:664
+msgid "Got "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:664
+msgid " messages: "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:667
+msgid " Message "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:667
+#, c-format
+msgid " : %s "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:695
+#, c-format
+msgid "%s: Couldn't find onData"
+msgstr ""
+
+#: server/as_value.cpp:172
+#, c-format
+msgid "[object %p].%s() did not return a string: %s"
+msgstr ""
+
+#: server/as_value.cpp:179 server/as_value.cpp:339
+#, c-format
+msgid "get_member(%s) returned false"
+msgstr ""
+
+#: server/as_value.cpp:324
+#, c-format
+msgid "[object %p].%s() did not return a number: %s"
+msgstr ""
+
+#: server/as_value.cpp:504
+#, c-format
+msgid ""
+"MovieClip value is a dangling reference: target '%s' not found (should set "
+"to NULL?)"
+msgstr ""
+
+#: server/button_character_instance.cpp:328
+#, c-format
+msgid "Unsupported event for button instance: %s"
+msgstr ""
+
+#: server/button_character_instance.cpp:533
+#, c-format
+msgid "Unhandled button event %s"
+msgstr ""
+
+#: server/button_character_instance.cpp:623
+#, c-format
+msgid "Executing actions for button condition %d"
+msgstr ""
+
+#: server/character.cpp:99
+msgid "Relative drag"
+msgstr ""
+
+#: server/character.cpp:163
+msgid ""
+"ActionScript code trying to reference a nonexistent parent with '..'  (a "
+"nonexistent parent probably only occurs in the root MovieClip). Returning a "
+"reference to top parent (probably the root clip)."
+msgstr ""
+
+#: server/character.cpp:305
+#, c-format
+msgid "Attempt to set _xscale to %g, refused"
+msgstr ""
+
+#: server/character.cpp:313
+#, c-format
+msgid "Attempt to set _xscale to %g, use 0"
+msgstr ""
+
+#: server/character.cpp:349
+#, c-format
+msgid "Attempt to set _yscale to %g, refused"
+msgstr ""
+
+#: server/character.cpp:357
+#, c-format
+msgid "Attempt to set _yscale to %g, use 0"
+msgstr ""
+
+#: server/character.cpp:475
+msgid "FIXME: can't set _width on character with null or world bounds"
+msgstr ""
+
+#: server/character.cpp:486
+#, c-format
+msgid "Setting _width=%g"
+msgstr ""
+
+#: server/character.cpp:520
+msgid "FIXME: can't set _height on character with null or world bounds"
+msgstr ""
+
+#: server/character.cpp:531
+#, c-format
+msgid "Setting _height=%g"
+msgstr ""
+
+#: server/dlist.cpp:332
+#, c-format
+msgid "move_display_object() -- can't find object at depth %d"
+msgstr ""
+
+#: server/dlist.cpp:688
+#, c-format
+msgid "Item %d at depth %d (char id %d, name %s, type %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:850
+#, c-format
+msgid "TextField text doesn't fit in its boundaries: width %g, margin %d"
+msgstr ""
+
+#: server/edit_text_character.cpp:909
+#, c-format
+msgid "No font for edit_text_character! [%s:%d]"
+msgstr ""
+
+#: server/edit_text_character.cpp:937
+#, c-format
+msgid "substituting font!  font '%s' has no glyphs, using font '%s'"
+msgstr ""
+
+#: server/edit_text_character.cpp:947
+msgid ""
+"Current font has no glyphs and I couldn't find another font with glyphs... :("
+msgstr ""
+
+#: server/edit_text_character.cpp:1072
+#, c-format
+msgid ""
+"%s -- missing glyph for space char (needed for TAB).  Make sure character "
+"shapes for font %s are being exported into your SWF file."
+msgstr ""
+
+#: server/edit_text_character.cpp:1111
+#, c-format
+msgid ""
+"%s -- missing glyph for char %d.  Make sure character shapes for font %s are "
+"being exported into your SWF file"
+msgstr ""
+
+#: server/edit_text_character.cpp:1230
+msgid "registerTextVariable() no-op call (already registered)"
+msgstr ""
+
+#: server/edit_text_character.cpp:1238
+msgid "string is empty, consider as registered"
+msgstr ""
+
+#: server/edit_text_character.cpp:1254
+#, c-format
+msgid "VariableName: %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1269
+#, c-format
+msgid "Variable text Path: %s, Var: %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1282
+#, c-format
+msgid ""
+"VariableName associated to text field refer to an unknown target (%s). It is "
+"possible that the character will be instantiated later in the SWF stream. "
+"Gnash will try to register again on next access."
+msgstr ""
+
+#: server/edit_text_character.cpp:1297
+#, c-format
+msgid "target sprite (%p) does have a member named %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1304
+#, c-format
+msgid ""
+"target sprite (%p) does NOT have a member named %s (no problem, we'll add it)"
+msgstr ""
+
+#: server/fill_style.cpp:132
+msgid "num gradients 0"
+msgstr ""
+
+#: server/fill_style.cpp:141
+#, c-format
+msgid "Unexpected num gradients (%d), expected 1 to 8"
+msgstr ""
+
+#: server/fill_style.cpp:190
+#, c-format
+msgid ""
+"Bitmap fill specifies '%d' as associated bitmap character id, but that "
+"character is not found in the Characters Dictionary. It seems common to find "
+"such  malformed SWF, so we'll only warn once about this."
+msgstr ""
+
+#: server/fill_style.cpp:246
+#, c-format
+msgid "Unknown fill style %d"
+msgstr ""
+
+#: server/fill_style.cpp:282
+#, c-format
+msgid ""
+"First gradient in a fill_style have position==%d (expected 0). This seems to "
+"be common, so will warn only once."
+msgstr ""
+
+#: server/fill_style.cpp:318
+#, c-format
+msgid "two gradients in a fill_style have the same position/ratio: %d"
+msgstr ""
+
+#: server/font.cpp:139
+msgid "reading DefineFont"
+msgstr ""
+
+#: server/font.cpp:189
+msgid "reading DefineFont2 or DefineFont3"
+msgstr ""
+
+#: server/font.cpp:224 server/font.cpp:239
+#, c-format
+msgid "Glyph %d at offset %u"
+msgstr ""
+
+#: server/font.cpp:275
+msgid "Bad offset in DefineFont2"
+msgstr ""
+
+#: server/font.cpp:342
+msgid "Repeated kerning pair found - ignoring"
+msgstr ""
+
+#: server/font.cpp:364
+msgid "DefineFontInfo2 partially implemented"
+msgstr ""
+
+#: server/font.cpp:395
+#, c-format
+msgid "reading code table at offset %lu"
+msgstr ""
+
+#: server/font.cpp:429
+#, c-format
+msgid "get_glyph_index(%u) returning %d"
+msgstr ""
+
+#: server/font.cpp:436
+#, c-format
+msgid "get_glyph_index(%u) returning -1"
+msgstr ""
+
+#: server/font.cpp:456
+#, c-format
+msgid "empty advance table in font %s"
+msgstr ""
+
+#: server/font.cpp:523
+msgid ""
+"error reading cache file in font::input_cached_data(): glyph count mismatch"
+msgstr ""
+
+#: server/impl.cpp:89
+#, c-format
+msgid "Base url set to: %s"
+msgstr ""
+
+#: server/impl.cpp:254
+#, c-format
+msgid "get_movie_info(): can't open '%s'"
+msgstr ""
+
+#: server/impl.cpp:269
+#, c-format
+msgid "get_movie_info(): file '%s' does not start with a SWF header"
+msgstr ""
+
+#: server/impl.cpp:279
+msgid ""
+"get_movie_info(): can't read zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0"
+msgstr ""
+
+#: server/impl.cpp:339
+msgid "Can't read jpeg"
+msgstr ""
+
+#: server/impl.cpp:364
+msgid "Can't read file header"
+msgstr ""
+
+#: server/impl.cpp:441
+msgid ""
+"Requested to keep from completely loading a movie, but the movie in question "
+"is a jpeg, for which we don't yet have the concept of a 'loading thread'"
+msgstr ""
+
+#: server/impl.cpp:450
+#, c-format
+msgid "unknown file type (%s)"
+msgstr ""
+
+#: server/impl.cpp:466
+#, c-format
+msgid "failed to open '%s'; can't create movie"
+msgstr ""
+
+#: server/impl.cpp:471
+#, c-format
+msgid "streamProvider opener can't open '%s'"
+msgstr ""
+
+#: server/impl.cpp:490
+#, c-format
+msgid "note: couldn't open cache file '%s'"
+msgstr ""
+
+#: server/impl.cpp:499
+#, c-format
+msgid "Loading cache file %s"
+msgstr ""
+
+#: server/impl.cpp:627
+msgid "extern movie deleted"
+msgstr ""
+
+#: server/impl.cpp:677
+#, c-format
+msgid "Movie %s already in library"
+msgstr ""
+
+#: server/impl.cpp:693
+#, c-format
+msgid "Couldn't load library movie '%s'"
+msgstr ""
+
+#: server/impl.cpp:700
+#, c-format
+msgid "Movie %s (SWF%d) added to library"
+msgstr ""
+
+#: server/impl.cpp:739
+#, c-format
+msgid "%s: couldn't create instance"
+msgstr ""
+
+#: server/impl.cpp:791
+msgid "precompute_cached_data can't create instance of movie"
+msgstr ""
+
+#: server/impl.cpp:840
+msgid "loop back; jumping to frame "
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+msgid "process_decl_dict("
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+msgid ", "
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+#, c-format
+msgid ""
+"): decl_dict was already processed at %d. Skipping (or maybe we should "
+"append, or replace?)."
+msgstr ""
+
+#: server/parser/action_buffer.cpp:133
+msgid "action buffer dict length exceeded"
+msgstr ""
+
+#: server/parser/BitmapMovieDefinition.cpp:64
+#, c-format
+msgid "Creating a shape_definition wrapping a %g x %g bitmap"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:58
+msgid "-- actions in button\n"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:99
+#, c-format
+msgid ""
+"button record refer to character with id %d, which is not found in the chars "
+"dictionary"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:225
+msgid "button sound options: "
+msgstr ""
+
+#: server/parser/button_character_def.cpp:275
+#, c-format
+msgid "Next Button2 actionOffset (%u) points past the end of tag"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:301
+#, c-format
+msgid ""
+"Next action offset (%u) in Button2ActionConditions points past the end of tag"
+msgstr ""
+
+#: server/parser/edit_text_character_def.cpp:120
+#, c-format
+msgid "error: text style with undefined font; font_id = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:243
+#, c-format
+msgid "morph fill style type = 0x%X"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:253
+msgid "morph fill style begin color: "
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:255
+msgid "morph fill style end color: "
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:303
+#, c-format
+msgid "morph fsr: num_gradients = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:319
+#, c-format
+msgid "morph fsr bitmap_char = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:387
+msgid "Different number of paths in start ("
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:388
+msgid ") and end ("
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:389
+msgid ") shapes of a morph"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:395
+#, c-format
+msgid "Different number of edges in start (%u) and end (%u) shapes of a morph"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:280
+#, c-format
+msgid "import error: resource '%s' is not exported from movie '%s'"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:297 server/swf/tag_loaders.cpp:1081
+#, c-format
+msgid "import error: resource '%s' from movie '%s' has unknown type"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:326
+#, c-format
+msgid "get_character_def(): character_id %d is still waiting to be imported"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:348
+#, c-format
+msgid "get_font(): font_id %d is still waiting to be imported"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:395
+#, c-format
+msgid "Add sound sample %d"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:423
+msgid "gnash::movie_def_impl::read() -- file does not start with a SWF header"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:430
+#, c-format
+msgid "version = %d, file_length = %d"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:436
+#, c-format
+msgid "SWF%d is not fully supported, trying anyway but don't expect it to work"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:443
+msgid ""
+"movie_def_impl::read(): unable to read zipped SWF data; "
+"TU_CONFIG_LINK_TO_ZLIB is 0"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:449
+msgid "file is compressed"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:477
+#, c-format
+msgid "frame rate = %f, frames = "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:505
+msgid "Could not start loading thread"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:657
+msgid "cache file does not have the correct format; skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:663
+#, c-format
+msgid "cached data is version %d, but we require version %d; skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:678
+msgid "error reading cache file (characters); skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:683
+msgid "unexpected eof reading cache file (characters); skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:698
+msgid ""
+"sync error in cache file (reading characters).  Skipping rest of cache data."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:732
+#, c-format
+msgid "Character %d @ %p"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:744
+#, c-format
+msgid "Could not find char %d, dump is:"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:782
+#, c-format
+msgid "Ensure load of frame %u/%u (last loaded is: %u)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:787
+msgid "Could not advance to frame "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:796
+#, c-format
+msgid ""
+"No more frames to load. Framecount: %u, Lastloaded: %u, next to load: %u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:852
+#, c-format
+msgid ""
+"last expected SHOWFRAME in SWF stream '%s' isn't followed by an END (%d)."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:871
+#, c-format
+msgid "*** no tag loader for type %d (movie)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:889
+msgid ""
+"Hit stream-end tag, but not at the advertised SWF end; stopping for safety."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:905
+#, c-format
+msgid "Parsing exception: %s"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:911
+msgid " action blocks and "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:911
+msgid " init action blocks are NOT followed by a SHOWFRAME tag"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:921
+msgid " frames advertised in header, but only "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:921
+msgid " SHOWFRAME tags found in stream. Updating total frames count"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:947
+#, c-format
+msgid "number of SHOWFRAME tags in SWF stream '%s' ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:949
+msgid ") exceeds the advertised number in header ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:951
+msgid ")."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:960
+#, c-format
+msgid "Loaded frame %u/%u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:990
+#, c-format
+msgid "get_exported_resource called, frame count=%u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1026
+msgid "frame load advancement (from "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1027
+msgid " to "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1027 server/parser/sprite_definition.h:314
+msgid ")"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1036
+#, c-format
+msgid ""
+"No frame progress in movie %s after %lu milliseconds (%lu microseconds = %lu "
+"iterations), giving up on get_exported_resource(%s): circular IMPORTS?"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1050
+#, c-format
+msgid "no frame progress at iteration %lu"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1057
+#, c-format
+msgid "At end of stream, still no '%s' symbol found in m_exports ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1058
+msgid " entries in it, follow)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1064
+#, c-format
+msgid ""
+"We haven't finished loading (loading frame %u), and m_exports.get returned "
+"no entries, sleeping a bit and trying again"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:85
+#, c-format
+msgid "  read_fill_styles: count = %u"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:120
+#, c-format
+msgid "  read_line_styles: count = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:130
+#, c-format
+msgid "  read_line_styles: count2 = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:180
+#, c-format
+msgid "  bound rect: %s"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:192
+#, c-format
+msgid "  shape_character_def read: nfillbits = %d, nlinebits = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:249
+#, c-format
+msgid "  shape_character read: moveto %4g %4g"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:268
+#, c-format
+msgid "  shape_character read: fill0 (left) = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:288
+#, c-format
+msgid "  shape_character read: fill1 (right) = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:308
+#, c-format
+msgid "  shape_character_read: line = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:319
+msgid "  shape_character read: more fill styles"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:355
+#, c-format
+msgid "  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:386
+#, c-format
+msgid "  shape_character_read: straight edge = %4g %4g - %4g %4g"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:42
+#, c-format
+msgid "Instantiating sprite_def %p"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:81
+msgid "  frames = "
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:95
+msgid "DefineSprite tag inside sprite definition"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:106
+msgid "  show_frame "
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:107
+#: server/parser/sprite_definition.h:314 server/sprite_instance.cpp:1665
+#: server/sprite_instance.cpp:2293 server/sprite_instance.cpp:2317
+#: server/vm/ActionExec.cpp:429
+msgid "/"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:108
+msgid " (sprite)"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:121
+msgid ""
+"last SHOWFRAME of a DEFINESPRITE tag isn't followed by an END. Seeking to "
+"next END tag."
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:142
+#, c-format
+msgid "*** no tag loader for type %d (sprite)"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:150
+msgid "  -- sprite END --"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:208
+#, c-format
+msgid "Registered class %p for sprite_def %p"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:210
+msgid " Exported interface: "
+msgstr ""
+
+#: server/parser/sprite_definition.h:159
+msgid "add_font tag appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:180
+msgid "add_bitmap_character_def appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:194
+msgid "add sam appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:217
+msgid "Can't export from sprite"
+msgstr ""
+
+#: server/parser/sprite_definition.h:246
+msgid "add_character tag appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:276
+msgid "sprite_definition::add_init_action called!  Ignored"
+msgstr ""
+
+#: server/parser/sprite_definition.h:312
+msgid "sprite_definition: loading of frame "
+msgstr ""
+
+#: server/parser/sprite_definition.h:313
+msgid " requested (we are at "
+msgstr ""
+
+#: server/parser/text_character_def.cpp:29
+msgid "begin text records"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:43
+msgid "end text records"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:62
+msgid "  text style change"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:71
+#, c-format
+msgid "  has_font: font id = %d"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:86
+msgid "  has_color"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:94
+#, c-format
+msgid "  has_x_offset = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:107
+#, c-format
+msgid "  has_y_offset = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:119
+#, c-format
+msgid "  text_height = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:142
+#, c-format
+msgid "  glyph_records: count = %d"
+msgstr ""
+
+#: server/PropertyList.cpp:93
+#, c-format
+msgid "Property %s is read-only, not setting it to %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:138
+#, c-format
+msgid ""
+"attachMovie called with wrong number of arguments expected 3 to 4, got (%d) "
+"- returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:152
+#, c-format
+msgid "attachMovie: '%s': no such exported resource - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:162
+#, c-format
+msgid ""
+"attachMovie: exported resource '%s' is not a movie definition (%s) -- "
+"returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:186
+#, c-format
+msgid "Could not attach character at depth %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:205
+#, c-format
+msgid "Fourth argument of attachMovie doesn't cast to an object (%s)"
+msgstr ""
+
+#: server/sprite_instance.cpp:240
+#, c-format
+msgid "createEmptyMovieClip needs 2 args, but %d given, returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:250
+#, c-format
+msgid "createEmptyMovieClip takes 2 args, but %d given, discarding the excess"
+msgstr ""
+
+#: server/sprite_instance.cpp:288
+#, c-format
+msgid "%s.swapDepths() needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:297
+#, c-format
+msgid "%s.swapDepths(%s): won't swap a clip below depth %d (%d)"
+msgstr ""
+
+#: server/sprite_instance.cpp:309
+#, c-format
+msgid "%s.swapDepths(%s): this sprite has no parent, swapping depth of root?"
+msgstr ""
+
+#: server/sprite_instance.cpp:327
+#, c-format
+msgid "%s.swapDepths(%s): invalid call, swapping to self?"
+msgstr ""
+
+#: server/sprite_instance.cpp:337
+#, c-format
+msgid ""
+"%s.swapDepths(%s): invalid call, the two characters don't have the same "
+"parent"
+msgstr ""
+
+#: server/sprite_instance.cpp:354
+#, c-format
+msgid ""
+"%s.swapDepths(%s): first argument invalid (neither a sprite nor a number)"
+msgstr ""
+
+#: server/sprite_instance.cpp:389
+msgid "MovieClip.duplicateMovieClip() needs 2 or 3 args"
+msgstr ""
+
+#: server/sprite_instance.cpp:420
+msgid "sprite_goto_and_play needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:439
+msgid "sprite_goto_and_stop needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:503
+#, c-format
+msgid ""
+"MovieClip.loadMovie() expected 1 or 2 args, got %d - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:515
+#, c-format
+msgid ""
+"First argument of MovieClip.loadMovie(%s) evaluates to an empty string - "
+"returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:528
+#, c-format
+msgid ""
+"second argument of MovieClip.loadMovie(%s, <variables>) will be discarded"
+msgstr ""
+
+#: server/sprite_instance.cpp:551
+#, c-format
+msgid ""
+"MovieClip.loadVariables() expected 1 or 2 args, got %d - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:563
+#, c-format
+msgid ""
+"First argument passed to MovieClip.loadVariables(%s) evaluates to an empty "
+"string - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:627
+#, c-format
+msgid "Can't find hitTest target %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:665
+#, c-format
+msgid "hitTest() called with %u args"
+msgstr ""
+
+#: server/sprite_instance.cpp:684
+#, c-format
+msgid "createTextField called with %d args, expected 6 - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:693
+msgid "First argument of createTextField is not a string - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:703
+msgid ""
+"Second argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:713
+msgid "Third argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:723
+msgid ""
+"Fourth argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:733 server/sprite_instance.cpp:743
+msgid "Fifth argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:798
+#, c-format
+msgid "MovieClip.getBounds(%s): invalid call, first arg must be a sprite"
+msgstr ""
+
+#: server/sprite_instance.cpp:879
+msgid "MovieClip.lineTo() takes two args"
+msgstr ""
+
+#: server/sprite_instance.cpp:900
+msgid "MovieClip.moveTo() takes two args"
+msgstr ""
+
+#: server/sprite_instance.cpp:963
+msgid "MovieClip.curveTo() takes four args"
+msgstr ""
+
+#: server/sprite_instance.cpp:1624
+#, c-format
+msgid ""
+"A sprite member (%s) clashes with the name of an existing character in its "
+"display list.  The member will hide the character"
+msgstr ""
+
+#: server/sprite_instance.cpp:1664 server/sprite_instance.cpp:2291
+#: server/sprite_instance.cpp:2316
+msgid "Executing "
+msgstr ""
+
+#: server/sprite_instance.cpp:1664
+msgid " actions in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:1665 server/sprite_instance.cpp:2293
+#: server/sprite_instance.cpp:2317
+#, c-format
+msgid " of sprite %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:1714
+#, c-format
+msgid "call_frame('%s') -- invalid frame"
+msgstr ""
+
+#: server/sprite_instance.cpp:1828
+msgid "Can't clone root of the movie"
+msgstr ""
+
+#: server/sprite_instance.cpp:1834
+#, c-format
+msgid "%s parent is not a sprite, can't clone"
+msgstr ""
+
+#: server/sprite_instance.cpp:1890
+#, c-format
+msgid ""
+"clone_display_object(%s, %s, %d): could not find a character named %s to "
+"clone"
+msgstr ""
+
+#: server/sprite_instance.cpp:1986
+#, c-format
+msgid "sprite[%p]::set_member(%s, %s)"
+msgstr ""
+
+#: server/sprite_instance.cpp:2007
+msgid "it's a Text Variable"
+msgstr ""
+
+#: server/sprite_instance.cpp:2015
+msgid "it's NOT a Text Variable"
+msgstr ""
+
+#: server/sprite_instance.cpp:2029 server/sprite_instance.cpp:2055
+msgid "NULL path_to_var passed to set_variable()"
+msgstr ""
+
+#: server/sprite_instance.cpp:2034 server/sprite_instance.cpp:2060
+#, c-format
+msgid "NULL passed to set_variable('%s', NULL)"
+msgstr ""
+
+#: server/sprite_instance.cpp:2088
+#, c-format
+msgid ""
+"sprite '%s' ::advance_sprite is at frame %u/%u - onload called: %d - "
+"oldDIsplayList has %d elements"
+msgstr ""
+
+#: server/sprite_instance.cpp:2098
+msgid "sprite_instance::advance_sprite we're in PLAY mode"
+msgstr ""
+
+#: server/sprite_instance.cpp:2106
+msgid "on_event_load called, incrementing"
+msgstr ""
+
+#: server/sprite_instance.cpp:2110
+#, c-format
+msgid "after increment we are at frame %u/%u"
+msgstr ""
+
+#: server/sprite_instance.cpp:2124
+msgid "sprite_instance::advance_sprite we're in STOP mode"
+msgstr ""
+
+#: server/sprite_instance.cpp:2191
+msgid "Calling ONLOAD event"
+msgstr ""
+
+#: server/sprite_instance.cpp:2292
+msgid " *init* tags in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:2316
+msgid " tags in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:2400
+#, c-format
+msgid "sprite %s ::goto_frame("
+msgstr ""
+
+#: server/sprite_instance.cpp:2400
+msgid ") - current frame is "
+msgstr ""
+
+#: server/sprite_instance.cpp:2440
+msgid "GotoFrame("
+msgstr ""
+
+#: server/sprite_instance.cpp:2440
+msgid ") targets a yet to be loaded frame ("
+msgstr ""
+
+#: server/sprite_instance.cpp:2441
+msgid ""
+") loaded). We'll wait for it but a more correct form is explicitly using "
+"WaitForFrame instead"
+msgstr ""
+
+#: server/sprite_instance.cpp:2531
+#, c-format
+msgid "sprite_instance::goto_labeled_frame('%s') unknown label"
+msgstr ""
+
+#: server/sprite_instance.cpp:2620
+#, c-format
+msgid "sprite_instance::add_display_object(): unknown cid = %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:2706
+#, c-format
+msgid "sprite::replace_display_object(): unknown cid = %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:2780
+#, c-format
+msgid "Frame %u/%u, bytes %u/%u"
+msgstr ""
+
+#: server/sprite_instance.cpp:3014
+#, c-format
+msgid "%s doesn't even check for a char"
+msgstr ""
+
+#: server/sprite_instance.cpp:3155
+#, c-format
+msgid "Constructing sprite '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3205
+#, c-format
+msgid "Unloading sprite '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3227 server/vm/action.cpp:140
+#, c-format
+msgid "can't create movie_definition for %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:3236
+#, c-format
+msgid "can't create extern movie_instance for %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:3306
+msgid "MovieClip.loadVariables() with GET/POST won't append vars for now"
+msgstr ""
+
+#: server/sprite_instance.cpp:3331
+#, c-format
+msgid "Setting variable '%s' to value '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3374
+#, c-format
+msgid ""
+"removeMovieClip(%s): sprite depth (%d) out of the 'dynamic' zone "
+"[0..1048575], won't remove"
+msgstr ""
+
+#: server/sprite_instance.cpp:3391
+#, c-format
+msgid "Can't remove sprite %s as it has no parent"
+msgstr ""
+
+#: server/StreamProvider.cpp:91 server/StreamProvider.cpp:132
+#, c-format
+msgid "Unsupported network connection %s"
+msgstr ""
+
+#: server/StreamProvider.cpp:105
+msgid "POST data discarded while getting a stream from file: uri"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:53
+#, c-format
+msgid "DefineFontAlignZones tag references an undefined font %d"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:67
+#, c-format
+msgid "  DefinFontAlignZones: font=%d, flags=%d"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:71
+msgid "FIXME: DefineFontAlignZoneTag unfinished"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:47
+#, c-format
+msgid "  char_id = %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:48
+#, c-format
+msgid "  depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:58 server/swf/PlaceObject2Tag.cpp:272
+msgid "  cxform:"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:80
+#, c-format
+msgid "  actions: flags = 0x%X"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:101
+#, c-format
+msgid ""
+"swf_event::read(), even_length = %u, but only %lu bytes left to the end of "
+"current tag. Breaking for safety."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:126 server/swf/PlaceObject2Tag.cpp:138
+#, c-format
+msgid "swf_event::read(), event_length = %d, but read "
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:129
+msgid ". Breaking for safety."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:141
+msgid ". Skipping excessive bytes."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:177
+#, c-format
+msgid ""
+"swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:263
+#, c-format
+msgid "  PLACEOBJECT2: depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:264
+#, c-format
+msgid "  char id = %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:267
+msgid "  mat:"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:275
+#, c-format
+msgid "  ratio: %f"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:276
+#, c-format
+msgid "  name = %s"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:277
+#, c-format
+msgid "  clip_depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:278
+#, c-format
+msgid " m_place_type: %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:383
+#, c-format
+msgid "reverse REPLACE can't find previous replace or add tag(%d, %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:142
+msgid "anchor-labeled frame not supported"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:147
+msgid "frame_label_loader end position "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:147
+msgid ", read up to "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:182
+#, c-format
+msgid "  set_background_color: (%d %d %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:211
+msgid "  jpeg_tables_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:249 server/swf/tag_loaders.cpp:297
+msgid "gnash is not linked to jpeglib -- can't load jpeg image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:261
+#, c-format
+msgid "DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:281
+#, c-format
+msgid "  define_bits_jpeg2_loader: charid = %d pos = %lx"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:306
+#, c-format
+msgid "DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:342
+#, c-format
+msgid "inflate_wrapper() inflateInit() returned %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:358
+#, c-format
+msgid "inflate_wrapper() inflate() returned %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:365
+#, c-format
+msgid "inflate_wrapper() inflateEnd() return %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:382
+#, c-format
+msgid "  define_bits_jpeg3_loader: charid = %d pos = %lx"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:393
+msgid ""
+"gnash is not linked to jpeglib/zlib -- can't load jpeg/zipped image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:440
+#, c-format
+msgid "  defbitslossless2: tag = %d, id = %d, fmt = %d, w = %d, h = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:449
+msgid "gnash is not linked to zlib -- can't load zipped image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:555
+#, c-format
+msgid ""
+"DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:685
+#, c-format
+msgid "  FIXME: tagtype = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:697
+#, c-format
+msgid "  shape_loader: id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:713
+#, c-format
+msgid "  shape_morph_loader: id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:762
+#, c-format
+msgid "define_font_info_loader: can't find font w/ id %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:775
+msgid "  place_object_2"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:795
+#, c-format
+msgid "  sprite:  char id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:803
+msgid "nested DEFINESPRITE tags"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:870
+#, c-format
+msgid "reverse REMOVE can't find previous replace or add tag(%d, %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:889
+#, c-format
+msgid "  remove_object_2(%d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:920
+#, c-format
+msgid "  button character loader: char_id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:944
+#, c-format
+msgid "  export: count = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:954
+#, c-format
+msgid "  export: id = %d, name = %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:973
+#, c-format
+msgid "don't know how to export resource '%s' with id %d (can't find that id)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1010
+#, c-format
+msgid "  import: version = %u, source_url = %s (%s), count = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1022
+#, c-format
+msgid "Exception: %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1028
+#, c-format
+msgid "can't import movie from url %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1037
+msgid "Movie attempts to import symbols from itself."
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1050
+#, c-format
+msgid "  import: id = %d, name = %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1066
+#, c-format
+msgid "import error: could not find resource '%s' in movie '%s'"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1102
+#, c-format
+msgid "edit_text_char, id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1120
+#, c-format
+msgid "text_character, id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1141
+#, c-format
+msgid "tag %d: do_action_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1142
+msgid "-- actions in frame "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1165
+#, c-format
+msgid "  tag %d: do_init_action_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1166
+#, c-format
+msgid "  -- init actions for sprite %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1199
+#, c-format
+msgid "define sound: ch=%d, format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1215 server/swf/tag_loaders.cpp:1361
+#, c-format
+msgid "Bad sound sample rate %d read from SWF header"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1274
+#, c-format
+msgid ""
+"There is no sound handler currently active, so character with id %d will NOT "
+"be added to the dictionary"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1300
+#, c-format
+msgid "start_sound tag: id=%d, stop = %d, loop ct = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1309
+#, c-format
+msgid "start_sound_loader: sound_id %d is not defined"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1351
+#, c-format
+msgid "sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1516
+#, c-format
+msgid "  file attributes: has_metadata=%s use_network=%s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1517 server/swf/tag_loaders.cpp:1518
+msgid "true"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1517 server/swf/tag_loaders.cpp:1518
+msgid "false"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1523
+msgid ""
+"FileAttributes tag in the SWF requests that network access is not granted to "
+"this movie (or application?). Anyway Gnash won't care; use white/black "
+"listing in your .gnashrc instead"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1541
+#, c-format
+msgid ""
+"  metadata = [[\n"
+"%s\n"
+"]]"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1544
+#, c-format
+msgid "METADATA tag unused: %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1562
+#, c-format
+msgid ""
+"  serialnumber = [[\n"
+"%s\n"
+"]]"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1565
+#, c-format
+msgid "SERIALNUMBER: %s"
+msgstr ""
+
+#: server/text.cpp:50
+#, c-format
+msgid "text style references unknown font (id = %d)"
+msgstr ""
+
+#: server/text.cpp:154
+msgid "invalid glyph, render as an empty box"
+msgstr ""
+
+#: server/text.cpp:181
+msgid "render glyph using draw_glyph"
+msgstr ""
+
+#: server/text.cpp:192
+msgid "render glyph using filled outline (?) actually draw_glyph()"
+msgstr ""
+
+#: server/textformat.cpp:124
+#, c-format
+msgid "Created New TextFormat object at %p.  Not fully implemented yet"
+msgstr ""
+
+#: server/textformat.cpp:150
+msgid "TextFormat.setFormat() needs at least 3 arguments - ...me thinks"
+msgstr ""
+
+#: server/textformat.cpp:159
+msgid ""
+"Argument 3 given to TextFormat.setFormat() is not a TextFormat object - ... "
+"should it be?"
+msgstr ""
+
+#: server/textformat.cpp:237
+#, c-format
+msgid "%s: args=%d unfinished implementation"
+msgstr ""
+
+#: server/video_stream_instance.cpp:43
+msgid "attachVideo needs 1 arg"
+msgstr ""
+
+#: server/video_stream_instance.cpp:56
+#, c-format
+msgid "attachVideo(%s) first arg is not a NetStream instance"
+msgstr ""
+
+#: server/video_stream_instance.cpp:116
+msgid "An error occured while decoding video frame"
+msgstr ""
+
+#: server/vm/action.cpp:152
+#, c-format
+msgid "can't create extern root sprite for %s"
+msgstr ""
+
+#: server/vm/action.cpp:169
+#, c-format
+msgid "can't create extern sprite for %s"
+msgstr ""
+
+#: server/vm/action.cpp:238
+msgid ""
+"Attempt to call a value which is neither a C nor an ActionScript function"
+msgstr ""
+
+#: server/vm/action.cpp:270
+#, c-format
+msgid "FIXME(%d): %s"
+msgstr ""
+
+#: server/vm/action.cpp:389
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid fmt '%%l%c'"
+msgstr ""
+
+#: server/vm/action.cpp:398
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid fmt '%%%c'"
+msgstr ""
+
+#: server/vm/action.cpp:414
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid char '%c'"
+msgstr ""
+
+#: server/vm/action.cpp:450
+msgid "-- start movie"
+msgstr ""
+
+#: server/vm/action.cpp:461
+#, c-format
+msgid "FIXME: %s"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:136
+msgid "at ActionExec operator() start, pc="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:137
+msgid ", stop_pc="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:137
+msgid ", code.size="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:138 server/vm/ActionExec.cpp:211
+msgid "."
+msgstr ""
+
+#: server/vm/ActionExec.cpp:178
+#, c-format
+msgid "Length %u (%d) of action tag id %u at pc "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:180
+msgid " overflows actions buffer size "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:211
+msgid " After execution, PC is "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:249
+msgid "Call stack non-empty at end of ExecutableCode run (limits hit?)"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:255
+msgid ""
+"Stack smashed (ActionScript compiler bug?).Fixing by pushing undefined "
+"values to the missing slots,  but don't expect things to work afterwards"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:265
+msgid " elements left on the stack after block execution.  Cleaning up"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:283
+msgid "End of DoAction block hit while skipping "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:284
+msgid " action tags (pc:"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:285
+msgid ", stop_pc:"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:285
+msgid ") (WaitForFrame, probably)"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:319
+msgid "'With' stack depth ("
+msgstr ""
+
+#: server/vm/ActionExec.cpp:319
+msgid ") exceeds the allowed limit for current SWF target version ("
+msgstr ""
+
+#: server/vm/ActionExec.cpp:321
+#, c-format
+msgid " for version %d). Don't expect this movie to work with all players."
+msgstr ""
+
+#: server/vm/ActionExec.cpp:428
+msgid "Stack underrun: "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:428
+msgid " elements required, "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:429
+msgid " available. Fixing by inserting "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:430
+msgid " undefined values on the missing slots."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:101
+#, c-format
+msgid "Unsupported action handler invoked, code at pc is %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:182
+msgid ""
+"FIXME: VM not initialized at SWFHandlers construction time, can't set action "
+"handlers based on SWF version"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:466
+#, c-format
+msgid "%s: CHECKME: was broken"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:609
+#, c-format
+msgid "GetUrl: target=%s url=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:630
+#, c-format
+msgid "ActionWaitForFrame (0x%X) tag length == "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:631
+msgid " (expected 3)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:645 server/vm/ASHandlers.cpp:696
+#: server/vm/ASHandlers.cpp:1487
+#, c-format
+msgid "%s: environment target is not a sprite_instance"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:861
+msgid "Undefined or null string passed to ActionSubString, returning undefined"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:876
+msgid "Negative size passed to ActionSubString, taking as whole length"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:887
+msgid "Base is less then 1 in ActionSubString, setting to 1."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:896
+msgid ""
+"base goes beyond input string in ActionSubString, returning the empty string."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:910
+msgid "base+size goes beyond input string in ActionSubString, adjusting size"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:978
+#, c-format
+msgid "-- get var: %s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:982
+#, c-format
+msgid "-- get var: %s=%s at %p"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1007
+#, c-format
+msgid "-- set var: %s = %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1069
+msgid ""
+"ActionGetProperty(<empty>) called, but current target is not a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1092
+#, c-format
+msgid "invalid property query, property number %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1101
+#, c-format
+msgid "Could not find GetProperty target (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1133
+#, c-format
+msgid "invalid set_property, property number %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1157
+#, c-format
+msgid "Path given to duplicateMovieClip(%s) doesn't point to a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1168
+#, c-format
+msgid "Path given to duplicateMovieClip(%s) is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1193
+#, c-format
+msgid "Path given to removeMovieClip(%s) doesn't point to a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1203
+#, c-format
+msgid "Path given to removeMovieClip(%s) is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1242
+#, c-format
+msgid "start_drag of invalid target '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1266
+msgid "Y values in ActionStartDrag swapped, fixing"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1274
+msgid "X values in ActionStartDrag swapped, fixing"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1340
+#, c-format
+msgid "-- %s cast_to %s (invalid args?)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1360
+msgid "ActionCastOp TESTING"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1496
+#, c-format
+msgid ""
+"Frame spec found on stack at ActionWaitForFrame doesn't evaluate to a valid "
+"frame: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1561
+#, c-format
+msgid "[push length=%d]"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1580
+#, c-format
+msgid ""
+"Unknown push type %d. Execution will continue but it is likely to fail due "
+"to lost sync."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1630
+#, c-format
+msgid "register %d out of bounds"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1676 server/vm/ASHandlers.cpp:1695
+#, c-format
+msgid "dict_lookup %d is out of bounds"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1707 server/vm/ASHandlers.cpp:1711
+msgid "\t"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1707
+#, c-format
+msgid ") type=%s (%d), value=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1711
+#, c-format
+msgid ") type=%s, value=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1762
+msgid "Bogus empty GetUrl url in SWF file, skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1777
+msgid ""
+"Bogus GetUrl2 send vars method  in SWF file (both GET and POST requested), "
+"set to 0"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1830
+#, c-format
+msgid "get url: target=%s, url=%s (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1838
+#, c-format
+msgid "get url: target %s not found"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1846
+#, c-format
+msgid "get url: target %s is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1853
+msgid "getURL2 loadVariable"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1860
+msgid "getURL2 target load"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1871
+#, c-format
+msgid ""
+"Unhandled GetUrl2 sendVariableMethod (%d) with loadTargetFlag and ! "
+"loadVariablesFlag"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1884
+#, c-format
+msgid "Unhandled GetUrl2 sendVariableMethod (%d) with no loadTargetFlag"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1898
+#, c-format
+msgid "Launching URL... %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1923
+#, c-format
+msgid ""
+"Couldn't find movie \"%s\" to set target to! Not setting target at all..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1951
+msgid "Undefined GetUrl2 url on stack, skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1988
+msgid "branch to offset "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1988
+msgid "  --  this section only runs to "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2028
+#, c-format
+msgid ""
+"Couldn't find target_sprite \"%s\" in ActionCallFrame! target frame actions "
+"will not be called..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2090
+#, c-format
+msgid ""
+"Frame spec found on stack at ActionGotoExpression doesn't evaluate to a "
+"valid frame: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2104
+#, c-format
+msgid ""
+"Couldn't find target sprite \"%s\" in ActionGotoExpression.  Will not go to "
+"target frame..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2125
+msgid "No elements on the stack at ActionDelete (0x3A). Returning FALSE."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2164
+#, c-format
+msgid "-- set local var: %s = %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2196
+#, c-format
+msgid "ActionCallFunction: %s is not an object"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2205
+msgid "Object doensn't have a constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2216
+#, c-format
+msgid ""
+"Attempt to call a function with %u arguments while only %u are available on "
+"the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2307
+#, c-format
+msgid "---new object: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2320
+#, c-format
+msgid "ActionNew: '%s' is not a constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2360
+msgid "The 'var whatever' syntax in timeline context is a no-op."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2476
+#, c-format
+msgid "Argument to TargetPath(%s) doesn't cast to a MovieClip"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2514
+#, c-format
+msgid "Top of stack not an object (%s) at ActionEnumerate execution"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2672
+#, c-format
+msgid " ActionGetMember: target: %s (object %p)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2688
+#, c-format
+msgid "-- get_member %s.%s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2714
+#, c-format
+msgid "-- set_member %s.%s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2726
+#, c-format
+msgid "-- set_member %s.%s=%s on invalid object!"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2781
+#, c-format
+msgid ""
+"Attempt to call a method with %u arguments while only %u are available on "
+"the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2790
+#, c-format
+msgid " method name: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2791
+#, c-format
+msgid " method object/func: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2792
+#, c-format
+msgid " method nargs: %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2807
+msgid ""
+"ActionCallMethod invoked with undefined method_name and non-object object/"
+"func"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2816
+msgid ""
+"Function object given to ActionCallMethod is not a function, will try to use "
+"its 'constructor' member"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2826
+msgid "ActionCallMethod: object has no constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2835
+msgid "ActionCallMethod: object constructor is not a function"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2851
+#, c-format
+msgid "ActionCallMethod: Tried to invoke method '%s' on non-object value %s."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2864
+#, c-format
+msgid "ActionCallMethod: Can't find method %s of object %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2887
+msgid "FIXME: debugger doesn't deal with anonymous function calls"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2924
+#, c-format
+msgid ""
+"Attempt to call a constructor with %u arguments while only %u are available "
+"on the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2936
+msgid "On ActionNewMethod: no object found on stack on ActionMethod"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2954
+#, c-format
+msgid "ActionNewMethod: can't find method %s of object %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2968
+msgid "ActionNewMethod: method name is undefined, and object is not a function"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3007
+#, c-format
+msgid "-- %s instanceof %s (invalid args?)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3041
+#, c-format
+msgid "Top of stack not an object %s at ActionEnum2  execution"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3218
+#, c-format
+msgid "ActionExtends: Super is not an as_function (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3223
+#, c-format
+msgid "ActionExtends: Sub is not an as_function (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3312
+#, c-format
+msgid ""
+"function2 code len (%u) overflows DOACTION tag boundaries (DOACTION tag len="
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3315
+msgid ", function2 code offset="
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3315
+msgid "). Forcing code len to eat the whole buffer (would this work?)."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3379
+msgid "-------------- with block start: stack size is "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3389
+msgid "ActionWith tag length != 2; skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3399
+msgid "Empty with() block..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3415
+msgid "With-block skipped (with stack size exceeds limit of "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3417
+msgid " elements)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3533
+#, c-format
+msgid "-------------- local register[%d] = '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3542
+#, c-format
+msgid "-------------- global register[%d] = '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3550
+#, c-format
+msgid "store_register[%d] -- register out of bounds!"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3561
+#, c-format
+msgid "at SWFHandlers::action_name(%d) call time, _handlers size is "
+msgstr ""
+
+#: utilities/dumpshm.cpp:206
 msgid ""
 "Sorry, we can only list the files on systems with disk based shared memory"
 msgstr ""
 
-#: utilities/dumpshm.cpp:209
+#: utilities/dumpshm.cpp:215
 msgid "No name specified, nuking everything..."
 msgstr ""
 
-#: utilities/dumpshm.cpp:216
+#: utilities/dumpshm.cpp:222
 msgid "Removing segment: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:224
+#: utilities/dumpshm.cpp:230
 msgid "Nuking the shared memory segment "
 msgstr ""
 
-#: utilities/dumpshm.cpp:250
+#: utilities/dumpshm.cpp:256
 msgid "ERROR: couldn't read!"
 msgstr ""
 
-#: utilities/dumpshm.cpp:281
+#: utilities/dumpshm.cpp:287
 msgid "This program dumps the internal data of a shared memory segment"
 msgstr ""
 
-#: utilities/dumpshm.cpp:283
+#: utilities/dumpshm.cpp:289
 msgid "Usage: dumpmem [hdsanlif] filename"
 msgstr ""
 
-#: utilities/dumpshm.cpp:284
+#: utilities/dumpshm.cpp:290
 msgid "-h\tHelp"
 msgstr ""
 
-#: utilities/dumpshm.cpp:285
+#: utilities/dumpshm.cpp:291
 msgid "-d\tDump data"
 msgstr ""
 
-#: utilities/dumpshm.cpp:286
+#: utilities/dumpshm.cpp:292
 msgid "-n [optional name]\tNuke everything"
 msgstr ""
 
-#: utilities/dumpshm.cpp:287
+#: utilities/dumpshm.cpp:293
 msgid "-l\tLength of segment"
 msgstr ""
 
-#: utilities/dumpshm.cpp:288
+#: utilities/dumpshm.cpp:294
 msgid "-i\tList segments"
 msgstr ""
 
-#: utilities/dumpshm.cpp:289
+#: utilities/dumpshm.cpp:295
 msgid "-f\tForce to use builtin names for nuke"
 msgstr ""
 
-#: utilities/dumpshm.cpp:301
+#: utilities/dumpshm.cpp:307
 msgid "\tBase address of this segment: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:303
+#: utilities/dumpshm.cpp:309
 msgid "\tFilespec: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:304
+#: utilities/dumpshm.cpp:310
 msgid "\t# Bytes allocated: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:305
+#: utilities/dumpshm.cpp:311
 msgid "\tTotal # of bytes: "
 msgstr ""
 

Index: po/es.po
===================================================================
RCS file: /sources/gnash/gnash/po/es.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/es.po	6 Apr 2007 07:49:55 -0000	1.1
+++ po/es.po	20 Apr 2007 11:11:36 -0000	1.2
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnash cvs20070405\n"
 "Report-Msgid-Bugs-To: bug-gnash@gnu.org\n"
-"POT-Creation-Date: 2007-04-05 20:53-0700\n"
+"POT-Creation-Date: 2007-04-20 00:11-0700\n"
 "PO-Revision-Date: 2007-04-05 20:35-0700\n"
 "Last-Translator: John Gilmore <gnu@gnash-translation.toad.com>\n"
 "Language-Team: Espanol <ES@li.org>\n"
@@ -14,72 +14,4393 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: utilities/dumpshm.cpp:200
+#: backend/sound_handler_sdl.cpp:76
+msgid "could not allocate memory for sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:99
+msgid "Some kind of error occurred with raw sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:112
+msgid "Some kind of error occurred with adpcm sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:123
+msgid "gnash has not been compiled to handle mp3 audio"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:129
+msgid "could not allocate space for data in sound handler"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:138
+#, c-format
+msgid "unknown sound format %d requested; gnash does not handle it"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:170
+msgid "Some kind of error with resampling sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:215
+#, c-format
+msgid ""
+"Behavior for this audio codec %d is unknown.  Please send this SWF to the "
+"developers"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:276
+msgid "Your FFMPEG can't decode MP3?!"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:304
+#, c-format
+msgid "Unable to start SDL sound: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:496
+#, c-format
+msgid "Unable to start aux SDL sound: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:717
+#, c-format
+msgid "Negative buffer length in sdl_audio_callback (%d)"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:834
+msgid ""
+"Error while decoding MP3-stream.  Upgrading ffmpeg/libavcodec might fix this "
+"issue."
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:864
+#, c-format
+msgid "Recoverable error while decoding MP3-stream, MAD error: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:872
+#, c-format
+msgid "Unrecoverable error while decoding MP3-stream, MAD error: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:929
+msgid "Error in sound sample conversion"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:186
+msgid "Couldn't initialize database"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:191
+msgid "Couldn't connect to database"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:217 extensions/mysql/mysql_db.cpp:244
+#, c-format
+msgid "MySQL connection error: %s"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:224 extensions/mysql/mysql_db.cpp:251
+#, c-format
+msgid ""
+"MySQL error on query for:\n"
+"\t%s\n"
+"Query was: %s"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:265
+#, c-format
+msgid "Field name is: %s: "
+msgstr ""
+
+#: gui/gnash.cpp:73
+msgid ""
+"usage: gnash [options] movie_file.swf\n"
+"\n"
+"Plays a SWF (Shockwave Flash) movie\n"
+"options:\n"
+"\n"
+msgstr ""
+
+#: gui/gnash.cpp:78
+msgid ""
+"  -h, --help  Print this info.\n"
+"  -s <factor> Scale the movie up/down by the specified factor\n"
+"  -c          Produce a core file instead of letting SDL trap it\n"
+"  -d num      Number of milliseconds to delay in main loop\n"
+"  -v          Be verbose; i.e. print log messages to stdout\n"
+msgstr ""
+
+#: gui/gnash.cpp:85
+msgid "  -va         Be verbose about movie Actions\n"
+msgstr ""
+
+#: gui/gnash.cpp:90
+msgid "  -vp         Be verbose about parsing the movie\n"
+msgstr ""
+
+#: gui/gnash.cpp:95
+msgid ""
+"  -m <bias>   Specify the texture LOD bias (float, default is -1.0)\n"
+"  -x <ID>     X11 Window ID for display\n"
+"  -w          Produce the disk based debug log\n"
+"  -j <width>  Set window width\n"
+"  -k <height> Set window height\n"
+"  -1          Play once; exit when/if movie reaches the last frame\n"
+msgstr ""
+
+#: gui/gnash.cpp:102
+msgid ""
+"  -g          Turn on the Flash debugger\n"
+"  -r <0|1|2|3>\n"
+"              0 disables both rendering & sound (good for batch tests)\n"
+"              1 enables rendering & disables sound\n"
+"              2 enables sound & disables rendering\n"
+"              3 enables both rendering & sound (default)\n"
+msgstr ""
+
+#: gui/gnash.cpp:109
+msgid ""
+"  -t <sec>    Timeout and exit after the specified number of seconds\n"
+"  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
+"  -u <url>    Set \"real\" url of the movie\n"
+"              (useful for downloaded movies)\n"
+"  -U <url>    Set \"base\" url for this run\n"
+"              (used to resolve relative urls, defaults to movie url)\n"
+"  -P <param>  Set parameter (ie. \"FlashVars=A=1&b=2\")\n"
+"  --version   Print gnash's version number and exit\n"
+msgstr ""
+
+#: gui/gnash.cpp:118
+msgid ""
+"\n"
+"keys:\n"
+"  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
+"  CTRL-P          Toggle Pause\n"
+"  CTRL-R          Restart the movie\n"
+"  CTRL-[ or kp-   Step back one frame\n"
+"  CTRL-] or kp+   Step forward one frame\n"
+"  CTRL-B          Toggle background color\n"
+"  CTRL-A          Toggle antialiasing (doesn't work)\n"
+"  CTRL-T          Debug.  Test the set_variable() function\n"
+"  CTRL-G          Debug.  Test the get_variable() function\n"
+"  CTRL-M          Debug.  Test the call_method() function\n"
+msgstr ""
+
+#: gui/gnash.cpp:138 plugin/klash/klash.cpp:660
+#, c-format
+msgid "Gnash "
+msgstr ""
+
+#: gui/gnash.cpp:138
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 2005-2007 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License.  For more information, see the file named COPYING.\n"
+msgstr ""
+
+#: gui/gnash.cpp:149
+#, c-format
+msgid ""
+"Build options %s\n"
+"   Target: %s\n"
+"   Renderer: %s   GUI: %s   Media handler: %s\n"
+msgstr ""
+
+#: gui/gnash.cpp:190 plugin/klash/klash.cpp:319
+msgid "Verbose output turned on"
+msgstr "Verbose [Español] output turned on"
+
+#: gui/gnash.cpp:194
+msgid "Logging to disk enabled"
+msgstr ""
+
+#: gui/gnash.cpp:200
+msgid "No verbose actions; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:207
+msgid "No verbose parsing; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:218
+#, c-format
+msgid "Setting root URL to %s"
+msgstr ""
+
+#: gui/gnash.cpp:224
+#, c-format
+msgid "Setting base URL to %s"
+msgstr ""
+
+#: gui/gnash.cpp:229
+#, c-format
+msgid "Setting width to %d"
+msgstr ""
+
+#: gui/gnash.cpp:233
+msgid "Setting debugger ON"
+msgstr ""
+
+#: gui/gnash.cpp:238
+msgid "No debugger; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:243
+#, c-format
+msgid "Setting height to %d"
+msgstr ""
+
+#: gui/gnash.cpp:279
+#, c-format
+msgid "-r must be followed by 0, 1, 2 or 3 (%ld is invalid)"
+msgstr ""
+
+#: gui/gnash.cpp:314
+msgid "No rendering flags specified, using rcfile"
+msgstr ""
+
+#: gui/gnash.cpp:328
+#, c-format
+msgid "Got variable option (%s) on command line"
+msgstr ""
+
+#: gui/gui.cpp:460
+#, c-format
+msgid "Frame %d"
+msgstr ""
+
+#: gui/Player.cpp:187
+msgid "Sound requested but no sound support compiled in"
+msgstr ""
+
+#: gui/Player.cpp:364
+#, c-format
+msgid "fs_callback(%p): %s %s"
+msgstr ""
+
+#: libamf/amf.cpp:179
+#, c-format
+msgid "Type is %s"
+msgstr ""
+
+#: libamf/amf.cpp:185
+msgid "Number is "
+msgstr ""
+
+#: libamf/amf.cpp:189
+#, c-format
+msgid "Boolean is %d"
+msgstr ""
+
+#: libamf/amf.cpp:202 libamf/amf.cpp:241
+#, c-format
+msgid "String is %s"
+msgstr ""
+
+#: libamf/amf.cpp:218
+msgid "Undefined element"
+msgstr ""
+
+#: libamf/amf.cpp:234
+msgid "Date is "
+msgstr ""
+
+#: libamf/amf.cpp:234
+msgid " nanoseconds"
+msgstr ""
+
+#: libamf/amf.cpp:884
+#, c-format
+msgid "AMF Header size bits (0x%X) out of range"
+msgstr ""
+
+#: libamf/amf.cpp:901
+#, c-format
+msgid "AMF header byte is: 0x%X"
+msgstr ""
+
+#: libamf/amf.cpp:904
+#, c-format
+msgid "The AMF channel index is %d"
+msgstr ""
+
+#: libamf/amf.cpp:907
+#, c-format
+msgid "The header size is %d"
+msgstr ""
+
+#: libamf/amf.cpp:911
+#, c-format
+msgid "The packet head is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:918
+#, c-format
+msgid "The mystery word is: %d or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:927
+#, c-format
+msgid "The body size is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:937
+#, c-format
+msgid "The type is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:956
+#, c-format
+msgid "ERROR: Unidentified AMF header data type %d"
+msgstr ""
+
+#: libamf/amf.cpp:964
+#, c-format
+msgid "The source/destination is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1007
+msgid "AMF body input data is NULL"
+msgstr ""
+
+#: libamf/amf.cpp:1017
+#, c-format
+msgid "The packet body is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1046
+#, c-format
+msgid "AMF String length is: %d"
+msgstr ""
+
+#: libamf/amf.cpp:1052
+#, c-format
+msgid "AMF String is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1108 libamf/amf.cpp:1193
+msgid "End of Object definition"
+msgstr ""
+
+#: libamf/amf.cpp:1119
+#, c-format
+msgid "The element is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1124
+#, c-format
+msgid "AMF element length is: %d"
+msgstr ""
+
+#: libamf/amf.cpp:1134
+#, c-format
+msgid "AMF type is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1151
+#, c-format
+msgid "Number \"%s\" is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1162
+#, c-format
+msgid "Boolean \"%s\" is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1171 libamf/amf.cpp:1184
+#, c-format
+msgid "Variable \"%s\" is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1181
+msgid "Undefined type"
+msgstr ""
+
+#: libamf/amf.cpp:1207
+#, c-format
+msgid "astype_e of value: %d"
+msgstr ""
+
+#: libbase/curl_adapter.cpp:277 libbase/curl_adapter.cpp:529
+#, c-format
+msgid "404 response from url %s"
+msgstr ""
+
+#: libbase/extension.cpp:124
+#, c-format
+msgid "Loading module: %s"
+msgstr ""
+
+#: libbase/extension.cpp:140
+#, c-format
+msgid "Initializing module: \"%s\""
+msgstr ""
+
+#: libbase/extension.cpp:157
+msgid "Couldn't get class_init symbol"
+msgstr ""
+
+#: libbase/extension.cpp:192
+#, c-format
+msgid "Scanning directory \"%s\" for plugins"
+msgstr ""
+
+#: libbase/extension.cpp:196
+#, c-format
+msgid "Can't open directory %s"
+msgstr ""
+
+#: libbase/extension.cpp:218
+#, c-format
+msgid "Gnash Plugin name: %s"
+msgstr ""
+
+#: libbase/log.cpp:188
+msgid "TRACE: "
+msgstr ""
+
+#: libbase/log.cpp:210 libbase/log.cpp:625
+msgid "DEBUG: "
+msgstr "ENSECTREMOVAL: "
+
+#: libbase/log.cpp:276
+msgid "ERROR: "
+msgstr ""
+
+#: libbase/log.cpp:293
+msgid "ERROR: Unimplemented: "
+msgstr ""
+
+#: libbase/log.cpp:310
+msgid "SECURITY: "
+msgstr ""
+
+#: libbase/log.cpp:327
+msgid "MALFORMED SWF: "
+msgstr ""
+
+#: libbase/log.cpp:344
+msgid "ACTIONSCRIPT ERROR: "
+msgstr ""
+
+#: libbase/network.cpp:85
+msgid "Could not find a usable WinSock DLL"
+msgstr ""
+
+#: libbase/network.cpp:127
+#, c-format
+msgid "Can't connect to privileged port #%d"
+msgstr ""
+
+#: libbase/network.cpp:149
+#, c-format
+msgid "unable to get protocol entry for %s"
+msgstr ""
+
+#: libbase/network.cpp:166
+#, c-format
+msgid "unable to create socket: %s"
+msgstr ""
+
+#: libbase/network.cpp:173
+msgid "setsockopt SO_REUSEADDR failed"
+msgstr ""
+
+#: libbase/network.cpp:183
+#, c-format
+msgid "unable to bind to port %hd: %s"
+msgstr ""
+
+#: libbase/network.cpp:192
+#, c-format
+msgid "Server bound to service on %s, port %hd, using fd %d"
+msgstr ""
+
+#: libbase/network.cpp:198
+#, c-format
+msgid "unable to listen on port: %hd: %s "
+msgstr ""
+
+#: libbase/network.cpp:235
+#, c-format
+msgid "Trying to accept net traffic on fd %d"
+msgstr ""
+
+#: libbase/network.cpp:264
+msgid "There is data at the console for stdin"
+msgstr ""
+
+#: libbase/network.cpp:270
+#, c-format
+msgid "The accept() socket for fd %d was interupted by a system call"
+msgstr ""
+
+#: libbase/network.cpp:274
+#, c-format
+msgid "The accept() socket for fd %d never was available for writing"
+msgstr ""
+
+#: libbase/network.cpp:281
+#, c-format
+msgid "The accept() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: libbase/network.cpp:293
+#, c-format
+msgid "unable to accept: %s"
+msgstr ""
+
+#: libbase/network.cpp:298
+#, c-format
+msgid "Accepting tcp/ip connection on fd %d"
+msgstr ""
+
+#: libbase/network.cpp:344
+#, c-format
+msgid "Can't connect to privileged port %hd"
+msgstr ""
+
+#: libbase/network.cpp:349
+#, c-format
+msgid "%s: to host %s at port %d"
+msgstr ""
+
+#: libbase/network.cpp:355
+#, c-format
+msgid "The hostname for this machine is %s"
+msgstr ""
+
+#: libbase/network.cpp:357
+msgid "Couldn't get the hostname for this machine"
+msgstr ""
+
+#: libbase/network.cpp:371
+#, c-format
+msgid "The IP address for this client socket is %s"
+msgstr ""
+
+#: libbase/network.cpp:379
+#, c-format
+msgid "unable to create socket : %s"
+msgstr ""
+
+#: libbase/network.cpp:401
+#, c-format
+msgid "The connect() socket for fd %d was interupted by a system call"
+msgstr ""
+
+#: libbase/network.cpp:408 libbase/network.cpp:436
+#, c-format
+msgid "The connect() socket for fd %d never was available for writing"
+msgstr ""
+
+#: libbase/network.cpp:419
+#, c-format
+msgid "The connect() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: libbase/network.cpp:429
+#, c-format
+msgid "\tport %d at IP %s for fd %d"
+msgstr ""
+
+#: libbase/network.cpp:505
+#, c-format
+msgid "Unable to close the socket for fd %d: %s"
+msgstr ""
+
+#: libbase/network.cpp:512
+#, c-format
+msgid "Closed the socket on fd %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:101
+msgid "Play Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:102
+msgid "Pause Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:103
+msgid "Stop Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:104
+msgid "Restart Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:105
+msgid "Step Forward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:106
+msgid "Step Backward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:107
+msgid "Jump Forward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:108
+msgid "Jump Backward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:109
+msgid "Quit Gnash"
+msgstr ""
+
+#: plugin/klash/klash.cpp:147
+msgid "Klash"
+msgstr ""
+
+#: plugin/klash/klash.cpp:148
+msgid "The Gnash Flash player for KDE.\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:309
+#, c-format
+msgid "Timer delay set to %d milliseconds"
+msgstr ""
+
+#: plugin/klash/klash.cpp:323
+msgid "Logging to disk enabled."
+msgstr ""
+
+#: plugin/klash/klash.cpp:342
+#, c-format
+msgid "Setting root URL to: %s"
+msgstr ""
+
+#: plugin/klash/klash.cpp:346
+#, c-format
+msgid "Setting width to: %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:350
+#, c-format
+msgid "Setting height to: %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:381
+#, c-format
+msgid "-r must be followed by 0, 1 or 2 (%d is invalid)"
+msgstr ""
+
+#: plugin/klash/klash.cpp:399
+msgid "Got variable option on command line!"
+msgstr ""
+
+#: plugin/klash/klash.cpp:414
+#, c-format
+msgid "No input files"
+msgstr ""
+
+#: plugin/klash/klash.cpp:448
+#, c-format
+msgid "error: can't get info about %s\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:508
+#, c-format
+msgid "error: can't create a movie from '%s'\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:513
+#, c-format
+msgid "error: can't create movie instance\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:660
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 2006, 2007 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License.  For more information, see the file named COPYING.\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:673
+msgid ""
+"usage: gnash [options] movie_file.swf\n"
+"\n"
+"Plays a SWF (Shockwave Flash) movie\n"
+"options:\n"
+"\n"
+"  -h, --help  Print this info.\n"
+"  -s <factor> Scale the movie up/down by the specified factor\n"
+"  -c          Produce a core file instead of letting SDL trap it\n"
+"  -d num      Number of milliseconds to delay in main loop\n"
+"  -v          Be verbose; i.e. print log messages to stdout\n"
+"  -va         Be verbose about movie Actions\n"
+"  -vp         Be verbose about parsing the movie\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:685
+msgid ""
+"  -m <bias>   Specify the texture LOD bias (float, default is -1)\n"
+"  -x <ID>     X11 Window ID for display\n"
+"  -w          Produce the disk based debug log\n"
+"  -1          Play once; exit when/if movie reaches the last frame\n"
+"  -r <0|1|2>  0 disables rendering & sound (good for batch tests)\n"
+"              1 enables rendering & sound (default setting)\n"
+"              2 enables rendering & disables sound\n"
+"  -t <sec>    Timeout and exit after the specified number of seconds\n"
+"  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
+"  --version   Print gnash's version number and exit\n"
+"\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:696
+msgid ""
+"keys:\n"
+"  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
+"  CTRL-P          Toggle Pause\n"
+"  CTRL-R          Restart the movie\n"
+"  CTRL-[ or kp-   Step back one frame\n"
+"  CTRL-] or kp+   Step forward one frame\n"
+"  CTRL-B          Toggle background color\n"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:259
+#, c-format
+msgid "can't get info about %s"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:262
+#, c-format
+msgid "Movie %s: width is %d, height is %d, version is %d\n"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:272
+#, c-format
+msgid "can't create a movie from %s"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:280
+msgid "can't create movie instance"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:348
+msgid "player: Shutting down as requested..."
+msgstr ""
+
+#: server/array.cpp:203
+msgid "tried to pop element from back of empty array, returning undef"
+msgstr ""
+
+#: server/array.cpp:219
+msgid "tried to shift element from front of empty array, returning undef"
+msgstr ""
+
+#: server/array.cpp:313
+#, c-format
+msgid "Array.slice(%u, %u) called"
+msgstr ""
+
+#: server/array.cpp:343
+#, c-format
+msgid "Current array is %s"
+msgstr ""
+
+#: server/array.cpp:476
+#, c-format
+msgid "Unhandled sort flags: %d (0x%X)"
+msgstr ""
+
+#: server/array.cpp:486
+msgid "array.sort with unique flag"
+msgstr ""
+
+#: server/array.cpp:512
+#, c-format
+msgid "Array(%s).splice(%s) called"
+msgstr ""
+
+#: server/array.cpp:518
+msgid "Array.splice() needs at least 1 argument, call ignored"
+msgstr ""
+
+#: server/array.cpp:534
+#, c-format
+msgid "Array.splice: start:%d became %u"
+msgstr ""
+
+#: server/array.cpp:547
+#, c-format
+msgid "Array.splice(%d,%d): negative length given, call ignored"
+msgstr ""
+
+#: server/array.cpp:614
+#, c-format
+msgid "calling array push, pushing %d values onto back of array"
+msgstr ""
+
+#: server/array.cpp:630
+#, c-format
+msgid "calling array unshift, pushing %d values onto front of array"
+msgstr ""
+
+#: server/array.cpp:649
+#, c-format
+msgid "calling array pop, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:665
+#, c-format
+msgid "calling array shift, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:682
+#, c-format
+msgid "called array reverse, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:723
+#, c-format
+msgid "array_to_string called, nargs = %d, this_ptr = %p"
+msgstr ""
+
+#: server/array.cpp:726
+#, c-format
+msgid "to_string result is: %s"
+msgstr ""
+
+#: server/array.cpp:775
+msgid ""
+"More than 2 arguments to Array.slice, and I don't know what to do with "
+"them.  Ignoring them"
+msgstr ""
+
+#: server/array.cpp:845
+#, c-format
+msgid "array_new called, nargs = %d"
+msgstr ""
+
+#: server/array.cpp:878
+#, c-format
+msgid "array_new setting object %p in result"
+msgstr ""
+
+#: server/as_environment.cpp:68
+#, c-format
+msgid "find_object%s(\"%s\") [ varname = '%s' - current target = '%s' ] failed"
+msgstr ""
+
+#: server/as_environment.cpp:80
+#, c-format
+msgid "...but get_variable_raw(%s, <with_stack>) succeeded!"
+msgstr ""
+
+#: server/as_environment.cpp:157
+#, c-format
+msgid "get_variable_raw(\"%s\") failed, returning UNDEFINED"
+msgstr ""
+
+#: server/as_environment.cpp:247
+#, c-format
+msgid "Path target '%s' not found while setting %s=%s"
+msgstr ""
+
+#: server/as_environment.cpp:455
+#, c-format
+msgid ""
+"as_environment::find_target: '%s': invalid path; neither string nor object"
+msgstr ""
+
+#: server/as_environment.cpp:511
+#, c-format
+msgid "find_target(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:516 server/as_environment.cpp:593
+#: server/as_environment.cpp:703
+msgid "Returning m_target (empty path)"
+msgstr ""
+
+#: server/as_environment.cpp:533 server/as_environment.cpp:721
+#, c-format
+msgid "Absolute path, start at the root (%p)"
+msgstr ""
+
+#: server/as_environment.cpp:540 server/as_environment.cpp:606
+#: server/as_environment.cpp:728
+msgid "Null path, returning m_target"
+msgstr ""
+
+#: server/as_environment.cpp:551 server/as_environment.cpp:619
+#: server/as_environment.cpp:740
+#, c-format
+msgid "invalid path '%s'"
+msgstr ""
+
+#: server/as_environment.cpp:564 server/as_environment.cpp:636
+#: server/as_environment.cpp:757
+#, c-format
+msgid "No more subparts, env is %p"
+msgstr ""
+
+#: server/as_environment.cpp:570
+#, c-format
+msgid "Invoking get_relative_target(%s) on object %p (%s)"
+msgstr ""
+
+#: server/as_environment.cpp:588
+#, c-format
+msgid "find_object_dotsyntax(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:629 server/as_environment.cpp:750
+#, c-format
+msgid "Subpart ==  %s"
+msgstr ""
+
+#: server/as_environment.cpp:642 server/as_environment.cpp:787
+#, c-format
+msgid "Invoking get_member(%s) on object %p"
+msgstr ""
+
+#: server/as_environment.cpp:652
+#, c-format
+msgid "Member %s for object %p not found (dotsyntax).  Path was %s"
+msgstr ""
+
+#: server/as_environment.cpp:661
+#, c-format
+msgid ""
+"Element '%s' of variable '%s' not found in object %p nor in _global "
+"(dotsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:671
+#, c-format
+msgid ""
+"Member %s of object %p doesn't cast to an Object (%s) evaluating target path "
+"%s (dotsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:698
+#, c-format
+msgid "find_object_slashsyntax(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:767
+#, c-format
+msgid "'..' element in path '%s' follows a non-character object %p"
+msgstr ""
+
+#: server/as_environment.cpp:776
+#, c-format
+msgid ""
+"'..' in path '%s' follows a character with no parent (%s : %p) (root is %p)"
+msgstr ""
+
+#: server/as_environment.cpp:797
+#, c-format
+msgid "Member %s for object %p not found (slashsyntax). Path was %s"
+msgstr ""
+
+#: server/as_environment.cpp:806
+#, c-format
+msgid ""
+"Element '%s' of variable '%s' not found in object %p nor in _global "
+"(slashsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:816
+#, c-format
+msgid ""
+"Member %s of object %p doesn't cast to an Object (%s) evaluating target path "
+"%s (slashsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:1041
+#, c-format
+msgid "Max stack count reached (%u) - should abort execution"
+msgstr ""
+
+#: server/as_function.cpp:148
+#, c-format
+msgid "Exported interface of function %p has been overwritten (from %p to %p)"
+msgstr ""
+
+#: server/as_function.cpp:197
+msgid "Function.apply() called with no args"
+msgstr ""
+
+#: server/as_function.cpp:217
+#, c-format
+msgid ""
+"Function.apply() got %d args, expected at most 2 -- discarding the ones in "
+"excess"
+msgstr ""
+
+#: server/as_function.cpp:229
+#, c-format
+msgid ""
+"Second arg of Function.apply is %s (expected array) - considering as call "
+"with no args"
+msgstr ""
+
+#: server/as_function.cpp:243
+#, c-format
+msgid ""
+"Second arg of Function.apply is of type %s, with value %s (expected array) - "
+"considering as call with no args"
+msgstr ""
+
+#: server/as_function.cpp:331
+msgid "it's a built-in class"
+msgstr ""
+
+#: server/as_function.cpp:364
+#, c-format
+msgid "constructor prototype is %s"
+msgstr ""
+
+#: server/asobj/Date.cpp:416
+msgid "Date constructor called with more than 7 arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:443
+msgid "Date() failed to initialise from arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:648
+msgid "Date.setTime needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:655
+msgid "Date.setTime was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:705
+msgid "Failed to set a date."
+msgstr ""
+
+#: server/asobj/Date.cpp:742
+msgid "utc_tm_msec_to_date failed to convert a date"
+msgstr ""
+
+#: server/asobj/Date.cpp:816
+msgid "Date.setFullYear needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:832
+msgid "Date.setFullYear was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:861
+msgid "Date.setYear needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:881
+msgid "Date.setYear was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:909
+msgid "Date.setMonth needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:938
+msgid "Date.setMonth was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:957
+msgid "Date.setDate needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:971
+msgid "Date.setDate was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:995
+msgid "Date.setHours needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1013
+msgid "Date.setHours was called with more than four arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:1035
+msgid "Date.setMinutes needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1052 server/asobj/Date.cpp:1090
+msgid "Date.setMinutes was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:1072
+msgid "Date.setSeconds needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1106
+msgid "Date.setMilliseconds needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1116
+msgid "Date.setMilliseconds was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1240
+msgid "Date.UTC needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1260
+msgid "Date.UTC was called with more than 7 arguments"
+msgstr ""
+
+#: server/as_object.cpp:121
+#, c-format
+msgid "Caught exception: %s"
+msgstr ""
+
+#: server/as_object.cpp:205
+#, c-format
+msgid "Attempt to set read-only property '%s'"
+msgstr ""
+
+#: server/as_object.cpp:216
+#, c-format
+msgid "%s: Exception %s.  Will create a new member"
+msgstr ""
+
+#: server/as_object.cpp:226
+#, c-format
+msgid "Attempt to set read-only property ``%s'' on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:249
+#, c-format
+msgid "Attempt to initialize read-only property ``%s'' (%s) on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:263
+#, c-format
+msgid "Attempt to initialize read-only property ``%s'' on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:362
+msgid "Circular inheritance chain detected during instanceOf call"
+msgstr ""
+
+#: server/as_object.cpp:383
+msgid "Circular inheritance chain detected during isPrototypeOf call"
+msgstr ""
+
+#: server/as_object.cpp:392
+#, c-format
+msgid " members of object %p follow"
+msgstr ""
+
+#: server/as_object.cpp:420
+#, c-format
+msgid ""
+"Can't set propflags on object property %s (either not found or protected)"
+msgstr ""
+
+#: server/asobj/Global.cpp:80 server/asobj/string.cpp:39
+#, c-format
+msgid "%s needs one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:86 server/asobj/string.cpp:45
+#, c-format
+msgid "%s has more than one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:193
+#, c-format
+msgid "%s needs at least one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:199
+#, c-format
+msgid "%s has more than two arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:311
+#, c-format
+msgid "%s needs at least three arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:317
+#, c-format
+msgid "%s has more than four arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:319
+#, c-format
+msgid "%s has four arguments in a SWF version 5 movie"
+msgstr ""
+
+#: server/asobj/Global.cpp:328
+#, c-format
+msgid "Invalid call to ASSetPropFlags: object argument is not an object: %s"
+msgstr ""
+
+#: server/asobj/Key.cpp:231
+msgid "key_add_listener needs one argument (the listener object)"
+msgstr ""
+
+#: server/asobj/Key.cpp:238
+msgid "key_add_listener passed a NULL object; ignored"
+msgstr ""
+
+#: server/asobj/Key.cpp:279
+msgid "key_is_down needs one argument (the key code)"
+msgstr ""
+
+#: server/asobj/Key.cpp:303
+msgid "key_remove_listener needs one argument (the listener object)"
+msgstr ""
+
+#: server/asobj/Key.cpp:310
+msgid "key_remove_listener passed a NULL object; ignored"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:528
+msgid "LoadVars.load() requires at least one argument"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:537
+msgid "LoadVars.load(): invalid empty url"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:564
+msgid "LoadVars.sendAndLoad() requires at least two arguments"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:573
+msgid "LoadVars.sendAndLoad(): invalid empty url"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:582
+msgid "LoadVars.sendAndLoad(): invalid target (must be a LoadVars object)"
+msgstr ""
+
+#: server/asobj/LocalConnection.cpp:143
+msgid "No connection name specified to LocalConnection.connect()"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:182
+#, c-format
+msgid " resolved url: %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:221
+msgid ""
+"FIXME: MovieClipLoader calling onLoadComplete *before* movie has actually "
+"been fully loaded (cheating)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:261
+#, c-format
+msgid "Dispatching %s event to "
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:261
+msgid " listeners"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:274
+#, c-format
+msgid "Listener %p doesn't have an %s event to listen for, skipped"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:283
+#, c-format
+msgid "Testing call to listener's  %s function"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:308
+#, c-format
+msgid "MovieClipLoader.loadClip() first argument is not a string (%s)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:318
+#, c-format
+msgid "Could not find target %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:324
+#, c-format
+msgid "Target is not a sprite instance (%s)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:330
+#, c-format
+msgid "load clip: %s, target is: %p\n"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:344
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:388
+msgid "Listener given to MovieClipLoader.addListener() is not an object"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:406
+msgid "Listener given to MovieClipLoader.removeListener() is not an object"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:97
+#, c-format
+msgid "Gnash is not allowed to open this url: %s"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:104
+#, c-format
+msgid "Gnash could not open this url: %s"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:110
+#, c-format
+msgid "Connection etablished to movie: %s"
+msgstr ""
+
+#: server/asobj/NetStream.cpp:85
+#, c-format
+msgid ""
+"First argument to NetStream constructor doesn't cast to a NetConnection (%s)"
+msgstr ""
+
+#: server/asobj/NetStream.cpp:124
+msgid "NetStream play needs args"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:230 server/asobj/NetStreamGst.cpp:170
+msgid "No NetConnection associated with this NetStream, won't play"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:261
+msgid "libavcodec couldn't find decoder"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:267
+msgid "libavcodec couldn't allocate context"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:274
+msgid "libavcodec failed to initialize codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:311 server/asobj/NetStreamGst.cpp:491
+#, c-format
+msgid "Unsupported video codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:342 server/asobj/NetStreamGst.cpp:530
+#, c-format
+msgid "Unsupported audio codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:367
+msgid "Gnash could not read from movie url"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:384 server/asobj/NetStreamGst.cpp:346
+#: server/asobj/NetStreamGst.cpp:363
+#, c-format
+msgid "Gnash could not open movie: %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:403
+#, c-format
+msgid "Gnash could not open FLV movie: %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:414
+msgid "Failed to initialize FLV video codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:420
+msgid "Failed to initialize FLV audio codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:450
+#, c-format
+msgid "Couldn't determine stream input format from URL %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:466 server/asobj/SoundFfmpeg.cpp:136
+#, c-format
+msgid "Couldn't open file '%s' for decoding"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:476 server/asobj/SoundFfmpeg.cpp:146
+#, c-format
+msgid "Couldn't find stream information from '%s', error code: %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:515
+#, c-format
+msgid "Didn't find a video stream from '%s'"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:527
+#, c-format
+msgid "Video decoder %d not found"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:535
+#, c-format
+msgid "Could not open codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:561
+#, c-format
+msgid "No available audio decoder %d to process MPEG file: '%s'"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:569 server/asobj/SoundFfmpeg.cpp:201
+#, c-format
+msgid "Could not open audio codec %d for %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:744
+msgid "read_frame: not audio & video stream"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:944
+msgid "Problems decoding frame"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:988
+#, c-format
+msgid "%s: seeking failed"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:380
+msgid "The gstreamer pipeline element could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:399
+msgid "The gstreamer audiosink element could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:413
+msgid "Gstreamer audio element(s) for movie handling could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:458
+msgid ""
+"A gstreamer flashvideo (h.263) decoder element could not be created.  You "
+"probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:472
+msgid ""
+"A gstreamer flashvideo (VP6) decoder element could not be created! You "
+"probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:486
+msgid ""
+"A gstreamer flashvideo (ScreenVideo) decoder element could not be created! "
+"You probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:509
+msgid ""
+"This version of Fluendo's mp3 plugin does not support flash streaming "
+"sounds, please upgrade to version 0.10.4 or higher."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:516
+msgid ""
+"A gstreamer mp3-decoder element could not be created! You probably need to "
+"install a mp3-decoder plugin like gstreamer0.10-mad or gstreamer0.10-fluendo-"
+"mp3."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:566
+msgid ""
+"Gstreamer source element(s) for video movie handling could not be created, "
+"you probably need to install gstreamer0.10-core for fakesrc and capsfilter "
+"support."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:571
+msgid ""
+"Gstreamer element(s) for video movie handling could not be created, you "
+"probably need to install gstreamer0.10-base for decodebin support."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:577
+msgid ""
+"Gstreamer element(s) for video movie handling could not be created, you "
+"probably need to install gstreamer0.10-base for ffmpegcolorspace and "
+"videorate support."
+msgstr ""
+
+#: server/asobj/Number.cpp:221
+#, c-format
+msgid "Internal error: Cannot find \".0\" in %s for %.15g"
+msgstr ""
+
+#: server/asobj/Object.cpp:125
+msgid "Too many args to Object constructor"
+msgstr ""
+
+#: server/asobj/Object.cpp:171
+#, c-format
+msgid ""
+"Invalid call to Object.addProperty(%s) - expected 3 arguments (<name>, "
+"<getter>, <setter>)"
+msgstr ""
+
+#: server/asobj/Object.cpp:188
+msgid "Invalid call to Object.addProperty() - empty property name"
+msgstr ""
+
+#: server/asobj/Object.cpp:198
+msgid "Invalid call to Object.addProperty() - getter is not an AS function"
+msgstr ""
+
+#: server/asobj/Object.cpp:208
+msgid "Invalid call to Object.addProperty() - setter is not an AS function"
+msgstr ""
+
+#: server/asobj/Object.cpp:235
+#, c-format
+msgid ""
+"Invalid call to Object.registerClass(%s) - expected 2 arguments (<symbol>, "
+"<constructor>)"
+msgstr ""
+
+#: server/asobj/Object.cpp:252
+msgid "Invalid call to Object.registerClass() - empty symbol id"
+msgstr ""
+
+#: server/asobj/Object.cpp:262
+msgid "Invalid call to Object.registerClass() - class is not a function"
+msgstr ""
+
+#: server/asobj/Object.cpp:277
+#, c-format
+msgid "Object.registerClass(%s, %s): can't find exported symbol"
+msgstr ""
+
+#: server/asobj/Object.cpp:295
+#, c-format
+msgid ""
+"Object.registerClass(%s, %s): exported symbol is not a MovieClip symbol "
+"(sprite_definition), but a %s"
+msgstr ""
+
+#: server/asobj/Object.cpp:316
+msgid "Object.hasOwnProperty() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:325
+#, c-format
+msgid "Invalid call to Object.hasOwnProperty('%s')"
+msgstr ""
+
+#: server/asobj/Object.cpp:339
+msgid "Object.isPropertyEnumerable() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:348
+#, c-format
+msgid "Invalid call to Object.isPropertyEnumerable('%s')"
+msgstr ""
+
+#: server/asobj/Object.cpp:369
+msgid "Object.isPrototypeOf() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:378
+#, c-format
+msgid "First arg to Object.isPrototypeOf(%s) is not an object"
+msgstr ""
+
+#: server/asobj/Sound.cpp:140
+#, c-format
+msgid "%s is still testing!"
+msgstr ""
+
+#: server/asobj/Sound.cpp:143 server/asobj/SoundGst.cpp:229
+#, c-format
+msgid ""
+"%s: This sound already has a connection?  (We try to handle this by deleting "
+"the old one...)"
+msgstr ""
+
+#: server/asobj/Sound.cpp:217 server/asobj/Sound.cpp:229
+#, c-format
+msgid "%s: only works when ffmpeg, gstreamer or libmad is enabled"
+msgstr ""
+
+#: server/asobj/Sound.cpp:257
+msgid "-- start sound"
+msgstr ""
+
+#: server/asobj/Sound.cpp:282
+msgid "-- stop sound "
+msgstr ""
+
+#: server/asobj/Sound.cpp:298 server/asobj/Sound.cpp:352
+#, c-format
+msgid "import error: resource '%s' is not exported"
+msgstr ""
+
+#: server/asobj/Sound.cpp:312 server/asobj/Sound.cpp:366
+msgid "sound sample is NULL (doesn't cast to sound_sample)"
+msgstr ""
+
+#: server/asobj/Sound.cpp:325
+msgid "-- attach sound"
+msgstr ""
+
+#: server/asobj/Sound.cpp:330
+msgid "attach sound needs one argument"
+msgstr ""
+
+#: server/asobj/Sound.cpp:340
+msgid "attachSound needs a non-empty string"
+msgstr ""
+
+#: server/asobj/Sound.cpp:441
+msgid "loadSound needs 2 arguments"
+msgstr ""
+
+#: server/asobj/Sound.cpp:482
+msgid "set volume of sound needs one argument"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:92
+#, c-format
+msgid "%s could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:115
+#, c-format
+msgid "%s: could not read from audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:172
+#, c-format
+msgid "Non-audio data (type %d) found in file %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:181
+#, c-format
+msgid "Didn't find a audio stream from '%s'"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:192
+#, c-format
+msgid "No available audio decoder %d to process file: '%s'"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:320
+msgid "seeking to start of file (for looping) failed"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:372
+msgid ""
+"This sound already has a connection.  (We try to handle this by deleting the "
+"old one...)"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:402 server/asobj/SoundGst.cpp:257
+#, c-format
+msgid "%s: seeking to offset failed"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:108
+#, c-format
+msgid "%s: new pad found"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:122
+#, c-format
+msgid "%s: new pad connected"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:125
+#, c-format
+msgid "%s: Non-audio data found in file %s"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:142
+#, c-format
+msgid "could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:171
+msgid "Could not create gstreamer pipeline element"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:175
+msgid "Could not create gstreamer audiosink element"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:198
+msgid "Could not create Gstreamer element(s) for movie handling"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:83
+#, c-format
+msgid "Gnash could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:120 server/asobj/SoundMad.cpp:207
+#, c-format
+msgid "Recoverable error while decoding MP3, MAD error: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:215
+#, c-format
+msgid "Unrecoverable error while decoding MP3, MAD error: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:272
+msgid "Error in sound sample convertion"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:351
+msgid ""
+"This sound already has a connection?  (We try to handle this by deleting the "
+"old one...)"
+msgstr ""
+
+#: server/asobj/Stage.cpp:161
+msgid "Stage.addListener() needs one argument"
+msgstr ""
+
+#: server/asobj/Stage.cpp:172
+#, c-format
+msgid ""
+"Invalid call to Stage.addListener(%s) : first arg doesn't cast to an object"
+msgstr ""
+
+#: server/asobj/Stage.cpp:189
+msgid "Stage.removeListener() needs one argument"
+msgstr ""
+
+#: server/asobj/Stage.cpp:200
+#, c-format
+msgid ""
+"Invalid call to Stage.removeListener(%s) : first arg doesn't cast to an "
+"object"
+msgstr ""
+
+#: server/asobj/string.cpp:364
+msgid "string.slice() called with end < start"
+msgstr ""
+
+#: server/asobj/string.cpp:427
+msgid "string.charCodeAt needs one argument"
+msgstr ""
+
+#: server/asobj/string.cpp:436
+msgid "string.charCodeAt has more than one argument"
+msgstr ""
+
+#: server/asobj/xml.cpp:97 server/asobj/xml.cpp:115
+#, c-format
+msgid "Creating XML data at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:130
+#, c-format
+msgid "\tCreating XML data at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:164
+#, c-format
+msgid "set_member 'loaded' (%s) became boolean %d"
+msgstr ""
+
+#: server/asobj/xml.cpp:178
+#, c-format
+msgid "\tDeleting XML top level node at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:311
+msgid "Can't load XML file"
+msgstr ""
+
+#: server/asobj/xml.cpp:338
+msgid "XML data is empty"
+msgstr ""
+
+#: server/asobj/xml.cpp:353
+msgid "Can't parse XML data"
+msgstr ""
+
+#: server/asobj/xml.cpp:381
+#, c-format
+msgid "Can't load XML file: %s (security?)"
+msgstr ""
+
+#: server/asobj/xml.cpp:386
+#, c-format
+msgid "Loading XML file from url: '%s'"
+msgstr ""
+
+#: server/asobj/xml.cpp:397
+#, c-format
+msgid "Can't read XML file %s (stream error %d)"
+msgstr ""
+
+#: server/asobj/xml.cpp:408
+#, c-format
+msgid "Can't read XML file %s (%s)"
+msgstr ""
+
+#: server/asobj/xml.cpp:431
+#, c-format
+msgid "%s: FIXME: onLoad Default event handler"
+msgstr ""
+
+#: server/asobj/xml.cpp:569
+#, c-format
+msgid "\tCloned the XML object at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:578
+#, c-format
+msgid "First arg given to XML constructor (%s) evaluates to the empty string"
+msgstr ""
+
+#: server/asobj/xml.cpp:603
+#, c-format
+msgid "%s: %d args"
+msgstr ""
+
+#: server/asobj/xml.cpp:636
+msgid "no text for element creation"
+msgstr ""
+
+#: server/asobj/xml.cpp:665
+msgid "no text for text node creation"
+msgstr ""
+
+#: server/asobj/xml.cpp:791
+#, c-format
+msgid "XML parser: %s"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:83 server/asobj/xmlnode.cpp:95
+#, c-format
+msgid "\tCreating XMLNode data at %p"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:123
+#, c-format
+msgid "\tDeleting XMLNode data %s at %p"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:151
+#, c-format
+msgid "XMLNode %p has no children"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:192
+msgid ""
+"XMLNode.insertBefore(): positional parameter is not a child of this node"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:295
+#, c-format
+msgid ""
+"Stringifying node %p with name %s, value %s, %u attributes and %u children"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:443
+msgid "XMLNode::appendChild() needs at least one argument"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:452
+msgid "First argument to XMLNode::appendChild() is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:486
+#, c-format
+msgid "XMLNode.insertBefore(%s) needs at least two argument"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:496
+#, c-format
+msgid "First argument to XMLNode.insertBefore(%s) is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:507
+#, c-format
+msgid "Second argument to XMLNode.insertBefore(%s) is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:207
+#, c-format
+msgid ""
+"%s: fd <= 0, returning false (timer not unregistered while socket "
+"disconnected?"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:222
+#, c-format
+msgid "The socket for fd #%d was interupted by a system call"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:227 server/asobj/xmlsocket.cpp:403
+#, c-format
+msgid "%s: The socket for fd #%d never was available"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:243
+#, c-format
+msgid "%s: read %d bytes, first msg terminates at %d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:251
+#, c-format
+msgid "Packet size is %d at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:259
+#, c-format
+msgid "%d: Pushing Packet of size "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:259
+#, c-format
+msgid " at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:302
+#, c-format
+msgid "Throwing out partial packet %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:317
+#, c-format
+msgid "%s: Returning %d messages"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:332
+#, c-format
+msgid "%s: socket not initialized"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:339
+#, c-format
+msgid "%s: sent %d bytes, data was %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:399
+#, c-format
+msgid ""
+"%s: The socket for fd #%d was interupted by a system call in this thread"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:407
+#, c-format
+msgid "%s: There is no data in the socket for fd #%d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:411
+#, c-format
+msgid "%s: There is data in the socket for fd #%d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:429
+#, c-format
+msgid "XMLSocket.connect(%s) called"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:436
+msgid "XMLSocket.connect() called while already connected, ignored"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:455
+msgid "XMLSocket.connect(): calling onConnect"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:463
+msgid "Setting up timer for calling XMLSocket.onData()"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:471
+msgid "Timer set"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:512
+#, c-format
+msgid "new XMLSocket(%s) called - created object at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:532
+#, c-format
+msgid "%s: not connected"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:554
+#, c-format
+msgid ""
+"Builtin XMLSocket.onData doing nothing as no onXML event is defined on "
+"XMLSocket %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:563
+msgid "Builtin XMLSocket.onData() needs an argument"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:573
+#, c-format
+msgid ""
+"Builtin XMLSocket.onData() called with an argument that resolves to the "
+"empty string: %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:654
+msgid "Still processing data"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:664
+msgid "Got "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:664
+msgid " messages: "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:667
+msgid " Message "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:667
+#, c-format
+msgid " : %s "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:695
+#, c-format
+msgid "%s: Couldn't find onData"
+msgstr ""
+
+#: server/as_value.cpp:172
+#, c-format
+msgid "[object %p].%s() did not return a string: %s"
+msgstr ""
+
+#: server/as_value.cpp:179 server/as_value.cpp:339
+#, c-format
+msgid "get_member(%s) returned false"
+msgstr ""
+
+#: server/as_value.cpp:324
+#, c-format
+msgid "[object %p].%s() did not return a number: %s"
+msgstr ""
+
+#: server/as_value.cpp:504
+#, c-format
+msgid ""
+"MovieClip value is a dangling reference: target '%s' not found (should set "
+"to NULL?)"
+msgstr ""
+
+#: server/button_character_instance.cpp:328
+#, c-format
+msgid "Unsupported event for button instance: %s"
+msgstr ""
+
+#: server/button_character_instance.cpp:533
+#, c-format
+msgid "Unhandled button event %s"
+msgstr ""
+
+#: server/button_character_instance.cpp:623
+#, c-format
+msgid "Executing actions for button condition %d"
+msgstr ""
+
+#: server/character.cpp:99
+msgid "Relative drag"
+msgstr ""
+
+#: server/character.cpp:163
+msgid ""
+"ActionScript code trying to reference a nonexistent parent with '..'  (a "
+"nonexistent parent probably only occurs in the root MovieClip). Returning a "
+"reference to top parent (probably the root clip)."
+msgstr ""
+
+#: server/character.cpp:305
+#, c-format
+msgid "Attempt to set _xscale to %g, refused"
+msgstr ""
+
+#: server/character.cpp:313
+#, c-format
+msgid "Attempt to set _xscale to %g, use 0"
+msgstr ""
+
+#: server/character.cpp:349
+#, c-format
+msgid "Attempt to set _yscale to %g, refused"
+msgstr ""
+
+#: server/character.cpp:357
+#, c-format
+msgid "Attempt to set _yscale to %g, use 0"
+msgstr ""
+
+#: server/character.cpp:475
+msgid "FIXME: can't set _width on character with null or world bounds"
+msgstr ""
+
+#: server/character.cpp:486
+#, c-format
+msgid "Setting _width=%g"
+msgstr ""
+
+#: server/character.cpp:520
+msgid "FIXME: can't set _height on character with null or world bounds"
+msgstr ""
+
+#: server/character.cpp:531
+#, c-format
+msgid "Setting _height=%g"
+msgstr ""
+
+#: server/dlist.cpp:332
+#, c-format
+msgid "move_display_object() -- can't find object at depth %d"
+msgstr ""
+
+#: server/dlist.cpp:688
+#, c-format
+msgid "Item %d at depth %d (char id %d, name %s, type %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:850
+#, c-format
+msgid "TextField text doesn't fit in its boundaries: width %g, margin %d"
+msgstr ""
+
+#: server/edit_text_character.cpp:909
+#, c-format
+msgid "No font for edit_text_character! [%s:%d]"
+msgstr ""
+
+#: server/edit_text_character.cpp:937
+#, c-format
+msgid "substituting font!  font '%s' has no glyphs, using font '%s'"
+msgstr ""
+
+#: server/edit_text_character.cpp:947
+msgid ""
+"Current font has no glyphs and I couldn't find another font with glyphs... :("
+msgstr ""
+
+#: server/edit_text_character.cpp:1072
+#, c-format
+msgid ""
+"%s -- missing glyph for space char (needed for TAB).  Make sure character "
+"shapes for font %s are being exported into your SWF file."
+msgstr ""
+
+#: server/edit_text_character.cpp:1111
+#, c-format
+msgid ""
+"%s -- missing glyph for char %d.  Make sure character shapes for font %s are "
+"being exported into your SWF file"
+msgstr ""
+
+#: server/edit_text_character.cpp:1230
+msgid "registerTextVariable() no-op call (already registered)"
+msgstr ""
+
+#: server/edit_text_character.cpp:1238
+msgid "string is empty, consider as registered"
+msgstr ""
+
+#: server/edit_text_character.cpp:1254
+#, c-format
+msgid "VariableName: %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1269
+#, c-format
+msgid "Variable text Path: %s, Var: %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1282
+#, c-format
+msgid ""
+"VariableName associated to text field refer to an unknown target (%s). It is "
+"possible that the character will be instantiated later in the SWF stream. "
+"Gnash will try to register again on next access."
+msgstr ""
+
+#: server/edit_text_character.cpp:1297
+#, c-format
+msgid "target sprite (%p) does have a member named %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1304
+#, c-format
+msgid ""
+"target sprite (%p) does NOT have a member named %s (no problem, we'll add it)"
+msgstr ""
+
+#: server/fill_style.cpp:132
+msgid "num gradients 0"
+msgstr ""
+
+#: server/fill_style.cpp:141
+#, c-format
+msgid "Unexpected num gradients (%d), expected 1 to 8"
+msgstr ""
+
+#: server/fill_style.cpp:190
+#, c-format
+msgid ""
+"Bitmap fill specifies '%d' as associated bitmap character id, but that "
+"character is not found in the Characters Dictionary. It seems common to find "
+"such  malformed SWF, so we'll only warn once about this."
+msgstr ""
+
+#: server/fill_style.cpp:246
+#, c-format
+msgid "Unknown fill style %d"
+msgstr ""
+
+#: server/fill_style.cpp:282
+#, c-format
+msgid ""
+"First gradient in a fill_style have position==%d (expected 0). This seems to "
+"be common, so will warn only once."
+msgstr ""
+
+#: server/fill_style.cpp:318
+#, c-format
+msgid "two gradients in a fill_style have the same position/ratio: %d"
+msgstr ""
+
+#: server/font.cpp:139
+msgid "reading DefineFont"
+msgstr ""
+
+#: server/font.cpp:189
+msgid "reading DefineFont2 or DefineFont3"
+msgstr ""
+
+#: server/font.cpp:224 server/font.cpp:239
+#, c-format
+msgid "Glyph %d at offset %u"
+msgstr ""
+
+#: server/font.cpp:275
+msgid "Bad offset in DefineFont2"
+msgstr ""
+
+#: server/font.cpp:342
+msgid "Repeated kerning pair found - ignoring"
+msgstr ""
+
+#: server/font.cpp:364
+msgid "DefineFontInfo2 partially implemented"
+msgstr ""
+
+#: server/font.cpp:395
+#, c-format
+msgid "reading code table at offset %lu"
+msgstr ""
+
+#: server/font.cpp:429
+#, c-format
+msgid "get_glyph_index(%u) returning %d"
+msgstr ""
+
+#: server/font.cpp:436
+#, c-format
+msgid "get_glyph_index(%u) returning -1"
+msgstr ""
+
+#: server/font.cpp:456
+#, c-format
+msgid "empty advance table in font %s"
+msgstr ""
+
+#: server/font.cpp:523
+msgid ""
+"error reading cache file in font::input_cached_data(): glyph count mismatch"
+msgstr ""
+
+#: server/impl.cpp:89
+#, c-format
+msgid "Base url set to: %s"
+msgstr ""
+
+#: server/impl.cpp:254
+#, c-format
+msgid "get_movie_info(): can't open '%s'"
+msgstr ""
+
+#: server/impl.cpp:269
+#, c-format
+msgid "get_movie_info(): file '%s' does not start with a SWF header"
+msgstr ""
+
+#: server/impl.cpp:279
+msgid ""
+"get_movie_info(): can't read zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0"
+msgstr ""
+
+#: server/impl.cpp:339
+msgid "Can't read jpeg"
+msgstr ""
+
+#: server/impl.cpp:364
+msgid "Can't read file header"
+msgstr ""
+
+#: server/impl.cpp:441
+msgid ""
+"Requested to keep from completely loading a movie, but the movie in question "
+"is a jpeg, for which we don't yet have the concept of a 'loading thread'"
+msgstr ""
+
+#: server/impl.cpp:450
+#, c-format
+msgid "unknown file type (%s)"
+msgstr ""
+
+#: server/impl.cpp:466
+#, c-format
+msgid "failed to open '%s'; can't create movie"
+msgstr ""
+
+#: server/impl.cpp:471
+#, c-format
+msgid "streamProvider opener can't open '%s'"
+msgstr ""
+
+#: server/impl.cpp:490
+#, c-format
+msgid "note: couldn't open cache file '%s'"
+msgstr ""
+
+#: server/impl.cpp:499
+#, c-format
+msgid "Loading cache file %s"
+msgstr ""
+
+#: server/impl.cpp:627
+msgid "extern movie deleted"
+msgstr ""
+
+#: server/impl.cpp:677
+#, c-format
+msgid "Movie %s already in library"
+msgstr ""
+
+#: server/impl.cpp:693
+#, c-format
+msgid "Couldn't load library movie '%s'"
+msgstr ""
+
+#: server/impl.cpp:700
+#, c-format
+msgid "Movie %s (SWF%d) added to library"
+msgstr ""
+
+#: server/impl.cpp:739
+#, c-format
+msgid "%s: couldn't create instance"
+msgstr ""
+
+#: server/impl.cpp:791
+msgid "precompute_cached_data can't create instance of movie"
+msgstr ""
+
+#: server/impl.cpp:840
+msgid "loop back; jumping to frame "
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+msgid "process_decl_dict("
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+msgid ", "
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+#, c-format
+msgid ""
+"): decl_dict was already processed at %d. Skipping (or maybe we should "
+"append, or replace?)."
+msgstr ""
+
+#: server/parser/action_buffer.cpp:133
+msgid "action buffer dict length exceeded"
+msgstr ""
+
+#: server/parser/BitmapMovieDefinition.cpp:64
+#, c-format
+msgid "Creating a shape_definition wrapping a %g x %g bitmap"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:58
+msgid "-- actions in button\n"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:99
+#, c-format
+msgid ""
+"button record refer to character with id %d, which is not found in the chars "
+"dictionary"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:225
+msgid "button sound options: "
+msgstr ""
+
+#: server/parser/button_character_def.cpp:275
+#, c-format
+msgid "Next Button2 actionOffset (%u) points past the end of tag"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:301
+#, c-format
+msgid ""
+"Next action offset (%u) in Button2ActionConditions points past the end of tag"
+msgstr ""
+
+#: server/parser/edit_text_character_def.cpp:120
+#, c-format
+msgid "error: text style with undefined font; font_id = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:243
+#, c-format
+msgid "morph fill style type = 0x%X"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:253
+msgid "morph fill style begin color: "
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:255
+msgid "morph fill style end color: "
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:303
+#, c-format
+msgid "morph fsr: num_gradients = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:319
+#, c-format
+msgid "morph fsr bitmap_char = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:387
+msgid "Different number of paths in start ("
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:388
+msgid ") and end ("
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:389
+msgid ") shapes of a morph"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:395
+#, c-format
+msgid "Different number of edges in start (%u) and end (%u) shapes of a morph"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:280
+#, c-format
+msgid "import error: resource '%s' is not exported from movie '%s'"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:297 server/swf/tag_loaders.cpp:1081
+#, c-format
+msgid "import error: resource '%s' from movie '%s' has unknown type"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:326
+#, c-format
+msgid "get_character_def(): character_id %d is still waiting to be imported"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:348
+#, c-format
+msgid "get_font(): font_id %d is still waiting to be imported"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:395
+#, c-format
+msgid "Add sound sample %d"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:423
+msgid "gnash::movie_def_impl::read() -- file does not start with a SWF header"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:430
+#, c-format
+msgid "version = %d, file_length = %d"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:436
+#, c-format
+msgid "SWF%d is not fully supported, trying anyway but don't expect it to work"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:443
+msgid ""
+"movie_def_impl::read(): unable to read zipped SWF data; "
+"TU_CONFIG_LINK_TO_ZLIB is 0"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:449
+msgid "file is compressed"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:477
+#, c-format
+msgid "frame rate = %f, frames = "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:505
+msgid "Could not start loading thread"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:657
+msgid "cache file does not have the correct format; skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:663
+#, c-format
+msgid "cached data is version %d, but we require version %d; skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:678
+msgid "error reading cache file (characters); skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:683
+msgid "unexpected eof reading cache file (characters); skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:698
+msgid ""
+"sync error in cache file (reading characters).  Skipping rest of cache data."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:732
+#, c-format
+msgid "Character %d @ %p"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:744
+#, c-format
+msgid "Could not find char %d, dump is:"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:782
+#, c-format
+msgid "Ensure load of frame %u/%u (last loaded is: %u)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:787
+msgid "Could not advance to frame "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:796
+#, c-format
+msgid ""
+"No more frames to load. Framecount: %u, Lastloaded: %u, next to load: %u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:852
+#, c-format
+msgid ""
+"last expected SHOWFRAME in SWF stream '%s' isn't followed by an END (%d)."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:871
+#, c-format
+msgid "*** no tag loader for type %d (movie)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:889
+msgid ""
+"Hit stream-end tag, but not at the advertised SWF end; stopping for safety."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:905
+#, c-format
+msgid "Parsing exception: %s"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:911
+msgid " action blocks and "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:911
+msgid " init action blocks are NOT followed by a SHOWFRAME tag"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:921
+msgid " frames advertised in header, but only "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:921
+msgid " SHOWFRAME tags found in stream. Updating total frames count"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:947
+#, c-format
+msgid "number of SHOWFRAME tags in SWF stream '%s' ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:949
+msgid ") exceeds the advertised number in header ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:951
+msgid ")."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:960
+#, c-format
+msgid "Loaded frame %u/%u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:990
+#, c-format
+msgid "get_exported_resource called, frame count=%u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1026
+msgid "frame load advancement (from "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1027
+msgid " to "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1027 server/parser/sprite_definition.h:314
+msgid ")"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1036
+#, c-format
+msgid ""
+"No frame progress in movie %s after %lu milliseconds (%lu microseconds = %lu "
+"iterations), giving up on get_exported_resource(%s): circular IMPORTS?"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1050
+#, c-format
+msgid "no frame progress at iteration %lu"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1057
+#, c-format
+msgid "At end of stream, still no '%s' symbol found in m_exports ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1058
+msgid " entries in it, follow)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1064
+#, c-format
+msgid ""
+"We haven't finished loading (loading frame %u), and m_exports.get returned "
+"no entries, sleeping a bit and trying again"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:85
+#, c-format
+msgid "  read_fill_styles: count = %u"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:120
+#, c-format
+msgid "  read_line_styles: count = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:130
+#, c-format
+msgid "  read_line_styles: count2 = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:180
+#, c-format
+msgid "  bound rect: %s"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:192
+#, c-format
+msgid "  shape_character_def read: nfillbits = %d, nlinebits = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:249
+#, c-format
+msgid "  shape_character read: moveto %4g %4g"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:268
+#, c-format
+msgid "  shape_character read: fill0 (left) = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:288
+#, c-format
+msgid "  shape_character read: fill1 (right) = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:308
+#, c-format
+msgid "  shape_character_read: line = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:319
+msgid "  shape_character read: more fill styles"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:355
+#, c-format
+msgid "  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:386
+#, c-format
+msgid "  shape_character_read: straight edge = %4g %4g - %4g %4g"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:42
+#, c-format
+msgid "Instantiating sprite_def %p"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:81
+msgid "  frames = "
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:95
+msgid "DefineSprite tag inside sprite definition"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:106
+msgid "  show_frame "
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:107
+#: server/parser/sprite_definition.h:314 server/sprite_instance.cpp:1665
+#: server/sprite_instance.cpp:2293 server/sprite_instance.cpp:2317
+#: server/vm/ActionExec.cpp:429
+msgid "/"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:108
+msgid " (sprite)"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:121
+msgid ""
+"last SHOWFRAME of a DEFINESPRITE tag isn't followed by an END. Seeking to "
+"next END tag."
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:142
+#, c-format
+msgid "*** no tag loader for type %d (sprite)"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:150
+msgid "  -- sprite END --"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:208
+#, c-format
+msgid "Registered class %p for sprite_def %p"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:210
+msgid " Exported interface: "
+msgstr ""
+
+#: server/parser/sprite_definition.h:159
+msgid "add_font tag appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:180
+msgid "add_bitmap_character_def appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:194
+msgid "add sam appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:217
+msgid "Can't export from sprite"
+msgstr ""
+
+#: server/parser/sprite_definition.h:246
+msgid "add_character tag appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:276
+msgid "sprite_definition::add_init_action called!  Ignored"
+msgstr ""
+
+#: server/parser/sprite_definition.h:312
+msgid "sprite_definition: loading of frame "
+msgstr ""
+
+#: server/parser/sprite_definition.h:313
+msgid " requested (we are at "
+msgstr ""
+
+#: server/parser/text_character_def.cpp:29
+msgid "begin text records"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:43
+msgid "end text records"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:62
+msgid "  text style change"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:71
+#, c-format
+msgid "  has_font: font id = %d"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:86
+msgid "  has_color"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:94
+#, c-format
+msgid "  has_x_offset = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:107
+#, c-format
+msgid "  has_y_offset = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:119
+#, c-format
+msgid "  text_height = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:142
+#, c-format
+msgid "  glyph_records: count = %d"
+msgstr ""
+
+#: server/PropertyList.cpp:93
+#, c-format
+msgid "Property %s is read-only, not setting it to %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:138
+#, c-format
+msgid ""
+"attachMovie called with wrong number of arguments expected 3 to 4, got (%d) "
+"- returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:152
+#, c-format
+msgid "attachMovie: '%s': no such exported resource - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:162
+#, c-format
+msgid ""
+"attachMovie: exported resource '%s' is not a movie definition (%s) -- "
+"returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:186
+#, c-format
+msgid "Could not attach character at depth %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:205
+#, c-format
+msgid "Fourth argument of attachMovie doesn't cast to an object (%s)"
+msgstr ""
+
+#: server/sprite_instance.cpp:240
+#, c-format
+msgid "createEmptyMovieClip needs 2 args, but %d given, returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:250
+#, c-format
+msgid "createEmptyMovieClip takes 2 args, but %d given, discarding the excess"
+msgstr ""
+
+#: server/sprite_instance.cpp:288
+#, c-format
+msgid "%s.swapDepths() needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:297
+#, c-format
+msgid "%s.swapDepths(%s): won't swap a clip below depth %d (%d)"
+msgstr ""
+
+#: server/sprite_instance.cpp:309
+#, c-format
+msgid "%s.swapDepths(%s): this sprite has no parent, swapping depth of root?"
+msgstr ""
+
+#: server/sprite_instance.cpp:327
+#, c-format
+msgid "%s.swapDepths(%s): invalid call, swapping to self?"
+msgstr ""
+
+#: server/sprite_instance.cpp:337
+#, c-format
+msgid ""
+"%s.swapDepths(%s): invalid call, the two characters don't have the same "
+"parent"
+msgstr ""
+
+#: server/sprite_instance.cpp:354
+#, c-format
+msgid ""
+"%s.swapDepths(%s): first argument invalid (neither a sprite nor a number)"
+msgstr ""
+
+#: server/sprite_instance.cpp:389
+msgid "MovieClip.duplicateMovieClip() needs 2 or 3 args"
+msgstr ""
+
+#: server/sprite_instance.cpp:420
+msgid "sprite_goto_and_play needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:439
+msgid "sprite_goto_and_stop needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:503
+#, c-format
+msgid ""
+"MovieClip.loadMovie() expected 1 or 2 args, got %d - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:515
+#, c-format
+msgid ""
+"First argument of MovieClip.loadMovie(%s) evaluates to an empty string - "
+"returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:528
+#, c-format
+msgid ""
+"second argument of MovieClip.loadMovie(%s, <variables>) will be discarded"
+msgstr ""
+
+#: server/sprite_instance.cpp:551
+#, c-format
+msgid ""
+"MovieClip.loadVariables() expected 1 or 2 args, got %d - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:563
+#, c-format
+msgid ""
+"First argument passed to MovieClip.loadVariables(%s) evaluates to an empty "
+"string - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:627
+#, c-format
+msgid "Can't find hitTest target %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:665
+#, c-format
+msgid "hitTest() called with %u args"
+msgstr ""
+
+#: server/sprite_instance.cpp:684
+#, c-format
+msgid "createTextField called with %d args, expected 6 - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:693
+msgid "First argument of createTextField is not a string - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:703
+msgid ""
+"Second argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:713
+msgid "Third argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:723
+msgid ""
+"Fourth argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:733 server/sprite_instance.cpp:743
+msgid "Fifth argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:798
+#, c-format
+msgid "MovieClip.getBounds(%s): invalid call, first arg must be a sprite"
+msgstr ""
+
+#: server/sprite_instance.cpp:879
+msgid "MovieClip.lineTo() takes two args"
+msgstr ""
+
+#: server/sprite_instance.cpp:900
+msgid "MovieClip.moveTo() takes two args"
+msgstr ""
+
+#: server/sprite_instance.cpp:963
+msgid "MovieClip.curveTo() takes four args"
+msgstr ""
+
+#: server/sprite_instance.cpp:1624
+#, c-format
+msgid ""
+"A sprite member (%s) clashes with the name of an existing character in its "
+"display list.  The member will hide the character"
+msgstr ""
+
+#: server/sprite_instance.cpp:1664 server/sprite_instance.cpp:2291
+#: server/sprite_instance.cpp:2316
+msgid "Executing "
+msgstr ""
+
+#: server/sprite_instance.cpp:1664
+msgid " actions in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:1665 server/sprite_instance.cpp:2293
+#: server/sprite_instance.cpp:2317
+#, c-format
+msgid " of sprite %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:1714
+#, c-format
+msgid "call_frame('%s') -- invalid frame"
+msgstr ""
+
+#: server/sprite_instance.cpp:1828
+msgid "Can't clone root of the movie"
+msgstr ""
+
+#: server/sprite_instance.cpp:1834
+#, c-format
+msgid "%s parent is not a sprite, can't clone"
+msgstr ""
+
+#: server/sprite_instance.cpp:1890
+#, c-format
+msgid ""
+"clone_display_object(%s, %s, %d): could not find a character named %s to "
+"clone"
+msgstr ""
+
+#: server/sprite_instance.cpp:1986
+#, c-format
+msgid "sprite[%p]::set_member(%s, %s)"
+msgstr ""
+
+#: server/sprite_instance.cpp:2007
+msgid "it's a Text Variable"
+msgstr ""
+
+#: server/sprite_instance.cpp:2015
+msgid "it's NOT a Text Variable"
+msgstr ""
+
+#: server/sprite_instance.cpp:2029 server/sprite_instance.cpp:2055
+msgid "NULL path_to_var passed to set_variable()"
+msgstr ""
+
+#: server/sprite_instance.cpp:2034 server/sprite_instance.cpp:2060
+#, c-format
+msgid "NULL passed to set_variable('%s', NULL)"
+msgstr ""
+
+#: server/sprite_instance.cpp:2088
+#, c-format
+msgid ""
+"sprite '%s' ::advance_sprite is at frame %u/%u - onload called: %d - "
+"oldDIsplayList has %d elements"
+msgstr ""
+
+#: server/sprite_instance.cpp:2098
+msgid "sprite_instance::advance_sprite we're in PLAY mode"
+msgstr ""
+
+#: server/sprite_instance.cpp:2106
+msgid "on_event_load called, incrementing"
+msgstr ""
+
+#: server/sprite_instance.cpp:2110
+#, c-format
+msgid "after increment we are at frame %u/%u"
+msgstr ""
+
+#: server/sprite_instance.cpp:2124
+msgid "sprite_instance::advance_sprite we're in STOP mode"
+msgstr ""
+
+#: server/sprite_instance.cpp:2191
+msgid "Calling ONLOAD event"
+msgstr ""
+
+#: server/sprite_instance.cpp:2292
+msgid " *init* tags in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:2316
+msgid " tags in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:2400
+#, c-format
+msgid "sprite %s ::goto_frame("
+msgstr ""
+
+#: server/sprite_instance.cpp:2400
+msgid ") - current frame is "
+msgstr ""
+
+#: server/sprite_instance.cpp:2440
+msgid "GotoFrame("
+msgstr ""
+
+#: server/sprite_instance.cpp:2440
+msgid ") targets a yet to be loaded frame ("
+msgstr ""
+
+#: server/sprite_instance.cpp:2441
+msgid ""
+") loaded). We'll wait for it but a more correct form is explicitly using "
+"WaitForFrame instead"
+msgstr ""
+
+#: server/sprite_instance.cpp:2531
+#, c-format
+msgid "sprite_instance::goto_labeled_frame('%s') unknown label"
+msgstr ""
+
+#: server/sprite_instance.cpp:2620
+#, c-format
+msgid "sprite_instance::add_display_object(): unknown cid = %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:2706
+#, c-format
+msgid "sprite::replace_display_object(): unknown cid = %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:2780
+#, c-format
+msgid "Frame %u/%u, bytes %u/%u"
+msgstr ""
+
+#: server/sprite_instance.cpp:3014
+#, c-format
+msgid "%s doesn't even check for a char"
+msgstr ""
+
+#: server/sprite_instance.cpp:3155
+#, c-format
+msgid "Constructing sprite '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3205
+#, c-format
+msgid "Unloading sprite '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3227 server/vm/action.cpp:140
+#, c-format
+msgid "can't create movie_definition for %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:3236
+#, c-format
+msgid "can't create extern movie_instance for %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:3306
+msgid "MovieClip.loadVariables() with GET/POST won't append vars for now"
+msgstr ""
+
+#: server/sprite_instance.cpp:3331
+#, c-format
+msgid "Setting variable '%s' to value '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3374
+#, c-format
+msgid ""
+"removeMovieClip(%s): sprite depth (%d) out of the 'dynamic' zone "
+"[0..1048575], won't remove"
+msgstr ""
+
+#: server/sprite_instance.cpp:3391
+#, c-format
+msgid "Can't remove sprite %s as it has no parent"
+msgstr ""
+
+#: server/StreamProvider.cpp:91 server/StreamProvider.cpp:132
+#, c-format
+msgid "Unsupported network connection %s"
+msgstr ""
+
+#: server/StreamProvider.cpp:105
+msgid "POST data discarded while getting a stream from file: uri"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:53
+#, c-format
+msgid "DefineFontAlignZones tag references an undefined font %d"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:67
+#, c-format
+msgid "  DefinFontAlignZones: font=%d, flags=%d"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:71
+msgid "FIXME: DefineFontAlignZoneTag unfinished"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:47
+#, c-format
+msgid "  char_id = %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:48
+#, c-format
+msgid "  depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:58 server/swf/PlaceObject2Tag.cpp:272
+msgid "  cxform:"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:80
+#, c-format
+msgid "  actions: flags = 0x%X"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:101
+#, c-format
+msgid ""
+"swf_event::read(), even_length = %u, but only %lu bytes left to the end of "
+"current tag. Breaking for safety."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:126 server/swf/PlaceObject2Tag.cpp:138
+#, c-format
+msgid "swf_event::read(), event_length = %d, but read "
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:129
+msgid ". Breaking for safety."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:141
+msgid ". Skipping excessive bytes."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:177
+#, c-format
+msgid ""
+"swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:263
+#, c-format
+msgid "  PLACEOBJECT2: depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:264
+#, c-format
+msgid "  char id = %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:267
+msgid "  mat:"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:275
+#, c-format
+msgid "  ratio: %f"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:276
+#, c-format
+msgid "  name = %s"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:277
+#, c-format
+msgid "  clip_depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:278
+#, c-format
+msgid " m_place_type: %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:383
+#, c-format
+msgid "reverse REPLACE can't find previous replace or add tag(%d, %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:142
+msgid "anchor-labeled frame not supported"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:147
+msgid "frame_label_loader end position "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:147
+msgid ", read up to "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:182
+#, c-format
+msgid "  set_background_color: (%d %d %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:211
+msgid "  jpeg_tables_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:249 server/swf/tag_loaders.cpp:297
+msgid "gnash is not linked to jpeglib -- can't load jpeg image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:261
+#, c-format
+msgid "DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:281
+#, c-format
+msgid "  define_bits_jpeg2_loader: charid = %d pos = %lx"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:306
+#, c-format
+msgid "DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:342
+#, c-format
+msgid "inflate_wrapper() inflateInit() returned %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:358
+#, c-format
+msgid "inflate_wrapper() inflate() returned %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:365
+#, c-format
+msgid "inflate_wrapper() inflateEnd() return %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:382
+#, c-format
+msgid "  define_bits_jpeg3_loader: charid = %d pos = %lx"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:393
+msgid ""
+"gnash is not linked to jpeglib/zlib -- can't load jpeg/zipped image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:440
+#, c-format
+msgid "  defbitslossless2: tag = %d, id = %d, fmt = %d, w = %d, h = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:449
+msgid "gnash is not linked to zlib -- can't load zipped image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:555
+#, c-format
+msgid ""
+"DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:685
+#, c-format
+msgid "  FIXME: tagtype = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:697
+#, c-format
+msgid "  shape_loader: id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:713
+#, c-format
+msgid "  shape_morph_loader: id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:762
+#, c-format
+msgid "define_font_info_loader: can't find font w/ id %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:775
+msgid "  place_object_2"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:795
+#, c-format
+msgid "  sprite:  char id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:803
+msgid "nested DEFINESPRITE tags"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:870
+#, c-format
+msgid "reverse REMOVE can't find previous replace or add tag(%d, %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:889
+#, c-format
+msgid "  remove_object_2(%d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:920
+#, c-format
+msgid "  button character loader: char_id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:944
+#, c-format
+msgid "  export: count = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:954
+#, c-format
+msgid "  export: id = %d, name = %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:973
+#, c-format
+msgid "don't know how to export resource '%s' with id %d (can't find that id)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1010
+#, c-format
+msgid "  import: version = %u, source_url = %s (%s), count = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1022
+#, c-format
+msgid "Exception: %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1028
+#, c-format
+msgid "can't import movie from url %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1037
+msgid "Movie attempts to import symbols from itself."
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1050
+#, c-format
+msgid "  import: id = %d, name = %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1066
+#, c-format
+msgid "import error: could not find resource '%s' in movie '%s'"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1102
+#, c-format
+msgid "edit_text_char, id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1120
+#, c-format
+msgid "text_character, id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1141
+#, c-format
+msgid "tag %d: do_action_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1142
+msgid "-- actions in frame "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1165
+#, c-format
+msgid "  tag %d: do_init_action_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1166
+#, c-format
+msgid "  -- init actions for sprite %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1199
+#, c-format
+msgid "define sound: ch=%d, format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1215 server/swf/tag_loaders.cpp:1361
+#, c-format
+msgid "Bad sound sample rate %d read from SWF header"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1274
+#, c-format
+msgid ""
+"There is no sound handler currently active, so character with id %d will NOT "
+"be added to the dictionary"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1300
+#, c-format
+msgid "start_sound tag: id=%d, stop = %d, loop ct = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1309
+#, c-format
+msgid "start_sound_loader: sound_id %d is not defined"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1351
+#, c-format
+msgid "sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1516
+#, c-format
+msgid "  file attributes: has_metadata=%s use_network=%s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1517 server/swf/tag_loaders.cpp:1518
+msgid "true"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1517 server/swf/tag_loaders.cpp:1518
+msgid "false"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1523
+msgid ""
+"FileAttributes tag in the SWF requests that network access is not granted to "
+"this movie (or application?). Anyway Gnash won't care; use white/black "
+"listing in your .gnashrc instead"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1541
+#, c-format
+msgid ""
+"  metadata = [[\n"
+"%s\n"
+"]]"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1544
+#, c-format
+msgid "METADATA tag unused: %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1562
+#, c-format
+msgid ""
+"  serialnumber = [[\n"
+"%s\n"
+"]]"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1565
+#, c-format
+msgid "SERIALNUMBER: %s"
+msgstr ""
+
+#: server/text.cpp:50
+#, c-format
+msgid "text style references unknown font (id = %d)"
+msgstr ""
+
+#: server/text.cpp:154
+msgid "invalid glyph, render as an empty box"
+msgstr ""
+
+#: server/text.cpp:181
+msgid "render glyph using draw_glyph"
+msgstr ""
+
+#: server/text.cpp:192
+msgid "render glyph using filled outline (?) actually draw_glyph()"
+msgstr ""
+
+#: server/textformat.cpp:124
+#, c-format
+msgid "Created New TextFormat object at %p.  Not fully implemented yet"
+msgstr ""
+
+#: server/textformat.cpp:150
+msgid "TextFormat.setFormat() needs at least 3 arguments - ...me thinks"
+msgstr ""
+
+#: server/textformat.cpp:159
+msgid ""
+"Argument 3 given to TextFormat.setFormat() is not a TextFormat object - ... "
+"should it be?"
+msgstr ""
+
+#: server/textformat.cpp:237
+#, c-format
+msgid "%s: args=%d unfinished implementation"
+msgstr ""
+
+#: server/video_stream_instance.cpp:43
+msgid "attachVideo needs 1 arg"
+msgstr ""
+
+#: server/video_stream_instance.cpp:56
+#, c-format
+msgid "attachVideo(%s) first arg is not a NetStream instance"
+msgstr ""
+
+#: server/video_stream_instance.cpp:116
+msgid "An error occured while decoding video frame"
+msgstr ""
+
+#: server/vm/action.cpp:152
+#, c-format
+msgid "can't create extern root sprite for %s"
+msgstr ""
+
+#: server/vm/action.cpp:169
+#, c-format
+msgid "can't create extern sprite for %s"
+msgstr ""
+
+#: server/vm/action.cpp:238
+msgid ""
+"Attempt to call a value which is neither a C nor an ActionScript function"
+msgstr ""
+
+#: server/vm/action.cpp:270
+#, c-format
+msgid "FIXME(%d): %s"
+msgstr ""
+
+#: server/vm/action.cpp:389
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid fmt '%%l%c'"
+msgstr ""
+
+#: server/vm/action.cpp:398
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid fmt '%%%c'"
+msgstr ""
+
+#: server/vm/action.cpp:414
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid char '%c'"
+msgstr ""
+
+#: server/vm/action.cpp:450
+msgid "-- start movie"
+msgstr ""
+
+#: server/vm/action.cpp:461
+#, c-format
+msgid "FIXME: %s"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:136
+msgid "at ActionExec operator() start, pc="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:137
+msgid ", stop_pc="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:137
+msgid ", code.size="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:138 server/vm/ActionExec.cpp:211
+msgid "."
+msgstr ""
+
+#: server/vm/ActionExec.cpp:178
+#, c-format
+msgid "Length %u (%d) of action tag id %u at pc "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:180
+msgid " overflows actions buffer size "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:211
+msgid " After execution, PC is "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:249
+msgid "Call stack non-empty at end of ExecutableCode run (limits hit?)"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:255
+msgid ""
+"Stack smashed (ActionScript compiler bug?).Fixing by pushing undefined "
+"values to the missing slots,  but don't expect things to work afterwards"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:265
+msgid " elements left on the stack after block execution.  Cleaning up"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:283
+msgid "End of DoAction block hit while skipping "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:284
+msgid " action tags (pc:"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:285
+msgid ", stop_pc:"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:285
+msgid ") (WaitForFrame, probably)"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:319
+msgid "'With' stack depth ("
+msgstr ""
+
+#: server/vm/ActionExec.cpp:319
+msgid ") exceeds the allowed limit for current SWF target version ("
+msgstr ""
+
+#: server/vm/ActionExec.cpp:321
+#, c-format
+msgid " for version %d). Don't expect this movie to work with all players."
+msgstr ""
+
+#: server/vm/ActionExec.cpp:428
+msgid "Stack underrun: "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:428
+msgid " elements required, "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:429
+msgid " available. Fixing by inserting "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:430
+msgid " undefined values on the missing slots."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:101
+#, c-format
+msgid "Unsupported action handler invoked, code at pc is %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:182
+msgid ""
+"FIXME: VM not initialized at SWFHandlers construction time, can't set action "
+"handlers based on SWF version"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:466
+#, c-format
+msgid "%s: CHECKME: was broken"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:609
+#, c-format
+msgid "GetUrl: target=%s url=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:630
+#, c-format
+msgid "ActionWaitForFrame (0x%X) tag length == "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:631
+msgid " (expected 3)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:645 server/vm/ASHandlers.cpp:696
+#: server/vm/ASHandlers.cpp:1487
+#, c-format
+msgid "%s: environment target is not a sprite_instance"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:861
+msgid "Undefined or null string passed to ActionSubString, returning undefined"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:876
+msgid "Negative size passed to ActionSubString, taking as whole length"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:887
+msgid "Base is less then 1 in ActionSubString, setting to 1."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:896
+msgid ""
+"base goes beyond input string in ActionSubString, returning the empty string."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:910
+msgid "base+size goes beyond input string in ActionSubString, adjusting size"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:978
+#, c-format
+msgid "-- get var: %s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:982
+#, c-format
+msgid "-- get var: %s=%s at %p"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1007
+#, c-format
+msgid "-- set var: %s = %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1069
+msgid ""
+"ActionGetProperty(<empty>) called, but current target is not a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1092
+#, c-format
+msgid "invalid property query, property number %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1101
+#, c-format
+msgid "Could not find GetProperty target (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1133
+#, c-format
+msgid "invalid set_property, property number %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1157
+#, c-format
+msgid "Path given to duplicateMovieClip(%s) doesn't point to a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1168
+#, c-format
+msgid "Path given to duplicateMovieClip(%s) is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1193
+#, c-format
+msgid "Path given to removeMovieClip(%s) doesn't point to a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1203
+#, c-format
+msgid "Path given to removeMovieClip(%s) is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1242
+#, c-format
+msgid "start_drag of invalid target '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1266
+msgid "Y values in ActionStartDrag swapped, fixing"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1274
+msgid "X values in ActionStartDrag swapped, fixing"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1340
+#, c-format
+msgid "-- %s cast_to %s (invalid args?)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1360
+msgid "ActionCastOp TESTING"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1496
+#, c-format
+msgid ""
+"Frame spec found on stack at ActionWaitForFrame doesn't evaluate to a valid "
+"frame: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1561
+#, c-format
+msgid "[push length=%d]"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1580
+#, c-format
+msgid ""
+"Unknown push type %d. Execution will continue but it is likely to fail due "
+"to lost sync."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1630
+#, c-format
+msgid "register %d out of bounds"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1676 server/vm/ASHandlers.cpp:1695
+#, c-format
+msgid "dict_lookup %d is out of bounds"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1707 server/vm/ASHandlers.cpp:1711
+msgid "\t"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1707
+#, c-format
+msgid ") type=%s (%d), value=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1711
+#, c-format
+msgid ") type=%s, value=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1762
+msgid "Bogus empty GetUrl url in SWF file, skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1777
+msgid ""
+"Bogus GetUrl2 send vars method  in SWF file (both GET and POST requested), "
+"set to 0"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1830
+#, c-format
+msgid "get url: target=%s, url=%s (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1838
+#, c-format
+msgid "get url: target %s not found"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1846
+#, c-format
+msgid "get url: target %s is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1853
+msgid "getURL2 loadVariable"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1860
+msgid "getURL2 target load"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1871
+#, c-format
+msgid ""
+"Unhandled GetUrl2 sendVariableMethod (%d) with loadTargetFlag and ! "
+"loadVariablesFlag"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1884
+#, c-format
+msgid "Unhandled GetUrl2 sendVariableMethod (%d) with no loadTargetFlag"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1898
+#, c-format
+msgid "Launching URL... %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1923
+#, c-format
+msgid ""
+"Couldn't find movie \"%s\" to set target to! Not setting target at all..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1951
+msgid "Undefined GetUrl2 url on stack, skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1988
+msgid "branch to offset "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1988
+msgid "  --  this section only runs to "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2028
+#, c-format
+msgid ""
+"Couldn't find target_sprite \"%s\" in ActionCallFrame! target frame actions "
+"will not be called..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2090
+#, c-format
+msgid ""
+"Frame spec found on stack at ActionGotoExpression doesn't evaluate to a "
+"valid frame: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2104
+#, c-format
+msgid ""
+"Couldn't find target sprite \"%s\" in ActionGotoExpression.  Will not go to "
+"target frame..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2125
+msgid "No elements on the stack at ActionDelete (0x3A). Returning FALSE."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2164
+#, c-format
+msgid "-- set local var: %s = %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2196
+#, c-format
+msgid "ActionCallFunction: %s is not an object"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2205
+msgid "Object doensn't have a constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2216
+#, c-format
+msgid ""
+"Attempt to call a function with %u arguments while only %u are available on "
+"the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2307
+#, c-format
+msgid "---new object: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2320
+#, c-format
+msgid "ActionNew: '%s' is not a constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2360
+msgid "The 'var whatever' syntax in timeline context is a no-op."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2476
+#, c-format
+msgid "Argument to TargetPath(%s) doesn't cast to a MovieClip"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2514
+#, c-format
+msgid "Top of stack not an object (%s) at ActionEnumerate execution"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2672
+#, c-format
+msgid " ActionGetMember: target: %s (object %p)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2688
+#, c-format
+msgid "-- get_member %s.%s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2714
+#, c-format
+msgid "-- set_member %s.%s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2726
+#, c-format
+msgid "-- set_member %s.%s=%s on invalid object!"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2781
+#, c-format
+msgid ""
+"Attempt to call a method with %u arguments while only %u are available on "
+"the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2790
+#, c-format
+msgid " method name: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2791
+#, c-format
+msgid " method object/func: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2792
+#, c-format
+msgid " method nargs: %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2807
+msgid ""
+"ActionCallMethod invoked with undefined method_name and non-object object/"
+"func"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2816
+msgid ""
+"Function object given to ActionCallMethod is not a function, will try to use "
+"its 'constructor' member"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2826
+msgid "ActionCallMethod: object has no constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2835
+msgid "ActionCallMethod: object constructor is not a function"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2851
+#, c-format
+msgid "ActionCallMethod: Tried to invoke method '%s' on non-object value %s."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2864
+#, c-format
+msgid "ActionCallMethod: Can't find method %s of object %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2887
+msgid "FIXME: debugger doesn't deal with anonymous function calls"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2924
+#, c-format
+msgid ""
+"Attempt to call a constructor with %u arguments while only %u are available "
+"on the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2936
+msgid "On ActionNewMethod: no object found on stack on ActionMethod"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2954
+#, c-format
+msgid "ActionNewMethod: can't find method %s of object %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2968
+msgid "ActionNewMethod: method name is undefined, and object is not a function"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3007
+#, c-format
+msgid "-- %s instanceof %s (invalid args?)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3041
+#, c-format
+msgid "Top of stack not an object %s at ActionEnum2  execution"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3218
+#, c-format
+msgid "ActionExtends: Super is not an as_function (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3223
+#, c-format
+msgid "ActionExtends: Sub is not an as_function (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3312
+#, c-format
+msgid ""
+"function2 code len (%u) overflows DOACTION tag boundaries (DOACTION tag len="
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3315
+msgid ", function2 code offset="
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3315
+msgid "). Forcing code len to eat the whole buffer (would this work?)."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3379
+msgid "-------------- with block start: stack size is "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3389
+msgid "ActionWith tag length != 2; skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3399
+msgid "Empty with() block..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3415
+msgid "With-block skipped (with stack size exceeds limit of "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3417
+msgid " elements)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3533
+#, c-format
+msgid "-------------- local register[%d] = '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3542
+#, c-format
+msgid "-------------- global register[%d] = '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3550
+#, c-format
+msgid "store_register[%d] -- register out of bounds!"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3561
+#, c-format
+msgid "at SWFHandlers::action_name(%d) call time, _handlers size is "
+msgstr ""
+
+#: utilities/dumpshm.cpp:206
 msgid ""
 "Sorry, we can only list the files on systems with disk based shared memory"
 msgstr ""
 
-#: utilities/dumpshm.cpp:209
+#: utilities/dumpshm.cpp:215
 msgid "No name specified, nuking everything..."
 msgstr ""
 
-#: utilities/dumpshm.cpp:216
+#: utilities/dumpshm.cpp:222
 msgid "Removing segment: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:224
+#: utilities/dumpshm.cpp:230
 msgid "Nuking the shared memory segment "
 msgstr ""
 
-#: utilities/dumpshm.cpp:250
+#: utilities/dumpshm.cpp:256
 msgid "ERROR: couldn't read!"
 msgstr ""
 
-#: utilities/dumpshm.cpp:281
+#: utilities/dumpshm.cpp:287
 msgid "This program dumps the internal data of a shared memory segment"
 msgstr "Esta programma dumpa la data de la memoria segmentia sharedia"
 
-#: utilities/dumpshm.cpp:283
+#: utilities/dumpshm.cpp:289
 msgid "Usage: dumpmem [hdsanlif] filename"
 msgstr ""
 
-#: utilities/dumpshm.cpp:284
+#: utilities/dumpshm.cpp:290
 msgid "-h\tHelp"
 msgstr ""
 
-#: utilities/dumpshm.cpp:285
+#: utilities/dumpshm.cpp:291
 msgid "-d\tDump data"
 msgstr ""
 
-#: utilities/dumpshm.cpp:286
+#: utilities/dumpshm.cpp:292
 msgid "-n [optional name]\tNuke everything"
 msgstr ""
 
-#: utilities/dumpshm.cpp:287
+#: utilities/dumpshm.cpp:293
 msgid "-l\tLength of segment"
 msgstr ""
 
-#: utilities/dumpshm.cpp:288
+#: utilities/dumpshm.cpp:294
 msgid "-i\tList segments"
 msgstr ""
 
-#: utilities/dumpshm.cpp:289
+#: utilities/dumpshm.cpp:295
 msgid "-f\tForce to use builtin names for nuke"
 msgstr ""
 
-#: utilities/dumpshm.cpp:301
+#: utilities/dumpshm.cpp:307
 msgid "\tBase address of this segment: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:303
+#: utilities/dumpshm.cpp:309
 msgid "\tFilespec: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:304
+#: utilities/dumpshm.cpp:310
 msgid "\t# Bytes allocated: "
 msgstr ""
 
-#: utilities/dumpshm.cpp:305
+#: utilities/dumpshm.cpp:311
 msgid "\tTotal # of bytes: "
 msgstr ""
 

Index: po/LINGUAS
===================================================================
RCS file: /sources/gnash/gnash/po/LINGUAS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/LINGUAS	6 Apr 2007 07:49:55 -0000	1.1
+++ po/LINGUAS	20 Apr 2007 11:11:36 -0000	1.2
@@ -1,2 +1,3 @@
 # Set of available languages.
 es
+fr

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2948
retrieving revision 1.2949
diff -u -b -r1.2948 -r1.2949
--- ChangeLog	20 Apr 2007 10:03:12 -0000	1.2948
+++ ChangeLog	20 Apr 2007 11:11:37 -0000	1.2949
@@ -1,3 +1,11 @@
+2007-04-20  John Gilmore  <gnu@toad.com>
+
+	More internationalization.
+	* po/POTFILES.in:  Add all files with gettext-able messages.
+	* po/gnash.pot:  Update to include current gettext-able messages.
+	* po/{es,fr}.po:  First few languages that have a few translations.
+	* po/LINGUAS:  Add es and fr (with only a few translations in each).
+
 2007-04-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler.h: Prototype for initTestBuffer() 

Index: po/fr.po
===================================================================
RCS file: po/fr.po
diff -N po/fr.po
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/fr.po	20 Apr 2007 11:11:36 -0000	1.1
@@ -0,0 +1,4454 @@
+# French translation of GNU Gnash.
+# Copyright (C) 2007 Free Software Foundation, Inc.
+# This file is distributed under the same license as the gnash package.
+#
+# Robert-André Mauchin <zebob.m@gmail.com>, 2007.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnash cvs20070419\n"
+"Report-Msgid-Bugs-To: bug-gnash@gnu.org\n"
+"POT-Creation-Date: 2007-04-20 00:11-0700\n"
+"PO-Revision-Date: 2007-04-19 11:00+0200\n"
+"Last-Translator: Robert-André Mauchin <zebob.m@gmail.com>\n"
+"Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: backend/sound_handler_sdl.cpp:76
+msgid "could not allocate memory for sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:99
+msgid "Some kind of error occurred with raw sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:112
+msgid "Some kind of error occurred with adpcm sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:123
+msgid "gnash has not been compiled to handle mp3 audio"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:129
+msgid "could not allocate space for data in sound handler"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:138
+#, c-format
+msgid "unknown sound format %d requested; gnash does not handle it"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:170
+msgid "Some kind of error with resampling sound data"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:215
+#, c-format
+msgid ""
+"Behavior for this audio codec %d is unknown.  Please send this SWF to the "
+"developers"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:276
+msgid "Your FFMPEG can't decode MP3?!"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:304
+#, c-format
+msgid "Unable to start SDL sound: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:496
+#, c-format
+msgid "Unable to start aux SDL sound: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:717
+#, c-format
+msgid "Negative buffer length in sdl_audio_callback (%d)"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:834
+msgid ""
+"Error while decoding MP3-stream.  Upgrading ffmpeg/libavcodec might fix this "
+"issue."
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:864
+#, c-format
+msgid "Recoverable error while decoding MP3-stream, MAD error: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:872
+#, c-format
+msgid "Unrecoverable error while decoding MP3-stream, MAD error: %s"
+msgstr ""
+
+#: backend/sound_handler_sdl.cpp:929
+msgid "Error in sound sample conversion"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:186
+msgid "Couldn't initialize database"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:191
+msgid "Couldn't connect to database"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:217 extensions/mysql/mysql_db.cpp:244
+#, c-format
+msgid "MySQL connection error: %s"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:224 extensions/mysql/mysql_db.cpp:251
+#, c-format
+msgid ""
+"MySQL error on query for:\n"
+"\t%s\n"
+"Query was: %s"
+msgstr ""
+
+#: extensions/mysql/mysql_db.cpp:265
+#, c-format
+msgid "Field name is: %s: "
+msgstr ""
+
+#: gui/gnash.cpp:73
+msgid ""
+"usage: gnash [options] movie_file.swf\n"
+"\n"
+"Plays a SWF (Shockwave Flash) movie\n"
+"options:\n"
+"\n"
+msgstr ""
+
+#: gui/gnash.cpp:78
+msgid ""
+"  -h, --help  Print this info.\n"
+"  -s <factor> Scale the movie up/down by the specified factor\n"
+"  -c          Produce a core file instead of letting SDL trap it\n"
+"  -d num      Number of milliseconds to delay in main loop\n"
+"  -v          Be verbose; i.e. print log messages to stdout\n"
+msgstr ""
+
+#: gui/gnash.cpp:85
+msgid "  -va         Be verbose about movie Actions\n"
+msgstr ""
+
+#: gui/gnash.cpp:90
+msgid "  -vp         Be verbose about parsing the movie\n"
+msgstr ""
+
+#: gui/gnash.cpp:95
+msgid ""
+"  -m <bias>   Specify the texture LOD bias (float, default is -1.0)\n"
+"  -x <ID>     X11 Window ID for display\n"
+"  -w          Produce the disk based debug log\n"
+"  -j <width>  Set window width\n"
+"  -k <height> Set window height\n"
+"  -1          Play once; exit when/if movie reaches the last frame\n"
+msgstr ""
+
+#: gui/gnash.cpp:102
+msgid ""
+"  -g          Turn on the Flash debugger\n"
+"  -r <0|1|2|3>\n"
+"              0 disables both rendering & sound (good for batch tests)\n"
+"              1 enables rendering & disables sound\n"
+"              2 enables sound & disables rendering\n"
+"              3 enables both rendering & sound (default)\n"
+msgstr ""
+
+#: gui/gnash.cpp:109
+msgid ""
+"  -t <sec>    Timeout and exit after the specified number of seconds\n"
+"  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
+"  -u <url>    Set \"real\" url of the movie\n"
+"              (useful for downloaded movies)\n"
+"  -U <url>    Set \"base\" url for this run\n"
+"              (used to resolve relative urls, defaults to movie url)\n"
+"  -P <param>  Set parameter (ie. \"FlashVars=A=1&b=2\")\n"
+"  --version   Print gnash's version number and exit\n"
+msgstr ""
+
+#: gui/gnash.cpp:118
+msgid ""
+"\n"
+"keys:\n"
+"  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
+"  CTRL-P          Toggle Pause\n"
+"  CTRL-R          Restart the movie\n"
+"  CTRL-[ or kp-   Step back one frame\n"
+"  CTRL-] or kp+   Step forward one frame\n"
+"  CTRL-B          Toggle background color\n"
+"  CTRL-A          Toggle antialiasing (doesn't work)\n"
+"  CTRL-T          Debug.  Test the set_variable() function\n"
+"  CTRL-G          Debug.  Test the get_variable() function\n"
+"  CTRL-M          Debug.  Test the call_method() function\n"
+msgstr ""
+
+#: gui/gnash.cpp:138 plugin/klash/klash.cpp:660
+#, c-format
+msgid "Gnash "
+msgstr ""
+
+#: gui/gnash.cpp:138
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 2005-2007 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License.  For more information, see the file named COPYING.\n"
+msgstr ""
+
+#: gui/gnash.cpp:149
+#, c-format
+msgid ""
+"Build options %s\n"
+"   Target: %s\n"
+"   Renderer: %s   GUI: %s   Media handler: %s\n"
+msgstr ""
+
+#: gui/gnash.cpp:190 plugin/klash/klash.cpp:319
+msgid "Verbose output turned on"
+msgstr ""
+
+#: gui/gnash.cpp:194
+msgid "Logging to disk enabled"
+msgstr ""
+
+#: gui/gnash.cpp:200
+msgid "No verbose actions; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:207
+msgid "No verbose parsing; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:218
+#, c-format
+msgid "Setting root URL to %s"
+msgstr ""
+
+#: gui/gnash.cpp:224
+#, c-format
+msgid "Setting base URL to %s"
+msgstr ""
+
+#: gui/gnash.cpp:229
+#, c-format
+msgid "Setting width to %d"
+msgstr ""
+
+#: gui/gnash.cpp:233
+msgid "Setting debugger ON"
+msgstr ""
+
+#: gui/gnash.cpp:238
+msgid "No debugger; disabled at compile time"
+msgstr ""
+
+#: gui/gnash.cpp:243
+#, c-format
+msgid "Setting height to %d"
+msgstr ""
+
+#: gui/gnash.cpp:279
+#, c-format
+msgid "-r must be followed by 0, 1, 2 or 3 (%ld is invalid)"
+msgstr ""
+
+#: gui/gnash.cpp:314
+msgid "No rendering flags specified, using rcfile"
+msgstr ""
+
+#: gui/gnash.cpp:328
+#, c-format
+msgid "Got variable option (%s) on command line"
+msgstr ""
+
+#: gui/gui.cpp:460
+#, c-format
+msgid "Frame %d"
+msgstr ""
+
+#: gui/Player.cpp:187
+msgid "Sound requested but no sound support compiled in"
+msgstr ""
+
+#: gui/Player.cpp:364
+#, c-format
+msgid "fs_callback(%p): %s %s"
+msgstr ""
+
+#: libamf/amf.cpp:179
+#, c-format
+msgid "Type is %s"
+msgstr ""
+
+#: libamf/amf.cpp:185
+msgid "Number is "
+msgstr ""
+
+#: libamf/amf.cpp:189
+#, c-format
+msgid "Boolean is %d"
+msgstr ""
+
+#: libamf/amf.cpp:202 libamf/amf.cpp:241
+#, c-format
+msgid "String is %s"
+msgstr ""
+
+#: libamf/amf.cpp:218
+msgid "Undefined element"
+msgstr ""
+
+#: libamf/amf.cpp:234
+msgid "Date is "
+msgstr ""
+
+#: libamf/amf.cpp:234
+msgid " nanoseconds"
+msgstr ""
+
+#: libamf/amf.cpp:884
+#, c-format
+msgid "AMF Header size bits (0x%X) out of range"
+msgstr ""
+
+#: libamf/amf.cpp:901
+#, c-format
+msgid "AMF header byte is: 0x%X"
+msgstr ""
+
+#: libamf/amf.cpp:904
+#, c-format
+msgid "The AMF channel index is %d"
+msgstr ""
+
+#: libamf/amf.cpp:907
+#, c-format
+msgid "The header size is %d"
+msgstr ""
+
+#: libamf/amf.cpp:911
+#, c-format
+msgid "The packet head is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:918
+#, c-format
+msgid "The mystery word is: %d or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:927
+#, c-format
+msgid "The body size is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:937
+#, c-format
+msgid "The type is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:956
+#, c-format
+msgid "ERROR: Unidentified AMF header data type %d"
+msgstr ""
+
+#: libamf/amf.cpp:964
+#, c-format
+msgid "The source/destination is: %d, or 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1007
+msgid "AMF body input data is NULL"
+msgstr ""
+
+#: libamf/amf.cpp:1017
+#, c-format
+msgid "The packet body is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1046
+#, c-format
+msgid "AMF String length is: %d"
+msgstr ""
+
+#: libamf/amf.cpp:1052
+#, c-format
+msgid "AMF String is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1108 libamf/amf.cpp:1193
+msgid "End of Object definition"
+msgstr ""
+
+#: libamf/amf.cpp:1119
+#, c-format
+msgid "The element is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1124
+#, c-format
+msgid "AMF element length is: %d"
+msgstr ""
+
+#: libamf/amf.cpp:1134
+#, c-format
+msgid "AMF type is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1151
+#, c-format
+msgid "Number \"%s\" is: 0x%s"
+msgstr ""
+
+#: libamf/amf.cpp:1162
+#, c-format
+msgid "Boolean \"%s\" is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1171 libamf/amf.cpp:1184
+#, c-format
+msgid "Variable \"%s\" is: %s"
+msgstr ""
+
+#: libamf/amf.cpp:1181
+msgid "Undefined type"
+msgstr ""
+
+#: libamf/amf.cpp:1207
+#, c-format
+msgid "astype_e of value: %d"
+msgstr ""
+
+#: libbase/curl_adapter.cpp:277 libbase/curl_adapter.cpp:529
+#, c-format
+msgid "404 response from url %s"
+msgstr ""
+
+#: libbase/extension.cpp:124
+#, c-format
+msgid "Loading module: %s"
+msgstr ""
+
+#: libbase/extension.cpp:140
+#, c-format
+msgid "Initializing module: \"%s\""
+msgstr ""
+
+#: libbase/extension.cpp:157
+msgid "Couldn't get class_init symbol"
+msgstr ""
+
+#: libbase/extension.cpp:192
+#, c-format
+msgid "Scanning directory \"%s\" for plugins"
+msgstr ""
+
+#: libbase/extension.cpp:196
+#, c-format
+msgid "Can't open directory %s"
+msgstr ""
+
+#: libbase/extension.cpp:218
+#, c-format
+msgid "Gnash Plugin name: %s"
+msgstr ""
+
+#: libbase/log.cpp:188
+msgid "TRACE: "
+msgstr ""
+
+#: libbase/log.cpp:210 libbase/log.cpp:625
+msgid "DEBUG: "
+msgstr ""
+
+#: libbase/log.cpp:276
+msgid "ERROR: "
+msgstr ""
+
+#: libbase/log.cpp:293
+msgid "ERROR: Unimplemented: "
+msgstr ""
+
+#: libbase/log.cpp:310
+msgid "SECURITY: "
+msgstr ""
+
+#: libbase/log.cpp:327
+msgid "MALFORMED SWF: "
+msgstr ""
+
+#: libbase/log.cpp:344
+msgid "ACTIONSCRIPT ERROR: "
+msgstr ""
+
+#: libbase/network.cpp:85
+msgid "Could not find a usable WinSock DLL"
+msgstr ""
+
+#: libbase/network.cpp:127
+#, c-format
+msgid "Can't connect to privileged port #%d"
+msgstr ""
+
+#: libbase/network.cpp:149
+#, c-format
+msgid "unable to get protocol entry for %s"
+msgstr ""
+
+#: libbase/network.cpp:166
+#, c-format
+msgid "unable to create socket: %s"
+msgstr ""
+
+#: libbase/network.cpp:173
+msgid "setsockopt SO_REUSEADDR failed"
+msgstr ""
+
+#: libbase/network.cpp:183
+#, c-format
+msgid "unable to bind to port %hd: %s"
+msgstr ""
+
+#: libbase/network.cpp:192
+#, c-format
+msgid "Server bound to service on %s, port %hd, using fd %d"
+msgstr ""
+
+#: libbase/network.cpp:198
+#, c-format
+msgid "unable to listen on port: %hd: %s "
+msgstr ""
+
+#: libbase/network.cpp:235
+#, c-format
+msgid "Trying to accept net traffic on fd %d"
+msgstr ""
+
+#: libbase/network.cpp:264
+msgid "There is data at the console for stdin"
+msgstr ""
+
+#: libbase/network.cpp:270
+#, c-format
+msgid "The accept() socket for fd %d was interupted by a system call"
+msgstr ""
+
+#: libbase/network.cpp:274
+#, c-format
+msgid "The accept() socket for fd %d never was available for writing"
+msgstr ""
+
+#: libbase/network.cpp:281
+#, c-format
+msgid "The accept() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: libbase/network.cpp:293
+#, c-format
+msgid "unable to accept: %s"
+msgstr ""
+
+#: libbase/network.cpp:298
+#, c-format
+msgid "Accepting tcp/ip connection on fd %d"
+msgstr ""
+
+#: libbase/network.cpp:344
+#, c-format
+msgid "Can't connect to privileged port %hd"
+msgstr ""
+
+#: libbase/network.cpp:349
+#, c-format
+msgid "%s: to host %s at port %d"
+msgstr ""
+
+#: libbase/network.cpp:355
+#, c-format
+msgid "The hostname for this machine is %s"
+msgstr ""
+
+#: libbase/network.cpp:357
+msgid "Couldn't get the hostname for this machine"
+msgstr ""
+
+#: libbase/network.cpp:371
+#, c-format
+msgid "The IP address for this client socket is %s"
+msgstr ""
+
+#: libbase/network.cpp:379
+#, c-format
+msgid "unable to create socket : %s"
+msgstr ""
+
+#: libbase/network.cpp:401
+#, c-format
+msgid "The connect() socket for fd %d was interupted by a system call"
+msgstr ""
+
+#: libbase/network.cpp:408 libbase/network.cpp:436
+#, c-format
+msgid "The connect() socket for fd %d never was available for writing"
+msgstr ""
+
+#: libbase/network.cpp:419
+#, c-format
+msgid "The connect() socket for fd %d timed out waiting to write"
+msgstr ""
+
+#: libbase/network.cpp:429
+#, c-format
+msgid "\tport %d at IP %s for fd %d"
+msgstr ""
+
+#: libbase/network.cpp:505
+#, c-format
+msgid "Unable to close the socket for fd %d: %s"
+msgstr ""
+
+#: libbase/network.cpp:512
+#, c-format
+msgid "Closed the socket on fd %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:101
+msgid "Play Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:102
+msgid "Pause Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:103
+msgid "Stop Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:104
+msgid "Restart Movie"
+msgstr ""
+
+#: plugin/klash/klash.cpp:105
+msgid "Step Forward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:106
+msgid "Step Backward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:107
+msgid "Jump Forward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:108
+msgid "Jump Backward"
+msgstr ""
+
+#: plugin/klash/klash.cpp:109
+msgid "Quit Gnash"
+msgstr ""
+
+#: plugin/klash/klash.cpp:147
+msgid "Klash"
+msgstr ""
+
+#: plugin/klash/klash.cpp:148
+msgid "The Gnash Flash player for KDE.\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:309
+#, c-format
+msgid "Timer delay set to %d milliseconds"
+msgstr ""
+
+#: plugin/klash/klash.cpp:323
+msgid "Logging to disk enabled."
+msgstr ""
+
+#: plugin/klash/klash.cpp:342
+#, c-format
+msgid "Setting root URL to: %s"
+msgstr ""
+
+#: plugin/klash/klash.cpp:346
+#, c-format
+msgid "Setting width to: %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:350
+#, c-format
+msgid "Setting height to: %d"
+msgstr ""
+
+#: plugin/klash/klash.cpp:381
+#, c-format
+msgid "-r must be followed by 0, 1 or 2 (%d is invalid)"
+msgstr ""
+
+#: plugin/klash/klash.cpp:399
+msgid "Got variable option on command line!"
+msgstr ""
+
+#: plugin/klash/klash.cpp:414
+#, c-format
+msgid "No input files"
+msgstr ""
+
+#: plugin/klash/klash.cpp:448
+#, c-format
+msgid "error: can't get info about %s\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:508
+#, c-format
+msgid "error: can't create a movie from '%s'\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:513
+#, c-format
+msgid "error: can't create movie instance\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:660
+#, c-format
+msgid ""
+"\n"
+"Copyright (C) 2006, 2007 Free Software Foundation, Inc.\n"
+"Gnash comes with NO WARRANTY, to the extent permitted by law.\n"
+"You may redistribute copies of Gnash under the terms of the GNU General\n"
+"Public License.  For more information, see the file named COPYING.\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:673
+msgid ""
+"usage: gnash [options] movie_file.swf\n"
+"\n"
+"Plays a SWF (Shockwave Flash) movie\n"
+"options:\n"
+"\n"
+"  -h, --help  Print this info.\n"
+"  -s <factor> Scale the movie up/down by the specified factor\n"
+"  -c          Produce a core file instead of letting SDL trap it\n"
+"  -d num      Number of milliseconds to delay in main loop\n"
+"  -v          Be verbose; i.e. print log messages to stdout\n"
+"  -va         Be verbose about movie Actions\n"
+"  -vp         Be verbose about parsing the movie\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:685
+msgid ""
+"  -m <bias>   Specify the texture LOD bias (float, default is -1)\n"
+"  -x <ID>     X11 Window ID for display\n"
+"  -w          Produce the disk based debug log\n"
+"  -1          Play once; exit when/if movie reaches the last frame\n"
+"  -r <0|1|2>  0 disables rendering & sound (good for batch tests)\n"
+"              1 enables rendering & sound (default setting)\n"
+"              2 enables rendering & disables sound\n"
+"  -t <sec>    Timeout and exit after the specified number of seconds\n"
+"  -b <bits>   Bit depth of output window (16 or 32, default is 16)\n"
+"  --version   Print gnash's version number and exit\n"
+"\n"
+msgstr ""
+
+#: plugin/klash/klash.cpp:696
+msgid ""
+"keys:\n"
+"  CTRL-Q, CTRL-W, ESC   Quit/Exit\n"
+"  CTRL-P          Toggle Pause\n"
+"  CTRL-R          Restart the movie\n"
+"  CTRL-[ or kp-   Step back one frame\n"
+"  CTRL-] or kp+   Step forward one frame\n"
+"  CTRL-B          Toggle background color\n"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:259
+#, c-format
+msgid "can't get info about %s"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:262
+#, c-format
+msgid "Movie %s: width is %d, height is %d, version is %d\n"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:272
+#, c-format
+msgid "can't create a movie from %s"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:280
+msgid "can't create movie instance"
+msgstr ""
+
+#: plugin/win32/plugin.cpp:348
+msgid "player: Shutting down as requested..."
+msgstr ""
+
+#: server/array.cpp:203
+msgid "tried to pop element from back of empty array, returning undef"
+msgstr ""
+
+#: server/array.cpp:219
+msgid "tried to shift element from front of empty array, returning undef"
+msgstr ""
+
+#: server/array.cpp:313
+#, c-format
+msgid "Array.slice(%u, %u) called"
+msgstr ""
+
+#: server/array.cpp:343
+#, c-format
+msgid "Current array is %s"
+msgstr ""
+
+#: server/array.cpp:476
+#, c-format
+msgid "Unhandled sort flags: %d (0x%X)"
+msgstr ""
+
+#: server/array.cpp:486
+msgid "array.sort with unique flag"
+msgstr ""
+
+#: server/array.cpp:512
+#, c-format
+msgid "Array(%s).splice(%s) called"
+msgstr ""
+
+#: server/array.cpp:518
+msgid "Array.splice() needs at least 1 argument, call ignored"
+msgstr ""
+
+#: server/array.cpp:534
+#, c-format
+msgid "Array.splice: start:%d became %u"
+msgstr ""
+
+#: server/array.cpp:547
+#, c-format
+msgid "Array.splice(%d,%d): negative length given, call ignored"
+msgstr ""
+
+#: server/array.cpp:614
+#, c-format
+msgid "calling array push, pushing %d values onto back of array"
+msgstr ""
+
+#: server/array.cpp:630
+#, c-format
+msgid "calling array unshift, pushing %d values onto front of array"
+msgstr ""
+
+#: server/array.cpp:649
+#, c-format
+msgid "calling array pop, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:665
+#, c-format
+msgid "calling array shift, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:682
+#, c-format
+msgid "called array reverse, result:%s, new array size:%d"
+msgstr ""
+
+#: server/array.cpp:723
+#, c-format
+msgid "array_to_string called, nargs = %d, this_ptr = %p"
+msgstr ""
+
+#: server/array.cpp:726
+#, c-format
+msgid "to_string result is: %s"
+msgstr ""
+
+#: server/array.cpp:775
+msgid ""
+"More than 2 arguments to Array.slice, and I don't know what to do with "
+"them.  Ignoring them"
+msgstr ""
+
+#: server/array.cpp:845
+#, c-format
+msgid "array_new called, nargs = %d"
+msgstr ""
+
+#: server/array.cpp:878
+#, c-format
+msgid "array_new setting object %p in result"
+msgstr ""
+
+#: server/as_environment.cpp:68
+#, c-format
+msgid "find_object%s(\"%s\") [ varname = '%s' - current target = '%s' ] failed"
+msgstr ""
+
+#: server/as_environment.cpp:80
+#, c-format
+msgid "...but get_variable_raw(%s, <with_stack>) succeeded!"
+msgstr ""
+
+#: server/as_environment.cpp:157
+#, c-format
+msgid "get_variable_raw(\"%s\") failed, returning UNDEFINED"
+msgstr ""
+
+#: server/as_environment.cpp:247
+#, c-format
+msgid "Path target '%s' not found while setting %s=%s"
+msgstr ""
+
+#: server/as_environment.cpp:455
+#, c-format
+msgid ""
+"as_environment::find_target: '%s': invalid path; neither string nor object"
+msgstr ""
+
+#: server/as_environment.cpp:511
+#, c-format
+msgid "find_target(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:516 server/as_environment.cpp:593
+#: server/as_environment.cpp:703
+msgid "Returning m_target (empty path)"
+msgstr ""
+
+#: server/as_environment.cpp:533 server/as_environment.cpp:721
+#, c-format
+msgid "Absolute path, start at the root (%p)"
+msgstr ""
+
+#: server/as_environment.cpp:540 server/as_environment.cpp:606
+#: server/as_environment.cpp:728
+msgid "Null path, returning m_target"
+msgstr ""
+
+#: server/as_environment.cpp:551 server/as_environment.cpp:619
+#: server/as_environment.cpp:740
+#, c-format
+msgid "invalid path '%s'"
+msgstr ""
+
+#: server/as_environment.cpp:564 server/as_environment.cpp:636
+#: server/as_environment.cpp:757
+#, c-format
+msgid "No more subparts, env is %p"
+msgstr ""
+
+#: server/as_environment.cpp:570
+#, c-format
+msgid "Invoking get_relative_target(%s) on object %p (%s)"
+msgstr ""
+
+#: server/as_environment.cpp:588
+#, c-format
+msgid "find_object_dotsyntax(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:629 server/as_environment.cpp:750
+#, c-format
+msgid "Subpart ==  %s"
+msgstr ""
+
+#: server/as_environment.cpp:642 server/as_environment.cpp:787
+#, c-format
+msgid "Invoking get_member(%s) on object %p"
+msgstr ""
+
+#: server/as_environment.cpp:652
+#, c-format
+msgid "Member %s for object %p not found (dotsyntax).  Path was %s"
+msgstr ""
+
+#: server/as_environment.cpp:661
+#, c-format
+msgid ""
+"Element '%s' of variable '%s' not found in object %p nor in _global "
+"(dotsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:671
+#, c-format
+msgid ""
+"Member %s of object %p doesn't cast to an Object (%s) evaluating target path "
+"%s (dotsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:698
+#, c-format
+msgid "find_object_slashsyntax(%s) called"
+msgstr ""
+
+#: server/as_environment.cpp:767
+#, c-format
+msgid "'..' element in path '%s' follows a non-character object %p"
+msgstr ""
+
+#: server/as_environment.cpp:776
+#, c-format
+msgid ""
+"'..' in path '%s' follows a character with no parent (%s : %p) (root is %p)"
+msgstr ""
+
+#: server/as_environment.cpp:797
+#, c-format
+msgid "Member %s for object %p not found (slashsyntax). Path was %s"
+msgstr ""
+
+#: server/as_environment.cpp:806
+#, c-format
+msgid ""
+"Element '%s' of variable '%s' not found in object %p nor in _global "
+"(slashsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:816
+#, c-format
+msgid ""
+"Member %s of object %p doesn't cast to an Object (%s) evaluating target path "
+"%s (slashsyntax)"
+msgstr ""
+
+#: server/as_environment.cpp:1041
+#, c-format
+msgid "Max stack count reached (%u) - should abort execution"
+msgstr ""
+
+#: server/as_function.cpp:148
+#, c-format
+msgid "Exported interface of function %p has been overwritten (from %p to %p)"
+msgstr ""
+
+#: server/as_function.cpp:197
+msgid "Function.apply() called with no args"
+msgstr ""
+
+#: server/as_function.cpp:217
+#, c-format
+msgid ""
+"Function.apply() got %d args, expected at most 2 -- discarding the ones in "
+"excess"
+msgstr ""
+
+#: server/as_function.cpp:229
+#, c-format
+msgid ""
+"Second arg of Function.apply is %s (expected array) - considering as call "
+"with no args"
+msgstr ""
+
+#: server/as_function.cpp:243
+#, c-format
+msgid ""
+"Second arg of Function.apply is of type %s, with value %s (expected array) - "
+"considering as call with no args"
+msgstr ""
+
+#: server/as_function.cpp:331
+msgid "it's a built-in class"
+msgstr ""
+
+#: server/as_function.cpp:364
+#, c-format
+msgid "constructor prototype is %s"
+msgstr ""
+
+#: server/asobj/Date.cpp:416
+msgid "Date constructor called with more than 7 arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:443
+msgid "Date() failed to initialise from arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:648
+msgid "Date.setTime needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:655
+msgid "Date.setTime was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:705
+msgid "Failed to set a date."
+msgstr ""
+
+#: server/asobj/Date.cpp:742
+msgid "utc_tm_msec_to_date failed to convert a date"
+msgstr ""
+
+#: server/asobj/Date.cpp:816
+msgid "Date.setFullYear needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:832
+msgid "Date.setFullYear was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:861
+msgid "Date.setYear needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:881
+msgid "Date.setYear was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:909
+msgid "Date.setMonth needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:938
+msgid "Date.setMonth was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:957
+msgid "Date.setDate needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:971
+msgid "Date.setDate was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:995
+msgid "Date.setHours needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1013
+msgid "Date.setHours was called with more than four arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:1035
+msgid "Date.setMinutes needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1052 server/asobj/Date.cpp:1090
+msgid "Date.setMinutes was called with more than three arguments"
+msgstr ""
+
+#: server/asobj/Date.cpp:1072
+msgid "Date.setSeconds needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1106
+msgid "Date.setMilliseconds needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1116
+msgid "Date.setMilliseconds was called with more than one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1240
+msgid "Date.UTC needs one argument"
+msgstr ""
+
+#: server/asobj/Date.cpp:1260
+msgid "Date.UTC was called with more than 7 arguments"
+msgstr ""
+
+#: server/as_object.cpp:121
+#, c-format
+msgid "Caught exception: %s"
+msgstr ""
+
+#: server/as_object.cpp:205
+#, c-format
+msgid "Attempt to set read-only property '%s'"
+msgstr ""
+
+#: server/as_object.cpp:216
+#, c-format
+msgid "%s: Exception %s.  Will create a new member"
+msgstr ""
+
+#: server/as_object.cpp:226
+#, c-format
+msgid "Attempt to set read-only property ``%s'' on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:249
+#, c-format
+msgid "Attempt to initialize read-only property ``%s'' (%s) on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:263
+#, c-format
+msgid "Attempt to initialize read-only property ``%s'' on object ``%p''"
+msgstr ""
+
+#: server/as_object.cpp:362
+msgid "Circular inheritance chain detected during instanceOf call"
+msgstr ""
+
+#: server/as_object.cpp:383
+msgid "Circular inheritance chain detected during isPrototypeOf call"
+msgstr ""
+
+#: server/as_object.cpp:392
+#, c-format
+msgid " members of object %p follow"
+msgstr ""
+
+#: server/as_object.cpp:420
+#, c-format
+msgid ""
+"Can't set propflags on object property %s (either not found or protected)"
+msgstr ""
+
+#: server/asobj/Global.cpp:80 server/asobj/string.cpp:39
+#, c-format
+msgid "%s needs one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:86 server/asobj/string.cpp:45
+#, c-format
+msgid "%s has more than one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:193
+#, c-format
+msgid "%s needs at least one argument"
+msgstr ""
+
+#: server/asobj/Global.cpp:199
+#, c-format
+msgid "%s has more than two arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:311
+#, c-format
+msgid "%s needs at least three arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:317
+#, c-format
+msgid "%s has more than four arguments"
+msgstr ""
+
+#: server/asobj/Global.cpp:319
+#, c-format
+msgid "%s has four arguments in a SWF version 5 movie"
+msgstr ""
+
+#: server/asobj/Global.cpp:328
+#, c-format
+msgid "Invalid call to ASSetPropFlags: object argument is not an object: %s"
+msgstr ""
+
+#: server/asobj/Key.cpp:231
+msgid "key_add_listener needs one argument (the listener object)"
+msgstr ""
+
+#: server/asobj/Key.cpp:238
+msgid "key_add_listener passed a NULL object; ignored"
+msgstr ""
+
+#: server/asobj/Key.cpp:279
+msgid "key_is_down needs one argument (the key code)"
+msgstr ""
+
+#: server/asobj/Key.cpp:303
+msgid "key_remove_listener needs one argument (the listener object)"
+msgstr ""
+
+#: server/asobj/Key.cpp:310
+msgid "key_remove_listener passed a NULL object; ignored"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:528
+msgid "LoadVars.load() requires at least one argument"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:537
+msgid "LoadVars.load(): invalid empty url"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:564
+msgid "LoadVars.sendAndLoad() requires at least two arguments"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:573
+msgid "LoadVars.sendAndLoad(): invalid empty url"
+msgstr ""
+
+#: server/asobj/LoadVars.cpp:582
+msgid "LoadVars.sendAndLoad(): invalid target (must be a LoadVars object)"
+msgstr ""
+
+#: server/asobj/LocalConnection.cpp:143
+msgid "No connection name specified to LocalConnection.connect()"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:182
+#, c-format
+msgid " resolved url: %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:221
+msgid ""
+"FIXME: MovieClipLoader calling onLoadComplete *before* movie has actually "
+"been fully loaded (cheating)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:261
+#, c-format
+msgid "Dispatching %s event to "
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:261
+msgid " listeners"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:274
+#, c-format
+msgid "Listener %p doesn't have an %s event to listen for, skipped"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:283
+#, c-format
+msgid "Testing call to listener's  %s function"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:308
+#, c-format
+msgid "MovieClipLoader.loadClip() first argument is not a string (%s)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:318
+#, c-format
+msgid "Could not find target %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:324
+#, c-format
+msgid "Target is not a sprite instance (%s)"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:330
+#, c-format
+msgid "load clip: %s, target is: %p\n"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:344
+#, c-format
+msgid "%s: %s"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:388
+msgid "Listener given to MovieClipLoader.addListener() is not an object"
+msgstr ""
+
+#: server/asobj/MovieClipLoader.cpp:406
+msgid "Listener given to MovieClipLoader.removeListener() is not an object"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:97
+#, c-format
+msgid "Gnash is not allowed to open this url: %s"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:104
+#, c-format
+msgid "Gnash could not open this url: %s"
+msgstr ""
+
+#: server/asobj/NetConnection.cpp:110
+#, c-format
+msgid "Connection etablished to movie: %s"
+msgstr ""
+
+#: server/asobj/NetStream.cpp:85
+#, c-format
+msgid ""
+"First argument to NetStream constructor doesn't cast to a NetConnection (%s)"
+msgstr ""
+
+#: server/asobj/NetStream.cpp:124
+msgid "NetStream play needs args"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:230 server/asobj/NetStreamGst.cpp:170
+msgid "No NetConnection associated with this NetStream, won't play"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:261
+msgid "libavcodec couldn't find decoder"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:267
+msgid "libavcodec couldn't allocate context"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:274
+msgid "libavcodec failed to initialize codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:311 server/asobj/NetStreamGst.cpp:491
+#, c-format
+msgid "Unsupported video codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:342 server/asobj/NetStreamGst.cpp:530
+#, c-format
+msgid "Unsupported audio codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:367
+msgid "Gnash could not read from movie url"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:384 server/asobj/NetStreamGst.cpp:346
+#: server/asobj/NetStreamGst.cpp:363
+#, c-format
+msgid "Gnash could not open movie: %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:403
+#, c-format
+msgid "Gnash could not open FLV movie: %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:414
+msgid "Failed to initialize FLV video codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:420
+msgid "Failed to initialize FLV audio codec"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:450
+#, c-format
+msgid "Couldn't determine stream input format from URL %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:466 server/asobj/SoundFfmpeg.cpp:136
+#, c-format
+msgid "Couldn't open file '%s' for decoding"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:476 server/asobj/SoundFfmpeg.cpp:146
+#, c-format
+msgid "Couldn't find stream information from '%s', error code: %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:515
+#, c-format
+msgid "Didn't find a video stream from '%s'"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:527
+#, c-format
+msgid "Video decoder %d not found"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:535
+#, c-format
+msgid "Could not open codec %d"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:561
+#, c-format
+msgid "No available audio decoder %d to process MPEG file: '%s'"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:569 server/asobj/SoundFfmpeg.cpp:201
+#, c-format
+msgid "Could not open audio codec %d for %s"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:744
+msgid "read_frame: not audio & video stream"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:944
+msgid "Problems decoding frame"
+msgstr ""
+
+#: server/asobj/NetStreamFfmpeg.cpp:988
+#, c-format
+msgid "%s: seeking failed"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:380
+msgid "The gstreamer pipeline element could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:399
+msgid "The gstreamer audiosink element could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:413
+msgid "Gstreamer audio element(s) for movie handling could not be created"
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:458
+msgid ""
+"A gstreamer flashvideo (h.263) decoder element could not be created.  You "
+"probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:472
+msgid ""
+"A gstreamer flashvideo (VP6) decoder element could not be created! You "
+"probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:486
+msgid ""
+"A gstreamer flashvideo (ScreenVideo) decoder element could not be created! "
+"You probably need to install gst-ffmpeg."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:509
+msgid ""
+"This version of Fluendo's mp3 plugin does not support flash streaming "
+"sounds, please upgrade to version 0.10.4 or higher."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:516
+msgid ""
+"A gstreamer mp3-decoder element could not be created! You probably need to "
+"install a mp3-decoder plugin like gstreamer0.10-mad or gstreamer0.10-fluendo-"
+"mp3."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:566
+msgid ""
+"Gstreamer source element(s) for video movie handling could not be created, "
+"you probably need to install gstreamer0.10-core for fakesrc and capsfilter "
+"support."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:571
+msgid ""
+"Gstreamer element(s) for video movie handling could not be created, you "
+"probably need to install gstreamer0.10-base for decodebin support."
+msgstr ""
+
+#: server/asobj/NetStreamGst.cpp:577
+msgid ""
+"Gstreamer element(s) for video movie handling could not be created, you "
+"probably need to install gstreamer0.10-base for ffmpegcolorspace and "
+"videorate support."
+msgstr ""
+
+#: server/asobj/Number.cpp:221
+#, c-format
+msgid "Internal error: Cannot find \".0\" in %s for %.15g"
+msgstr ""
+
+#: server/asobj/Object.cpp:125
+msgid "Too many args to Object constructor"
+msgstr ""
+
+#: server/asobj/Object.cpp:171
+#, c-format
+msgid ""
+"Invalid call to Object.addProperty(%s) - expected 3 arguments (<name>, "
+"<getter>, <setter>)"
+msgstr ""
+
+#: server/asobj/Object.cpp:188
+msgid "Invalid call to Object.addProperty() - empty property name"
+msgstr ""
+
+#: server/asobj/Object.cpp:198
+msgid "Invalid call to Object.addProperty() - getter is not an AS function"
+msgstr ""
+
+#: server/asobj/Object.cpp:208
+msgid "Invalid call to Object.addProperty() - setter is not an AS function"
+msgstr ""
+
+#: server/asobj/Object.cpp:235
+#, c-format
+msgid ""
+"Invalid call to Object.registerClass(%s) - expected 2 arguments (<symbol>, "
+"<constructor>)"
+msgstr ""
+
+#: server/asobj/Object.cpp:252
+msgid "Invalid call to Object.registerClass() - empty symbol id"
+msgstr ""
+
+#: server/asobj/Object.cpp:262
+msgid "Invalid call to Object.registerClass() - class is not a function"
+msgstr ""
+
+#: server/asobj/Object.cpp:277
+#, c-format
+msgid "Object.registerClass(%s, %s): can't find exported symbol"
+msgstr ""
+
+#: server/asobj/Object.cpp:295
+#, c-format
+msgid ""
+"Object.registerClass(%s, %s): exported symbol is not a MovieClip symbol "
+"(sprite_definition), but a %s"
+msgstr ""
+
+#: server/asobj/Object.cpp:316
+msgid "Object.hasOwnProperty() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:325
+#, c-format
+msgid "Invalid call to Object.hasOwnProperty('%s')"
+msgstr ""
+
+#: server/asobj/Object.cpp:339
+msgid "Object.isPropertyEnumerable() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:348
+#, c-format
+msgid "Invalid call to Object.isPropertyEnumerable('%s')"
+msgstr ""
+
+#: server/asobj/Object.cpp:369
+msgid "Object.isPrototypeOf() requires one arg"
+msgstr ""
+
+#: server/asobj/Object.cpp:378
+#, c-format
+msgid "First arg to Object.isPrototypeOf(%s) is not an object"
+msgstr ""
+
+#: server/asobj/Sound.cpp:140
+#, c-format
+msgid "%s is still testing!"
+msgstr ""
+
+#: server/asobj/Sound.cpp:143 server/asobj/SoundGst.cpp:229
+#, c-format
+msgid ""
+"%s: This sound already has a connection?  (We try to handle this by deleting "
+"the old one...)"
+msgstr ""
+
+#: server/asobj/Sound.cpp:217 server/asobj/Sound.cpp:229
+#, c-format
+msgid "%s: only works when ffmpeg, gstreamer or libmad is enabled"
+msgstr ""
+
+#: server/asobj/Sound.cpp:257
+msgid "-- start sound"
+msgstr ""
+
+#: server/asobj/Sound.cpp:282
+msgid "-- stop sound "
+msgstr ""
+
+#: server/asobj/Sound.cpp:298 server/asobj/Sound.cpp:352
+#, c-format
+msgid "import error: resource '%s' is not exported"
+msgstr ""
+
+#: server/asobj/Sound.cpp:312 server/asobj/Sound.cpp:366
+msgid "sound sample is NULL (doesn't cast to sound_sample)"
+msgstr ""
+
+#: server/asobj/Sound.cpp:325
+msgid "-- attach sound"
+msgstr ""
+
+#: server/asobj/Sound.cpp:330
+msgid "attach sound needs one argument"
+msgstr ""
+
+#: server/asobj/Sound.cpp:340
+msgid "attachSound needs a non-empty string"
+msgstr ""
+
+#: server/asobj/Sound.cpp:441
+msgid "loadSound needs 2 arguments"
+msgstr ""
+
+#: server/asobj/Sound.cpp:482
+msgid "set volume of sound needs one argument"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:92
+#, c-format
+msgid "%s could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:115
+#, c-format
+msgid "%s: could not read from audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:172
+#, c-format
+msgid "Non-audio data (type %d) found in file %s"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:181
+#, c-format
+msgid "Didn't find a audio stream from '%s'"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:192
+#, c-format
+msgid "No available audio decoder %d to process file: '%s'"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:320
+msgid "seeking to start of file (for looping) failed"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:372
+msgid ""
+"This sound already has a connection.  (We try to handle this by deleting the "
+"old one...)"
+msgstr ""
+
+#: server/asobj/SoundFfmpeg.cpp:402 server/asobj/SoundGst.cpp:257
+#, c-format
+msgid "%s: seeking to offset failed"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:108
+#, c-format
+msgid "%s: new pad found"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:122
+#, c-format
+msgid "%s: new pad connected"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:125
+#, c-format
+msgid "%s: Non-audio data found in file %s"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:142
+#, c-format
+msgid "could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:171
+msgid "Could not create gstreamer pipeline element"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:175
+msgid "Could not create gstreamer audiosink element"
+msgstr ""
+
+#: server/asobj/SoundGst.cpp:198
+msgid "Could not create Gstreamer element(s) for movie handling"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:83
+#, c-format
+msgid "Gnash could not open audio url: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:120 server/asobj/SoundMad.cpp:207
+#, c-format
+msgid "Recoverable error while decoding MP3, MAD error: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:215
+#, c-format
+msgid "Unrecoverable error while decoding MP3, MAD error: %s"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:272
+msgid "Error in sound sample convertion"
+msgstr ""
+
+#: server/asobj/SoundMad.cpp:351
+msgid ""
+"This sound already has a connection?  (We try to handle this by deleting the "
+"old one...)"
+msgstr ""
+
+#: server/asobj/Stage.cpp:161
+msgid "Stage.addListener() needs one argument"
+msgstr ""
+
+#: server/asobj/Stage.cpp:172
+#, c-format
+msgid ""
+"Invalid call to Stage.addListener(%s) : first arg doesn't cast to an object"
+msgstr ""
+
+#: server/asobj/Stage.cpp:189
+msgid "Stage.removeListener() needs one argument"
+msgstr ""
+
+#: server/asobj/Stage.cpp:200
+#, c-format
+msgid ""
+"Invalid call to Stage.removeListener(%s) : first arg doesn't cast to an "
+"object"
+msgstr ""
+
+#: server/asobj/string.cpp:364
+msgid "string.slice() called with end < start"
+msgstr ""
+
+#: server/asobj/string.cpp:427
+msgid "string.charCodeAt needs one argument"
+msgstr ""
+
+#: server/asobj/string.cpp:436
+msgid "string.charCodeAt has more than one argument"
+msgstr ""
+
+#: server/asobj/xml.cpp:97 server/asobj/xml.cpp:115
+#, c-format
+msgid "Creating XML data at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:130
+#, c-format
+msgid "\tCreating XML data at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:164
+#, c-format
+msgid "set_member 'loaded' (%s) became boolean %d"
+msgstr ""
+
+#: server/asobj/xml.cpp:178
+#, c-format
+msgid "\tDeleting XML top level node at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:311
+msgid "Can't load XML file"
+msgstr ""
+
+#: server/asobj/xml.cpp:338
+msgid "XML data is empty"
+msgstr ""
+
+#: server/asobj/xml.cpp:353
+msgid "Can't parse XML data"
+msgstr ""
+
+#: server/asobj/xml.cpp:381
+#, c-format
+msgid "Can't load XML file: %s (security?)"
+msgstr ""
+
+#: server/asobj/xml.cpp:386
+#, c-format
+msgid "Loading XML file from url: '%s'"
+msgstr ""
+
+#: server/asobj/xml.cpp:397
+#, c-format
+msgid "Can't read XML file %s (stream error %d)"
+msgstr ""
+
+#: server/asobj/xml.cpp:408
+#, c-format
+msgid "Can't read XML file %s (%s)"
+msgstr ""
+
+#: server/asobj/xml.cpp:431
+#, c-format
+msgid "%s: FIXME: onLoad Default event handler"
+msgstr ""
+
+#: server/asobj/xml.cpp:569
+#, c-format
+msgid "\tCloned the XML object at %p"
+msgstr ""
+
+#: server/asobj/xml.cpp:578
+#, c-format
+msgid "First arg given to XML constructor (%s) evaluates to the empty string"
+msgstr ""
+
+#: server/asobj/xml.cpp:603
+#, c-format
+msgid "%s: %d args"
+msgstr ""
+
+#: server/asobj/xml.cpp:636
+msgid "no text for element creation"
+msgstr ""
+
+#: server/asobj/xml.cpp:665
+msgid "no text for text node creation"
+msgstr ""
+
+#: server/asobj/xml.cpp:791
+#, c-format
+msgid "XML parser: %s"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:83 server/asobj/xmlnode.cpp:95
+#, c-format
+msgid "\tCreating XMLNode data at %p"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:123
+#, c-format
+msgid "\tDeleting XMLNode data %s at %p"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:151
+#, c-format
+msgid "XMLNode %p has no children"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:192
+msgid ""
+"XMLNode.insertBefore(): positional parameter is not a child of this node"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:295
+#, c-format
+msgid ""
+"Stringifying node %p with name %s, value %s, %u attributes and %u children"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:443
+msgid "XMLNode::appendChild() needs at least one argument"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:452
+msgid "First argument to XMLNode::appendChild() is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:486
+#, c-format
+msgid "XMLNode.insertBefore(%s) needs at least two argument"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:496
+#, c-format
+msgid "First argument to XMLNode.insertBefore(%s) is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlnode.cpp:507
+#, c-format
+msgid "Second argument to XMLNode.insertBefore(%s) is not an XMLNode"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:207
+#, c-format
+msgid ""
+"%s: fd <= 0, returning false (timer not unregistered while socket "
+"disconnected?"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:222
+#, c-format
+msgid "The socket for fd #%d was interupted by a system call"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:227 server/asobj/xmlsocket.cpp:403
+#, c-format
+msgid "%s: The socket for fd #%d never was available"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:243
+#, c-format
+msgid "%s: read %d bytes, first msg terminates at %d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:251
+#, c-format
+msgid "Packet size is %d at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:259
+#, c-format
+msgid "%d: Pushing Packet of size "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:259
+#, c-format
+msgid " at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:302
+#, c-format
+msgid "Throwing out partial packet %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:317
+#, c-format
+msgid "%s: Returning %d messages"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:332
+#, c-format
+msgid "%s: socket not initialized"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:339
+#, c-format
+msgid "%s: sent %d bytes, data was %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:399
+#, c-format
+msgid ""
+"%s: The socket for fd #%d was interupted by a system call in this thread"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:407
+#, c-format
+msgid "%s: There is no data in the socket for fd #%d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:411
+#, c-format
+msgid "%s: There is data in the socket for fd #%d"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:429
+#, c-format
+msgid "XMLSocket.connect(%s) called"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:436
+msgid "XMLSocket.connect() called while already connected, ignored"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:455
+msgid "XMLSocket.connect(): calling onConnect"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:463
+msgid "Setting up timer for calling XMLSocket.onData()"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:471
+msgid "Timer set"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:512
+#, c-format
+msgid "new XMLSocket(%s) called - created object at %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:532
+#, c-format
+msgid "%s: not connected"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:554
+#, c-format
+msgid ""
+"Builtin XMLSocket.onData doing nothing as no onXML event is defined on "
+"XMLSocket %p"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:563
+msgid "Builtin XMLSocket.onData() needs an argument"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:573
+#, c-format
+msgid ""
+"Builtin XMLSocket.onData() called with an argument that resolves to the "
+"empty string: %s"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:654
+msgid "Still processing data"
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:664
+msgid "Got "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:664
+msgid " messages: "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:667
+msgid " Message "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:667
+#, c-format
+msgid " : %s "
+msgstr ""
+
+#: server/asobj/xmlsocket.cpp:695
+#, c-format
+msgid "%s: Couldn't find onData"
+msgstr ""
+
+#: server/as_value.cpp:172
+#, c-format
+msgid "[object %p].%s() did not return a string: %s"
+msgstr ""
+
+#: server/as_value.cpp:179 server/as_value.cpp:339
+#, c-format
+msgid "get_member(%s) returned false"
+msgstr ""
+
+#: server/as_value.cpp:324
+#, c-format
+msgid "[object %p].%s() did not return a number: %s"
+msgstr ""
+
+#: server/as_value.cpp:504
+#, c-format
+msgid ""
+"MovieClip value is a dangling reference: target '%s' not found (should set "
+"to NULL?)"
+msgstr ""
+
+#: server/button_character_instance.cpp:328
+#, c-format
+msgid "Unsupported event for button instance: %s"
+msgstr ""
+
+#: server/button_character_instance.cpp:533
+#, c-format
+msgid "Unhandled button event %s"
+msgstr ""
+
+#: server/button_character_instance.cpp:623
+#, c-format
+msgid "Executing actions for button condition %d"
+msgstr ""
+
+#: server/character.cpp:99
+msgid "Relative drag"
+msgstr ""
+
+#: server/character.cpp:163
+msgid ""
+"ActionScript code trying to reference a nonexistent parent with '..'  (a "
+"nonexistent parent probably only occurs in the root MovieClip). Returning a "
+"reference to top parent (probably the root clip)."
+msgstr ""
+
+#: server/character.cpp:305
+#, c-format
+msgid "Attempt to set _xscale to %g, refused"
+msgstr ""
+
+#: server/character.cpp:313
+#, c-format
+msgid "Attempt to set _xscale to %g, use 0"
+msgstr ""
+
+#: server/character.cpp:349
+#, c-format
+msgid "Attempt to set _yscale to %g, refused"
+msgstr ""
+
+#: server/character.cpp:357
+#, c-format
+msgid "Attempt to set _yscale to %g, use 0"
+msgstr ""
+
+#: server/character.cpp:475
+msgid "FIXME: can't set _width on character with null or world bounds"
+msgstr ""
+
+#: server/character.cpp:486
+#, c-format
+msgid "Setting _width=%g"
+msgstr ""
+
+#: server/character.cpp:520
+msgid "FIXME: can't set _height on character with null or world bounds"
+msgstr ""
+
+#: server/character.cpp:531
+#, c-format
+msgid "Setting _height=%g"
+msgstr ""
+
+#: server/dlist.cpp:332
+#, c-format
+msgid "move_display_object() -- can't find object at depth %d"
+msgstr ""
+
+#: server/dlist.cpp:688
+#, c-format
+msgid "Item %d at depth %d (char id %d, name %s, type %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:850
+#, c-format
+msgid "TextField text doesn't fit in its boundaries: width %g, margin %d"
+msgstr ""
+
+#: server/edit_text_character.cpp:909
+#, c-format
+msgid "No font for edit_text_character! [%s:%d]"
+msgstr ""
+
+#: server/edit_text_character.cpp:937
+#, c-format
+msgid "substituting font!  font '%s' has no glyphs, using font '%s'"
+msgstr ""
+
+#: server/edit_text_character.cpp:947
+msgid ""
+"Current font has no glyphs and I couldn't find another font with glyphs... :("
+msgstr ""
+
+#: server/edit_text_character.cpp:1072
+#, c-format
+msgid ""
+"%s -- missing glyph for space char (needed for TAB).  Make sure character "
+"shapes for font %s are being exported into your SWF file."
+msgstr ""
+
+#: server/edit_text_character.cpp:1111
+#, c-format
+msgid ""
+"%s -- missing glyph for char %d.  Make sure character shapes for font %s are "
+"being exported into your SWF file"
+msgstr ""
+
+#: server/edit_text_character.cpp:1230
+msgid "registerTextVariable() no-op call (already registered)"
+msgstr ""
+
+#: server/edit_text_character.cpp:1238
+msgid "string is empty, consider as registered"
+msgstr ""
+
+#: server/edit_text_character.cpp:1254
+#, c-format
+msgid "VariableName: %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1269
+#, c-format
+msgid "Variable text Path: %s, Var: %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1282
+#, c-format
+msgid ""
+"VariableName associated to text field refer to an unknown target (%s). It is "
+"possible that the character will be instantiated later in the SWF stream. "
+"Gnash will try to register again on next access."
+msgstr ""
+
+#: server/edit_text_character.cpp:1297
+#, c-format
+msgid "target sprite (%p) does have a member named %s"
+msgstr ""
+
+#: server/edit_text_character.cpp:1304
+#, c-format
+msgid ""
+"target sprite (%p) does NOT have a member named %s (no problem, we'll add it)"
+msgstr ""
+
+#: server/fill_style.cpp:132
+msgid "num gradients 0"
+msgstr ""
+
+#: server/fill_style.cpp:141
+#, c-format
+msgid "Unexpected num gradients (%d), expected 1 to 8"
+msgstr ""
+
+#: server/fill_style.cpp:190
+#, c-format
+msgid ""
+"Bitmap fill specifies '%d' as associated bitmap character id, but that "
+"character is not found in the Characters Dictionary. It seems common to find "
+"such  malformed SWF, so we'll only warn once about this."
+msgstr ""
+
+#: server/fill_style.cpp:246
+#, c-format
+msgid "Unknown fill style %d"
+msgstr ""
+
+#: server/fill_style.cpp:282
+#, c-format
+msgid ""
+"First gradient in a fill_style have position==%d (expected 0). This seems to "
+"be common, so will warn only once."
+msgstr ""
+
+#: server/fill_style.cpp:318
+#, c-format
+msgid "two gradients in a fill_style have the same position/ratio: %d"
+msgstr ""
+
+#: server/font.cpp:139
+msgid "reading DefineFont"
+msgstr ""
+
+#: server/font.cpp:189
+msgid "reading DefineFont2 or DefineFont3"
+msgstr ""
+
+#: server/font.cpp:224 server/font.cpp:239
+#, c-format
+msgid "Glyph %d at offset %u"
+msgstr ""
+
+#: server/font.cpp:275
+msgid "Bad offset in DefineFont2"
+msgstr ""
+
+#: server/font.cpp:342
+msgid "Repeated kerning pair found - ignoring"
+msgstr ""
+
+#: server/font.cpp:364
+msgid "DefineFontInfo2 partially implemented"
+msgstr ""
+
+#: server/font.cpp:395
+#, c-format
+msgid "reading code table at offset %lu"
+msgstr ""
+
+#: server/font.cpp:429
+#, c-format
+msgid "get_glyph_index(%u) returning %d"
+msgstr ""
+
+#: server/font.cpp:436
+#, c-format
+msgid "get_glyph_index(%u) returning -1"
+msgstr ""
+
+#: server/font.cpp:456
+#, c-format
+msgid "empty advance table in font %s"
+msgstr ""
+
+#: server/font.cpp:523
+msgid ""
+"error reading cache file in font::input_cached_data(): glyph count mismatch"
+msgstr ""
+
+#: server/impl.cpp:89
+#, c-format
+msgid "Base url set to: %s"
+msgstr ""
+
+#: server/impl.cpp:254
+#, c-format
+msgid "get_movie_info(): can't open '%s'"
+msgstr ""
+
+#: server/impl.cpp:269
+#, c-format
+msgid "get_movie_info(): file '%s' does not start with a SWF header"
+msgstr ""
+
+#: server/impl.cpp:279
+msgid ""
+"get_movie_info(): can't read zipped SWF data; TU_CONFIG_LINK_TO_ZLIB is 0"
+msgstr ""
+
+#: server/impl.cpp:339
+msgid "Can't read jpeg"
+msgstr ""
+
+#: server/impl.cpp:364
+msgid "Can't read file header"
+msgstr ""
+
+#: server/impl.cpp:441
+msgid ""
+"Requested to keep from completely loading a movie, but the movie in question "
+"is a jpeg, for which we don't yet have the concept of a 'loading thread'"
+msgstr ""
+
+#: server/impl.cpp:450
+#, c-format
+msgid "unknown file type (%s)"
+msgstr ""
+
+#: server/impl.cpp:466
+#, c-format
+msgid "failed to open '%s'; can't create movie"
+msgstr ""
+
+#: server/impl.cpp:471
+#, c-format
+msgid "streamProvider opener can't open '%s'"
+msgstr ""
+
+#: server/impl.cpp:490
+#, c-format
+msgid "note: couldn't open cache file '%s'"
+msgstr ""
+
+#: server/impl.cpp:499
+#, c-format
+msgid "Loading cache file %s"
+msgstr ""
+
+#: server/impl.cpp:627
+msgid "extern movie deleted"
+msgstr ""
+
+#: server/impl.cpp:677
+#, c-format
+msgid "Movie %s already in library"
+msgstr ""
+
+#: server/impl.cpp:693
+#, c-format
+msgid "Couldn't load library movie '%s'"
+msgstr ""
+
+#: server/impl.cpp:700
+#, c-format
+msgid "Movie %s (SWF%d) added to library"
+msgstr ""
+
+#: server/impl.cpp:739
+#, c-format
+msgid "%s: couldn't create instance"
+msgstr ""
+
+#: server/impl.cpp:791
+msgid "precompute_cached_data can't create instance of movie"
+msgstr ""
+
+#: server/impl.cpp:840
+msgid "loop back; jumping to frame "
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+msgid "process_decl_dict("
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+msgid ", "
+msgstr ""
+
+#: server/parser/action_buffer.cpp:105
+#, c-format
+msgid ""
+"): decl_dict was already processed at %d. Skipping (or maybe we should "
+"append, or replace?)."
+msgstr ""
+
+#: server/parser/action_buffer.cpp:133
+msgid "action buffer dict length exceeded"
+msgstr ""
+
+#: server/parser/BitmapMovieDefinition.cpp:64
+#, c-format
+msgid "Creating a shape_definition wrapping a %g x %g bitmap"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:58
+msgid "-- actions in button\n"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:99
+#, c-format
+msgid ""
+"button record refer to character with id %d, which is not found in the chars "
+"dictionary"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:225
+msgid "button sound options: "
+msgstr ""
+
+#: server/parser/button_character_def.cpp:275
+#, c-format
+msgid "Next Button2 actionOffset (%u) points past the end of tag"
+msgstr ""
+
+#: server/parser/button_character_def.cpp:301
+#, c-format
+msgid ""
+"Next action offset (%u) in Button2ActionConditions points past the end of tag"
+msgstr ""
+
+#: server/parser/edit_text_character_def.cpp:120
+#, c-format
+msgid "error: text style with undefined font; font_id = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:243
+#, c-format
+msgid "morph fill style type = 0x%X"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:253
+msgid "morph fill style begin color: "
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:255
+msgid "morph fill style end color: "
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:303
+#, c-format
+msgid "morph fsr: num_gradients = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:319
+#, c-format
+msgid "morph fsr bitmap_char = %d"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:387
+msgid "Different number of paths in start ("
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:388
+msgid ") and end ("
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:389
+msgid ") shapes of a morph"
+msgstr ""
+
+#: server/parser/morph2_character_def.cpp:395
+#, c-format
+msgid "Different number of edges in start (%u) and end (%u) shapes of a morph"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:280
+#, c-format
+msgid "import error: resource '%s' is not exported from movie '%s'"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:297 server/swf/tag_loaders.cpp:1081
+#, c-format
+msgid "import error: resource '%s' from movie '%s' has unknown type"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:326
+#, c-format
+msgid "get_character_def(): character_id %d is still waiting to be imported"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:348
+#, c-format
+msgid "get_font(): font_id %d is still waiting to be imported"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:395
+#, c-format
+msgid "Add sound sample %d"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:423
+msgid "gnash::movie_def_impl::read() -- file does not start with a SWF header"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:430
+#, c-format
+msgid "version = %d, file_length = %d"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:436
+#, c-format
+msgid "SWF%d is not fully supported, trying anyway but don't expect it to work"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:443
+msgid ""
+"movie_def_impl::read(): unable to read zipped SWF data; "
+"TU_CONFIG_LINK_TO_ZLIB is 0"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:449
+msgid "file is compressed"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:477
+#, c-format
+msgid "frame rate = %f, frames = "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:505
+msgid "Could not start loading thread"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:657
+msgid "cache file does not have the correct format; skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:663
+#, c-format
+msgid "cached data is version %d, but we require version %d; skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:678
+msgid "error reading cache file (characters); skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:683
+msgid "unexpected eof reading cache file (characters); skipping"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:698
+msgid ""
+"sync error in cache file (reading characters).  Skipping rest of cache data."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:732
+#, c-format
+msgid "Character %d @ %p"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:744
+#, c-format
+msgid "Could not find char %d, dump is:"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:782
+#, c-format
+msgid "Ensure load of frame %u/%u (last loaded is: %u)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:787
+msgid "Could not advance to frame "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:796
+#, c-format
+msgid ""
+"No more frames to load. Framecount: %u, Lastloaded: %u, next to load: %u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:852
+#, c-format
+msgid ""
+"last expected SHOWFRAME in SWF stream '%s' isn't followed by an END (%d)."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:871
+#, c-format
+msgid "*** no tag loader for type %d (movie)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:889
+msgid ""
+"Hit stream-end tag, but not at the advertised SWF end; stopping for safety."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:905
+#, c-format
+msgid "Parsing exception: %s"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:911
+msgid " action blocks and "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:911
+msgid " init action blocks are NOT followed by a SHOWFRAME tag"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:921
+msgid " frames advertised in header, but only "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:921
+msgid " SHOWFRAME tags found in stream. Updating total frames count"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:947
+#, c-format
+msgid "number of SHOWFRAME tags in SWF stream '%s' ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:949
+msgid ") exceeds the advertised number in header ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:951
+msgid ")."
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:960
+#, c-format
+msgid "Loaded frame %u/%u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:990
+#, c-format
+msgid "get_exported_resource called, frame count=%u"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1026
+msgid "frame load advancement (from "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1027
+msgid " to "
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1027 server/parser/sprite_definition.h:314
+msgid ")"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1036
+#, c-format
+msgid ""
+"No frame progress in movie %s after %lu milliseconds (%lu microseconds = %lu "
+"iterations), giving up on get_exported_resource(%s): circular IMPORTS?"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1050
+#, c-format
+msgid "no frame progress at iteration %lu"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1057
+#, c-format
+msgid "At end of stream, still no '%s' symbol found in m_exports ("
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1058
+msgid " entries in it, follow)"
+msgstr ""
+
+#: server/parser/movie_def_impl.cpp:1064
+#, c-format
+msgid ""
+"We haven't finished loading (loading frame %u), and m_exports.get returned "
+"no entries, sleeping a bit and trying again"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:85
+#, c-format
+msgid "  read_fill_styles: count = %u"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:120
+#, c-format
+msgid "  read_line_styles: count = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:130
+#, c-format
+msgid "  read_line_styles: count2 = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:180
+#, c-format
+msgid "  bound rect: %s"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:192
+#, c-format
+msgid "  shape_character_def read: nfillbits = %d, nlinebits = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:249
+#, c-format
+msgid "  shape_character read: moveto %4g %4g"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:268
+#, c-format
+msgid "  shape_character read: fill0 (left) = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:288
+#, c-format
+msgid "  shape_character read: fill1 (right) = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:308
+#, c-format
+msgid "  shape_character_read: line = %d"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:319
+msgid "  shape_character read: more fill styles"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:355
+#, c-format
+msgid "  shape_character read: curved edge   = %4g %4g - %4g %4g - %4g %4g"
+msgstr ""
+
+#: server/parser/shape_character_def.cpp:386
+#, c-format
+msgid "  shape_character_read: straight edge = %4g %4g - %4g %4g"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:42
+#, c-format
+msgid "Instantiating sprite_def %p"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:81
+msgid "  frames = "
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:95
+msgid "DefineSprite tag inside sprite definition"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:106
+msgid "  show_frame "
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:107
+#: server/parser/sprite_definition.h:314 server/sprite_instance.cpp:1665
+#: server/sprite_instance.cpp:2293 server/sprite_instance.cpp:2317
+#: server/vm/ActionExec.cpp:429
+msgid "/"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:108
+msgid " (sprite)"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:121
+msgid ""
+"last SHOWFRAME of a DEFINESPRITE tag isn't followed by an END. Seeking to "
+"next END tag."
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:142
+#, c-format
+msgid "*** no tag loader for type %d (sprite)"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:150
+msgid "  -- sprite END --"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:208
+#, c-format
+msgid "Registered class %p for sprite_def %p"
+msgstr ""
+
+#: server/parser/sprite_definition.cpp:210
+msgid " Exported interface: "
+msgstr ""
+
+#: server/parser/sprite_definition.h:159
+msgid "add_font tag appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:180
+msgid "add_bitmap_character_def appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:194
+msgid "add sam appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:217
+msgid "Can't export from sprite"
+msgstr ""
+
+#: server/parser/sprite_definition.h:246
+msgid "add_character tag appears in sprite tags"
+msgstr ""
+
+#: server/parser/sprite_definition.h:276
+msgid "sprite_definition::add_init_action called!  Ignored"
+msgstr ""
+
+#: server/parser/sprite_definition.h:312
+msgid "sprite_definition: loading of frame "
+msgstr ""
+
+#: server/parser/sprite_definition.h:313
+msgid " requested (we are at "
+msgstr ""
+
+#: server/parser/text_character_def.cpp:29
+msgid "begin text records"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:43
+msgid "end text records"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:62
+msgid "  text style change"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:71
+#, c-format
+msgid "  has_font: font id = %d"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:86
+msgid "  has_color"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:94
+#, c-format
+msgid "  has_x_offset = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:107
+#, c-format
+msgid "  has_y_offset = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:119
+#, c-format
+msgid "  text_height = %g"
+msgstr ""
+
+#: server/parser/text_character_def.cpp:142
+#, c-format
+msgid "  glyph_records: count = %d"
+msgstr ""
+
+#: server/PropertyList.cpp:93
+#, c-format
+msgid "Property %s is read-only, not setting it to %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:138
+#, c-format
+msgid ""
+"attachMovie called with wrong number of arguments expected 3 to 4, got (%d) "
+"- returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:152
+#, c-format
+msgid "attachMovie: '%s': no such exported resource - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:162
+#, c-format
+msgid ""
+"attachMovie: exported resource '%s' is not a movie definition (%s) -- "
+"returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:186
+#, c-format
+msgid "Could not attach character at depth %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:205
+#, c-format
+msgid "Fourth argument of attachMovie doesn't cast to an object (%s)"
+msgstr ""
+
+#: server/sprite_instance.cpp:240
+#, c-format
+msgid "createEmptyMovieClip needs 2 args, but %d given, returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:250
+#, c-format
+msgid "createEmptyMovieClip takes 2 args, but %d given, discarding the excess"
+msgstr ""
+
+#: server/sprite_instance.cpp:288
+#, c-format
+msgid "%s.swapDepths() needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:297
+#, c-format
+msgid "%s.swapDepths(%s): won't swap a clip below depth %d (%d)"
+msgstr ""
+
+#: server/sprite_instance.cpp:309
+#, c-format
+msgid "%s.swapDepths(%s): this sprite has no parent, swapping depth of root?"
+msgstr ""
+
+#: server/sprite_instance.cpp:327
+#, c-format
+msgid "%s.swapDepths(%s): invalid call, swapping to self?"
+msgstr ""
+
+#: server/sprite_instance.cpp:337
+#, c-format
+msgid ""
+"%s.swapDepths(%s): invalid call, the two characters don't have the same "
+"parent"
+msgstr ""
+
+#: server/sprite_instance.cpp:354
+#, c-format
+msgid ""
+"%s.swapDepths(%s): first argument invalid (neither a sprite nor a number)"
+msgstr ""
+
+#: server/sprite_instance.cpp:389
+msgid "MovieClip.duplicateMovieClip() needs 2 or 3 args"
+msgstr ""
+
+#: server/sprite_instance.cpp:420
+msgid "sprite_goto_and_play needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:439
+msgid "sprite_goto_and_stop needs one arg"
+msgstr ""
+
+#: server/sprite_instance.cpp:503
+#, c-format
+msgid ""
+"MovieClip.loadMovie() expected 1 or 2 args, got %d - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:515
+#, c-format
+msgid ""
+"First argument of MovieClip.loadMovie(%s) evaluates to an empty string - "
+"returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:528
+#, c-format
+msgid ""
+"second argument of MovieClip.loadMovie(%s, <variables>) will be discarded"
+msgstr ""
+
+#: server/sprite_instance.cpp:551
+#, c-format
+msgid ""
+"MovieClip.loadVariables() expected 1 or 2 args, got %d - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:563
+#, c-format
+msgid ""
+"First argument passed to MovieClip.loadVariables(%s) evaluates to an empty "
+"string - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:627
+#, c-format
+msgid "Can't find hitTest target %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:665
+#, c-format
+msgid "hitTest() called with %u args"
+msgstr ""
+
+#: server/sprite_instance.cpp:684
+#, c-format
+msgid "createTextField called with %d args, expected 6 - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:693
+msgid "First argument of createTextField is not a string - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:703
+msgid ""
+"Second argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:713
+msgid "Third argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:723
+msgid ""
+"Fourth argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:733 server/sprite_instance.cpp:743
+msgid "Fifth argument of createTextField is not a number - returning undefined"
+msgstr ""
+
+#: server/sprite_instance.cpp:798
+#, c-format
+msgid "MovieClip.getBounds(%s): invalid call, first arg must be a sprite"
+msgstr ""
+
+#: server/sprite_instance.cpp:879
+msgid "MovieClip.lineTo() takes two args"
+msgstr ""
+
+#: server/sprite_instance.cpp:900
+msgid "MovieClip.moveTo() takes two args"
+msgstr ""
+
+#: server/sprite_instance.cpp:963
+msgid "MovieClip.curveTo() takes four args"
+msgstr ""
+
+#: server/sprite_instance.cpp:1624
+#, c-format
+msgid ""
+"A sprite member (%s) clashes with the name of an existing character in its "
+"display list.  The member will hide the character"
+msgstr ""
+
+#: server/sprite_instance.cpp:1664 server/sprite_instance.cpp:2291
+#: server/sprite_instance.cpp:2316
+msgid "Executing "
+msgstr ""
+
+#: server/sprite_instance.cpp:1664
+msgid " actions in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:1665 server/sprite_instance.cpp:2293
+#: server/sprite_instance.cpp:2317
+#, c-format
+msgid " of sprite %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:1714
+#, c-format
+msgid "call_frame('%s') -- invalid frame"
+msgstr ""
+
+#: server/sprite_instance.cpp:1828
+msgid "Can't clone root of the movie"
+msgstr ""
+
+#: server/sprite_instance.cpp:1834
+#, c-format
+msgid "%s parent is not a sprite, can't clone"
+msgstr ""
+
+#: server/sprite_instance.cpp:1890
+#, c-format
+msgid ""
+"clone_display_object(%s, %s, %d): could not find a character named %s to "
+"clone"
+msgstr ""
+
+#: server/sprite_instance.cpp:1986
+#, c-format
+msgid "sprite[%p]::set_member(%s, %s)"
+msgstr ""
+
+#: server/sprite_instance.cpp:2007
+msgid "it's a Text Variable"
+msgstr ""
+
+#: server/sprite_instance.cpp:2015
+msgid "it's NOT a Text Variable"
+msgstr ""
+
+#: server/sprite_instance.cpp:2029 server/sprite_instance.cpp:2055
+msgid "NULL path_to_var passed to set_variable()"
+msgstr ""
+
+#: server/sprite_instance.cpp:2034 server/sprite_instance.cpp:2060
+#, c-format
+msgid "NULL passed to set_variable('%s', NULL)"
+msgstr ""
+
+#: server/sprite_instance.cpp:2088
+#, c-format
+msgid ""
+"sprite '%s' ::advance_sprite is at frame %u/%u - onload called: %d - "
+"oldDIsplayList has %d elements"
+msgstr ""
+
+#: server/sprite_instance.cpp:2098
+msgid "sprite_instance::advance_sprite we're in PLAY mode"
+msgstr ""
+
+#: server/sprite_instance.cpp:2106
+msgid "on_event_load called, incrementing"
+msgstr ""
+
+#: server/sprite_instance.cpp:2110
+#, c-format
+msgid "after increment we are at frame %u/%u"
+msgstr ""
+
+#: server/sprite_instance.cpp:2124
+msgid "sprite_instance::advance_sprite we're in STOP mode"
+msgstr ""
+
+#: server/sprite_instance.cpp:2191
+msgid "Calling ONLOAD event"
+msgstr ""
+
+#: server/sprite_instance.cpp:2292
+msgid " *init* tags in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:2316
+msgid " tags in frame "
+msgstr ""
+
+#: server/sprite_instance.cpp:2400
+#, c-format
+msgid "sprite %s ::goto_frame("
+msgstr ""
+
+#: server/sprite_instance.cpp:2400
+msgid ") - current frame is "
+msgstr ""
+
+#: server/sprite_instance.cpp:2440
+msgid "GotoFrame("
+msgstr ""
+
+#: server/sprite_instance.cpp:2440
+msgid ") targets a yet to be loaded frame ("
+msgstr ""
+
+#: server/sprite_instance.cpp:2441
+msgid ""
+") loaded). We'll wait for it but a more correct form is explicitly using "
+"WaitForFrame instead"
+msgstr ""
+
+#: server/sprite_instance.cpp:2531
+#, c-format
+msgid "sprite_instance::goto_labeled_frame('%s') unknown label"
+msgstr ""
+
+#: server/sprite_instance.cpp:2620
+#, c-format
+msgid "sprite_instance::add_display_object(): unknown cid = %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:2706
+#, c-format
+msgid "sprite::replace_display_object(): unknown cid = %d"
+msgstr ""
+
+#: server/sprite_instance.cpp:2780
+#, c-format
+msgid "Frame %u/%u, bytes %u/%u"
+msgstr ""
+
+#: server/sprite_instance.cpp:3014
+#, c-format
+msgid "%s doesn't even check for a char"
+msgstr ""
+
+#: server/sprite_instance.cpp:3155
+#, c-format
+msgid "Constructing sprite '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3205
+#, c-format
+msgid "Unloading sprite '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3227 server/vm/action.cpp:140
+#, c-format
+msgid "can't create movie_definition for %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:3236
+#, c-format
+msgid "can't create extern movie_instance for %s"
+msgstr ""
+
+#: server/sprite_instance.cpp:3306
+msgid "MovieClip.loadVariables() with GET/POST won't append vars for now"
+msgstr ""
+
+#: server/sprite_instance.cpp:3331
+#, c-format
+msgid "Setting variable '%s' to value '%s'"
+msgstr ""
+
+#: server/sprite_instance.cpp:3374
+#, c-format
+msgid ""
+"removeMovieClip(%s): sprite depth (%d) out of the 'dynamic' zone "
+"[0..1048575], won't remove"
+msgstr ""
+
+#: server/sprite_instance.cpp:3391
+#, c-format
+msgid "Can't remove sprite %s as it has no parent"
+msgstr ""
+
+#: server/StreamProvider.cpp:91 server/StreamProvider.cpp:132
+#, c-format
+msgid "Unsupported network connection %s"
+msgstr ""
+
+#: server/StreamProvider.cpp:105
+msgid "POST data discarded while getting a stream from file: uri"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:53
+#, c-format
+msgid "DefineFontAlignZones tag references an undefined font %d"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:67
+#, c-format
+msgid "  DefinFontAlignZones: font=%d, flags=%d"
+msgstr ""
+
+#: server/swf/DefineFontAlignZonesTag.cpp:71
+msgid "FIXME: DefineFontAlignZoneTag unfinished"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:47
+#, c-format
+msgid "  char_id = %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:48
+#, c-format
+msgid "  depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:58 server/swf/PlaceObject2Tag.cpp:272
+#, fuzzy
+msgid "  cxform:"
+msgstr "cxform :\n"
+
+#: server/swf/PlaceObject2Tag.cpp:80
+#, c-format
+msgid "  actions: flags = 0x%X"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:101
+#, c-format
+msgid ""
+"swf_event::read(), even_length = %u, but only %lu bytes left to the end of "
+"current tag. Breaking for safety."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:126 server/swf/PlaceObject2Tag.cpp:138
+#, c-format
+msgid "swf_event::read(), event_length = %d, but read "
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:129
+msgid ". Breaking for safety."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:141
+msgid ". Skipping excessive bytes."
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:177
+#, c-format
+msgid ""
+"swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:263
+#, c-format
+msgid "  PLACEOBJECT2: depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:264
+#, c-format
+msgid "  char id = %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:267
+msgid "  mat:"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:275
+#, c-format
+msgid "  ratio: %f"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:276
+#, c-format
+msgid "  name = %s"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:277
+#, c-format
+msgid "  clip_depth = %d (%d)"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:278
+#, c-format
+msgid " m_place_type: %d"
+msgstr ""
+
+#: server/swf/PlaceObject2Tag.cpp:383
+#, c-format
+msgid "reverse REPLACE can't find previous replace or add tag(%d, %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:142
+msgid "anchor-labeled frame not supported"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:147
+msgid "frame_label_loader end position "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:147
+msgid ", read up to "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:182
+#, c-format
+msgid "  set_background_color: (%d %d %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:211
+msgid "  jpeg_tables_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:249 server/swf/tag_loaders.cpp:297
+msgid "gnash is not linked to jpeglib -- can't load jpeg image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:261
+#, c-format
+msgid "DEFINEBITS: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:281
+#, c-format
+msgid "  define_bits_jpeg2_loader: charid = %d pos = %lx"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:306
+#, c-format
+msgid "DEFINEBITSJPEG2: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:342
+#, c-format
+msgid "inflate_wrapper() inflateInit() returned %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:358
+#, c-format
+msgid "inflate_wrapper() inflate() returned %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:365
+#, c-format
+msgid "inflate_wrapper() inflateEnd() return %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:382
+#, c-format
+msgid "  define_bits_jpeg3_loader: charid = %d pos = %lx"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:393
+msgid ""
+"gnash is not linked to jpeglib/zlib -- can't load jpeg/zipped image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:440
+#, c-format
+msgid "  defbitslossless2: tag = %d, id = %d, fmt = %d, w = %d, h = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:449
+msgid "gnash is not linked to zlib -- can't load zipped image data"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:555
+#, c-format
+msgid ""
+"DEFINEBITSLOSSLESS: Duplicate id (%d) for bitmap character - discarding it"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:685
+#, c-format
+msgid "  FIXME: tagtype = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:697
+#, c-format
+msgid "  shape_loader: id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:713
+#, c-format
+msgid "  shape_morph_loader: id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:762
+#, c-format
+msgid "define_font_info_loader: can't find font w/ id %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:775
+msgid "  place_object_2"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:795
+#, c-format
+msgid "  sprite:  char id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:803
+msgid "nested DEFINESPRITE tags"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:870
+#, c-format
+msgid "reverse REMOVE can't find previous replace or add tag(%d, %d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:889
+#, c-format
+msgid "  remove_object_2(%d)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:920
+#, c-format
+msgid "  button character loader: char_id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:944
+#, c-format
+msgid "  export: count = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:954
+#, c-format
+msgid "  export: id = %d, name = %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:973
+#, c-format
+msgid "don't know how to export resource '%s' with id %d (can't find that id)"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1010
+#, c-format
+msgid "  import: version = %u, source_url = %s (%s), count = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1022
+#, c-format
+msgid "Exception: %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1028
+#, c-format
+msgid "can't import movie from url %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1037
+msgid "Movie attempts to import symbols from itself."
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1050
+#, c-format
+msgid "  import: id = %d, name = %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1066
+#, c-format
+msgid "import error: could not find resource '%s' in movie '%s'"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1102
+#, c-format
+msgid "edit_text_char, id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1120
+#, c-format
+msgid "text_character, id = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1141
+#, c-format
+msgid "tag %d: do_action_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1142
+msgid "-- actions in frame "
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1165
+#, c-format
+msgid "  tag %d: do_init_action_loader"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1166
+#, c-format
+msgid "  -- init actions for sprite %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1199
+#, c-format
+msgid "define sound: ch=%d, format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1215 server/swf/tag_loaders.cpp:1361
+#, c-format
+msgid "Bad sound sample rate %d read from SWF header"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1274
+#, c-format
+msgid ""
+"There is no sound handler currently active, so character with id %d will NOT "
+"be added to the dictionary"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1300
+#, c-format
+msgid "start_sound tag: id=%d, stop = %d, loop ct = %d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1309
+#, c-format
+msgid "start_sound_loader: sound_id %d is not defined"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1351
+#, c-format
+msgid "sound stream head: format=%d, rate=%d, 16=%d, stereo=%d, ct=%d"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1516
+#, c-format
+msgid "  file attributes: has_metadata=%s use_network=%s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1517 server/swf/tag_loaders.cpp:1518
+msgid "true"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1517 server/swf/tag_loaders.cpp:1518
+msgid "false"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1523
+msgid ""
+"FileAttributes tag in the SWF requests that network access is not granted to "
+"this movie (or application?). Anyway Gnash won't care; use white/black "
+"listing in your .gnashrc instead"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1541
+#, c-format
+msgid ""
+"  metadata = [[\n"
+"%s\n"
+"]]"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1544
+#, c-format
+msgid "METADATA tag unused: %s"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1562
+#, c-format
+msgid ""
+"  serialnumber = [[\n"
+"%s\n"
+"]]"
+msgstr ""
+
+#: server/swf/tag_loaders.cpp:1565
+#, c-format
+msgid "SERIALNUMBER: %s"
+msgstr ""
+
+#: server/text.cpp:50
+#, c-format
+msgid "text style references unknown font (id = %d)"
+msgstr ""
+
+#: server/text.cpp:154
+msgid "invalid glyph, render as an empty box"
+msgstr ""
+
+#: server/text.cpp:181
+msgid "render glyph using draw_glyph"
+msgstr ""
+
+#: server/text.cpp:192
+msgid "render glyph using filled outline (?) actually draw_glyph()"
+msgstr ""
+
+#: server/textformat.cpp:124
+#, c-format
+msgid "Created New TextFormat object at %p.  Not fully implemented yet"
+msgstr ""
+
+#: server/textformat.cpp:150
+msgid "TextFormat.setFormat() needs at least 3 arguments - ...me thinks"
+msgstr ""
+
+#: server/textformat.cpp:159
+msgid ""
+"Argument 3 given to TextFormat.setFormat() is not a TextFormat object - ... "
+"should it be?"
+msgstr ""
+
+#: server/textformat.cpp:237
+#, c-format
+msgid "%s: args=%d unfinished implementation"
+msgstr ""
+
+#: server/video_stream_instance.cpp:43
+msgid "attachVideo needs 1 arg"
+msgstr ""
+
+#: server/video_stream_instance.cpp:56
+#, c-format
+msgid "attachVideo(%s) first arg is not a NetStream instance"
+msgstr ""
+
+#: server/video_stream_instance.cpp:116
+msgid "An error occured while decoding video frame"
+msgstr ""
+
+#: server/vm/action.cpp:152
+#, c-format
+msgid "can't create extern root sprite for %s"
+msgstr ""
+
+#: server/vm/action.cpp:169
+#, c-format
+msgid "can't create extern sprite for %s"
+msgstr ""
+
+#: server/vm/action.cpp:238
+msgid ""
+"Attempt to call a value which is neither a C nor an ActionScript function"
+msgstr ""
+
+#: server/vm/action.cpp:270
+#, c-format
+msgid "FIXME(%d): %s"
+msgstr ""
+
+#: server/vm/action.cpp:389
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid fmt '%%l%c'"
+msgstr ""
+
+#: server/vm/action.cpp:398
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid fmt '%%%c'"
+msgstr ""
+
+#: server/vm/action.cpp:414
+#, c-format
+msgid "call_method_parsed('%s','%s') -- invalid char '%c'"
+msgstr ""
+
+#: server/vm/action.cpp:450
+msgid "-- start movie"
+msgstr ""
+
+#: server/vm/action.cpp:461
+#, c-format
+msgid "FIXME: %s"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:136
+msgid "at ActionExec operator() start, pc="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:137
+msgid ", stop_pc="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:137
+msgid ", code.size="
+msgstr ""
+
+#: server/vm/ActionExec.cpp:138 server/vm/ActionExec.cpp:211
+msgid "."
+msgstr ""
+
+#: server/vm/ActionExec.cpp:178
+#, c-format
+msgid "Length %u (%d) of action tag id %u at pc "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:180
+msgid " overflows actions buffer size "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:211
+msgid " After execution, PC is "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:249
+msgid "Call stack non-empty at end of ExecutableCode run (limits hit?)"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:255
+msgid ""
+"Stack smashed (ActionScript compiler bug?).Fixing by pushing undefined "
+"values to the missing slots,  but don't expect things to work afterwards"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:265
+msgid " elements left on the stack after block execution.  Cleaning up"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:283
+msgid "End of DoAction block hit while skipping "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:284
+msgid " action tags (pc:"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:285
+msgid ", stop_pc:"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:285
+msgid ") (WaitForFrame, probably)"
+msgstr ""
+
+#: server/vm/ActionExec.cpp:319
+msgid "'With' stack depth ("
+msgstr ""
+
+#: server/vm/ActionExec.cpp:319
+msgid ") exceeds the allowed limit for current SWF target version ("
+msgstr ""
+
+#: server/vm/ActionExec.cpp:321
+#, c-format
+msgid " for version %d). Don't expect this movie to work with all players."
+msgstr ""
+
+#: server/vm/ActionExec.cpp:428
+msgid "Stack underrun: "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:428
+msgid " elements required, "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:429
+msgid " available. Fixing by inserting "
+msgstr ""
+
+#: server/vm/ActionExec.cpp:430
+msgid " undefined values on the missing slots."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:101
+#, c-format
+msgid "Unsupported action handler invoked, code at pc is %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:182
+msgid ""
+"FIXME: VM not initialized at SWFHandlers construction time, can't set action "
+"handlers based on SWF version"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:466
+#, c-format
+msgid "%s: CHECKME: was broken"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:609
+#, c-format
+msgid "GetUrl: target=%s url=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:630
+#, c-format
+msgid "ActionWaitForFrame (0x%X) tag length == "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:631
+msgid " (expected 3)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:645 server/vm/ASHandlers.cpp:696
+#: server/vm/ASHandlers.cpp:1487
+#, c-format
+msgid "%s: environment target is not a sprite_instance"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:861
+msgid "Undefined or null string passed to ActionSubString, returning undefined"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:876
+msgid "Negative size passed to ActionSubString, taking as whole length"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:887
+msgid "Base is less then 1 in ActionSubString, setting to 1."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:896
+msgid ""
+"base goes beyond input string in ActionSubString, returning the empty string."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:910
+msgid "base+size goes beyond input string in ActionSubString, adjusting size"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:978
+#, c-format
+msgid "-- get var: %s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:982
+#, c-format
+msgid "-- get var: %s=%s at %p"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1007
+#, c-format
+msgid "-- set var: %s = %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1069
+msgid ""
+"ActionGetProperty(<empty>) called, but current target is not a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1092
+#, c-format
+msgid "invalid property query, property number %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1101
+#, c-format
+msgid "Could not find GetProperty target (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1133
+#, c-format
+msgid "invalid set_property, property number %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1157
+#, c-format
+msgid "Path given to duplicateMovieClip(%s) doesn't point to a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1168
+#, c-format
+msgid "Path given to duplicateMovieClip(%s) is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1193
+#, c-format
+msgid "Path given to removeMovieClip(%s) doesn't point to a character"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1203
+#, c-format
+msgid "Path given to removeMovieClip(%s) is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1242
+#, c-format
+msgid "start_drag of invalid target '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1266
+msgid "Y values in ActionStartDrag swapped, fixing"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1274
+msgid "X values in ActionStartDrag swapped, fixing"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1340
+#, c-format
+msgid "-- %s cast_to %s (invalid args?)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1360
+msgid "ActionCastOp TESTING"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1496
+#, c-format
+msgid ""
+"Frame spec found on stack at ActionWaitForFrame doesn't evaluate to a valid "
+"frame: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1561
+#, c-format
+msgid "[push length=%d]"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1580
+#, c-format
+msgid ""
+"Unknown push type %d. Execution will continue but it is likely to fail due "
+"to lost sync."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1630
+#, c-format
+msgid "register %d out of bounds"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1676 server/vm/ASHandlers.cpp:1695
+#, c-format
+msgid "dict_lookup %d is out of bounds"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1707 server/vm/ASHandlers.cpp:1711
+msgid "\t"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1707
+#, c-format
+msgid ") type=%s (%d), value=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1711
+#, c-format
+msgid ") type=%s, value=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1762
+msgid "Bogus empty GetUrl url in SWF file, skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1777
+msgid ""
+"Bogus GetUrl2 send vars method  in SWF file (both GET and POST requested), "
+"set to 0"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1830
+#, c-format
+msgid "get url: target=%s, url=%s (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1838
+#, c-format
+msgid "get url: target %s not found"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1846
+#, c-format
+msgid "get url: target %s is not a sprite"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1853
+msgid "getURL2 loadVariable"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1860
+msgid "getURL2 target load"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1871
+#, c-format
+msgid ""
+"Unhandled GetUrl2 sendVariableMethod (%d) with loadTargetFlag and ! "
+"loadVariablesFlag"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1884
+#, c-format
+msgid "Unhandled GetUrl2 sendVariableMethod (%d) with no loadTargetFlag"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1898
+#, c-format
+msgid "Launching URL... %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1923
+#, c-format
+msgid ""
+"Couldn't find movie \"%s\" to set target to! Not setting target at all..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1951
+msgid "Undefined GetUrl2 url on stack, skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1988
+msgid "branch to offset "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:1988
+msgid "  --  this section only runs to "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2028
+#, c-format
+msgid ""
+"Couldn't find target_sprite \"%s\" in ActionCallFrame! target frame actions "
+"will not be called..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2090
+#, c-format
+msgid ""
+"Frame spec found on stack at ActionGotoExpression doesn't evaluate to a "
+"valid frame: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2104
+#, c-format
+msgid ""
+"Couldn't find target sprite \"%s\" in ActionGotoExpression.  Will not go to "
+"target frame..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2125
+msgid "No elements on the stack at ActionDelete (0x3A). Returning FALSE."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2164
+#, c-format
+msgid "-- set local var: %s = %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2196
+#, c-format
+msgid "ActionCallFunction: %s is not an object"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2205
+msgid "Object doensn't have a constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2216
+#, c-format
+msgid ""
+"Attempt to call a function with %u arguments while only %u are available on "
+"the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2307
+#, c-format
+msgid "---new object: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2320
+#, c-format
+msgid "ActionNew: '%s' is not a constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2360
+msgid "The 'var whatever' syntax in timeline context is a no-op."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2476
+#, c-format
+msgid "Argument to TargetPath(%s) doesn't cast to a MovieClip"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2514
+#, c-format
+msgid "Top of stack not an object (%s) at ActionEnumerate execution"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2672
+#, c-format
+msgid " ActionGetMember: target: %s (object %p)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2688
+#, c-format
+msgid "-- get_member %s.%s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2714
+#, c-format
+msgid "-- set_member %s.%s=%s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2726
+#, c-format
+msgid "-- set_member %s.%s=%s on invalid object!"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2781
+#, c-format
+msgid ""
+"Attempt to call a method with %u arguments while only %u are available on "
+"the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2790
+#, c-format
+msgid " method name: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2791
+#, c-format
+msgid " method object/func: %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2792
+#, c-format
+msgid " method nargs: %d"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2807
+msgid ""
+"ActionCallMethod invoked with undefined method_name and non-object object/"
+"func"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2816
+msgid ""
+"Function object given to ActionCallMethod is not a function, will try to use "
+"its 'constructor' member"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2826
+msgid "ActionCallMethod: object has no constructor"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2835
+msgid "ActionCallMethod: object constructor is not a function"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2851
+#, c-format
+msgid "ActionCallMethod: Tried to invoke method '%s' on non-object value %s."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2864
+#, c-format
+msgid "ActionCallMethod: Can't find method %s of object %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2887
+msgid "FIXME: debugger doesn't deal with anonymous function calls"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2924
+#, c-format
+msgid ""
+"Attempt to call a constructor with %u arguments while only %u are available "
+"on the stack."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2936
+msgid "On ActionNewMethod: no object found on stack on ActionMethod"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2954
+#, c-format
+msgid "ActionNewMethod: can't find method %s of object %s"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:2968
+msgid "ActionNewMethod: method name is undefined, and object is not a function"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3007
+#, c-format
+msgid "-- %s instanceof %s (invalid args?)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3041
+#, c-format
+msgid "Top of stack not an object %s at ActionEnum2  execution"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3218
+#, c-format
+msgid "ActionExtends: Super is not an as_function (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3223
+#, c-format
+msgid "ActionExtends: Sub is not an as_function (%s)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3312
+#, c-format
+msgid ""
+"function2 code len (%u) overflows DOACTION tag boundaries (DOACTION tag len="
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3315
+msgid ", function2 code offset="
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3315
+msgid "). Forcing code len to eat the whole buffer (would this work?)."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3379
+msgid "-------------- with block start: stack size is "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3389
+msgid "ActionWith tag length != 2; skipping"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3399
+msgid "Empty with() block..."
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3415
+msgid "With-block skipped (with stack size exceeds limit of "
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3417
+msgid " elements)"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3533
+#, c-format
+msgid "-------------- local register[%d] = '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3542
+#, c-format
+msgid "-------------- global register[%d] = '%s'"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3550
+#, c-format
+msgid "store_register[%d] -- register out of bounds!"
+msgstr ""
+
+#: server/vm/ASHandlers.cpp:3561
+#, c-format
+msgid "at SWFHandlers::action_name(%d) call time, _handlers size is "
+msgstr ""
+
+#: utilities/dumpshm.cpp:206
+msgid ""
+"Sorry, we can only list the files on systems with disk based shared memory"
+msgstr ""
+"Désolé, nous pouvons uniquement lister les fichiers sur les systèmes "
+"possédant de la mémoire partagée basée sur le disque"
+
+#: utilities/dumpshm.cpp:215
+msgid "No name specified, nuking everything..."
+msgstr "Aucun nom indiqué, destruction de l'ensemble..."
+
+#: utilities/dumpshm.cpp:222
+msgid "Removing segment: "
+msgstr "Supression du segment :"
+
+#: utilities/dumpshm.cpp:230
+msgid "Nuking the shared memory segment "
+msgstr "Destruction du segment de mémoire partagée"
+
+#: utilities/dumpshm.cpp:256
+msgid "ERROR: couldn't read!"
+msgstr "Erreur : lecture impossible !"
+
+#: utilities/dumpshm.cpp:287
+msgid "This program dumps the internal data of a shared memory segment"
+msgstr ""
+"Ce programme vide les données internes d'un segment de mémoire partagée"
+
+#: utilities/dumpshm.cpp:289
+msgid "Usage: dumpmem [hdsanlif] filename"
+msgstr "utilisation : dumpmem [hdsanlif] nom_de_fichier"
+
+#: utilities/dumpshm.cpp:290
+msgid "-h\tHelp"
+msgstr "-h\tAide"
+
+#: utilities/dumpshm.cpp:291
+msgid "-d\tDump data"
+msgstr "-d\tVidage des données"
+
+#: utilities/dumpshm.cpp:292
+msgid "-n [optional name]\tNuke everything"
+msgstr "-n [optional name]\tDestruction de l'ensemble"
+
+#: utilities/dumpshm.cpp:293
+msgid "-l\tLength of segment"
+msgstr "-l\tLongueur du segment"
+
+#: utilities/dumpshm.cpp:294
+msgid "-i\tList segments"
+msgstr "-i\tLister les segments"
+
+#: utilities/dumpshm.cpp:295
+msgid "-f\tForce to use builtin names for nuke"
+msgstr "-f\tForcer l'usage des noms incorporés pour la destruction"
+
+#: utilities/dumpshm.cpp:307
+msgid "\tBase address of this segment: "
+msgstr "\tAdresse de base de ce segment : "
+
+#: utilities/dumpshm.cpp:309
+msgid "\tFilespec: "
+msgstr "\tSpec du fichier : "
+
+#: utilities/dumpshm.cpp:310
+msgid "\t# Bytes allocated: "
+msgstr "\t# Octets alloués : "
+
+#: utilities/dumpshm.cpp:311
+msgid "\tTotal # of bytes: "
+msgstr "\t# d'octets totaux : "
+
+#: utilities/parser.cpp:138
+#, c-format
+msgid "has_scale = %d, has_rotate = %d\n"
+msgstr "has_scale = %d, has_rotate = %d\n"
+
+#: utilities/parser.cpp:163
+#, c-format
+msgid "x_min: %i, x_max: %i,\twidth: %i twips, %4.0f pixels\n"
+msgstr "x_min : %i, x_max : %i,\tlargeur : %i twips, %4.0f pixels\n"
+
+#: utilities/parser.cpp:164
+#, c-format
+msgid "y_min: %i, y_max: %i, height: %i twips, %4.0f pixels\n"
+msgstr "y_min : %i, y_max : %i, hauteur : %i twips, %4.0f pixels\n"
+
+#: utilities/parser.cpp:185
+#, c-format
+msgid "rgb: %d %d %d \n"
+msgstr "rvb : %d %d %d \n"
+
+#: utilities/parser.cpp:206
+#, c-format
+msgid "rgba: %d %d %d %d\n"
+msgstr "rvba : %d %d %d %d\n"
+
+#: utilities/parser.cpp:279
+msgid "cxform:\n"
+msgstr "cxform :\n"
+
+#: utilities/parser.cpp:280
+#, c-format
+msgid "has_add = %d, has_mult = %d\n"
+msgstr "has_add = %d, has_mult = %d\n"
+
+#: utilities/parser.cpp:298
+msgid ""
+"Movie ended\n"
+"\n"
+msgstr ""
+"Film terminé\n"
+"\n"



From MAILER-DAEMON Fri Apr 20 07:31:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HerKd-000883-KS
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 07:31:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HerKc-00086C-C9
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:31:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HerKb-00085p-MZ
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:31:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HerKb-00085m-Ft
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:31:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HerFX-0003bC-QS
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:25:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HerFX-0001g1-3s
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:25:59 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HerFW-0001fv-OX
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:25:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HerFW-0001fv-OX@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 11:25:58 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 11:31:14 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 11:25:58

Modified files:
	.              : ChangeLog 
	backend        : render_handler.h 

Log message:
	        * backend/render_handler.h: remove unused parameter warnings.
	          [  I'm afraid this will confuse doxygen :(  ]

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2949&r2=1.2950
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.35&r2=1.36

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2949
retrieving revision 1.2950
diff -u -b -r1.2949 -r1.2950
--- ChangeLog	20 Apr 2007 11:11:37 -0000	1.2949
+++ ChangeLog	20 Apr 2007 11:25:58 -0000	1.2950
@@ -1,3 +1,8 @@
+2007-04-20 Sandro Santilli <strk@keybit.net>
+
+	* backend/render_handler.h: remove unused parameter warnings.
+	  [  I'm afraid this will confuse doxygen :(  ]
+
 2007-04-20  John Gilmore  <gnu@toad.com>
 
 	More internationalization.

Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- backend/render_handler.h	20 Apr 2007 09:49:14 -0000	1.35
+++ backend/render_handler.h	20 Apr 2007 11:25:58 -0000	1.36
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.35 2007/04/20 09:49:14 udog Exp $ */
+/* $Id: render_handler.h,v 1.36 2007/04/20 11:25:58 strk Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -575,7 +575,8 @@
   /// @param width stage width in pixels
   ///
   /// @param height stage height in pixels
-  virtual bool initTestBuffer(unsigned width, unsigned height) {
+	virtual bool initTestBuffer(unsigned /*width*/, unsigned /*height*/)
+	{
     return false;
   }
   



From MAILER-DAEMON Fri Apr 20 07:46:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HerZd-0007BG-7J
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 07:46:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HerZc-0007BB-1H
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:46:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HerZZ-0007Ak-Lx
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:46:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HerZZ-0007Ah-HA
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:46:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HerUV-0005n2-Q0
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:41:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HerUV-0003Yw-R3
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:41:27 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HerUV-0003Yq-C5
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:41:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HerUV-0003Yq-C5@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Fri, 20 Apr 2007 11:41:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash README ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 11:46:44 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/20 11:41:26

Modified files:
	.              : README ChangeLog 

Log message:
	* README:  Gettext program is now a required prerequisite for clean
	  builds of gnash.  (We use the msgfmt program for compiling
	  translations.)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/README?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2950&r2=1.2951

Patches:
Index: README
===================================================================
RCS file: /sources/gnash/gnash/README,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- README	29 Jan 2007 23:21:01 -0000	1.25
+++ README	20 Apr 2007 11:41:26 -0000	1.26
@@ -1,4 +1,4 @@
-$Id: README,v 1.25 2007/01/29 23:21:01 martinwguy Exp $
+$Id: README,v 1.26 2007/04/20 11:41:26 jgilmore Exp $
 
 		    Gnash: the GNU Flash Player
 
@@ -113,7 +113,9 @@
 The GTK support is more developed and featureful, while the SDL
 support has less dependancies on other packages.
 
-Other required packages are libxml2, libpng and libjpeg.
+Other required packages are libxml2, libpng, libjpeg, and gettext.
+If gettext is missing, gnash will compile, but you'll get errors when
+trying to build or install its message translations in the po/ directory.
 
 At this time the sound support is experimental until the new sound
 support is completed. This will support both Gstreamer and

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2950
retrieving revision 1.2951
diff -u -b -r1.2950 -r1.2951
--- ChangeLog	20 Apr 2007 11:25:58 -0000	1.2950
+++ ChangeLog	20 Apr 2007 11:41:26 -0000	1.2951
@@ -10,6 +10,9 @@
 	* po/gnash.pot:  Update to include current gettext-able messages.
 	* po/{es,fr}.po:  First few languages that have a few translations.
 	* po/LINGUAS:  Add es and fr (with only a few translations in each).
+	* README:  Gettext program is now a required prerequisite for clean
+	  builds of gnash.  (We use the msgfmt program for compiling
+	  translations.)
 
 2007-04-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
 



From MAILER-DAEMON Fri Apr 20 07:56:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HerjE-00017i-UC
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 07:56:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HerjC-00012V-Fy
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:56:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HerjB-00011d-Tx
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:56:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HerjB-000119-M7
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:56:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Here7-00071e-US
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:51:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Here8-00043a-1O
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:51:24 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Here7-00043X-TB
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:51:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Here7-00043X-TB@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Fri, 20 Apr 2007 11:51:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler_agg.cpp ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 11:56:39 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/20 11:51:23

Modified files:
	.              : ChangeLog 
	backend        : render_handler_agg.cpp render_handler_agg.h 

Log message:
	implement initTestBuffer() for AGG

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2951&r2=1.2952
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2951
retrieving revision 1.2952
diff -u -b -r1.2951 -r1.2952
--- ChangeLog	20 Apr 2007 11:41:26 -0000	1.2951
+++ ChangeLog	20 Apr 2007 11:51:23 -0000	1.2952
@@ -17,6 +17,7 @@
 2007-04-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler.h: Prototype for initTestBuffer() 
+	* backend/render_handler_agg.{cpp,h}: implement initTestBuffer() 
 		
 2007-04-20 Sandro Santilli <strk@keybit.net>
 

Index: backend/render_handler_agg.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- backend/render_handler_agg.cpp	18 Apr 2007 17:07:34 -0000	1.74
+++ backend/render_handler_agg.cpp	20 Apr 2007 11:51:23 -0000	1.75
@@ -16,7 +16,7 @@
 
  
 
-/* $Id: render_handler_agg.cpp,v 1.74 2007/04/18 17:07:34 udog Exp $ */
+/* $Id: render_handler_agg.cpp,v 1.75 2007/04/20 11:51:23 udog Exp $ */
 
 // Original version by Udo Giacomozzi and Hannes Mayr, 
 // INDUNET GmbH (www.indunet.it)
@@ -1901,6 +1901,10 @@
     scale.m_y = PIXELS_TO_TWIPS(yscale);
   }
   
+  virtual unsigned int getBytesPerPixel() {
+    return bpp/8;
+  }  
+  
 private:  // private methods  
 
   /// Returns the cache manager instance of the given character definition.

Index: backend/render_handler_agg.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- backend/render_handler_agg.h	30 Nov 2006 21:52:37 -0000	1.11
+++ backend/render_handler_agg.h	20 Apr 2007 11:51:23 -0000	1.12
@@ -21,18 +21,39 @@
 
 #ifndef BACKEND_RENDER_HANDLER_AGG_H
 #define BACKEND_RENDER_HANDLER_AGG_H
-
+#include <stdio.h>
 namespace gnash {
 
 // Base class to shield GUIs from AGG's pixelformat classes 
 class render_handler_agg_base : public render_handler
 {
+private:
+
+  unsigned char *_testBuffer; // buffer used by initTestBuffer() only
+  
 public:
-  // these methods need to be accessed from outside:
-  virtual void init_buffer(unsigned char *mem, int size, int x, int y)=0;  
+  
+  render_handler_agg_base() : _testBuffer(0) { }  
 
   // virtual classes should have virtual destructors
   virtual ~render_handler_agg_base() {}
+  
+  // these methods need to be accessed from outside:
+  virtual void init_buffer(unsigned char *mem, int size, int x, int y)=0;
+
+  virtual unsigned int getBytesPerPixel()=0;
+  
+  virtual bool initTestBuffer(unsigned width, unsigned height) {
+    int size = width * height * getBytesPerPixel();
+    
+    _testBuffer	= static_cast<unsigned char *>( realloc(_testBuffer, size) );
+    
+    init_buffer(_testBuffer, size, width, height);
+    
+    return true;
+  }
+  
+  
 };
 
 



From MAILER-DAEMON Fri Apr 20 07:58:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HerlE-00054s-Rs
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 07:58:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HerlD-00054G-10
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:58:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HerlC-00053w-Gr
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:58:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HerlC-00053r-5j
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:58:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Herg8-0007JV-DI
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 07:53:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Herg8-0004AM-5s
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:53:28 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Herg7-0004AF-WB
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:53:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Herg7-0004AF-WB@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Fri, 20 Apr 2007 11:53:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/backend render_handler_agg.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 11:58:43 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/20 11:53:27

Modified files:
	backend        : render_handler_agg.h 

Log message:
	this was used for debugging... :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler_agg.h?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: render_handler_agg.h
===================================================================
RCS file: /cvsroot/gnash/gnash/backend/render_handler_agg.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- render_handler_agg.h	20 Apr 2007 11:51:23 -0000	1.12
+++ render_handler_agg.h	20 Apr 2007 11:53:27 -0000	1.13
@@ -21,7 +21,7 @@
 
 #ifndef BACKEND_RENDER_HANDLER_AGG_H
 #define BACKEND_RENDER_HANDLER_AGG_H
-#include <stdio.h>
+
 namespace gnash {
 
 // Base class to shield GUIs from AGG's pixelformat classes 



From MAILER-DAEMON Fri Apr 20 08:18:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hes4k-0004UN-39
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 08:18:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hes4i-0004UI-88
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 08:18:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hes4g-0004U6-AJ
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 08:18:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hes4g-0004U3-5i
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 08:18:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Herzc-0002rL-44
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 08:13:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Herzb-0005ES-8a
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 12:13:35 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Herza-0005EP-Rb
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 12:13:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Herza-0005EP-Rb@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 12:13:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/debugger.cpp server/pars...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 12:18:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 12:13:34

Modified files:
	.              : ChangeLog 
	server         : debugger.cpp 
	server/parser  : action_buffer.cpp 
	server/vm      : ActionExec.cpp 

Log message:
	        * server/debugger.cpp, server/parser/action_buffer.cpp,
	          server/vm/ActionExec.cpp: don't force creation of the
	          SWFHandlers singleton too early, this hopefully means
	          at time of initialization the VM version will be known.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2952&r2=1.2953
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.27&r2=1.28

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2952
retrieving revision 1.2953
diff -u -b -r1.2952 -r1.2953
--- ChangeLog	20 Apr 2007 11:51:23 -0000	1.2952
+++ ChangeLog	20 Apr 2007 12:13:34 -0000	1.2953
@@ -1,5 +1,9 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* server/debugger.cpp, server/parser/action_buffer.cpp,
+	  server/vm/ActionExec.cpp: don't force creation of the
+	  SWFHandlers singleton too early, this hopefully means
+	  at time of initialization the VM version will be known.
 	* backend/render_handler.h: remove unused parameter warnings.
 	  [  I'm afraid this will confuse doxygen :(  ]
 

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/debugger.cpp	16 Apr 2007 18:23:05 -0000	1.16
+++ server/debugger.cpp	20 Apr 2007 12:13:34 -0000	1.17
@@ -36,7 +36,6 @@
 namespace {
 gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
-const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
 }
 
 using namespace std;
@@ -332,6 +331,8 @@
     unsigned char num[10];
     memset(num, 0, 10);
 
+    const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
+
     if (_pc == 0) {
     }
     

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/action_buffer.cpp	18 Apr 2007 14:07:32 -0000	1.17
+++ server/parser/action_buffer.cpp	20 Apr 2007 12:13:34 -0000	1.18
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: action_buffer.cpp,v 1.17 2007/04/18 14:07:32 jgilmore Exp $ */
+/* $Id: action_buffer.cpp,v 1.18 2007/04/20 12:13:34 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -39,7 +39,6 @@
 
 namespace {
 gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
 }
 
 namespace gnash {
@@ -192,6 +191,8 @@
 
     using namespace gnash::SWF;
 
+    const gnash::SWF::SWFHandlers& ash = gnash::SWF::SWFHandlers::instance();
+
     as_arg_t fmt = ARG_HEX;
     action_type	action_id = (action_type)instruction_data[0];
     unsigned char num[10];

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/vm/ActionExec.cpp	18 Apr 2007 14:07:33 -0000	1.27
+++ server/vm/ActionExec.cpp	20 Apr 2007 12:13:34 -0000	1.28
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.27 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: ActionExec.cpp,v 1.28 2007/04/20 12:13:34 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -59,7 +59,6 @@
 
 namespace gnash {
 
-static const SWFHandlers& ash = SWFHandlers::instance();
 static LogFile& dbglogfile = LogFile::getDefaultInstance();
 #ifdef USE_DEBUGGER
 static Debugger& debugger = Debugger::getDefaultInstance();
@@ -127,6 +126,8 @@
     }
 #endif
 		
+    static const SWFHandlers& ash = SWFHandlers::instance();
+		
     _original_target = env.get_target();
 
     _initial_stack_size = env.stack_size();



From MAILER-DAEMON Fri Apr 20 09:17:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeszG-00042n-Cp
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 09:17:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeszF-00040P-3y
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:17:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeszD-0003yo-6I
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:17:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeszD-0003yj-03
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:17:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hesu8-0001jE-O4
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:12:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hesu6-0000of-Tu
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 13:11:59 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hesu6-0000oc-Qm
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 13:11:58 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hesu6-0000oc-Qm@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 13:11:58 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libgeometry/snappingrange.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 13:17:17 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 13:11:58

Modified files:
	.              : ChangeLog 
	libgeometry    : snappingrange.h 

Log message:
	* libgeometry/snappingrange.h: add output operator.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2953&r2=1.2954
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2953
retrieving revision 1.2954
diff -u -b -r1.2953 -r1.2954
--- ChangeLog	20 Apr 2007 12:13:34 -0000	1.2953
+++ ChangeLog	20 Apr 2007 13:11:58 -0000	1.2954
@@ -1,5 +1,6 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* libgeometry/snappingrange.h: add output operator.
 	* server/debugger.cpp, server/parser/action_buffer.cpp,
 	  server/vm/ActionExec.cpp: don't force creation of the
 	  SWFHandlers singleton too early, this hopefully means

Index: libgeometry/snappingrange.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libgeometry/snappingrange.h	6 Mar 2007 15:23:38 -0000	1.13
+++ libgeometry/snappingrange.h	20 Apr 2007 13:11:58 -0000	1.14
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.13 2007/03/06 15:23:38 udog Exp $
+// $Id: snappingrange.h,v 1.14 2007/04/20 13:11:58 strk Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -71,6 +71,9 @@
 	typedef std::vector<RangeType> RangeList; // TODO: list might be more appropriate
 	typedef typename RangeList::size_type size_type;	
 	
+	template <typename U>
+	friend std::ostream& operator<< (std::ostream& os, SnappingRanges2d<U>& r);
+	
 	/// distance (horizontally *plus* vertically) below ranges are snapped
 	/// You should initialize this when single_mode=false! 
 	T snap_distance;
@@ -357,6 +360,18 @@
 /// Standard snapping 2d ranges type for invalidated bounds calculation  
 typedef SnappingRanges2d<float> InvalidatedRanges;
 
+template <class T>
+std::ostream& operator<< (std::ostream& os, SnappingRanges2d<T>& r)
+{
+	for (typename SnappingRanges2d<T>::RangeList::const_iterator
+		it = r._ranges.begin(), itEnd = r._ranges.end();
+		it != itEnd; ++it)
+	{
+		if ( it != r._ranges.begin() ) os << ", ";
+		os << *it;
+	}
+	return os;
+}
 
 } //namespace gnash
 



From MAILER-DAEMON Fri Apr 20 09:51:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HetWW-0000Cq-To
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 09:51:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HetWV-0000BX-2a
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:51:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HetWU-0000Ab-8Y
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:51:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HetWT-0000AH-Ti
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:51:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HetRP-0006ZR-7D
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:46:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HetRN-0003TT-LY
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 13:46:21 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HetRN-0003TQ-B8
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 13:46:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HetRN-0003TQ-B8@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 13:46:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/types.cpp server/types.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 13:51:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 13:46:21

Modified files:
	.              : ChangeLog 
	server         : types.cpp types.h 

Log message:
	* server/types.{cpp,h}: add toShortString, for neater output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2954&r2=1.2955
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2954
retrieving revision 1.2955
diff -u -b -r1.2954 -r1.2955
--- ChangeLog	20 Apr 2007 13:11:58 -0000	1.2954
+++ ChangeLog	20 Apr 2007 13:46:20 -0000	1.2955
@@ -1,5 +1,6 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* server/types.{cpp,h}: add toShortString, for neater output.
 	* libgeometry/snappingrange.h: add output operator.
 	* server/debugger.cpp, server/parser/action_buffer.cpp,
 	  server/vm/ActionExec.cpp: don't force creation of the

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/types.cpp	11 Apr 2007 14:20:20 -0000	1.21
+++ server/types.cpp	20 Apr 2007 13:46:20 -0000	1.22
@@ -84,6 +84,17 @@
 		return ss.str();
 	}
 	
+	std::string rgba::toShortString() const
+	// For debugging.
+	{
+		std::stringstream ss;
+		ss << (unsigned)m_r << ","
+			<< (unsigned)m_g << ","
+			<< (unsigned)m_b << ","
+			<< (unsigned)m_a;
+		return ss.str();
+	}
+	
 	void	rgba::set_lerp(const rgba& a, const rgba& b, float f)
 	{
 		m_r = (uint8_t) frnd(flerp(a.m_r, b.m_r, f));

Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/types.h	7 Feb 2007 08:43:33 -0000	1.11
+++ server/types.h	20 Apr 2007 13:46:20 -0000	1.12
@@ -89,6 +89,9 @@
 
 		/// Debug print.
 		std::string toString() const;
+
+		// neater string output (example: "0,0,0,255")
+		std::string toShortString() const;
 	};
 
 	std::ostream& operator<< (std::ostream& os, const rgba& r);



From MAILER-DAEMON Fri Apr 20 09:55:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HetaQ-0003Cm-EH
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 09:55:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HetaO-0003A4-6t
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:55:40 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HetaN-00039M-JL
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:55:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HetaN-000396-Fz
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:55:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HetVJ-0007E9-1h
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 09:50:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HetVH-0003g1-Rf
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 13:50:23 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HetVH-0003fy-Gi
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 13:50:23 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HetVH-0003fy-Gi@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Fri, 20 Apr 2007 13:50:23 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 13:55:40 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/20 13:50:23

Modified files:
	server         : sprite_instance.cpp 

Log message:
	add comment about set_invalidated() use

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.248&r2=1.249

Patches:
Index: sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -b -r1.248 -r1.249
--- sprite_instance.cpp	19 Apr 2007 17:41:36 -0000	1.248
+++ sprite_instance.cpp	20 Apr 2007 13:50:23 -0000	1.249
@@ -2453,6 +2453,17 @@
 	// Construct the DisplayList of the target frame
 	//
 	
+  // TODO:
+  // <UdoG> current design is sub-optimal because it causes unnecessary 
+  // redraw. Consider a static graphic that stays at it's position all
+  // the time. When looping betwen two frames 
+  //  gotoAndPlay(_currentframe-1);
+  // then resetDisplayList() will remove that character and 
+  // execute_frame_tags() will insert it again. So the next 
+  // set_invalidated() call (which currently *is* correct) will cause
+  // redraw of the whole sprite even if it doesn't change visually
+  // at all.
+	
 	set_invalidated();
 
 	if (target_frame_number < m_current_frame)



From MAILER-DAEMON Fri Apr 20 10:06:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HetlA-00080B-2S
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 10:06:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hetl8-000801-Qs
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:06:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hetl6-0007zp-T3
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:06:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hetl6-0007zm-NK
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:06:44 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hetg2-0000dU-1F
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:01:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hetg0-0004GG-2O
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:01:28 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hetfz-0004GC-Qe
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:01:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hetfz-0004GC-Qe@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 14:01:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/FuzzyPixel.h testsuit...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 14:06:46 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 14:01:27

Modified files:
	.              : ChangeLog 
	testsuite      : FuzzyPixel.h MovieTester.cpp MovieTester.h 
	testsuite/misc-ming.all: ButtonEventsTest-Runner.cpp 

Log message:
	        * testsuite/FuzzyPixel.h: const-correctness
	        * testsuite/MovieTester.{cpp,h}: prepared for working
	          with all render handlers, implemented support for
	          a single one (AGG only for now); provided
	          check_pixel and xcheck_pixel macros.
	        * testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp:
	          Test pixel checker (doesn't work).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2955&r2=1.2956
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/FuzzyPixel.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2955
retrieving revision 1.2956
diff -u -b -r1.2955 -r1.2956
--- ChangeLog	20 Apr 2007 13:46:20 -0000	1.2955
+++ ChangeLog	20 Apr 2007 14:01:26 -0000	1.2956
@@ -1,5 +1,15 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/FuzzyPixel.h: const-correctness
+	* testsuite/MovieTester.{cpp,h}: prepared for working
+	  with all render handlers, implemented support for
+	  a single one (AGG only for now); provided 
+	  check_pixel and xcheck_pixel macros.
+	* testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp:
+	  Test pixel checker (doesn't work).
+
+2007-04-20 Sandro Santilli <strk@keybit.net>
+
 	* server/types.{cpp,h}: add toShortString, for neater output.
 	* libgeometry/snappingrange.h: add output operator.
 	* server/debugger.cpp, server/parser/action_buffer.cpp,

Index: testsuite/FuzzyPixel.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/FuzzyPixel.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/FuzzyPixel.h	20 Apr 2007 09:18:48 -0000	1.2
+++ testsuite/FuzzyPixel.h	20 Apr 2007 14:01:27 -0000	1.3
@@ -70,7 +70,7 @@
 	/// @param tolerance
 	///	The tolerance to use in comparisons.
 	///
-	FuzzyPixel(rgba& color, short unsigned tolerance=0)
+	FuzzyPixel(const rgba& color, short unsigned tolerance=0)
 		:
 		_col(color),
 		// From short unsigned to signed we hopefully never swap sign.

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/MovieTester.cpp	20 Apr 2007 09:03:42 -0000	1.26
+++ testsuite/MovieTester.cpp	20 Apr 2007 14:01:27 -0000	1.27
@@ -32,6 +32,8 @@
 #include "render.h" // for get_render_handler
 #include "types.h" // for rgba class
 #include "FuzzyPixel.h"
+#include "render.h"
+#include "render_handler.h"
 #include "render_handler_agg.h"
 
 #include <cstdio>
@@ -101,8 +103,13 @@
 }
 
 void
-MovieTester::advance() 
+MovieTester::render(render_handler& h, InvalidatedRanges& invalidated_regions) 
 {
+	set_render_handler(&h);
+
+	invalidated_regions.setWorld(); // testing
+	h.set_invalidated_regions(invalidated_regions);
+
 	// We call display here to simulate effect of a real run.
 	//
 	// What we're particularly interested about is 
@@ -119,6 +126,27 @@
 	// real runs as close as possible, by calling display().
 	//
 	_movie_root->display();
+}
+
+void
+MovieTester::render() 
+{
+	InvalidatedRanges ranges;
+	_movie_root->add_invalidated_bounds(ranges, false);
+	cout << "Invalidated ranges before any advance: " << ranges << endl;
+
+	for (TRenderers::const_iterator it=_testingRenderers.begin(), itE=_testingRenderers.end();
+				it != itE; ++it)
+	{
+		TestingRenderer& rend = *(*it);
+		render(rend.getRenderer(), ranges);
+	}
+}
+
+void
+MovieTester::advance() 
+{
+	render();
 
 	_movie_root->advance(1.0);
 #ifdef SHOW_INVALIDATED_BOUNDS_ON_ADVANCE
@@ -156,9 +184,55 @@
 }
 
 void
-MovieTester::checkPixel(unsigned radius, const rgba& color, int tolerance) const
+MovieTester::checkPixel(unsigned radius, const rgba& color,
+		short unsigned tolerance, const std::string& label, bool expectFailure) const
 {
-	log_msg("XFAILED: pixel checking not implemented yet.");
+	FuzzyPixel exp(color, tolerance);
+	const char* X="";
+	if ( expectFailure ) X="X";
+
+	//cout <<"BINGO: X is '"<< X<<"'"<<endl;
+
+	for (TRenderers::const_iterator it=_testingRenderers.begin(), itE=_testingRenderers.end();
+				it != itE; ++it)
+	{
+		const TestingRenderer& rend = *(*it);
+
+		std::stringstream ss;
+		ss << rend.getName() <<" ";
+		ss << "pix:" << _x << "," << _y <<" ";
+
+		rgba obt_col;
+
+	        if ( ! rend.getRenderer().getAveragePixel(obt_col, _x, _y, radius) )
+		{
+			ss << " is out of rendering buffer";
+			log_msg("%sFAILED: %s (%s)", X,
+					ss.str().c_str(),
+					label.c_str()
+					);
+		}
+
+	        ss << "exp:" << color.toShortString() << " ";
+	        ss << "obt:" << obt_col.toShortString() << " ";
+	        ss << "tol:" << tolerance;
+
+		FuzzyPixel obt(obt_col, tolerance);
+		if (exp ==  obt)
+		{
+			log_msg("%sPASSED: %s %s", X,
+					ss.str().c_str(),
+					label.c_str()
+					);
+		}
+		else
+		{
+			log_msg("%sFAILED: %s %s", X,
+					ss.str().c_str(),
+					label.c_str()
+					);
+		}
+	}
 }
 
 void
@@ -233,40 +307,49 @@
 {
 	std::auto_ptr<render_handler> handler;
 
+	// TODO: add support for testing multiple renderers
+	// This is tricky as requires changes in the core lib
+
+#ifdef RENDERER_AGG
 	// Initialize AGG
 	handler.reset( create_render_handler_agg("RGB24") );
 	assert(handler.get());
 	addTestingRenderer(handler, "AGG_RGB24");
+#endif
+
+#ifdef RENDERER_CAIRO
+	// Initialize Cairo
+#endif
+
+#ifdef RENDERER_OPENGL
+	// Initialize opengl renderer
+#endif
 }
 
 void
 MovieTester::addTestingRenderer(std::auto_ptr<render_handler> h, const std::string& name)
 {
-	// TODO: init the buffer before pushing, and do not add to the table
-	//       if the renderer is not capable of doing so !!
-
+	if ( ! h->initTestBuffer(_width, _height) )
+	{
 	cout << "UNTESTED: render handler " << name
 		<< " doesn't support in-memory rendering "
-		<< "(not true, but we need to add interfaces "
-		<< "for this in the base render_handler class)"
 		<< endl;
+		return;
+	}
 
-	// h->initTestBuffer(_width, _height);
-	//_testingRenderers.push_back(TestingRendererPtr(new TestingRenderer(h, name)));
-}
-
-FuzzyPixel
-TestingRenderer::getAveragePixel(int x, int y, unsigned radius, unsigned tolerance) const
-{
-	render_handler* rend = get_render_handler();
-	assert(rend);
-	rgba color;
-	if ( ! rend->getAveragePixel(color, x, y, radius) )
+	// TODO: make the core lib support this
+	if ( ! _testingRenderers.empty() )
 	{
-		return FuzzyPixel();
+		cout << "UNTESTED: can't test render handler " << name
+			<< " because gnash core lib is unable to support testing of "
+			<< "multiple renderers from a single process "
+			<< "and we're already testing render handler "
+			<< _testingRenderers.front()->getName()
+			<< endl;
+		return;
 	}
-	return FuzzyPixel(color, tolerance);
-}
 
+	_testingRenderers.push_back(TestingRendererPtr(new TestingRenderer(h, name)));
+}
 
 } // namespace gnash

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/MovieTester.h	20 Apr 2007 09:03:42 -0000	1.14
+++ testsuite/MovieTester.h	20 Apr 2007 14:01:27 -0000	1.15
@@ -24,11 +24,26 @@
 #include "gnash.h" // for namespace key
 #include "sound_handler_test.h" // for creating the "test" sound handler
 #include "types.h" // for rgba class
+#include "render_handler.h" // for dtor visibility by auto_ptr
 
 #include <memory> // for auto_ptr
 #include <string> 
 #include <boost/shared_ptr.hpp>
 
+#define check_pixel(radius, color, tolerance) \
+	{\
+		std::stringstream ss; \
+		ss << "[" << __FILE__ << ":" << __LINE__ << "]"; \
+		tester.checkPixel(2, rgba(0,0,0,255), 1, ss.str(), false); \
+	}
+
+#define xcheck_pixel(radius, color, tolerance) \
+	{\
+		std::stringstream ss; \
+		ss << "[" << __FILE__ << ":" << __LINE__ << "]"; \
+		tester.checkPixel(2, rgba(0,0,0,255), 1, ss.str(), true); \
+	}
+
 // Forward declarations
 namespace gnash {
 	class movie_definition;
@@ -56,26 +71,8 @@
 
 	const std::string& getName() const { return _name; }
 
-        /// Get the average pixel under the mouse pointer
-        //
-        /// @param x
-	///	X coordinate, in pixels
-	///
-        /// @param x
-	///	Y coordinate, in pixels
-	///
-        /// @param radius
-        ///     Radius defining the average zone used.
-        ///     1 means a single pixel.
-        ///     Behaviour of passing 0 is undefined.
-        ///
-        /// @param tolerance
-        ///     The tolerance value to use for the returned FuzzyPixel.
-        ///
-        /// Note that if current pointer is outside of the rendered region
-        /// an intollerant FuzzyPixel is returned.
-        ///
-        FuzzyPixel getAveragePixel(int x, int y, unsigned radius, unsigned tolerance) const;
+	/// Return the underlying render handler
+	render_handler& getRenderer() const { return *_renderer; }
 
 private:
 
@@ -157,7 +154,13 @@
 	/// @param tolerance
 	///	The tolerated difference of any r,g,b,a values
 	///
-	void checkPixel(unsigned radius, const rgba& color, int tolerance) const;
+	/// @param label
+	///	A label to use in test results.
+	///
+	/// @param expectFailure
+	///	Set to true if a failure is expected. Defaults to false.
+	///
+	void checkPixel(unsigned radius, const rgba& color, short unsigned tolerance, const std::string& label, bool expectFailure=false) const;
 
 	/// Notify mouse button was pressed
 	void pressMouseButton();
@@ -200,6 +203,23 @@
 	/// Initialize testing renderers
 	void initTestingRenderers();
 
+	/// Render the current movie to all testing renderers
+	//
+	/// This function calls movie_root::display internally
+	///
+	void render();
+
+	/// Render the current movie to a specific testing renderer
+	//
+	/// @param renderer
+	///	The renderer to draw to. It will be temporarly set as
+	///	the global renderer in the gnash core lib.
+	///
+	/// @param invalidated
+	///	The invalidated ranges as computed by the core lib.
+	///
+	void render(render_handler& renderer, InvalidatedRanges& invalidated);
+
 	/// Add a testing renderer to the list, initializing it with current viewport size
 	void addTestingRenderer(std::auto_ptr<render_handler> h, const std::string& name);
 
@@ -227,6 +247,8 @@
 	/// boost 1.33 requirement for the moment.
 	/// Still, I'd like to simplify things...
 	/// is shared_ptr fine ?
+	typedef std::vector< TestingRendererPtr > TRenderers;
+
 	std::vector< TestingRendererPtr > _testingRenderers;
 };
 

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 07:21:26 -0000	1.12
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 14:01:27 -0000	1.13
@@ -43,7 +43,7 @@
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
 	// TODO: check that pixel @ 60,60 is yellow !
-	//tester.checkPixel(2, rgba(0,0,0,255), 1);
+	xcheck_pixel(2, rgba(255,255,0,255), 2);
 
 	// press the mouse button, this should change
 	// the textfield value.



From MAILER-DAEMON Fri Apr 20 10:12:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HetqE-0000hh-GR
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 10:12:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HetqC-0000hF-E3
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:12:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HetqA-0000h3-W1
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:11:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HetqA-0000h0-QB
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:11:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hetl6-0001gX-79
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:06:44 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hetl5-0004Ul-3c
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:06:43 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hetl4-0004Ui-S5
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:06:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hetl4-0004Ui-S5@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 14:06:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all ButtonEventsTest-...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 14:12:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 14:06:42

Modified files:
	testsuite/misc-ming.all: ButtonEventsTest-Runner.cpp 

Log message:
	Do all pixel checking in the TODO comments - all fail by now, but probably due to bugs in the MovieTester

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ButtonEventsTest-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ButtonEventsTest-Runner.cpp	20 Apr 2007 14:01:27 -0000	1.13
+++ ButtonEventsTest-Runner.cpp	20 Apr 2007 14:06:42 -0000	1.14
@@ -42,7 +42,7 @@
 	check_equals(string(text->get_text_value()), string("MouseOver"));
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is yellow !
+	// check that pixel @ 60,60 is yellow !
 	xcheck_pixel(2, rgba(255,255,0,255), 2);
 
 	// press the mouse button, this should change
@@ -51,7 +51,8 @@
 	check_equals(string(text->get_text_value()), string("MouseDown"));
 	check_equals(string(text2->get_text_value()), string("Press"));
 	check(tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is green !
+	// check that pixel @ 60,60 is green !
+	xcheck_pixel(2, rgba(0,255,0,255), 2);
 
 	// depress the mouse button, this should change
 	// the textfield value.
@@ -59,7 +60,8 @@
 	check_equals(string(text->get_text_value()), string("MouseUp"));
 	check_equals(string(text2->get_text_value()), string("Release"));
 	check(tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is yellow !
+	// check that pixel @ 60,60 is yellow !
+	xcheck_pixel(2, rgba(255,255,0,255), 2);
 
 	// roll off the square, this should change
 	// the textfield value.
@@ -67,7 +69,10 @@
 	check_equals(string(text->get_text_value()), string("MouseOut"));
 	check_equals(string(text2->get_text_value()), string("RollOut"));
 	check(!tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is red !
+	// check that pixel @ 60,60 is red !
+	tester.movePointerTo(60, 60);
+	xcheck_pixel(2, rgba(255,0,0,255), 2);
+	tester.movePointerTo(39, 60); // get back
 
 	// press the mouse button, this should not change anything
 	// as we're outside of the button.
@@ -75,7 +80,10 @@
 	check_equals(string(text->get_text_value()), string("MouseOut"));
 	check_equals(string(text2->get_text_value()), string("RollOut"));
 	check(!tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is red !
+	// check that pixel @ 60,60 is red !
+	tester.movePointerTo(60, 60);
+	xcheck_pixel(2, rgba(255,0,0,255), 2);
+	tester.movePointerTo(39, 60); // get back
 
 	// depress the mouse button, this should not change anything
 	// as we're outside of the button.
@@ -83,19 +91,24 @@
 	check_equals(string(text->get_text_value()), string("MouseOut"));
 	check_equals(string(text2->get_text_value()), string("RollOut"));
 	check(!tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is red !
+	// check that pixel @ 60,60 is red !
+	tester.movePointerTo(60, 60);
+	xcheck_pixel(2, rgba(255,0,0,255), 2);
 
 	// Now press the mouse inside and release outside
-	tester.movePointerTo(60, 60);
+	tester.movePointerTo(60, 60); // should be there already
 	check_equals(string(text->get_text_value()), string("MouseOver"));
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is yellow !
+	// check that pixel @ 60,60 is yellow !
+	xcheck_pixel(2, rgba(255,255,0,255), 2);
+	
 	tester.pressMouseButton();
 	check_equals(string(text->get_text_value()), string("MouseDown"));
 	check_equals(string(text2->get_text_value()), string("Press"));
 	check(tester.isMouseOverMouseEntity());
-	// TODO: check that pixel @ 60,60 is green !
+	// check that pixel @ 60,60 is green !
+	xcheck_pixel(2, rgba(0,255,0,255), 2);
 	tester.movePointerTo(39, 60);
 	// The following might be correct, as the character still catches releaseOutside events
 	//check(tester.isMouseOverMouseEntity());



From MAILER-DAEMON Fri Apr 20 10:20:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hety5-0005uI-Cl
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 10:20:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hety3-0005tY-Np
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:20:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hety2-0005t7-R7
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:20:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hety2-0005t1-HA
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:20:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hetsx-0002se-TS
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:14:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hetsw-0004vU-IM
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:14:50 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hetsw-0004vP-D1
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:14:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hetsw-0004vP-D1@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 14:14:50 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libgeometry snappingrange.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 14:20:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 14:14:50

Modified files:
	libgeometry    : snappingrange.h 

Log message:
	print NULL for null snappingranges and WORLD for world ones (output operator)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: snappingrange.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- snappingrange.h	20 Apr 2007 13:11:58 -0000	1.14
+++ snappingrange.h	20 Apr 2007 14:14:50 -0000	1.15
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.14 2007/04/20 13:11:58 strk Exp $
+// $Id: snappingrange.h,v 1.15 2007/04/20 14:14:50 strk Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -363,6 +363,9 @@
 template <class T>
 std::ostream& operator<< (std::ostream& os, SnappingRanges2d<T>& r)
 {
+	if ( r.isNull() ) return os << "NULL";
+	if ( r.isWorld() ) return os << "WORLD";
+
 	for (typename SnappingRanges2d<T>::RangeList::const_iterator
 		it = r._ranges.begin(), itEnd = r._ranges.end();
 		it != itEnd; ++it)



From MAILER-DAEMON Fri Apr 20 10:41:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HeuII-000322-1W
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 10:41:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HeuIH-00031x-0p
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:41:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HeuIG-00031l-I5
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:41:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HeuIG-00031i-FD
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:41:00 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HeuDB-0005ds-R0
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 10:35:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HeuDA-0006rr-PA
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:35:44 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HeuDA-0006rg-DO
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 14:35:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HeuDA-0006rg-DO@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 14:35:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog backend/render_handler.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 14:41:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 14:35:44

Modified files:
	.              : ChangeLog 
	backend        : render_handler.h 

Log message:
	        * backend/render_handler.h (getAveragePixel):
	          fix computation of max x/y values.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2956&r2=1.2957
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/render_handler.h?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2956
retrieving revision 1.2957
diff -u -b -r1.2956 -r1.2957
--- ChangeLog	20 Apr 2007 14:01:26 -0000	1.2956
+++ ChangeLog	20 Apr 2007 14:35:44 -0000	1.2957
@@ -1,3 +1,8 @@
+2007-04-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* backend/render_handler.h (getAveragePixel):
+	  fix computation of max x/y values.
+
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/FuzzyPixel.h: const-correctness

Index: backend/render_handler.h
===================================================================
RCS file: /sources/gnash/gnash/backend/render_handler.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- backend/render_handler.h	20 Apr 2007 11:25:58 -0000	1.36
+++ backend/render_handler.h	20 Apr 2007 14:35:44 -0000	1.37
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: render_handler.h,v 1.36 2007/04/20 11:25:58 strk Exp $ */
+/* $Id: render_handler.h,v 1.37 2007/04/20 14:35:44 strk Exp $ */
 
 #ifndef RENDER_HANDLER_H
 #define RENDER_HANDLER_H
@@ -528,8 +528,8 @@
     x -= radius/2;
     y -= radius/2;
     
-    int xe = x+radius-1;
-    int ye = y+radius-1;
+    int xe = x+radius;
+    int ye = y+radius;
 
     rgba pixel;
     



From MAILER-DAEMON Fri Apr 20 11:08:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Heuj5-0008Tv-U2
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 11:08:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Heuj4-0008TH-5w
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:08:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Heuj3-0008Sn-BS
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:08:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Heuj3-0008Sd-3l
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:08:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1Heudy-000186-72
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:03:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Heudx-0007x1-Fk
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 15:03:25 +0000
Received: from udog by cvs with local (Exim 4.50) id 1Heudx-0007wy-3B
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 15:03:25 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Heudx-0007wy-3B@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Fri, 20 Apr 2007 15:03:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/character.h server/sprit...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 15:08:42 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/20 15:03:24

Modified files:
	.              : ChangeLog 
	server         : character.h sprite_instance.cpp 

Log message:
	newly placed characters aren't masks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2957&r2=1.2958
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.249&r2=1.250

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2957
retrieving revision 1.2958
diff -u -b -r1.2957 -r1.2958
--- ChangeLog	20 Apr 2007 14:35:44 -0000	1.2957
+++ ChangeLog	20 Apr 2007 15:03:24 -0000	1.2958
@@ -2,6 +2,9 @@
 
 	* backend/render_handler.h (getAveragePixel):
 	  fix computation of max x/y values.
+	* server/character.h: character are not masks by default
+	* server/character.h, server/sprite_instance.cpp: when placing
+	  new characters, disable clip_depth (zero is a valid depth)  	
 
 2007-04-20 Sandro Santilli <strk@keybit.net>
 

Index: server/character.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/character.h,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/character.h	19 Apr 2007 17:41:35 -0000	1.70
+++ server/character.h	20 Apr 2007 15:03:24 -0000	1.71
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.70 2007/04/19 17:41:35 udog Exp $ */
+/* $Id: character.h,v 1.71 2007/04/20 15:03:24 udog Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -259,7 +259,7 @@
 	m_id(id),
 	m_depth(0),
 	m_ratio(0.0f),
-	m_clip_depth(0),
+	m_clip_depth(noClipDepthValue),
 	m_display_callback(NULL),
 	m_display_callback_user_ptr(NULL),
 	_unloaded(false),

Index: server/sprite_instance.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.249
retrieving revision 1.250
diff -u -b -r1.249 -r1.250
--- server/sprite_instance.cpp	20 Apr 2007 13:50:23 -0000	1.249
+++ server/sprite_instance.cpp	20 Apr 2007 15:03:24 -0000	1.250
@@ -1772,7 +1772,7 @@
 		color_transform,
 		matrix,
 		0.0f,
-		0); 
+		character::noClipDepthValue); 
 
 	return sprite;
 }
@@ -1806,7 +1806,7 @@
 		cxform(),
 		txt_matrix,
 		0.0f,
-		0);
+		character::noClipDepthValue);
 
 	static bool warned = false;
 	if ( ! warned )
@@ -2606,7 +2606,7 @@
 		cxform(),
 		matrix(),
 		1.0,
-		0);
+		character::noClipDepthValue);
 
 	return true; // FIXME: check return from place_character above ?
 }



From MAILER-DAEMON Fri Apr 20 11:27:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hev15-00057w-K7
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 11:27:19 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hev14-000571-4g
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:27:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hev12-00056D-GS
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:27:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hev12-000564-CD
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:27:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Heuvx-0003tF-CX
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:22:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Heuvw-0000MC-8e
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 15:22:00 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Heuvw-0000M9-3f
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 15:22:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Heuvw-0000M9-3f@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 15:22:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite MovieTester.cpp MovieTester.h m...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 15:27:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 15:22:00

Modified files:
	testsuite      : MovieTester.cpp MovieTester.h 
	testsuite/misc-ming.all: attachMovieTestRunner.cpp 

Log message:
	        * testsuite/MovieTester.{cpp,h} (advance): advance
	          first, *then* render. Cache invalidated bound to
	          avoid loosing them.
	        * testsuite/misc-ming.all/attachMovieTestRunner.cpp:
	          Add renderer tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/attachMovieTestRunner.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- MovieTester.cpp	20 Apr 2007 14:01:27 -0000	1.27
+++ MovieTester.cpp	20 Apr 2007 15:21:59 -0000	1.28
@@ -107,7 +107,6 @@
 {
 	set_render_handler(&h);
 
-	invalidated_regions.setWorld(); // testing
 	h.set_invalidated_regions(invalidated_regions);
 
 	// We call display here to simulate effect of a real run.
@@ -131,9 +130,18 @@
 void
 MovieTester::render() 
 {
-	InvalidatedRanges ranges;
-	_movie_root->add_invalidated_bounds(ranges, false);
-	cout << "Invalidated ranges before any advance: " << ranges << endl;
+	// Get invalidated ranges and cache them
+	_invalidatedBounds.setNull();
+
+	_movie_root->add_invalidated_bounds(_invalidatedBounds, false);
+
+#ifdef SHOW_INVALIDATED_BOUNDS_ON_ADVANCE
+	cout << "frame " << _movie->get_current_frame() << ") Invalidated bounds " << _invalidatedBounds;
+#endif
+
+	// Force full redraw by using a WORLD invalidated ranges
+	InvalidatedRanges ranges = _invalidatedBounds; // copy the cache, so we don't accidentally modify it ...
+	ranges.setWorld(); // TESTING !! TODO: make this a parameter
 
 	for (TRenderers::const_iterator it=_testingRenderers.begin(), itE=_testingRenderers.end();
 				it != itE; ++it)
@@ -141,21 +149,34 @@
 		TestingRenderer& rend = *(*it);
 		render(rend.getRenderer(), ranges);
 	}
+	
+	if ( _testingRenderers.empty() )
+	{
+		// Make sure display is called in any case 
+		//
+		// What we're particularly interested about is 
+		// proper computation of invalidated bounds, which
+		// needs clear_invalidated() to be called.
+		// display() will call clear_invalidated() on characters
+		// actually modified so we're fine with that.
+		//
+		// Directly calling _movie->clear_invalidated() here
+		// also work currently, as invalidating the topmost
+		// movie will force recomputation of all invalidated
+		// bounds. Still, possible future changes might 
+		// introduce differences, so better to reproduce
+		// real runs as close as possible, by calling display().
+		//
+		_movie_root->display();
+	}
 }
 
 void
 MovieTester::advance() 
 {
-	render();
-
 	_movie_root->advance(1.0);
-#ifdef SHOW_INVALIDATED_BOUNDS_ON_ADVANCE
-	geometry::Range2d<float> invalidatedbounds = getInvalidatedBounds();
-	std::stringstream ss;
-	ss << "frame " << _movie->get_current_frame() << ") Invalidated bounds " << invalidatedbounds;
-	gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
-	dbglogfile << ss.str().c_str() << std::endl;
-#endif
+
+	render();
 
 }
 
@@ -191,7 +212,7 @@
 	const char* X="";
 	if ( expectFailure ) X="X";
 
-	//cout <<"BINGO: X is '"<< X<<"'"<<endl;
+	cout <<"chekPixel(" << color << ") called" << endl;
 
 	for (TRenderers::const_iterator it=_testingRenderers.begin(), itE=_testingRenderers.end();
 				it != itE; ++it)
@@ -205,6 +226,7 @@
 		rgba obt_col;
 
 	        if ( ! rend.getRenderer().getAveragePixel(obt_col, _x, _y, radius) )
+	        //if ( ! rend.getRenderer().getPixel(obt_col, _x, _y) )
 		{
 			ss << " is out of rendering buffer";
 			log_msg("%sFAILED: %s (%s)", X,
@@ -274,11 +296,11 @@
 	assert(ret.is_null());
 	
 	// TODO: Support multiple bounds in testsuite
-	//_movie_root->get_invalidated_bounds(&ret, false);
-	InvalidatedRanges ranges;
-	_movie_root->add_invalidated_bounds(ranges, false);
+	////_movie_root->get_invalidated_bounds(&ret, false);
+	//InvalidatedRanges ranges;
+	//_movie_root->add_invalidated_bounds(ranges, false);
 
-	Range2d<float> range = ranges.getFullArea();
+	Range2d<float> range = _invalidatedBounds.getFullArea();
 
 	// scale by 1/20 (twips to pixels)
 	range.scale(1.0/20);

Index: MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- MovieTester.h	20 Apr 2007 14:01:27 -0000	1.15
+++ MovieTester.h	20 Apr 2007 15:21:59 -0000	1.16
@@ -34,14 +34,14 @@
 	{\
 		std::stringstream ss; \
 		ss << "[" << __FILE__ << ":" << __LINE__ << "]"; \
-		tester.checkPixel(2, rgba(0,0,0,255), 1, ss.str(), false); \
+		tester.checkPixel(radius, color, tolerance, ss.str(), false); \
 	}
 
 #define xcheck_pixel(radius, color, tolerance) \
 	{\
 		std::stringstream ss; \
 		ss << "[" << __FILE__ << ":" << __LINE__ << "]"; \
-		tester.checkPixel(2, rgba(0,0,0,255), 1, ss.str(), true); \
+		tester.checkPixel(radius, color, tolerance, ss.str(), true); \
 	}
 
 // Forward declarations
@@ -243,6 +243,12 @@
 	/// Current viewport height
 	unsigned _height;
 
+	/// Invalidated bounds of the movie after last
+	/// advance call. They are cached here so we
+	/// can safely call ::display w/out wiping this
+	/// information out.
+	InvalidatedRanges _invalidatedBounds;
+
 	/// I'd use ptr_list here, but trying not to spread
 	/// boost 1.33 requirement for the moment.
 	/// Still, I'd like to simplify things...

Index: misc-ming.all/attachMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/attachMovieTestRunner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- misc-ming.all/attachMovieTestRunner.cpp	20 Feb 2007 10:26:06 -0000	1.7
+++ misc-ming.all/attachMovieTestRunner.cpp	20 Apr 2007 15:21:59 -0000	1.8
@@ -58,6 +58,8 @@
 
 	tester.movePointerTo(30, 30);
 	check(!tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is white
+	check_pixel(2, rgba(255,255,255,255), 2);
 
 	tester.advance();
 
@@ -68,8 +70,13 @@
 
 	tester.movePointerTo(30, 30);
 	check(tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is red
+	check_pixel(2, rgba(255,0,0,255), 2);
+
 	tester.movePointerTo(100, 30);
 	check(!tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is white
+	check_pixel(2, rgba(255,255,255,255), 2);
 
 	root->get_member("mousedown", &tmp);
 	check(tmp.is_undefined());
@@ -99,8 +106,13 @@
 
 	tester.movePointerTo(100, 30);
 	check(tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is red
+	check_pixel(2, rgba(255,0,0,255), 2);
+
 	tester.movePointerTo(170, 30);
 	check(!tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is white
+	check_pixel(2, rgba(255,255,255,255), 2);
 
 	tester.advance();
 
@@ -111,8 +123,13 @@
 
 	tester.movePointerTo(170, 30);
 	check(tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is red
+	check_pixel(2, rgba(255,0,0,255), 2);
+
 	tester.movePointerTo(240, 30);
 	check(!tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is white
+	check_pixel(2, rgba(255,255,255,255), 2);
 
 	tester.advance();
 
@@ -123,9 +140,13 @@
 
 	tester.movePointerTo(240, 30);
 	check(tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is red
+	check_pixel(2, rgba(255,0,0,255), 2);
 
 	tester.movePointerTo(340, 30);
 	check(! tester.isMouseOverMouseEntity());
+	// check that the pixel under the mouse is white
+	check_pixel(2, rgba(255,255,255,255), 2);
 
 	// Note that we are *not* on an active entity !
 	tester.pressMouseButton();



From MAILER-DAEMON Fri Apr 20 11:46:26 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HevJa-00061E-9T
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 11:46:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HevJZ-0005zx-1T
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:46:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HevJY-0005yw-F5
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:46:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HevJX-0005yk-VV
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:46:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HevES-0006rC-PX
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 11:41:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HevER-0002MW-CY
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 15:41:07 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HevER-0002MT-06
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 15:41:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HevER-0002MT-06@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 15:41:07 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/ButtonE...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 15:46:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 15:41:06

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

Log message:
	        * testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp:
	          Take the covering clip in consideration while testing
	          the renderer - there are a few xfailed that I'd like
	          to fix.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2958&r2=1.2959
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2958
retrieving revision 1.2959
diff -u -b -r1.2958 -r1.2959
--- ChangeLog	20 Apr 2007 15:03:24 -0000	1.2958
+++ ChangeLog	20 Apr 2007 15:41:06 -0000	1.2959
@@ -1,3 +1,15 @@
+2007-04-20 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/MovieTester.{cpp,h} (advance): advance
+	  first, *then* render. Cache invalidated bound to
+	  avoid loosing them.
+	* testsuite/misc-ming.all/attachMovieTestRunner.cpp:
+	  Add renderer tests.
+	* testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp:
+	  Take the covering clip in consideration while testing
+	  the renderer - there are a few xfailed that I'd like
+	  to fix.
+
 2007-04-20 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* backend/render_handler.h (getAveragePixel):

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 14:06:42 -0000	1.14
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 15:41:06 -0000	1.15
@@ -34,8 +34,13 @@
 using namespace std;
 
 void
-test_mouse_activity(MovieTester& tester, const character* text, const character* text2)
+test_mouse_activity(MovieTester& tester, const character* text, const character* text2, bool covered)
 {
+	rgba red(255,0,0,255);
+	rgba covered_red(127,126,0,255); // red, covered by 50% black
+	rgba yellow(255,255,0,255);
+	rgba green(0,255,0,255);
+
 	// roll over the middle of the square, this should change
 	// the textfield value.
 	tester.movePointerTo(60, 60);
@@ -43,7 +48,7 @@
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is yellow !
-	xcheck_pixel(2, rgba(255,255,0,255), 2);
+	xcheck_pixel(2, yellow, 2);
 
 	// press the mouse button, this should change
 	// the textfield value.
@@ -52,7 +57,7 @@
 	check_equals(string(text2->get_text_value()), string("Press"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is green !
-	xcheck_pixel(2, rgba(0,255,0,255), 2);
+	xcheck_pixel(2, green, 2);
 
 	// depress the mouse button, this should change
 	// the textfield value.
@@ -61,7 +66,7 @@
 	check_equals(string(text2->get_text_value()), string("Release"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is yellow !
-	xcheck_pixel(2, rgba(255,255,0,255), 2);
+	xcheck_pixel(2, yellow, 2);
 
 	// roll off the square, this should change
 	// the textfield value.
@@ -71,7 +76,11 @@
 	check(!tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is red !
 	tester.movePointerTo(60, 60);
-	xcheck_pixel(2, rgba(255,0,0,255), 2);
+	if ( covered ) {
+		check_pixel(2, covered_red, 2);
+	} else {
+		check_pixel(2, red, 2);
+	}
 	tester.movePointerTo(39, 60); // get back
 
 	// press the mouse button, this should not change anything
@@ -82,7 +91,11 @@
 	check(!tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is red !
 	tester.movePointerTo(60, 60);
-	xcheck_pixel(2, rgba(255,0,0,255), 2);
+	if ( covered ) {
+		check_pixel(2, covered_red, 2);
+	} else {
+		check_pixel(2, red, 2);
+	}
 	tester.movePointerTo(39, 60); // get back
 
 	// depress the mouse button, this should not change anything
@@ -93,7 +106,11 @@
 	check(!tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is red !
 	tester.movePointerTo(60, 60);
-	xcheck_pixel(2, rgba(255,0,0,255), 2);
+	if ( covered ) {
+		check_pixel(2, covered_red, 2);
+	} else {
+		check_pixel(2, red, 2);
+	}
 
 	// Now press the mouse inside and release outside
 	tester.movePointerTo(60, 60); // should be there already
@@ -101,7 +118,7 @@
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is yellow !
-	xcheck_pixel(2, rgba(255,255,0,255), 2);
+	xcheck_pixel(2, yellow, 2);
 	
 	tester.pressMouseButton();
 	check_equals(string(text->get_text_value()), string("MouseDown"));
@@ -176,7 +193,7 @@
 		check_equals(root->get_current_frame(), fno);
 
 		info (("testing mouse activity in frame %d", root->get_current_frame()));
-		test_mouse_activity(tester, text, text2);
+		test_mouse_activity(tester, text, text2, square_front!=NULL);
 
 		// TODO: test key presses !
 		//       They seem NOT to trigger immediate redraw



From MAILER-DAEMON Fri Apr 20 12:48:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HewHF-0008Lj-Vi
	for mharc-gnash-commit@gnu.org; Fri, 20 Apr 2007 12:48:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HewHE-0008LP-Q4
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 12:48:04 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HewHB-0008Jq-8v
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 12:48:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HewHB-0008Jm-0w
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 12:48:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HewC5-0007b9-Ke
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 12:42:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HewC4-0006FT-9G
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 16:42:44 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HewC3-0006FP-Tv
	for gnash-commit@gnu.org; Fri, 20 Apr 2007 16:42:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HewC3-0006FP-Tv@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 20 Apr 2007 16:42:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/MovieTester.cpp tests...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Apr 2007 16:48:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/20 16:42:43

Modified files:
	.              : ChangeLog 
	testsuite      : MovieTester.cpp MovieTester.h 
	testsuite/misc-ming.all: ButtonEventsTest-Runner.cpp 
	                         attachMovieTestRunner.cpp 

Log message:
	        * testsuite/MovieTester.{cpp,h}: reworked the
	          pixel checking interface to not force moving
	          the pointer (as moving the pointer might trigger
	          movie events, as was happening with the ButtonEvent
	          test).
	        * testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp:
	          All tests pass now.
	        * testsuite/misc-ming.all/attachMovieTestRunner.cpp:
	          Updated to work with the correct interface.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2959&r2=1.2960
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/attachMovieTestRunner.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2959
retrieving revision 1.2960
diff -u -b -r1.2959 -r1.2960
--- ChangeLog	20 Apr 2007 15:41:06 -0000	1.2959
+++ ChangeLog	20 Apr 2007 16:42:43 -0000	1.2960
@@ -1,5 +1,17 @@
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/MovieTester.{cpp,h}: reworked the
+	  pixel checking interface to not force moving
+	  the pointer (as moving the pointer might trigger
+	  movie events, as was happening with the ButtonEvent
+	  test).
+	* testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp:
+	  All tests pass now.
+	* testsuite/misc-ming.all/attachMovieTestRunner.cpp:
+	  Updated to work with the correct interface.
+
+2007-04-20 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/MovieTester.{cpp,h} (advance): advance
 	  first, *then* render. Cache invalidated bound to
 	  avoid loosing them.

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- testsuite/MovieTester.cpp	20 Apr 2007 15:21:59 -0000	1.28
+++ testsuite/MovieTester.cpp	20 Apr 2007 16:42:43 -0000	1.29
@@ -136,7 +136,7 @@
 	_movie_root->add_invalidated_bounds(_invalidatedBounds, false);
 
 #ifdef SHOW_INVALIDATED_BOUNDS_ON_ADVANCE
-	cout << "frame " << _movie->get_current_frame() << ") Invalidated bounds " << _invalidatedBounds;
+	cout << "frame " << _movie->get_current_frame() << ") Invalidated bounds " << _invalidatedBounds << endl;
 #endif
 
 	// Force full redraw by using a WORLD invalidated ranges
@@ -201,11 +201,11 @@
 {
 	_x = x;
 	_y = y;
-	_movie_root->notify_mouse_moved(x, y);
+	if ( _movie_root->notify_mouse_moved(x, y) ) render();
 }
 
 void
-MovieTester::checkPixel(unsigned radius, const rgba& color,
+MovieTester::checkPixel(int x, int y, unsigned radius, const rgba& color,
 		short unsigned tolerance, const std::string& label, bool expectFailure) const
 {
 	FuzzyPixel exp(color, tolerance);
@@ -221,12 +221,12 @@
 
 		std::stringstream ss;
 		ss << rend.getName() <<" ";
-		ss << "pix:" << _x << "," << _y <<" ";
+		ss << "pix:" << x << "," << y <<" ";
 
 		rgba obt_col;
 
-	        if ( ! rend.getRenderer().getAveragePixel(obt_col, _x, _y, radius) )
-	        //if ( ! rend.getRenderer().getPixel(obt_col, _x, _y) )
+	        if ( ! rend.getRenderer().getAveragePixel(obt_col, x, y, radius) )
+	        //if ( ! rend.getRenderer().getPixel(obt_col, x, y) )
 		{
 			ss << " is out of rendering buffer";
 			log_msg("%sFAILED: %s (%s)", X,
@@ -260,25 +260,47 @@
 void
 MovieTester::pressMouseButton()
 {
-	_movie_root->notify_mouse_clicked(true, 1);
+	if ( _movie_root->notify_mouse_clicked(true, 1) )
+	{
+		render();
+	}
 }
 
 void
 MovieTester::depressMouseButton()
 {
-	_movie_root->notify_mouse_clicked(false, 1);
+	if ( _movie_root->notify_mouse_clicked(false, 1) )
+	{
+		render();
+	}
+}
+
+void
+MovieTester::click()
+{
+	int wantRedraw = 0;
+	if ( _movie_root->notify_mouse_clicked(true, 1) ) ++wantRedraw;
+	if ( _movie_root->notify_mouse_clicked(false, 1) ) ++wantRedraw;
+
+	if ( wantRedraw ) render();
 }
 
 void
 MovieTester::pressKey(key::code code)
 {
-	_movie_root->notify_key_event(code, true);
+	if ( _movie_root->notify_key_event(code, true) )
+	{
+		render();
+	}
 }
 
 void
 MovieTester::releaseKey(key::code code)
 {
-	_movie_root->notify_key_event(code, false);
+	if ( _movie_root->notify_key_event(code, false) )
+	{
+		render();
+	}
 }
 
 bool

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- testsuite/MovieTester.h	20 Apr 2007 15:21:59 -0000	1.16
+++ testsuite/MovieTester.h	20 Apr 2007 16:42:43 -0000	1.17
@@ -30,18 +30,18 @@
 #include <string> 
 #include <boost/shared_ptr.hpp>
 
-#define check_pixel(radius, color, tolerance) \
+#define check_pixel(x, y, radius, color, tolerance) \
 	{\
 		std::stringstream ss; \
 		ss << "[" << __FILE__ << ":" << __LINE__ << "]"; \
-		tester.checkPixel(radius, color, tolerance, ss.str(), false); \
+		tester.checkPixel(x, y, radius, color, tolerance, ss.str(), false); \
 	}
 
-#define xcheck_pixel(radius, color, tolerance) \
+#define xcheck_pixel(x, y, radius, color, tolerance) \
 	{\
 		std::stringstream ss; \
 		ss << "[" << __FILE__ << ":" << __LINE__ << "]"; \
-		tester.checkPixel(radius, color, tolerance, ss.str(), true); \
+		tester.checkPixel(x, y, radius, color, tolerance, ss.str(), true); \
 	}
 
 // Forward declarations
@@ -143,6 +143,14 @@
 	///
 	/// This method will test any built renderer.
 	///
+	/// @param x
+	///	The x coordinate of the point being the center
+	///	of the circle you want to compute the average color of.
+	///
+	/// @param y
+	///	The y coordinate of the point being the center
+	///	of the circle you want to compute the average color of.
+	///
 	/// @param radius
 	///	Radius defining the average zone used.
 	///	1 means a single pixel.
@@ -160,7 +168,8 @@
 	/// @param expectFailure
 	///	Set to true if a failure is expected. Defaults to false.
 	///
-	void checkPixel(unsigned radius, const rgba& color, short unsigned tolerance, const std::string& label, bool expectFailure=false) const;
+	void checkPixel(int x, int y, unsigned radius, const rgba& color,
+			short unsigned tolerance, const std::string& label, bool expectFailure=false) const;
 
 	/// Notify mouse button was pressed
 	void pressMouseButton();
@@ -169,11 +178,7 @@
 	void depressMouseButton();
 
 	/// Simulate a mouse click (press and depress mouse button)
-	void click()
-	{
-		pressMouseButton();
-		depressMouseButton();
-	}
+	void click();
 
 	/// Notify key press
 	//

Index: testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 15:41:06 -0000	1.15
+++ testsuite/misc-ming.all/ButtonEventsTest-Runner.cpp	20 Apr 2007 16:42:43 -0000	1.16
@@ -39,6 +39,7 @@
 	rgba red(255,0,0,255);
 	rgba covered_red(127,126,0,255); // red, covered by 50% black
 	rgba yellow(255,255,0,255);
+	rgba covered_yellow(128,255,0,255); // yellow, covered by 50% black
 	rgba green(0,255,0,255);
 
 	// roll over the middle of the square, this should change
@@ -48,7 +49,8 @@
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is yellow !
-	xcheck_pixel(2, yellow, 2);
+	if ( covered ) { check_pixel(60, 60, 2, covered_yellow, 2);  }
+	else { check_pixel(60, 60, 2, yellow, 2);  }
 
 	// press the mouse button, this should change
 	// the textfield value.
@@ -57,7 +59,7 @@
 	check_equals(string(text2->get_text_value()), string("Press"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is green !
-	xcheck_pixel(2, green, 2);
+	check_pixel(60, 60, 2, green, 2);
 
 	// depress the mouse button, this should change
 	// the textfield value.
@@ -66,7 +68,8 @@
 	check_equals(string(text2->get_text_value()), string("Release"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is yellow !
-	xcheck_pixel(2, yellow, 2);
+	if ( covered ) { check_pixel(60, 60, 2, covered_yellow, 2);  }
+	else { check_pixel(60, 60, 2, yellow, 2);  }
 
 	// roll off the square, this should change
 	// the textfield value.
@@ -75,13 +78,8 @@
 	check_equals(string(text2->get_text_value()), string("RollOut"));
 	check(!tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is red !
-	tester.movePointerTo(60, 60);
-	if ( covered ) {
-		check_pixel(2, covered_red, 2);
-	} else {
-		check_pixel(2, red, 2);
-	}
-	tester.movePointerTo(39, 60); // get back
+	if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
+	else { check_pixel(60, 60, 2, red, 2); }
 
 	// press the mouse button, this should not change anything
 	// as we're outside of the button.
@@ -90,13 +88,8 @@
 	check_equals(string(text2->get_text_value()), string("RollOut"));
 	check(!tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is red !
-	tester.movePointerTo(60, 60);
-	if ( covered ) {
-		check_pixel(2, covered_red, 2);
-	} else {
-		check_pixel(2, red, 2);
-	}
-	tester.movePointerTo(39, 60); // get back
+	if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
+	else { check_pixel(60, 60, 2, red, 2); }
 
 	// depress the mouse button, this should not change anything
 	// as we're outside of the button.
@@ -105,27 +98,24 @@
 	check_equals(string(text2->get_text_value()), string("RollOut"));
 	check(!tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is red !
-	tester.movePointerTo(60, 60);
-	if ( covered ) {
-		check_pixel(2, covered_red, 2);
-	} else {
-		check_pixel(2, red, 2);
-	}
+	if ( covered ) { check_pixel(60, 60, 2, covered_red, 2); }
+	else { check_pixel(60, 60, 2, red, 2); }
 
 	// Now press the mouse inside and release outside
-	tester.movePointerTo(60, 60); // should be there already
+	tester.movePointerTo(60, 60); 
 	check_equals(string(text->get_text_value()), string("MouseOver"));
 	check_equals(string(text2->get_text_value()), string("RollOver"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is yellow !
-	xcheck_pixel(2, yellow, 2);
+	if ( covered ) { check_pixel(60, 60, 2, covered_yellow, 2);  }
+	else { check_pixel(60, 60, 2, yellow, 2);  }
 	
 	tester.pressMouseButton();
 	check_equals(string(text->get_text_value()), string("MouseDown"));
 	check_equals(string(text2->get_text_value()), string("Press"));
 	check(tester.isMouseOverMouseEntity());
 	// check that pixel @ 60,60 is green !
-	xcheck_pixel(2, rgba(0,255,0,255), 2);
+	check_pixel(60, 60, 2, rgba(0,255,0,255), 2);
 	tester.movePointerTo(39, 60);
 	// The following might be correct, as the character still catches releaseOutside events
 	//check(tester.isMouseOverMouseEntity());

Index: testsuite/misc-ming.all/attachMovieTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/attachMovieTestRunner.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/attachMovieTestRunner.cpp	20 Apr 2007 15:21:59 -0000	1.8
+++ testsuite/misc-ming.all/attachMovieTestRunner.cpp	20 Apr 2007 16:42:43 -0000	1.9
@@ -59,7 +59,7 @@
 	tester.movePointerTo(30, 30);
 	check(!tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is white
-	check_pixel(2, rgba(255,255,255,255), 2);
+	check_pixel(30, 30, 2, rgba(255,255,255,255), 2);
 
 	tester.advance();
 
@@ -71,12 +71,12 @@
 	tester.movePointerTo(30, 30);
 	check(tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is red
-	check_pixel(2, rgba(255,0,0,255), 2);
+	check_pixel(30, 30, 2, rgba(255,0,0,255), 2);
 
 	tester.movePointerTo(100, 30);
 	check(!tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is white
-	check_pixel(2, rgba(255,255,255,255), 2);
+	check_pixel(100, 30, 2, rgba(255,255,255,255), 2);
 
 	root->get_member("mousedown", &tmp);
 	check(tmp.is_undefined());
@@ -107,12 +107,12 @@
 	tester.movePointerTo(100, 30);
 	check(tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is red
-	check_pixel(2, rgba(255,0,0,255), 2);
+	check_pixel(100, 30, 2, rgba(255,0,0,255), 2);
 
 	tester.movePointerTo(170, 30);
 	check(!tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is white
-	check_pixel(2, rgba(255,255,255,255), 2);
+	check_pixel(170, 30, 2, rgba(255,255,255,255), 2);
 
 	tester.advance();
 
@@ -124,12 +124,12 @@
 	tester.movePointerTo(170, 30);
 	check(tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is red
-	check_pixel(2, rgba(255,0,0,255), 2);
+	check_pixel(170, 30, 2, rgba(255,0,0,255), 2);
 
 	tester.movePointerTo(240, 30);
 	check(!tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is white
-	check_pixel(2, rgba(255,255,255,255), 2);
+	check_pixel(240, 30, 2, rgba(255,255,255,255), 2);
 
 	tester.advance();
 
@@ -141,12 +141,12 @@
 	tester.movePointerTo(240, 30);
 	check(tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is red
-	check_pixel(2, rgba(255,0,0,255), 2);
+	check_pixel(240, 30, 2, rgba(255,0,0,255), 2);
 
 	tester.movePointerTo(340, 30);
 	check(! tester.isMouseOverMouseEntity());
 	// check that the pixel under the mouse is white
-	check_pixel(2, rgba(255,255,255,255), 2);
+	check_pixel(340, 30, 2, rgba(255,255,255,255), 2);
 
 	// Note that we are *not* on an active entity !
 	tester.pressMouseButton();



From MAILER-DAEMON Sat Apr 21 03:11:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hf9kQ-0007aw-L7
	for mharc-gnash-commit@gnu.org; Sat, 21 Apr 2007 03:11:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hf9kP-0007aq-7Y
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 03:11:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hf9kM-0007ae-Pc
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 03:11:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hf9kM-0007ab-La
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 03:11:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1Hf9fD-00081o-2Q
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 03:05:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hf9fC-0002R4-Ji
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 07:05:42 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1Hf9fC-0002R1-49
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 07:05:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hf9fC-0002R1-49@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Sat, 21 Apr 2007 07:05:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash plugin/plugin.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2007 07:11:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/21 07:05:41

Modified files:
	plugin         : plugin.cpp 
	.              : ChangeLog 

Log message:
	* plugin/plugin.cpp:  In the child process, before executing
	  gnash, close all the file descriptors we inherited from the
	  browser (except stdout and stderr).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/plugin.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2960&r2=1.2961

Patches:
Index: plugin/plugin.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- plugin/plugin.cpp	11 Apr 2007 17:54:21 -0000	1.74
+++ plugin/plugin.cpp	21 Apr 2007 07:05:41 -0000	1.75
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: plugin.cpp,v 1.74 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: plugin.cpp,v 1.75 2007/04/21 07:05:41 jgilmore Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -525,6 +525,22 @@
       cout << "ERROR: dup2() failed: " << strerror(errno) << endl;
     }
 
+    // Close all of the browser's file descriptors that we just 
+    // inherited (including pipefd[0] that we just dup'd to fd 0).
+    // Experiments show seventy or eighty file descriptors open in
+    // typical cases.  Rather than close all the thousands of possible file
+    // descriptors, we start after stderr and keep closing higher numbers
+    // until we encounter ten fd's in a row that
+    // aren't open.  This will tend to close most fd's in most programms.
+    int numfailed = 0, closed = 0;
+    int anfd = fileno(stderr)+1;
+    for ( ; numfailed < 10; anfd++) {
+	ret = close (anfd);
+	if (ret < 0) numfailed++;
+	else         { numfailed = 0; closed++; }
+    }
+    cout << "Closed " << closed << "files." <<endl;
+
     // setup the command line
 
     const char* pageurl = getCurrentPageURL();

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2960
retrieving revision 1.2961
diff -u -b -r1.2960 -r1.2961
--- ChangeLog	20 Apr 2007 16:42:43 -0000	1.2960
+++ ChangeLog	21 Apr 2007 07:05:41 -0000	1.2961
@@ -1,3 +1,9 @@
+2007-04-21  John Gilmore  <gnu@toad.com>
+
+	* plugin/plugin.cpp:  In the child process, before executing
+	  gnash, close all the file descriptors we inherited from the
+	  browser (except stdout and stderr).
+
 2007-04-20 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/MovieTester.{cpp,h}: reworked the



From MAILER-DAEMON Sat Apr 21 17:13:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfMtU-00078n-1N
	for mharc-gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfMtS-00078W-Ot
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfMtQ-00078K-5Y
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfMtQ-00078H-13
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HfMoC-0001wo-DC
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:07:52 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HfMo0-00036h-SS
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 21:07:40 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HfMo0-00036d-FE
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 21:07:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HfMo0-00036d-FE@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 21 Apr 2007 21:07:40 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/movie_root.cpp server/mo...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2007 21:13:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/21 21:07:40

Modified files:
	.              : ChangeLog 
	server         : movie_root.cpp movie_root.h sprite_instance.cpp 
	                 sprite_instance.h 
	server/asobj   : LoadVars.cpp 

Log message:
	        * server/: movie_root.{cpp,h}, sprite_instance.{cpp,h},
	          asobj/LoadVars.cpp: nuke ptr_list use so that boost 1.32
	          (version in Debian stable) is still usable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2961&r2=1.2962
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.250&r2=1.251
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2961
retrieving revision 1.2962
diff -u -b -r1.2961 -r1.2962
--- ChangeLog	21 Apr 2007 07:05:41 -0000	1.2961
+++ ChangeLog	21 Apr 2007 21:07:39 -0000	1.2962
@@ -1,3 +1,9 @@
+2007-04-21 Sandro Santilli <strk@keybit.net>
+
+	* server/: movie_root.{cpp,h}, sprite_instance.{cpp,h},
+	  asobj/LoadVars.cpp: nuke ptr_list use so that boost 1.32
+	  (version in Debian stable) is still usable.
+
 2007-04-21  John Gilmore  <gnu@toad.com>
 
 	* plugin/plugin.cpp:  In the child process, before executing

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- server/movie_root.cpp	13 Apr 2007 07:35:55 -0000	1.57
+++ server/movie_root.cpp	21 Apr 2007 21:07:40 -0000	1.58
@@ -35,7 +35,6 @@
 #include <string>
 #include <typeinfo>
 #include <cassert>
-#include <boost/ptr_container/ptr_list.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 
 using namespace std;
@@ -82,6 +81,12 @@
 
 movie_root::~movie_root()
 {
+	for (ActionQueue::iterator it=_actionQueue.begin(),
+			itE=_actionQueue.end();
+			it != itE; ++it)
+	{
+		delete *it;
+	}
 	assert(testInvariant());
 }
 
@@ -808,7 +813,7 @@
 	// and a final call to .clear() 
 	while ( ! _actionQueue.empty() )
 	{
-		ExecutableCode& code = _actionQueue.front();
+		ExecutableCode& code = *(_actionQueue.front());
 		code.execute();
 		_actionQueue.pop_front(); 
 	}
@@ -823,7 +828,7 @@
 void
 movie_root::pushAction(std::auto_ptr<ExecutableCode> code)
 {
-	_actionQueue.push_back(code->clone());
+	_actionQueue.push_back(code.release());
 }
 
 void

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/movie_root.h	16 Apr 2007 18:23:05 -0000	1.48
+++ server/movie_root.h	21 Apr 2007 21:07:40 -0000	1.49
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.48 2007/04/16 18:23:05 strk Exp $ */
+/* $Id: movie_root.h,v 1.49 2007/04/21 21:07:40 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -77,8 +77,8 @@
 #include "timers.h" // for composition
 
 #include <vector>
+#include <list>
 #include <set>
-#include <boost/ptr_container/ptr_list.hpp>
 
 // Forward declarations
 namespace gnash {
@@ -419,6 +419,12 @@
 
 private:
 
+	/// Forbid copy 
+	movie_root(const movie_root& ) { assert(0); }
+
+	/// Forbid assignment
+	movie_root& operator=(const movie_root& ) { assert(0); return *this; }
+
 	/// Notify the global Key ActionScript object about a key status change
 	void notify_global_key(key::code k, bool down);
 
@@ -433,7 +439,7 @@
 	///
 	boost::intrusive_ptr<Stage> getStageObject();
 
-	typedef boost::ptr_list<ExecutableCode> ActionQueue;
+	typedef std::list<ExecutableCode*> ActionQueue;
 
 	ActionQueue _actionQueue;
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -b -r1.250 -r1.251
--- server/sprite_instance.cpp	20 Apr 2007 15:03:24 -0000	1.250
+++ server/sprite_instance.cpp	21 Apr 2007 21:07:40 -0000	1.251
@@ -1566,6 +1566,12 @@
 	}
 
 	m_display_list.clear();
+
+	for (LoadVariablesThreads::iterator it=_loadVariableRequests.begin();
+			it != _loadVariableRequests.end(); ++it)
+	{
+		delete *it;
+	}
 }
 
 character* sprite_instance::get_character_at_depth(int depth)
@@ -3318,7 +3324,7 @@
 	}
 
 	_loadVariableRequests.push_back(new LoadVariablesThread(url));
-	_loadVariableRequests.back().process();
+	_loadVariableRequests.back()->process();
 	//log_msg(_(SIZET_FMT " loadVariables requests pending"), _loadVariableRequests.size());
 
 }
@@ -3354,7 +3360,7 @@
 	for (LoadVariablesThreads::iterator it=_loadVariableRequests.begin();
 			it != _loadVariableRequests.end(); ++it)
 	{
-		LoadVariablesThread& request = *it;
+		LoadVariablesThread& request = *(*it);
 		if ( request.completed() )
 		{
 			processCompletedLoadVariableRequest(request);

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/sprite_instance.h	19 Apr 2007 17:41:36 -0000	1.100
+++ server/sprite_instance.h	21 Apr 2007 21:07:40 -0000	1.101
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.100 2007/04/19 17:41:36 udog Exp $ */
+/* $Id: sprite_instance.h,v 1.101 2007/04/21 21:07:40 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -41,7 +41,6 @@
 #include <list>
 #include <map>
 #include <string>
-#include <boost/ptr_container/ptr_list.hpp>
 
 // Forward declarations
 namespace gnash {
@@ -739,6 +738,17 @@
 
 private:
 
+	/// Forbid copy
+	sprite_instance(const sprite_instance&)
+		:
+		character(NULL, 0)
+	{
+		assert(0);
+	}
+
+	/// Forbid assignment
+	sprite_instance& operator=(const sprite_instance&) { assert(0); return *this; }
+
 	/// \brief
 	/// Call has_keypress_event() or has_mouse_event()
 	/// if the given string correspond to an event handler
@@ -909,7 +919,7 @@
 	bool m_on_event_load_called;
 
 	/// List of loadVariables requests
-	typedef boost::ptr_list<LoadVariablesThread> LoadVariablesThreads;
+	typedef std::list<LoadVariablesThread*> LoadVariablesThreads;
 
 	/// List of active loadVariable requests 
 	//

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/LoadVars.cpp	18 Apr 2007 11:00:29 -0000	1.22
+++ server/asobj/LoadVars.cpp	21 Apr 2007 21:07:40 -0000	1.23
@@ -122,6 +122,15 @@
 
 private:
 
+	/// Forbid copy
+	LoadVars(const LoadVars&)
+		:
+		as_object()
+	{ assert(0); }
+
+	/// Forbid assignment
+	LoadVars& operator=(const LoadVars&) { assert(0); return *this; }
+
 	/// Return enumerable property pairs in url-encoded form
 	//
 	/// TODO: move up to as_object and make public,
@@ -199,8 +208,8 @@
 	size_t _bytesLoaded;
 
 	/// List of load requests
-	//typedef std::list<LoadVariablesThread> LoadVariablesThreads;
-	typedef boost::ptr_list<LoadVariablesThread> LoadVariablesThreads;
+	typedef std::list<LoadVariablesThread*> LoadVariablesThreads;
+	//typedef boost::ptr_list<LoadVariablesThread> LoadVariablesThreads;
 
 	/// Load requests queue
 	//
@@ -240,15 +249,20 @@
 LoadVars::~LoadVars()
 {
 	//log_msg("Deleting LoadVars %p", this);
+	for ( LoadVariablesThreads::iterator i=_loadRequests.begin(), e=_loadRequests.end();
+			i!=e; ++i)
+	{
+		delete *i;
+	}
 }
 
 void
 LoadVars::checkLoads()
 {
 	/// Process a completed load if any
-	if ( isLoading() && _currentLoad->completed() )
+	if ( isLoading() && (*_currentLoad)->completed() )
 	{
-		processLoaded(*_currentLoad);
+		processLoaded(*(*_currentLoad));
 		_loadRequests.pop_front();
 		_currentLoad = _loadRequests.end();
 	}
@@ -258,7 +272,7 @@
 		if ( ! _loadRequests.empty() )
 		{
 			_currentLoad = _loadRequests.begin();
-			_currentLoad->process();
+			(*_currentLoad)->process();
 		}
 		else
 		{



From MAILER-DAEMON Sat Apr 21 17:13:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfMtr-0007Ih-6x
	for mharc-gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfMtp-0007FA-Bf
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfMtm-0007AY-L5
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfMtm-0007AV-Eg
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:13:38 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HfMoX-0001z4-Rb
	for gnash-commit@gnu.org; Sat, 21 Apr 2007 17:08:14 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3LL7xj80948;
	Sat, 21 Apr 2007 23:07:59 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Sat, 21 Apr 2007 23:07:59 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
Message-ID: <20070421210759.GA80819@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1043777274.20070411174506@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Apr 2007 21:13:42 -0000

On Wed, Apr 11, 2007 at 05:45:06PM +0200, Udo Giacomozzi wrote:
> Tuesday, March 27, 2007, 4:52:07 PM, you wrote:
> SS> +#include <boost/ptr_container/ptr_list.hpp>
> 
> Just want to point out that this requires Boost 1.33 while 1.32
> (default in Debian Woody AFAIK) was enough previously.

Nuked. Please try to build now.

--strk;



From MAILER-DAEMON Sun Apr 22 22:13:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfo3J-00023x-3a
	for mharc-gnash-commit@gnu.org; Sun, 22 Apr 2007 22:13:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfo3I-00023s-5w
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:13:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hfo3H-00023Y-Hc
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:13:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hfo3H-00023V-9K
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:13:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hfnxv-0005Kp-7a
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:07:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hfnxu-0007ja-2Z
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 02:07:42 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hfnxt-0007jW-Ly
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 02:07:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hfnxt-0007jW-Ly@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 23 Apr 2007 02:07:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/event_h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 02:13:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/23 02:07:41

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-ming.all: event_handler_scope_test.c 

Log message:
	testcase for scope in event handlers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2962&r2=1.2963
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/event_handler_scope_test.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2962
retrieving revision 1.2963
diff -u -b -r1.2962 -r1.2963
--- ChangeLog	21 Apr 2007 21:07:39 -0000	1.2962
+++ ChangeLog	23 Apr 2007 02:07:40 -0000	1.2963
@@ -1,3 +1,8 @@
+2007-04-23 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/event_handler_scope_test.c
+	  testcase for scope in event handlers
+	  
 2007-04-21 Sandro Santilli <strk@keybit.net>
 
 	* server/: movie_root.{cpp,h}, sprite_instance.{cpp,h},

Index: testsuite/misc-ming.all/event_handler_scope_test.c
===================================================================
RCS file: testsuite/misc-ming.all/event_handler_scope_test.c
diff -N testsuite/misc-ming.all/event_handler_scope_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/event_handler_scope_test.c	23 Apr 2007 02:07:41 -0000	1.1
@@ -0,0 +1,106 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION  6
+#define OUTPUT_FILENAME  "event_handler_scope_test.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc2, dejagnuclip;
+  SWFDisplayItem  it2;
+  SWFShape  sh_red;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  add_actions(mo, "x1=0; x2=0; x3=0;");
+  SWFMovie_nextFrame(mo);  /* 1st frame */
+
+  
+  mc2 = newSWFMovieClip();
+  sh_red = make_fill_square (100, 200, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc2, (SWFBlock)sh_red);  
+  SWFMovieClip_nextFrame(mc2); //frame1
+  SWFMovieClip_nextFrame(mc2); //frame2
+  add_clip_actions(mc2, " if (scope_test == 1); scope_test = 2; stop();");
+  SWFMovieClip_nextFrame(mc2); //frame3
+
+  it2 = SWFMovie_add(mo, (SWFBlock)mc2); 
+  SWFDisplayItem_setDepth(it2, 20); 
+  SWFDisplayItem_setName(it2, "mc2"); 
+  /* Define onClipEnterFrame */
+  SWFDisplayItem_addAction(it2,
+    compileSWFActionCode(" _root.note('onClipEnterFrame triggered'); "
+                         " var scope_test = 1; "), // Define mc.scope_test
+    SWFACTION_ENTERFRAME);  
+  /* Define onEnterFrame */
+  add_actions(mo, " mc2.onEnterFrame = function () "
+                  " { _root.note('user defined onEnterFrame called'); "
+                  "   scope_test = 3; "          // Define _root.scope_test 
+                  " var scope_test = 4; }; " );  // Define a local var
+  
+  check_equals(mo, "_root.scope_test", "undefined");
+  check_equals(mo, "_root.mc2.scope_test", "undefined");
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+  
+  check_equals(mo, "_root.mc2.scope_test", "1");
+  check_equals(mo, "_root.scope_test", "3");
+  SWFMovie_nextFrame(mo); /* 3rd frame */
+  
+  check_equals(mo, "_root.mc2.scope_test", "2");
+  SWFMovie_nextFrame(mo); /* 4th frame */
+  
+  check_equals(mo, "_root.scope_test", "3");
+  SWFMovie_nextFrame(mo); /* 5th frame */
+  
+  SWFDisplayItem_remove(it2);
+  check_equals(mo, "_root.mc2.scope_test", "undefined");
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 6th frame */
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+



From MAILER-DAEMON Sun Apr 22 22:14:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfo4x-0002U5-BO
	for mharc-gnash-commit@gnu.org; Sun, 22 Apr 2007 22:14:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfo4v-0002U0-Nq
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:14:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hfo4t-0002To-6a
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:14:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hfo4t-0002Tk-1Y
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:14:55 -0400
Received: from nz-out-0506.google.com ([64.233.162.228])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HfnzW-0005Su-T6
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 22:09:23 -0400
Received: by nz-out-0506.google.com with SMTP id s1so1106615nze
	for <gnash-commit@gnu.org>; Sun, 22 Apr 2007 19:09:22 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Jh0DiX0mGrtEX2nuK+sgYBYK5igk/w31SvMoN/HoZRsG+4mzonGwTSLZD0PTJoMml/ogjJ16Y1Xys9rSah5zrW8aIx1jI6mx0LfTxCDOjMgAWebKPeRvj69HtWTtEIXSYFySDwJr6f4r629WKatGQ8wRu28HC7KWzqNkNT+aMNw=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=QvvbU2Y/IS04v7IFEo6YNtwQS2GjLwS8V/XzUHgORRTm83JYv/RfeolC1p3gCIEZZHaj2mFJTeQZd56BbPnBROGLowt9tS7+7eX1n+0OqWczX9FE8IMuJvkfp+XStfDovTamViGi44OFwCmcW/H+2MdvfnG47qo4Ivg3kyrUCWM=
Received: by 10.114.153.18 with SMTP id a18mr1188294wae.1177294161873;
	Sun, 22 Apr 2007 19:09:21 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Sun, 22 Apr 2007 19:09:21 -0700 (PDT)
Message-ID: <ca4b43ff0704221909kd6b62e2hf801ec0f5cc7e3d9@mail.gmail.com>
Date: Mon, 23 Apr 2007 10:09:21 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/event_h...
In-Reply-To: <E1Hfnxt-0007jW-Ly@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hfnxt-0007jW-Ly@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 02:14:57 -0000

seems that uer defined onEnterFrame is not tirggered, is this a regression?


On 4/23/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/23 02:07:41
>
> Modified files:
>        .              : ChangeLog
> Added files:
>        testsuite/misc-ming.all: event_handler_scope_test.c
>
> Log message:
>        testcase for scope in event handlers
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2962&r2=1.2963
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/event_handler_scope_test.c?cvsroot=gnash&rev=1.1
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.2962
> retrieving revision 1.2963
> diff -u -b -r1.2962 -r1.2963
> --- ChangeLog   21 Apr 2007 21:07:39 -0000      1.2962
> +++ ChangeLog   23 Apr 2007 02:07:40 -0000      1.2963
> @@ -1,3 +1,8 @@
> +2007-04-23 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       * testsuite/misc-ming.all/event_handler_scope_test.c
> +         testcase for scope in event handlers
> +
>  2007-04-21 Sandro Santilli <strk@keybit.net>
>
>        * server/: movie_root.{cpp,h}, sprite_instance.{cpp,h},
>
> Index: testsuite/misc-ming.all/event_handler_scope_test.c
> ===================================================================
> RCS file: testsuite/misc-ming.all/event_handler_scope_test.c
> diff -N testsuite/misc-ming.all/event_handler_scope_test.c
> --- /dev/null   1 Jan 1970 00:00:00 -0000
> +++ testsuite/misc-ming.all/event_handler_scope_test.c  23 Apr 2007 02:07:41 -0000      1.1
> @@ -0,0 +1,106 @@
> +/*
> + *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> + *
> + */
> +
> +
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <ming.h>
> +
> +#include "ming_utils.h"
> +
> +#define OUTPUT_VERSION  6
> +#define OUTPUT_FILENAME  "event_handler_scope_test.swf"
> +
> +
> +int
> +main(int argc, char** argv)
> +{
> +  SWFMovie mo;
> +  SWFMovieClip  mc2, dejagnuclip;
> +  SWFDisplayItem  it2;
> +  SWFShape  sh_red;
> +
> +  const char *srcdir=".";
> +  if ( argc>1 )
> +    srcdir=argv[1];
> +  else
> +  {
> +      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
> +      return 1;
> +  }
> +
> +  Ming_init();
> +  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
> +  SWFMovie_setDimension(mo, 800, 600);
> +  SWFMovie_setRate (mo, 12.0);
> +
> +  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
> +  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
> +  add_actions(mo, "x1=0; x2=0; x3=0;");
> +  SWFMovie_nextFrame(mo);  /* 1st frame */
> +
> +
> +  mc2 = newSWFMovieClip();
> +  sh_red = make_fill_square (100, 200, 60, 60, 255, 0, 0, 255, 0, 0);
> +  SWFMovieClip_add(mc2, (SWFBlock)sh_red);
> +  SWFMovieClip_nextFrame(mc2); //frame1
> +  SWFMovieClip_nextFrame(mc2); //frame2
> +  add_clip_actions(mc2, " if (scope_test == 1); scope_test = 2; stop();");
> +  SWFMovieClip_nextFrame(mc2); //frame3
> +
> +  it2 = SWFMovie_add(mo, (SWFBlock)mc2);
> +  SWFDisplayItem_setDepth(it2, 20);
> +  SWFDisplayItem_setName(it2, "mc2");
> +  /* Define onClipEnterFrame */
> +  SWFDisplayItem_addAction(it2,
> +    compileSWFActionCode(" _root.note('onClipEnterFrame triggered'); "
> +                         " var scope_test = 1; "), // Define mc.scope_test
> +    SWFACTION_ENTERFRAME);
> +  /* Define onEnterFrame */
> +  add_actions(mo, " mc2.onEnterFrame = function () "
> +                  " { _root.note('user defined onEnterFrame called'); "
> +                  "   scope_test = 3; "          // Define _root.scope_test
> +                  " var scope_test = 4; }; " );  // Define a local var
> +
> +  check_equals(mo, "_root.scope_test", "undefined");
> +  check_equals(mo, "_root.mc2.scope_test", "undefined");
> +  SWFMovie_nextFrame(mo); /* 2nd frame */
> +
> +  check_equals(mo, "_root.mc2.scope_test", "1");
> +  check_equals(mo, "_root.scope_test", "3");
> +  SWFMovie_nextFrame(mo); /* 3rd frame */
> +
> +  check_equals(mo, "_root.mc2.scope_test", "2");
> +  SWFMovie_nextFrame(mo); /* 4th frame */
> +
> +  check_equals(mo, "_root.scope_test", "3");
> +  SWFMovie_nextFrame(mo); /* 5th frame */
> +
> +  SWFDisplayItem_remove(it2);
> +  check_equals(mo, "_root.mc2.scope_test", "undefined");
> +  add_actions(mo, " _root.totals(); stop(); ");
> +  SWFMovie_nextFrame(mo); /* 6th frame */
> +  //Output movie
> +  puts("Saving " OUTPUT_FILENAME );
> +  SWFMovie_save(mo, OUTPUT_FILENAME);
> +
> +  return 0;
> +}
> +
> +
> +
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sun Apr 22 23:57:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfpgZ-0007Kk-La
	for mharc-gnash-commit@gnu.org; Sun, 22 Apr 2007 23:57:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfpgX-0007K3-Lo
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 23:57:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfpgX-0007Jj-5l
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 23:57:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfpgW-0007Jb-RP
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 23:57:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HfpbA-0006qk-BJ
	for gnash-commit@gnu.org; Sun, 22 Apr 2007 23:52:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hfpb9-0004tn-O3
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 03:52:19 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hfpb9-0004tk-J7
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 03:52:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hfpb9-0004tk-J7@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 23 Apr 2007 03:52:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all event_handler_sco...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 03:57:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/23 03:52:19

Modified files:
	testsuite/misc-ming.all: event_handler_scope_test.c 

Log message:
	minor clean up

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/event_handler_scope_test.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: event_handler_scope_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/event_handler_scope_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- event_handler_scope_test.c	23 Apr 2007 02:07:41 -0000	1.1
+++ event_handler_scope_test.c	23 Apr 2007 03:52:19 -0000	1.2
@@ -31,8 +31,8 @@
 main(int argc, char** argv)
 {
   SWFMovie mo;
-  SWFMovieClip  mc2, dejagnuclip;
-  SWFDisplayItem  it2;
+  SWFMovieClip  mc, dejagnuclip;
+  SWFDisplayItem  it;
   SWFShape  sh_red;
 
   const char *srcdir=".";
@@ -55,44 +55,44 @@
   SWFMovie_nextFrame(mo);  /* 1st frame */
 
   
-  mc2 = newSWFMovieClip();
+  mc = newSWFMovieClip();
   sh_red = make_fill_square (100, 200, 60, 60, 255, 0, 0, 255, 0, 0);
-  SWFMovieClip_add(mc2, (SWFBlock)sh_red);  
-  SWFMovieClip_nextFrame(mc2); //frame1
-  SWFMovieClip_nextFrame(mc2); //frame2
-  add_clip_actions(mc2, " if (scope_test == 1); scope_test = 2; stop();");
-  SWFMovieClip_nextFrame(mc2); //frame3
-
-  it2 = SWFMovie_add(mo, (SWFBlock)mc2); 
-  SWFDisplayItem_setDepth(it2, 20); 
-  SWFDisplayItem_setName(it2, "mc2"); 
+  SWFMovieClip_add(mc, (SWFBlock)sh_red);  
+  SWFMovieClip_nextFrame(mc); //frame1
+  SWFMovieClip_nextFrame(mc); //frame2
+  add_clip_actions(mc, " if (scope_test == 1); scope_test = 2; stop();");
+  SWFMovieClip_nextFrame(mc); //frame3
+
+  it = SWFMovie_add(mo, (SWFBlock)mc); 
+  SWFDisplayItem_setDepth(it, 20); 
+  SWFDisplayItem_setName(it, "mc"); 
   /* Define onClipEnterFrame */
-  SWFDisplayItem_addAction(it2,
+  SWFDisplayItem_addAction(it,
     compileSWFActionCode(" _root.note('onClipEnterFrame triggered'); "
                          " var scope_test = 1; "), // Define mc.scope_test
     SWFACTION_ENTERFRAME);  
   /* Define onEnterFrame */
-  add_actions(mo, " mc2.onEnterFrame = function () "
+  add_actions(mo, " mc.onEnterFrame = function () "
                   " { _root.note('user defined onEnterFrame called'); "
                   "   scope_test = 3; "          // Define _root.scope_test 
                   " var scope_test = 4; }; " );  // Define a local var
   
   check_equals(mo, "_root.scope_test", "undefined");
-  check_equals(mo, "_root.mc2.scope_test", "undefined");
+  check_equals(mo, "_root.mc.scope_test", "undefined");
   SWFMovie_nextFrame(mo); /* 2nd frame */
   
-  check_equals(mo, "_root.mc2.scope_test", "1");
+  check_equals(mo, "_root.mc.scope_test", "1");
   check_equals(mo, "_root.scope_test", "3");
   SWFMovie_nextFrame(mo); /* 3rd frame */
   
-  check_equals(mo, "_root.mc2.scope_test", "2");
+  check_equals(mo, "_root.mc.scope_test", "2");
   SWFMovie_nextFrame(mo); /* 4th frame */
   
   check_equals(mo, "_root.scope_test", "3");
   SWFMovie_nextFrame(mo); /* 5th frame */
   
-  SWFDisplayItem_remove(it2);
-  check_equals(mo, "_root.mc2.scope_test", "undefined");
+  SWFDisplayItem_remove(it);
+  check_equals(mo, "_root.mc.scope_test", "undefined");
   add_actions(mo, " _root.totals(); stop(); ");
   SWFMovie_nextFrame(mo); /* 6th frame */
   //Output movie



From MAILER-DAEMON Mon Apr 23 04:13:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hftft-00049b-UQ
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 04:13:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hftfr-00049R-Sj
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:13:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hftfq-00049F-7O
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:13:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hftfq-00049C-0B
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:13:26 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HftaS-0003CD-1c
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:07:52 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3N87gU4002090;
	Mon, 23 Apr 2007 10:07:48 +0200
Date: Mon, 23 Apr 2007 10:07:38 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1818758251.20070423100738@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <20070421210759.GA80819@keybit.net>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 08:13:28 -0000

Hello Sandro,

Saturday, April 21, 2007, 11:07:59 PM, you wrote:
>> Just want to point out that this requires Boost 1.33 while 1.32
>> (default in Debian Woody AFAIK) was enough previously.
SS> Nuked. Please try to build now.

Great, thanks, builds now.

FYI, "make check" fails with my somewhat older Ming version:

make[4]: Entering directory `/mnt/bigdrive/home/udo/gnash/testsuite/misc-ming.all'
/bin/sh ../../libtool --tag=CC --mode=link gcc  -g -O2 -march=athlon-xp     -W     -Wall     -Wcast-align     -Wcast-qual     -Wpointer-ar .. lming -lrt -lm
gcc -g -O2 -march=athlon-xp -W -Wall -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wmissing-prototypes -W .. ,/usr/local/lib
ming_utils.o(.text+0x5f2): In function `add_clip_init_actions':
/mnt/bigdrive/home/udo/gnash/testsuite/misc-ming.all/ming_utils.c:299: Error: undefined reference to `SWFMovieClip_addInitAction'
collect2: Error: ld returned 1 exit status
make[4]: *** [Dejagnu] Error 1


        MING version code is 00040004
        MING flags are -I/usr/local/include
        MING libs are -L/usr/local/lib -lming


Udo




From MAILER-DAEMON Mon Apr 23 04:22:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HftoQ-0008MB-Lt
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 04:22:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HftoO-0008Lx-QX
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:22:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HftoO-0008Ll-9E
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:22:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HftoO-0008Li-62
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:22:16 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hftiz-0004Mo-Uh
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:16:42 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3N8GU702263;
	Mon, 23 Apr 2007 10:16:30 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 23 Apr 2007 10:16:30 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
Message-ID: <20070423081630.GA93115@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1818758251.20070423100738@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 08:22:17 -0000

On Mon, Apr 23, 2007 at 10:07:38AM +0200, Udo Giacomozzi wrote:

> FYI, "make check" fails with my somewhat older Ming version:
> 
> make[4]: Entering directory `/mnt/bigdrive/home/udo/gnash/testsuite/misc-ming.all'
> /bin/sh ../../libtool --tag=CC --mode=link gcc  -g -O2 -march=athlon-xp     -W     -Wall     -Wcast-align     -Wcast-qual     -Wpointer-ar .. lming -lrt -lm
> gcc -g -O2 -march=athlon-xp -W -Wall -Wcast-align -Wcast-qual -Wpointer-arith -Wreturn-type -Wmissing-declarations -Wmissing-prototypes -W .. ,/usr/local/lib
> ming_utils.o(.text+0x5f2): In function `add_clip_init_actions':
> /mnt/bigdrive/home/udo/gnash/testsuite/misc-ming.all/ming_utils.c:299: Error: undefined reference to `SWFMovieClip_addInitAction'
> collect2: Error: ld returned 1 exit status
> make[4]: *** [Dejagnu] Error 1
> 
> 
>         MING version code is 00040004
>         MING flags are -I/usr/local/include
>         MING libs are -L/usr/local/lib -lming

I suspect you have a CVS version of Ming installed.
Try the actual *release* 0.4.0.beta4 which gives you the same version code.

--strk;



From MAILER-DAEMON Mon Apr 23 04:59:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfuOP-0001OA-9f
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 04:59:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfuON-0001Nw-0j
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:59:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfuOM-0001Ni-2Y
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:59:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfuOL-0001Nc-LL
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:59:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HfuIx-0002i3-MX
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 04:53:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HfuIu-0007dc-Fc
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 08:53:48 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HfuIu-0007dZ-0B
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 08:53:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HfuIu-0007dZ-0B@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 08:53:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/simple_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 08:59:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 08:53:47

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: simple_loop_testrunner.cpp 

Log message:
	        * testsuite/misc-ming.all/simple_loop_testrunner.cpp:
	          Use contains, not intersects, when testing invalidated bounds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2963&r2=1.2964
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2963
retrieving revision 1.2964
diff -u -b -r1.2963 -r1.2964
--- ChangeLog	23 Apr 2007 02:07:40 -0000	1.2963
+++ ChangeLog	23 Apr 2007 08:53:47 -0000	1.2964
@@ -1,3 +1,8 @@
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/simple_loop_testrunner.cpp: 
+	  Use contains, not intersects, when testing invalidated bounds.
+
 2007-04-23 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/event_handler_scope_test.c

Index: testsuite/misc-ming.all/simple_loop_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/simple_loop_testrunner.cpp	6 Apr 2007 11:43:44 -0000	1.4
+++ testsuite/misc-ming.all/simple_loop_testrunner.cpp	23 Apr 2007 08:53:47 -0000	1.5
@@ -66,7 +66,7 @@
 	check_equals(root->getDisplayList().size(), 1);
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(0, 0, 60, 60)) );
+	check( invalidated.contains(Bounds(0, 0, 60, 60)) );
 
 	tester.advance(); // FRAME 3/4
 	
@@ -76,7 +76,7 @@
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(60, 0, 120, 60)) );
+	check( invalidated.contains(Bounds(60, 0, 120, 60)) );
 
 	tester.advance(); // FRAME 4/4
 	
@@ -87,7 +87,7 @@
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 4+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(120, 0, 180, 60)) );
+	check( invalidated.contains(Bounds(120, 0, 180, 60)) );
 
 	tester.advance(); // FRAME 1/4 (loop back)
 	
@@ -95,7 +95,7 @@
 	check_equals(root->get_current_frame(), 0);
 	check_equals(root->getDisplayList().size(), 0);
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(0, 0, 180, 60)) );
+	check( invalidated.contains(Bounds(0, 0, 180, 60)) );
 
 	tester.advance(); // FRAME 2/4
 	
@@ -104,7 +104,7 @@
 	check_equals(root->getDisplayList().size(), 1);
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(0, 0, 60, 60)) );
+	check( invalidated.contains(Bounds(0, 0, 60, 60)) );
 
 	tester.advance(); // FRAME 3/4
 	
@@ -114,7 +114,7 @@
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(60, 0, 120, 60)) );
+	check( invalidated.contains(Bounds(60, 0, 120, 60)) );
 
 	tester.advance(); // FRAME 4/4
 	
@@ -125,7 +125,7 @@
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 4+character::staticDepthOffset) );
 	invalidated = tester.getInvalidatedBounds();
-	check( invalidated.intersects(Bounds(120, 0, 180, 60)) );
+	check( invalidated.contains(Bounds(120, 0, 180, 60)) );
 
 }
 



From MAILER-DAEMON Mon Apr 23 05:35:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfuxJ-0000u9-3m
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 05:35:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfuxG-0000tU-SY
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 05:35:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfuxF-0000tI-8M
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 05:35:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfuxF-0000tF-0f
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 05:35:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hfurq-0007MN-Qo
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 05:29:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hfurq-0000fo-JC
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:29:54 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hfurq-0000fl-6i
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:29:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hfurq-0000fl-6i@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 09:29:54 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libgeometry/snappingrange.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 09:35:31 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 09:29:54

Modified files:
	.              : ChangeLog 
	libgeometry    : snappingrange.h 

Log message:
	        * libgeometry/snappingrange.h: define the SnappingRanges2d<> in
	          the gnash::geometry namespace. Keep InvalidatedBounds in the
	          gnash namespace, for simplicity.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2964&r2=1.2965
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2964
retrieving revision 1.2965
diff -u -b -r1.2964 -r1.2965
--- ChangeLog	23 Apr 2007 08:53:47 -0000	1.2964
+++ ChangeLog	23 Apr 2007 09:29:53 -0000	1.2965
@@ -1,5 +1,8 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* libgeometry/snappingrange.h: define the SnappingRanges2d<> in
+	  the gnash::geometry namespace. Keep InvalidatedBounds in the
+	  gnash namespace, for simplicity.
 	* testsuite/misc-ming.all/simple_loop_testrunner.cpp: 
 	  Use contains, not intersects, when testing invalidated bounds.
 

Index: libgeometry/snappingrange.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libgeometry/snappingrange.h	20 Apr 2007 14:14:50 -0000	1.15
+++ libgeometry/snappingrange.h	23 Apr 2007 09:29:53 -0000	1.16
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.15 2007/04/20 14:14:50 strk Exp $
+// $Id: snappingrange.h,v 1.16 2007/04/23 09:29:53 strk Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -32,6 +32,7 @@
 
 namespace gnash {
 
+namespace geometry {
 
 /// \brief
 /// Snapping range class. Can hold a number of 2D ranges and combines 
@@ -357,9 +358,6 @@
 	
 }; //class SnappingRanges2d
 
-/// Standard snapping 2d ranges type for invalidated bounds calculation  
-typedef SnappingRanges2d<float> InvalidatedRanges;
-
 template <class T>
 std::ostream& operator<< (std::ostream& os, SnappingRanges2d<T>& r)
 {
@@ -376,6 +374,12 @@
 	return os;
 }
 
+} //namespace gnash.geometry
+
+/// Standard snapping 2d ranges type for invalidated bounds calculation  
+typedef geometry::SnappingRanges2d<float> InvalidatedRanges;
+
+
 } //namespace gnash
 
 #endif



From MAILER-DAEMON Mon Apr 23 06:25:29 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfvjd-00055t-1V
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 06:25:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfvja-000532-OD
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 06:25:26 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfvjY-00050P-Tv
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 06:25:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfvjY-0004zl-Ai
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 06:25:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hfve9-00073Z-NQ
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 06:19:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hfve8-0003tA-K1
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 10:19:48 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hfve8-0003t6-65
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 10:19:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hfve8-0003t6-65@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 10:19:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libgeometry/snappingrange.h tes...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 10:25:27 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 10:19:48

Modified files:
	.              : ChangeLog 
	libgeometry    : snappingrange.h 
	testsuite      : MovieTester.cpp MovieTester.h 
	testsuite/libgeometry: snappingrangetest.cpp 
	testsuite/misc-ming.all: simple_loop_testrunner.cpp 

Log message:
	        * libgeometry/snappingrange.h: add unconditional visitor; add
	          cast operator; add contains(Range2d); add scale(factor).
	        * testsuite/MovieTester.{cpp,h}: add a getInvalidatedRanges function;
	          drop getInvalidatedBounds one.
	        * testsuite/libgeometry/snappingrangetest.cpp: test contains(Range)
	          and cast to int.
	        * testsuite/misc-ming.all/simple_loop_testrunner.cpp: update
	          to use the new getInvalidatedRanges.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2965&r2=1.2966
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libgeometry/snappingrangetest.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2965
retrieving revision 1.2966
diff -u -b -r1.2965 -r1.2966
--- ChangeLog	23 Apr 2007 09:29:53 -0000	1.2965
+++ ChangeLog	23 Apr 2007 10:19:47 -0000	1.2966
@@ -1,5 +1,16 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* libgeometry/snappingrange.h: add unconditional visitor; add
+	  cast operator; add contains(Range2d); add scale(factor).
+	* testsuite/MovieTester.{cpp,h}: add a getInvalidatedRanges function;
+	  drop getInvalidatedBounds one.
+	* testsuite/libgeometry/snappingrangetest.cpp: test contains(Range)
+	  and cast to int.
+	* testsuite/misc-ming.all/simple_loop_testrunner.cpp: update
+	  to use the new getInvalidatedRanges.
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* libgeometry/snappingrange.h: define the SnappingRanges2d<> in
 	  the gnash::geometry namespace. Keep InvalidatedBounds in the
 	  gnash namespace, for simplicity.

Index: libgeometry/snappingrange.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libgeometry/snappingrange.h	23 Apr 2007 09:29:53 -0000	1.16
+++ libgeometry/snappingrange.h	23 Apr 2007 10:19:47 -0000	1.17
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.16 2007/04/23 09:29:53 strk Exp $
+// $Id: snappingrange.h,v 1.17 2007/04/23 10:19:47 strk Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -90,6 +90,26 @@
 	{
 	}
 	
+	/// Templated copy constructor, for casting between range types
+	template <typename U>
+	SnappingRanges2d(const SnappingRanges2d<U>& from)
+	{
+		if ( from.isWorld() ) {
+			setWorld();
+		} else if ( from.isNull() ) {
+			setNull();
+		} else {
+			// TODO: use visitor pattern !
+			unsigned rcount = from.size();
+			for (unsigned int rno=0; rno<rcount; rno++)
+			{
+				Range2d<U> r = from.getRange(rno);
+				RangeType rc(r);
+				add(rc);
+			}
+		}
+	}
+	
 	/// Add a Range to the set, merging when possible and appropriate
 	void add(const RangeType& range) {
 		if (range.isWorld()) {
@@ -149,6 +169,20 @@
 		combine_ranges_lazy();
 	}
 	
+	/// Scale all ranges by the specified factor
+	void scale(float factor) {
+	
+		if (isWorld() || isNull()) 
+			return;
+		
+		unsigned rcount = _ranges.size();
+		
+		for (unsigned int rno=0; rno<rcount; rno++)
+			_ranges[rno].scale(factor);
+			
+		combine_ranges_lazy();
+	}
+	
 	/// Combines known ranges. Previously merged ranges may have come close
 	/// to other ranges. Algorithm could be optimized. 
 	void combine_ranges() {
@@ -264,22 +298,14 @@
 	}
 	
 	/// Returns the range at the specified index
+	//
+	/// TODO: return by reference ?
+	///
 	RangeType getRange(unsigned int index) const {
 		finalize();
 		assert(index<size());
 		
 		return _ranges[index];
-		
-		/*
-		RangeList::iterator iter = _ranges.begin();
-		
-		while (index>0) {
-			index--;
-			iter++;
-		}
-		
-		return *iter;
-		*/		
 	}
 	
 	/// Return a range that surrounds *all* added ranges. This is used mainly
@@ -311,6 +337,19 @@
 	
 	}
 	
+	/// Returns true if any of the ranges contains the range
+	bool contains(RangeType r) const {
+	
+		finalize();
+	
+		for (unsigned rno=0, rcount=_ranges.size(); rno<rcount; rno++) 
+		if (_ranges[rno].contains(r))
+			return true;
+			
+		return false;
+	
+	}
+	
 	
 	/// Visit the current Ranges set
 	//
@@ -336,6 +375,25 @@
 		}
 	}
 	
+	/// Visit the current Ranges set
+	//
+	/// Visitor functor will be invoked inconditionally
+	/// for each RangeType in the current set.
+	/// 
+	/// The visitor functor will receive a RangeType reference.
+	///
+	template <class V>
+	inline void visitAll(V& visitor) const
+	{
+		for (typename RangeList::const_iterator
+			it = _ranges.begin(), itEnd = _ranges.end();
+			it != itEnd;
+			++it)
+		{
+			visitor(*it);
+		}
+	}
+	
 private:
 
 	inline T absmin(T a, T b) {

Index: testsuite/MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- testsuite/MovieTester.cpp	20 Apr 2007 16:42:43 -0000	1.29
+++ testsuite/MovieTester.cpp	23 Apr 2007 10:19:47 -0000	1.30
@@ -309,28 +309,20 @@
 	return _movie_root->isMouseOverActiveEntity();
 }
 
-geometry::Range2d<int>
-MovieTester::getInvalidatedBounds() const
+geometry::SnappingRanges2d<int>
+MovieTester::getInvalidatedRanges() const
 {
 	using namespace gnash::geometry;
 
-	rect ret;
-	assert(ret.is_null());
-	
-	// TODO: Support multiple bounds in testsuite
-	////_movie_root->get_invalidated_bounds(&ret, false);
-	//InvalidatedRanges ranges;
-	//_movie_root->add_invalidated_bounds(ranges, false);
-
-	Range2d<float> range = _invalidatedBounds.getFullArea();
+	SnappingRanges2d<float> ranges = _invalidatedBounds;
 
 	// scale by 1/20 (twips to pixels)
-	range.scale(1.0/20);
+	ranges.scale(1.0/20);
 
 	// Convert to integer range.
-	Range2d<int> pixrange(range);
+	SnappingRanges2d<int> pixranges(ranges);
 
-	return pixrange;
+	return pixranges;
 	
 }
 

Index: testsuite/MovieTester.h
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/MovieTester.h	20 Apr 2007 16:42:43 -0000	1.17
+++ testsuite/MovieTester.h	23 Apr 2007 10:19:47 -0000	1.18
@@ -105,11 +105,11 @@
 	/// Advance the movie by one frame
 	void advance();
 
-	/// Return the invalidated bounds in PIXELS
+	/// Return the invalidated ranges in PIXELS
 	//
 	/// This is to debug/test partial rendering
 	///
-	geometry::Range2d<int> getInvalidatedBounds() const;
+	geometry::SnappingRanges2d<int> getInvalidatedRanges() const;
 
 	/// Find a character in the display list of a sprite by name.
 	//

Index: testsuite/libgeometry/snappingrangetest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libgeometry/snappingrangetest.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libgeometry/snappingrangetest.cpp	2 Mar 2007 15:31:47 -0000	1.2
+++ testsuite/libgeometry/snappingrangetest.cpp	23 Apr 2007 10:19:47 -0000	1.3
@@ -151,6 +151,13 @@
 	check( ! irrSnap.contains( 15, 495) );
 	check( ! irrSnap.contains(495, 495) );
 	
+	check( irrSnap.contains(horiz) );
+	check( irrSnap.contains(vert) );
+
+	SnappingRanges2d<int> irrIntSnap(irrSnap);
+	check( irrSnap.contains(Range2d<int>(horiz)) );
+	check( irrSnap.contains(Range2d<int>(vert)) );
+	
 	 
 }
 

Index: testsuite/misc-ming.all/simple_loop_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/simple_loop_testrunner.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/simple_loop_testrunner.cpp	23 Apr 2007 08:53:47 -0000	1.5
+++ testsuite/misc-ming.all/simple_loop_testrunner.cpp	23 Apr 2007 10:19:47 -0000	1.6
@@ -38,6 +38,7 @@
 int
 main(int /*argc*/, char** /*argv*/)
 {
+	typedef gnash::geometry::SnappingRanges2d<int> Ranges;
 	typedef gnash::geometry::Range2d<int> Bounds;
 
 	string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
@@ -46,7 +47,7 @@
 	gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
 	dbglogfile.setVerbosity(1);
 
-	Bounds invalidated;
+	Ranges invalidated;
 	sprite_instance* root = tester.getRootMovie();
 	assert(root);
 
@@ -56,7 +57,7 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 0);
 	check_equals(root->getDisplayList().size(), 0); // no chars
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.isNull() );
 
 	tester.advance(); // FRAME 2/4
@@ -65,7 +66,7 @@
 	check_equals(root->get_current_frame(), 1);
 	check_equals(root->getDisplayList().size(), 1);
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(0, 0, 60, 60)) );
 
 	tester.advance(); // FRAME 3/4
@@ -75,7 +76,7 @@
 	check_equals(root->getDisplayList().size(), 2);
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(60, 0, 120, 60)) );
 
 	tester.advance(); // FRAME 4/4
@@ -86,7 +87,7 @@
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 4+character::staticDepthOffset) );
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(120, 0, 180, 60)) );
 
 	tester.advance(); // FRAME 1/4 (loop back)
@@ -94,7 +95,7 @@
 	check_equals(root->get_play_state(), sprite_instance::PLAY);
 	check_equals(root->get_current_frame(), 0);
 	check_equals(root->getDisplayList().size(), 0);
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(0, 0, 180, 60)) );
 
 	tester.advance(); // FRAME 2/4
@@ -103,7 +104,7 @@
 	check_equals(root->get_current_frame(), 1);
 	check_equals(root->getDisplayList().size(), 1);
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(0, 0, 60, 60)) );
 
 	tester.advance(); // FRAME 3/4
@@ -113,7 +114,7 @@
 	check_equals(root->getDisplayList().size(), 2);
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(60, 0, 120, 60)) );
 
 	tester.advance(); // FRAME 4/4
@@ -124,7 +125,7 @@
 	check( tester.findDisplayItemByDepth(*root, 2+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 3+character::staticDepthOffset) );
 	check( tester.findDisplayItemByDepth(*root, 4+character::staticDepthOffset) );
-	invalidated = tester.getInvalidatedBounds();
+	invalidated = tester.getInvalidatedRanges();
 	check( invalidated.contains(Bounds(120, 0, 180, 60)) );
 
 }



From MAILER-DAEMON Mon Apr 23 07:21:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfwbc-0001TW-6X
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 07:21:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfwbb-0001TN-9d
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:21:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hfwba-0001TA-JZ
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:21:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hfwba-0001T6-DX
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:21:14 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HfwWB-0006Ru-Mx
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:15:39 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HfwWA-0007fH-RM
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:15:38 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HfwWA-0007fC-KY
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:15:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HfwWA-0007fC-KY@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 23 Apr 2007 11:15:38 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all key_event_test.c ...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 11:21:15 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/23 11:15:38

Added files:
	testsuite/misc-ming.all: key_event_test.c 
	                         key_event_testrunner.cpp 

Log message:
	testcase for key events

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_test.c?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: key_event_test.c
===================================================================
RCS file: key_event_test.c
diff -N key_event_test.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ key_event_test.c	23 Apr 2007 11:15:38 -0000	1.1
@@ -0,0 +1,129 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+/*
+ *  Key events are: KeyUp, KeyDown, KeyPress
+ *  (1)KeyUp and KeyDown event handler is unrelated to any key;
+ *  (2)KeyPress event handler should bind a valid key, which is hard-coded in the placement tag;
+ *  (3)Use Key.addListener() to register user defined key event handler, otherwise it will not
+ *     be triggered.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION  6
+#define OUTPUT_FILENAME  "key_event_test.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc, dejagnuclip;
+  SWFDisplayItem  it;
+  SWFShape  sh_red;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 1.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  add_actions(mo, "x1=0; x2=0; x3=0; x=0; x5=0; x6=0; ");
+  SWFMovie_nextFrame(mo);  /* 1st frame */
+
+  
+  mc = newSWFMovieClip();
+  sh_red = make_fill_square (300, 300, 60, 60, 255, 0, 0, 255, 0, 0);
+  SWFMovieClip_add(mc, (SWFBlock)sh_red);  
+  SWFMovieClip_nextFrame(mc);
+
+
+  it = SWFMovie_add(mo, (SWFBlock)mc); 
+  SWFDisplayItem_setDepth(it, 20); 
+  SWFDisplayItem_setName(it, "mc"); 
+  /* Define onClipKeyDown */
+  SWFDisplayItem_addAction(it,
+    newSWFAction(" _root.x1 = Key.getAscii(); "
+                " _root.note('onClipKeyDown triggered'); "
+                " _root.note('key ASCII value: ' + _root.x1); "), 
+    SWFACTION_KEYDOWN); 
+  /* Define onClipKeyUp */
+  SWFDisplayItem_addAction(it,
+    newSWFAction(" _root.x2 = Key.getCode(); "
+                 " _root.note('onClipKeyUp triggered'); "
+                 " _root.note('key code: ' + _root.x2); "), 
+    SWFACTION_KEYUP); 
+  /* Define onClipKeyUp. Question: how to bind a key code with the KeyPress event??? */ 
+  SWFDisplayItem_addAction(it,
+    newSWFAction(" _root.note('onClipKeyPress triggered'); "
+                 " _root.x3 = _root.x1; "), 
+    SWFACTION_KEYPRESS);     
+    
+  /* add user defined events */
+  add_actions(mo, " mc.onKeyDown = function () { " 
+                  " _root.x4 = Key.getAscii(); "
+                  " _root.note('user defined onKeyDown triggered');  "
+                  " _root.note('key ASCII value: ' + _root.x4); }; "
+                  
+                  " mc.onKeyUp = function () { "
+                  " _root.x5 = Key.getCode(); "
+                  " _root.note('user defined onKeyUp triggered'); "
+                  " _root.note('key code: ' +  _root.x5);  }; "
+                  
+                  " mc.onKeyPress = function () { "
+                  " _root.x6 = _root.x3; "
+                  " _root.note('user defined onKeyPress triggered'); }; "
+              );
+  
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+  
+  int frame_num = 3;
+  for(frame_num; frame_num<=30; frame_num++)
+  {
+      SWFMovie_nextFrame(mo); 
+  }
+  
+  add_actions(mo, "_root.note('mc registered by addListener()'); ");
+  /* register "mc" to receive onKeyDown and onKeyUp notification after 30 seconds(30 frames). */
+  add_actions(mo, " Key.addListener(mc); stop(); ");
+  SWFMovie_nextFrame(mo); /* 31th frame */
+  
+  
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+

Index: key_event_testrunner.cpp
===================================================================
RCS file: key_event_testrunner.cpp
diff -N key_event_testrunner.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ key_event_testrunner.cpp	23 Apr 2007 11:15:38 -0000	1.1
@@ -0,0 +1,101 @@
+/* 
+ *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+#define INPUT_FILENAME "key_event_test.swf"
+
+#include "MovieTester.h"
+#include "sprite_instance.h"
+#include "character.h"
+#include "dlist.h"
+#include "container.h"
+#include "log.h"
+
+#include "check.h"
+#include <string>
+#include <cassert>
+
+using namespace gnash;
+using namespace std;
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+  string filename =  string(INPUT_FILENAME);
+  MovieTester tester(filename);
+
+  gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+  dbglogfile.setVerbosity(1);
+
+  sprite_instance* root = tester.getRootMovie();
+  assert(root);
+
+  check_equals(root->get_frame_count(), 31);
+  check_equals(root->get_current_frame(), 0);
+
+  tester.advance();
+  check_equals(root->get_current_frame(), 1);
+
+  character* mc = const_cast<character*>(tester.findDisplayItemByName(*root, "mc"));
+  check(mc);
+
+  as_value tmp;
+
+  check(root->get_member("x1", &tmp));
+  check_equals(tmp.to_number(), 0);
+  
+  // press key 'A' and checks
+  tester.pressKey(key::A);
+  tester.releaseKey(key::A);
+
+  // check that onClipKeyUp/KeyDown have been triggered
+  check(root->get_member("x1", &tmp));
+  xcheck_equals(tmp.to_string(), "A");
+  check(root->get_member("x2", &tmp));
+  xcheck_equals(tmp.to_number(), key::A);
+
+  // check that user defined onKeyUp/KeyDown are not triggered
+  check(root->get_member("x4", &tmp));
+  check_equals(tmp.to_number(), 0);
+  check(root->get_member("x5", &tmp));
+  check_equals(tmp.to_number(), 0);
+
+  for(int i=1; i<30; i++)
+  {
+    tester.advance();
+  }
+
+  check_equals(root->get_current_frame(), 30); // the 31th frame
+  check_equals(root->get_play_state(), sprite_instance::STOP);
+
+  // press key 'B' and checks
+  tester.pressKey(key::C);
+  tester.releaseKey(key::C);
+
+  // check that onClipKeyUp/KeyDown have been triggered
+  check(root->get_member("x1", &tmp));
+  xcheck_equals(tmp.to_string(), "C");
+  check(root->get_member("x2", &tmp));
+  xcheck_equals(tmp.to_number(), key::C);
+  
+  // check that user defined onKeyUp/KeyDown have been triggered
+  check(root->get_member("x4", &tmp));
+  check_equals(tmp.to_string(), "C");
+  check(root->get_member("x5", &tmp));
+  check_equals(tmp.to_number(), key::C);
+}



From MAILER-DAEMON Mon Apr 23 07:25:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfwfq-0003BK-SE
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 07:25:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfwfq-0003BD-0y
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:25:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hfwfp-0003Az-Jn
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:25:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hfwfp-0003Aw-F3
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:25:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HfwaQ-0006y5-Dz
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 07:20:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HfwaP-0008SO-5i
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:20:01 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HfwaP-0008SJ-1u
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:20:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HfwaP-0008SJ-1u@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 23 Apr 2007 11:20:01 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/key_eve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 11:25:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/23 11:20:00

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: key_event_testrunner.cpp 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2966&r2=1.2967
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2966
retrieving revision 1.2967
diff -u -b -r1.2966 -r1.2967
--- ChangeLog	23 Apr 2007 10:19:47 -0000	1.2966
+++ ChangeLog	23 Apr 2007 11:20:00 -0000	1.2967
@@ -21,6 +21,8 @@
 
 	* testsuite/misc-ming.all/event_handler_scope_test.c
 	  testcase for scope in event handlers
+	* testsuite/misc-ming.all/key_event_test.c, key_event_testrunner.cpp
+	  testcase for key events
 	  
 2007-04-21 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/misc-ming.all/key_event_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/key_event_testrunner.cpp	23 Apr 2007 11:15:38 -0000	1.1
+++ testsuite/misc-ming.all/key_event_testrunner.cpp	23 Apr 2007 11:20:00 -0000	1.2
@@ -1,5 +1,5 @@
 /* 
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by



From MAILER-DAEMON Mon Apr 23 08:35:50 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfxlm-0000FO-55
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 08:35:50 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfxlj-0000Ev-VK
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 08:35:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hfxlj-0000Eg-1I
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 08:35:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hfxli-0000Ea-O2
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 08:35:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HfxgJ-0007PA-Fd
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 08:30:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HfxgH-0003V5-2E
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 12:30:09 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HfxgG-0003V0-IQ
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 12:30:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HfxgG-0003V0-IQ@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 12:30:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 12:35:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 12:30:08

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am masks_test.c 
Added files:
	testsuite/misc-ming.all: masks_testrunner.cpp 

Log message:
	        * testsuite/misc-ming.all/: Makefile.am, masks_test.c,
	          masks_testrunner.cpp: Add a MovieTester based test runner
	          for the masks_test movie. Shows a bug in either the renderer
	          or in the core preventing rendering of dynamic clips.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2967&r2=1.2968
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_test.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_testrunner.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2967
retrieving revision 1.2968
diff -u -b -r1.2967 -r1.2968
--- ChangeLog	23 Apr 2007 11:20:00 -0000	1.2967
+++ ChangeLog	23 Apr 2007 12:30:07 -0000	1.2968
@@ -1,5 +1,9 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/: Makefile.am, masks_test.c,
+	  masks_testrunner.cpp: Add a MovieTester based test runner
+	  for the masks_test movie. Shows a bug in either the renderer
+	  or in the core preventing rendering of dynamic clips.
 	* libgeometry/snappingrange.h: add unconditional visitor; add
 	  cast operator; add contains(Range2d); add scale(factor).
 	* testsuite/MovieTester.{cpp,h}: add a getInvalidatedRanges function;

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- testsuite/misc-ming.all/Makefile.am	20 Apr 2007 07:21:26 -0000	1.96
+++ testsuite/misc-ming.all/Makefile.am	23 Apr 2007 12:30:08 -0000	1.97
@@ -109,6 +109,7 @@
 	frame_label_test \
 	path_format_test \
 	duplicate_movie_clip_test \
+	masks_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -148,7 +149,6 @@
 	path_format_testrunner \
 	duplicate_movie_clip_testrunner \
 	matrix_testrunner \
-	masks_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -391,9 +391,19 @@
 masks_test.swf: masks_test
 	./masks_test $(top_srcdir)/testsuite/media
 
-masks_testrunner: $(srcdir)/../generic-testrunner.sh masks_test.swf
-	sh $< -r5 $(top_builddir) masks_test.swf > $@
-	chmod 755 $@
+masks_testrunner_SOURCES = \
+	masks_testrunner.cpp \
+	$(NULL)
+masks_testrunner_CXXFLAGS = \
+	-DTGTDIR='"$(abs_builddir)"' \
+	$(NULL)
+masks_testrunner_LDADD = \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	$(NULL)
+masks_testrunner_DEPENDENCIES = \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	masks_test.swf      \
+	$(NULL)
 
 matrix_test_SOURCES =	\
 	matrix_test.c	\

Index: testsuite/misc-ming.all/masks_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/masks_test.c	20 Apr 2007 08:57:34 -0000	1.1
+++ testsuite/misc-ming.all/masks_test.c	23 Apr 2007 12:30:08 -0000	1.2
@@ -33,68 +33,47 @@
 #define OUTPUT_VERSION 6
 #define OUTPUT_FILENAME "masks_test.swf"
 
-void add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
-void add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height);
+void add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int r, int g, int b);
+void add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int r, int g, int b);
 void add_static_mask(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int masklevel);
 
 void
-add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
+add_dynamic_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int r, int g, int b)
 {
 	SWFAction ac = compile_actions("createEmptyMovieClip('%s', %d);"
 			"with (%s) {"
-			" lineStyle(1, 0x000000, 100);"	
-			" beginFill(0x00FF00, 100);"
+			//" lineStyle(1, 0x000000, 100);"	
+			" beginFill(0x%2.2X%2.2X%2.2X, 100);"
 			" moveTo(%d, %d);"
 			" lineTo(%d, %d);"
 			" lineTo(%d, %d);"
 			" lineTo(%d, %d);"
 			" lineTo(%d, %d);"
 			" endFill();"
-			"}"
-			"%s.createEmptyMovieClip('child', 1);"
-			"with (%s.child) {"
-			" lineStyle(3, 0x000000, 100);"	
-			" moveTo(%d, %d);"
-			" lineTo(%d, %d);"
-			" lineTo(%d, %d);"
-			" lineTo(%d, %d);"
-			" lineTo(%d, %d);"
 			"}",
 			name, depth, name,
+			r,g,b,
 			x, y,
 			x, y+height,
 			x+width, y+height,
 			x+width, y,
-			x, y,
-			name, name,
-			x+5, y+5,
-			x+5, y+height-5,
-			x+width-5, y+height-5,
-			x+width-5, y+5,
-			x+5, y+5
+			x, y
 			);
 
 	SWFMovie_add(mo, (SWFBlock)ac);
 }
 
 void
-add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height)
+add_static_mc(SWFMovie mo, const char* name, int depth, int x, int y, int width, int height, int r, int g, int b)
 {
 	SWFShape sh;
 	SWFMovieClip mc, mc2;
 	SWFDisplayItem it;
 
-	sh = make_fill_square (-(width/2), -(height/2), width, height, 255, 0, 0, 255, 0, 0);
+	sh = make_fill_square (0, 0, width, height, r, g, b, r, g, b);
 	mc = newSWFMovieClip();
 	SWFMovieClip_add(mc, (SWFBlock)sh);
 
-	sh = make_square (-(width/2)+5, -(height/2)+5, width-10, height-10, 0, 0, 0);
-	mc2 = newSWFMovieClip(); // child
-	SWFMovieClip_add(mc2, (SWFBlock)sh);
-	SWFMovieClip_nextFrame(mc2);
-
-	it = SWFMovieClip_add(mc, (SWFBlock)mc2);
-	SWFDisplayItem_setName(it, "child");
 	SWFMovieClip_nextFrame(mc);
 
 	it = SWFMovie_add(mo, (SWFBlock)mc);
@@ -143,7 +122,7 @@
 	Ming_init();
 	mo = newSWFMovieWithVersion(OUTPUT_VERSION);
 	SWFMovie_setDimension(mo, 800, 600);
-	SWFMovie_setRate (mo, 1);
+	SWFMovie_setRate (mo, 0.3);
 
 	dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
 	it = SWFMovie_add(mo, (SWFBlock)dejagnuclip);
@@ -155,14 +134,14 @@
 	// this one seems to confuse the MM player
 	//add_static_mask(mo, "mask1", 1, 0, 150, 200, 100, 20);
 
-	add_static_mc(mo, "staticmc2", 2, 0, 200, 60, 60);
-	add_static_mc(mo, "staticmc3", 3, 30, 200, 60, 60);
-	add_static_mc(mo, "staticmc4", 4, 200, 200, 60, 60);
-	add_static_mc(mo, "staticmc5", 5, 230, 200, 60, 60);
-	add_dynamic_mc(mo, "dynamicmc2", 12, 0, 300, 60, 60);
-	add_dynamic_mc(mo, "dynamicmc3", 13, 30, 300, 60, 60);
-	add_dynamic_mc(mo, "dynamicmc4", 14, 200, 300, 60, 60);
-	add_dynamic_mc(mo, "dynamicmc5", 15, 230, 300, 60, 60);
+	add_static_mc(mo, "staticmc2", 2, 0, 200, 60, 60, 255, 0, 0);
+	add_static_mc(mo, "staticmc3", 3, 30, 200, 60, 60, 255, 255, 0);
+	add_static_mc(mo, "staticmc4", 4, 200, 200, 60, 60, 0, 255, 0);
+	add_static_mc(mo, "staticmc5", 5, 230, 200, 60, 60, 0, 255, 255);
+	add_dynamic_mc(mo, "dynamicmc2", 12, 0, 300, 60, 60, 0, 0, 255);
+	add_dynamic_mc(mo, "dynamicmc3", 13, 30, 300, 60, 60, 255, 0, 255);
+	add_dynamic_mc(mo, "dynamicmc4", 14, 200, 300, 60, 60, 0, 128, 0);
+	add_dynamic_mc(mo, "dynamicmc5", 15, 230, 300, 60, 60, 0, 128, 255);
 
 
 	check_equals(mo, "staticmc2.getDepth()", "-16382");

Index: testsuite/misc-ming.all/masks_testrunner.cpp
===================================================================
RCS file: testsuite/misc-ming.all/masks_testrunner.cpp
diff -N testsuite/misc-ming.all/masks_testrunner.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/masks_testrunner.cpp	23 Apr 2007 12:30:08 -0000	1.1
@@ -0,0 +1,128 @@
+/* 
+ *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */ 
+
+#define INPUT_FILENAME "masks_test.swf"
+
+#include "MovieTester.h"
+#include "sprite_instance.h"
+#include "character.h"
+#include "dlist.h"
+#include "container.h"
+#include "log.h"
+
+#include "check.h"
+#include <string>
+#include <cassert>
+
+using namespace gnash;
+using namespace std;
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+	typedef gnash::geometry::SnappingRanges2d<int> Ranges;
+	typedef gnash::geometry::Range2d<int> Bounds;
+
+	string filename = string(TGTDIR) + string("/") + string(INPUT_FILENAME);
+	MovieTester tester(filename);
+
+	gnash::LogFile& dbglogfile = gnash::LogFile::getDefaultInstance();
+	dbglogfile.setVerbosity(1);
+
+	Ranges invalidated;
+	sprite_instance* root = tester.getRootMovie();
+	assert(root);
+
+	// FRAME 1 (start)
+
+	check_equals(root->get_frame_count(), 4);
+	check_equals(root->get_play_state(), sprite_instance::PLAY);
+	check_equals(root->get_current_frame(), 0);
+	check_equals(root->getDisplayList().size(), 1);  // dejagnu clip
+	invalidated = tester.getInvalidatedRanges();
+	check( invalidated.contains(76, 4) ); // the "-xtrace enabled-" label...
+
+	tester.advance(); // FRAME 2
+	
+	check_equals(root->get_play_state(), sprite_instance::PLAY);
+	check_equals(root->get_current_frame(), 1);
+	check_equals(root->getDisplayList().size(), 9);
+	root->getDisplayList().dump();
+	check( tester.findDisplayItemByName(*root, "staticmc2") );
+	check( tester.findDisplayItemByName(*root, "staticmc3") );
+	check( tester.findDisplayItemByName(*root, "staticmc4") );
+	check( tester.findDisplayItemByName(*root, "staticmc5") );
+	check( tester.findDisplayItemByName(*root, "dynamicmc2") );
+	check( tester.findDisplayItemByName(*root, "dynamicmc3") );
+	check( tester.findDisplayItemByName(*root, "dynamicmc4") );
+	check( tester.findDisplayItemByName(*root, "dynamicmc5") );
+	invalidated = tester.getInvalidatedRanges();
+
+	rgba red(255,0,0,255);
+	rgba green(0,255,0,255);
+	rgba blue(0,255,0,255);
+	rgba yellow(255,255,0,255);
+	rgba cyan(0,255,255,255);
+	rgba violet(255,0,255,255);
+	rgba dark_green(0,128,0,255);
+	rgba light_blue(0,0,128,255);
+
+	// 14,232 = red
+	check( invalidated.contains(14, 232) );
+	check_pixel(14,232, 2, red, 2);
+	// 48,232 = yellow (red behind)
+	check( invalidated.contains(48, 232) );
+	check_pixel(48,232, 2, yellow, 2);
+	// 80,232 = yellow
+	check( invalidated.contains(80, 232) );
+	check_pixel(80,232, 2, yellow, 2);
+
+	// 214,232 = green
+	check( invalidated.contains(214, 232) );
+	check_pixel(214,232, 2, green, 2);
+	// 248,232 = cyan (green behind)
+	check( invalidated.contains(248, 232) );
+	check_pixel(248,232, 2, cyan, 2);
+	// 276,232 = cyan
+	check( invalidated.contains(276, 232) );
+	check_pixel(276,232, 2, cyan, 2);
+
+	// 14,331 = blue
+	check( invalidated.contains(14, 331) );
+	xcheck_pixel(14,331, 2, blue, 2);
+	// 48,331 = violet (blue behind)
+	check( invalidated.contains(48, 331) );
+	xcheck_pixel(48,331, 2, violet, 2);
+	// 80,331 = violet
+	check( invalidated.contains(80, 331) );
+	xcheck_pixel(80,331, 2, violet, 2);
+
+	// 214,331 = dark_green
+	check( invalidated.contains(214, 331) );
+	xcheck_pixel(214,331, 2, dark_green, 2);
+	// 248,331 = light_blue (dark_green behind)
+	check( invalidated.contains(248, 331) );
+	xcheck_pixel(248,331, 2, light_blue, 2);
+	// 276,331 = light_blue
+	check( invalidated.contains(276, 331) );
+	xcheck_pixel(276,331, 2, light_blue, 2);
+
+
+}
+



From MAILER-DAEMON Mon Apr 23 09:37:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hfyjs-0008Bc-P8
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 09:37:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hfyjr-0008BS-7R
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:37:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hfyjp-0008BG-DD
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:37:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hfyjp-0008BD-84
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:37:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HfyeP-0007Kh-Rs
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:32:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HfyeO-0006Xd-11
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 13:32:16 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HfyeN-0006XX-KI
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 13:32:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HfyeN-0006XX-KI@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 13:32:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 13:37:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 13:32:15

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp 

Log message:
	        * testsuite/misc-ming.all/: DrawingApiTest.as,
	          DrawingApiTestRunner.cpp: add rendering tests.
	          Add a drawing in which move() is called after beginFill()
	          to confirm the fill is not reset after move().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2968&r2=1.2969
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2968
retrieving revision 1.2969
diff -u -b -r1.2968 -r1.2969
--- ChangeLog	23 Apr 2007 12:30:07 -0000	1.2968
+++ ChangeLog	23 Apr 2007 13:32:14 -0000	1.2969
@@ -1,5 +1,12 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/: DrawingApiTest.as,
+	  DrawingApiTestRunner.cpp: add rendering tests.
+	  Add a drawing in which move() is called after beginFill()
+	  to confirm the fill is not reset after move().
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/: Makefile.am, masks_test.c,
 	  masks_testrunner.cpp: Add a MovieTester based test runner
 	  for the masks_test movie. Shows a bug in either the renderer

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/DrawingApiTest.as	20 Feb 2007 14:58:34 -0000	1.1
+++ testsuite/misc-ming.all/DrawingApiTest.as	23 Apr 2007 13:32:15 -0000	1.2
@@ -61,6 +61,15 @@
 	lineTo(230, 100);
 	endFill();
 
+	// clockwise, move after beginFill
+	lineStyle(1, 0x00FF00);
+	beginFill(0xFF00FF, 100);
+	moveTo(260, 100);
+	lineTo(260, 120);
+	lineTo(240, 120);
+	lineTo(240, 100);
+	lineTo(260, 100);
+	endFill();
 }
 
 // Make the MovieClip "active" (grabbing mouse events)

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	21 Feb 2007 07:57:18 -0000	1.3
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 13:32:15 -0000	1.4
@@ -50,25 +50,54 @@
 
 	tester.advance();
 
+	rgba white(255, 255, 255, 255);
+	rgba blue(0, 0, 255, 255);
+	rgba cyan(0, 255, 255, 255);
+	rgba green(0, 255, 0, 255);
+	rgba red(255, 0, 0, 255);
+	rgba yellow(255, 255, 0, 255);
+	rgba black(0, 0, 0, 255);
+	rgba violet(255, 0, 255, 255);
+
 	// Out of any drawing
 	tester.movePointerTo(50, 50);
 	check(!tester.isMouseOverMouseEntity());
+	check_pixel(50, 50, 2, white, 1);
 
 	// Inside bottom-left blue fill
 	tester.movePointerTo(60, 215);
 	check(tester.isMouseOverMouseEntity());
+	check_pixel(60, 215, 2, blue, 1);
 
 	// Inside cyan clockwise fill
 	tester.movePointerTo(190, 112);
 	check(tester.isMouseOverMouseEntity());
+	check_pixel(190, 112, 2, cyan, 1);
 
 	// Inside green counterclockwise fill
 	tester.movePointerTo(220, 112);
 	check(tester.isMouseOverMouseEntity());
+	check_pixel(220, 112, 2, green, 1);
+
+	// Inside violet fill
+	tester.movePointerTo(250, 112);
+	check(tester.isMouseOverMouseEntity());
+	xcheck_pixel(250, 112, 2, violet, 1);
 
 	// Inside red "thick" line
 	tester.movePointerTo(146, 146);
 	xcheck(tester.isMouseOverMouseEntity());
+	xcheck_pixel(146, 146, 2, red, 2);
+
+	// Inside the yellow line
+	tester.movePointerTo(270, 232);
+	xcheck(tester.isMouseOverMouseEntity());
+	xcheck_pixel(270, 232, 2, yellow, 2);
+
+	// Inside the black vertical line
+	tester.movePointerTo(82, 127);
+	xcheck(tester.isMouseOverMouseEntity());
+	check_pixel(82, 127, 2, black, 2);
 
 }
 



From MAILER-DAEMON Mon Apr 23 09:51:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfywW-0003TI-O1
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 09:51:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfywU-0003T4-7Z
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:50:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfywS-0003Ss-Bi
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:50:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfywS-0003Sp-4y
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:50:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hfyr2-0000Yd-Q6
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 09:45:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hfyr0-0007vu-MZ
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 13:45:18 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hfyr0-0007vr-HY
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 13:45:18 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hfyr0-0007vr-HY@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 13:45:18 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/DynamicShape.cpp testsui...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 13:50:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 13:45:18

Modified files:
	.              : ChangeLog 
	server         : DynamicShape.cpp 
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 
	                         masks_testrunner.cpp 

Log message:
	        * server/DynamicShape.cpp (moveTo): do not reset current
	          fill style on move. Fixes some of the tests in DrawingApiTest.swf
	          and masks_test.swf.
	        * testsuite/misc-ming.all/: DrawingApiTestRunner.cpp,
	          masks_testrunner.cpp: some more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2969&r2=1.2970
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/masks_testrunner.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2969
retrieving revision 1.2970
diff -u -b -r1.2969 -r1.2970
--- ChangeLog	23 Apr 2007 13:32:14 -0000	1.2969
+++ ChangeLog	23 Apr 2007 13:45:17 -0000	1.2970
@@ -1,5 +1,13 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* server/DynamicShape.cpp (moveTo): do not reset current
+	  fill style on move. Fixes some of the tests in DrawingApiTest.swf
+	  and masks_test.swf.
+	* testsuite/misc-ming.all/: DrawingApiTestRunner.cpp,
+	  masks_testrunner.cpp: some more successes.
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/: DrawingApiTest.as,
 	  DrawingApiTestRunner.cpp: add rendering tests.
 	  Add a drawing in which move() is called after beginFill()

Index: server/DynamicShape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/DynamicShape.cpp	19 Feb 2007 22:51:50 -0000	1.4
+++ server/DynamicShape.cpp	23 Apr 2007 13:45:18 -0000	1.5
@@ -16,7 +16,7 @@
 
 
 
-/* $Id: DynamicShape.cpp,v 1.4 2007/02/19 22:51:50 strk Exp $ */
+/* $Id: DynamicShape.cpp,v 1.5 2007/04/23 13:45:18 strk Exp $ */
 
 #include "DynamicShape.h"
 
@@ -90,9 +90,13 @@
 DynamicShape::startNewPath()
 {
 	// Close any pending filled style
-	endFill();
+	// The DrawingApiTest.swf file shows we should NOT
+	// necessarely end the current fill when starting a new one.
+	//endFill();
 
-	path newPath(_x, _y, _currfill, _currfill, _currline);
+	// A quick test shows that *left* always work fine !
+	// More than that, using a *right* fill seems to break the tests !
+	path newPath(_x, _y, _currfill, 0, _currline);
 	add_path(newPath);
 }
 

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 13:32:15 -0000	1.4
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 13:45:18 -0000	1.5
@@ -82,21 +82,21 @@
 	// Inside violet fill
 	tester.movePointerTo(250, 112);
 	check(tester.isMouseOverMouseEntity());
-	xcheck_pixel(250, 112, 2, violet, 1);
+	check_pixel(250, 112, 2, violet, 1);
 
 	// Inside red "thick" line
 	tester.movePointerTo(146, 146);
-	xcheck(tester.isMouseOverMouseEntity());
+	check(tester.isMouseOverMouseEntity());
 	xcheck_pixel(146, 146, 2, red, 2);
 
 	// Inside the yellow line
 	tester.movePointerTo(270, 232);
-	xcheck(tester.isMouseOverMouseEntity());
+	check(tester.isMouseOverMouseEntity());
 	xcheck_pixel(270, 232, 2, yellow, 2);
 
 	// Inside the black vertical line
 	tester.movePointerTo(82, 127);
-	xcheck(tester.isMouseOverMouseEntity());
+	check(tester.isMouseOverMouseEntity());
 	check_pixel(82, 127, 2, black, 2);
 
 }

Index: testsuite/misc-ming.all/masks_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/masks_testrunner.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/masks_testrunner.cpp	23 Apr 2007 12:30:08 -0000	1.1
+++ testsuite/misc-ming.all/masks_testrunner.cpp	23 Apr 2007 13:45:18 -0000	1.2
@@ -1,5 +1,5 @@
 /* 
- *   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
  * 
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,14 +108,14 @@
 	xcheck_pixel(14,331, 2, blue, 2);
 	// 48,331 = violet (blue behind)
 	check( invalidated.contains(48, 331) );
-	xcheck_pixel(48,331, 2, violet, 2);
+	check_pixel(48,331, 2, violet, 2);
 	// 80,331 = violet
 	check( invalidated.contains(80, 331) );
-	xcheck_pixel(80,331, 2, violet, 2);
+	check_pixel(80,331, 2, violet, 2);
 
 	// 214,331 = dark_green
 	check( invalidated.contains(214, 331) );
-	xcheck_pixel(214,331, 2, dark_green, 2);
+	check_pixel(214,331, 2, dark_green, 2);
 	// 248,331 = light_blue (dark_green behind)
 	check( invalidated.contains(248, 331) );
 	xcheck_pixel(248,331, 2, light_blue, 2);



From MAILER-DAEMON Mon Apr 23 10:43:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HfzlO-0003M5-0B
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 10:43:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HfzlM-0003Lv-A2
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 10:43:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HfzlK-0003Lj-N0
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 10:43:32 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HfzlK-0003Lg-JR
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 10:43:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hfzfu-0008Ki-T3
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 10:37:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hfzft-0001qU-9O
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:37:53 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hfzfs-0001qR-Tz
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:37:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hfzfs-0001qR-Tz@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 14:37:52 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/cxform.cpp server/cxform.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 14:43:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 14:37:52

Modified files:
	.              : ChangeLog 
	server         : cxform.cpp cxform.h 

Log message:
	server/cxform.{cpp,h}: add output operator and toString method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2970&r2=1.2971
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/cxform.h?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2970
retrieving revision 1.2971
diff -u -b -r1.2970 -r1.2971
--- ChangeLog	23 Apr 2007 13:45:17 -0000	1.2970
+++ ChangeLog	23 Apr 2007 14:37:52 -0000	1.2971
@@ -1,5 +1,6 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* server/cxform.{cpp,h}: add output operator and toString method.
 	* server/DynamicShape.cpp (moveTo): do not reset current
 	  fill style on move. Fixes some of the tests in DrawingApiTest.swf
 	  and masks_test.swf.

Index: server/cxform.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/cxform.cpp	11 Apr 2007 14:20:20 -0000	1.1
+++ server/cxform.cpp	23 Apr 2007 14:37:52 -0000	1.2
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: cxform.cpp,v 1.1 2007/04/11 14:20:20 strk Exp $ 
+// $Id: cxform.cpp,v 1.2 2007/04/23 14:37:52 strk Exp $ 
 //
 
 #ifdef HAVE_CONFIG_H
@@ -162,6 +162,24 @@
 	log_parse("| %4.4f %4.4f|", m_[3][0], m_[3][1]);
 }
 
+std::string
+cxform::toString() const
+{
+	std::stringstream ss;
+	ss << *this;
+	return ss.str();
+}
+
+std::ostream&
+operator<< (std::ostream& os, const cxform& cx) 
+{
+	os << "r: *" << cx.m_[0][0] << " +" << cx.m_[0][1] << ", ";
+	os << "|g: *" << cx.m_[1][0] << " +" << cx.m_[1][1] << ", ";
+	os << "|b: *" << cx.m_[2][0] << " +" << cx.m_[2][1] << ", ";
+	os << "|a: *" << cx.m_[3][0] << " +" << cx.m_[3][1];
+	return os;
+}
+
 bool	cxform::is_identity() const
 // Returns true when the cxform equals identity (no transform)
 {	   

Index: server/cxform.h
===================================================================
RCS file: /sources/gnash/gnash/server/cxform.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/cxform.h	19 Apr 2007 05:23:30 -0000	1.3
+++ server/cxform.h	23 Apr 2007 14:37:52 -0000	1.4
@@ -37,6 +37,9 @@
 class DSOEXPORT cxform
 {
 public:
+
+    friend std::ostream& operator<< (std::ostream& os, const cxform& cx);
+
     /// [RGBA][multiply, add]
     float	m_[4][2];
     
@@ -76,6 +79,8 @@
     
     /// The identity color transform (no transform)
     static cxform	identity;
+
+    std::string toString() const;
 };
 
 



From MAILER-DAEMON Mon Apr 23 11:06:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg07O-0005Jp-92
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 11:06:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg07N-0005IT-8Q
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:06:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg07M-0005Gq-7n
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:06:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg07M-0005GS-1c
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:06:16 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1Hg01w-00033N-3H
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:00:40 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3NF0YU4013553;
	Mon, 23 Apr 2007 17:00:38 +0200
Date: Mon, 23 Apr 2007 17:00:30 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <802222433.20070423170030@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <20070423081630.GA93115@keybit.net>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 15:06:17 -0000

Hello Sandro,

Monday, April 23, 2007, 10:16:30 AM, you wrote:
SS> I suspect you have a CVS version of Ming installed.
SS> Try the actual *release* 0.4.0.beta4 which gives you the same version code.

I updated my Ming CVS checkout about 1 hour ago. It builds fine now.
FYI, I get unexpeced failures
(Gnash CVS Mon Apr 23 16:58:52 CEST 2007):



make[3]: Entering directory `/mnt/bigdrive/home/udo/gnash/testsuite/samples'
Making a new site.exp file...
WARNING: No tool specified
Test Run By udo on Mon Apr 23 16:56:28 2007
Native configuration is i686-pc-linux-gnu

                ===  tests ===

Schedule of variations:
    unix

Running target unix
Using /usr/share/dejagnu/baseboards/unix.exp as board description file for target.
Using /usr/share/dejagnu/config/unix.exp as generic interface file for target.
WARNING: Couldn't find tool config file for unix, using default.
Running ./../simple.exp ...
FAIL: clip_as_button2-TestRunner died prematurely (hangup)
FAIL: gotoFrameOnKeyEvent-TestRunner died prematurely (hangup)

                ===  Summary ===

# of expected passes            2
# of unexpected failures        2
make[3]: *** [check-DEJAGNU] Error 1
make[3]: Leaving directory `/mnt/bigdrive/home/udo/gnash/testsuite/samples'
make[2]: *** [check-am] Error 2
make[2]: Leaving directory `/mnt/bigdrive/home/udo/gnash/testsuite/samples'
make[1]: *** [check-recursive] Error 1
make[1]: Leaving directory `/mnt/bigdrive/home/udo/gnash/testsuite'
make: *** [check-recursive] Error 1
2

real    15m47.947s
user    14m24.405s
sys     1m10.338s





From MAILER-DAEMON Mon Apr 23 11:10:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg0Bo-0006ly-P0
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 11:10:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg0Bm-0006lR-84
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:10:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg0Bk-0006l7-Sg
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:10:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg0Bk-0006l4-Ms
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:10:48 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hg06J-0003ec-Qh
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:05:13 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3NF50B09045;
	Mon, 23 Apr 2007 17:05:00 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 23 Apr 2007 17:05:00 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
Message-ID: <20070423150500.GB3258@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <802222433.20070423170030@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 15:10:51 -0000

On Mon, Apr 23, 2007 at 05:00:30PM +0200, Udo Giacomozzi wrote:

> FAIL: clip_as_button2-TestRunner died prematurely (hangup)
> FAIL: gotoFrameOnKeyEvent-TestRunner died prematurely (hangup)

Try to run them manually, might be that they don't find the input.

--strk;



From MAILER-DAEMON Mon Apr 23 11:22:54 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg0NS-0002ee-6A
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 11:22:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg0NQ-0002eH-Rl
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:22:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg0NQ-0002e5-47
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:22:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg0NQ-0002e2-0Y
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:22:52 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1Hg0I0-0005Q4-1K
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:17:16 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3NFH5U4018952;
	Mon, 23 Apr 2007 17:17:09 +0200
Date: Mon, 23 Apr 2007 17:17:01 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <29647252.20070423171701@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <20070423150500.GB3258@keybit.net>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 15:22:53 -0000

Hello Sandro,

Monday, April 23, 2007, 5:05:00 PM, you wrote:
>> FAIL: clip_as_button2-TestRunner died prematurely (hangup)
>> FAIL: gotoFrameOnKeyEvent-TestRunner died prematurely (hangup)

SS> Try to run them manually, might be that they don't find the input.

Strange, in that case they run fine:

uudo@indunet:~/gnash/testsuite/samples$ ./gotoFrameOnKeyEvent-TestRunner ; echo $?
Movie file:///mnt/bigdrive/home/udo/gnash/testsuite/samples/gotoFrameOnKeyEvent.swf (SWF5) added to library
Base url set to: file:///mnt/bigdrive/home/udo/gnash/testsuite/samples/gotoFrameOnKeyEvent.swf
framebuffer pixel format is RGB24
initialized AGG buffer <0x40b4b008>, 540000 bytes, 450x400, rowsize is 1350 bytes
frame 0) Invalidated bounds Finite range (1533,1756 7903,2251), Finite range (4154,3510 7696,3828), Finite range (3590,5589.52 4646,6548.51)
frame 0) Invalidated bounds NULL
PASSED: root->get_frame_count() == 7 [gotoFrameOnKeyEvent-TestRunner.cpp:65]
PASSED: root->get_current_frame() == 0 [gotoFrameOnKeyEvent-TestRunner.cpp:67]
frame 0) Invalidated bounds NULL
PASSED: root->get_current_frame() == 0 [gotoFrameOnKeyEvent-TestRunner.cpp:69]
Notifying 1 keypress listeners
PASSED: root->get_current_frame() == 1 [gotoFrameOnKeyEvent-TestRunner.cpp:76]
frame 1) Invalidated bounds Finite range (1093,1718 8384,2251), Finite range (2657,3510 8083,4054), Finite range (3590,5589.52 5646,6550), Finite range (4630,3156 8083,3474)
PASSED: root->get_current_frame() == 1 [gotoFrameOnKeyEvent-TestRunner.cpp:78]
0





From MAILER-DAEMON Mon Apr 23 11:38:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg0cK-0008Sl-FH
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 11:38:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg0cI-0008Ry-JF
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:38:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg0cH-0008RZ-PP
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:38:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg0cH-0008RV-FZ
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:38:13 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hg0Wr-0007oQ-2L
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 11:32:37 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3NFWUg09454;
	Mon, 23 Apr 2007 17:32:30 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Mon, 23 Apr 2007 17:32:30 +0200
From: Sandro Santilli <strk@keybit.net>
To: Udo Giacomozzi <udo.gnu@nova-sys.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
Message-ID: <20070423153230.GC3258@keybit.net>
Mail-Followup-To: Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
	<29647252.20070423171701@nova-sys.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <29647252.20070423171701@nova-sys.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 15:38:14 -0000

On Mon, Apr 23, 2007 at 05:17:01PM +0200, Udo Giacomozzi wrote:
> Hello Sandro,
> 
> Monday, April 23, 2007, 5:05:00 PM, you wrote:
> >> FAIL: clip_as_button2-TestRunner died prematurely (hangup)
> >> FAIL: gotoFrameOnKeyEvent-TestRunner died prematurely (hangup)
> 
> SS> Try to run them manually, might be that they don't find the input.
> 
> Strange, in that case they run fine:

Try make check again, might be a random memory corruption problem,
or it might be a dejagnu timeout...

--strk;



From MAILER-DAEMON Mon Apr 23 12:45:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg1fh-0002qX-In
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 12:45:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg1fg-0002qS-Bt
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 12:45:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg1ff-0002qC-4J
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 12:45:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg1fe-0002q9-V7
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 12:45:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hg1aE-0001ks-L1
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 12:40:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hg1aD-0007HP-9x
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 16:40:09 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hg1aC-0007HL-Sv
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 16:40:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hg1aC-0007HL-Sv@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 16:40:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/gnash.h server/types.cpp...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 16:45:48 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 16:40:08

Modified files:
	.              : ChangeLog 
	server         : gnash.h types.cpp 
	testsuite/server: Makefile.am 
Added files:
	testsuite/server: PointTest.cpp 

Log message:
	        * server/: gnash.h, types.cpp: add point::distance() and
	          squaredDistance()
	        * testsuite/server/: Makefile.am, PointTest.cpp: point tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2971&r2=1.2972
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/PointTest.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2971
retrieving revision 1.2972
diff -u -b -r1.2971 -r1.2972
--- ChangeLog	23 Apr 2007 14:37:52 -0000	1.2971
+++ ChangeLog	23 Apr 2007 16:40:08 -0000	1.2972
@@ -1,5 +1,11 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* server/: gnash.h, types.cpp: add point::distance() and
+	  squaredDistance()
+	* testsuite/server/: Makefile.am, PointTest.cpp: point tests.
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* server/cxform.{cpp,h}: add output operator and toString method.
 	* server/DynamicShape.cpp (moveTo): do not reset current
 	  fill style on move. Fixes some of the tests in DrawingApiTest.swf

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- server/gnash.h	16 Apr 2007 10:26:59 -0000	1.94
+++ server/gnash.h	23 Apr 2007 16:40:08 -0000	1.95
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.94 2007/04/16 10:26:59 jgilmore Exp $ */
+/* $Id: gnash.h,v 1.95 2007/04/23 16:40:08 strk Exp $ */
 
 /// \mainpage
 ///
@@ -424,6 +424,12 @@
 
 	bool operator==(const point& p) const { return m_x == p.m_x && m_y == p.m_y; }
 
+	/// Return the square of the distance between this and other point.
+	float squareDistance(const point& other) const;
+
+	/// Return the distance between this and other point.
+	float distance(const point& other) const;
+
 	bool	bitwise_equal(const point& p) const;
 };
 

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/types.cpp	20 Apr 2007 13:46:20 -0000	1.22
+++ server/types.cpp	23 Apr 2007 16:40:08 -0000	1.23
@@ -36,6 +36,19 @@
 		return memcmp(this, &p, sizeof(p)) == 0;
 	}
 
+	float point::squareDistance(const point& other) const
+	{
+		float hside = other.m_x - m_x;
+		float vside = other.m_y - m_y;
+
+		return hside*hside + vside*vside;
+	}
+
+	float point::distance(const point& other) const
+	{
+		return sqrt(squareDistance(other));
+	}
+
 
 	//
 	// rgba

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- testsuite/server/Makefile.am	16 Apr 2007 12:31:02 -0000	1.26
+++ testsuite/server/Makefile.am	23 Apr 2007 16:40:08 -0000	1.27
@@ -34,6 +34,7 @@
 
 check_PROGRAMS = \
 	MatrixTest \
+	PointTest \
 	PropertyListTest \
 	GetterSetterTest \
 	as_prop_flagsTest \
@@ -62,6 +63,11 @@
 	$(GNASH_LIBS) \
 	$(NULL)
 
+PointTest_SOURCES = PointTest.cpp
+PointTest_LDADD = \
+	$(GNASH_LIBS) \
+	$(NULL)
+
 PropertyListTest_SOURCES = PropertyListTest.cpp
 PropertyListTest_LDADD = \
 	$(GNASH_LIBS) \

Index: testsuite/server/PointTest.cpp
===================================================================
RCS file: testsuite/server/PointTest.cpp
diff -N testsuite/server/PointTest.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/server/PointTest.cpp	23 Apr 2007 16:40:08 -0000	1.1
@@ -0,0 +1,82 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gnash.h" // for point !!
+#include <iostream>
+#include <sstream>
+#include <cassert>
+
+#include "check.h"
+
+using namespace std;
+using namespace gnash;
+
+// for double comparison
+struct D {
+	double _d;
+	double _t; // tolerance
+
+	D(double d) : _d(d), _t(1e-4) {}
+
+	// Set tolerance
+	D(double d, double t) : _d(d), _t(t) {}
+
+	// Return true if the difference between the two
+	// doubles is below the minimum tolerance defined for the two
+	bool operator==(const D& d)
+	{
+		double tol = std::min(_t, d._t);
+		double delta = fabs(_d - d._d);
+		bool ret = delta < tol;
+		//cout << "D " << _d << "operator==(const D " << d._d <<") returning " << ret << " (delta is " << delta << ") " << endl;
+		return ret;
+	}
+};
+std::ostream& operator<<(std::ostream& os, const D& d)
+{
+	return os << d._d << " [tol: " << d._t << "]";
+}
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+
+	point p0(0, 0);
+
+	//
+	// Test distance
+	//
+
+	check_equals(p0.distance(point(1, 0)), 1);
+	check_equals(p0.distance(point(10, 0)), 10);
+	check_equals(p0.distance(point(-1, 0)), 1);
+	check_equals(p0.distance(point(-10, 0)), 10);
+
+	check_equals(p0.distance(point(0, 1)), 1);
+	check_equals(p0.distance(point(0, 10)), 10);
+	check_equals(p0.distance(point(0, -1)), 1);
+	check_equals(p0.distance(point(0, -10)), 10);
+
+	check_equals(D(p0.distance(point(2, 4))), D(4.47214));
+	check_equals(D(p0.distance(point(20, 20))), D(28.2843));
+	check_equals(D(p0.distance(point(2, -4))), D(4.47214));
+	check_equals(D(p0.distance(point(-20, 20))), D(28.2843));
+}
+



From MAILER-DAEMON Mon Apr 23 14:15:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg34b-0006Ti-1g
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 14:15:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg34Z-0006TB-Sq
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:15:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg34Z-0006SX-AJ
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:15:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg34Y-0006SJ-Sn
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:15:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hg2z8-0004t0-2K
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:09:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hg2z5-00021y-Vf
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 18:09:56 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hg2z5-00021v-IT
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 18:09:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hg2z5-00021v-IT@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 18:09:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/shape.cpp server/shape.h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 18:15:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 18:09:55

Modified files:
	.              : ChangeLog 
	server         : shape.cpp shape.h 
	testsuite/server: Makefile.am 
Added files:
	testsuite/server: EdgeTest.cpp 

Log message:
	        * server/shape.{cpp,h}: add primitive distance functions
	          for point-segment
	        * testsuite/server/: Makefile.am, EdgeTest.cpp: add tests
	          for point-segment distance.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2972&r2=1.2973
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.h?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/EdgeTest.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2972
retrieving revision 1.2973
diff -u -b -r1.2972 -r1.2973
--- ChangeLog	23 Apr 2007 16:40:08 -0000	1.2972
+++ ChangeLog	23 Apr 2007 18:09:54 -0000	1.2973
@@ -1,5 +1,12 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* server/shape.{cpp,h}: add primitive distance functions
+	  for point-segment
+	* testsuite/server/: Makefile.am, EdgeTest.cpp: add tests 
+	  for point-segment distance.
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* server/: gnash.h, types.cpp: add point::distance() and
 	  squaredDistance()
 	* testsuite/server/: Makefile.am, PointTest.cpp: point tests.

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/shape.cpp	13 Apr 2007 07:35:55 -0000	1.31
+++ server/shape.cpp	23 Apr 2007 18:09:54 -0000	1.32
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.cpp,v 1.31 2007/04/13 07:35:55 bjacques Exp $ */
+/* $Id: shape.cpp,v 1.32 2007/04/23 18:09:54 strk Exp $ */
 
 #include "shape.h"
 
@@ -64,6 +64,48 @@
 	}
 }
 
+float
+edge::distancePtSeg(const point& pt, const point& A, const point& B)
+{
+	float square = squareDistancePtSeg(pt, A, B);
+	return sqrt(square);
+}
+
+float
+edge::squareDistancePtSeg(const point& p, const point& A, const point& B)
+{
+	float dx = B.m_x - A.m_x;
+	float dy = B.m_y - A.m_y;
+
+        /* if start==end, then use pt distance */
+        if ( dx == 0 && dy == 0 ) return p.squareDistance(A); 
+
+	float pdx = p.m_x - A.m_x;
+	float pdy = p.m_y - A.m_y;
+
+        float u = (pdx * dx + pdy * dy) / (dx*dx + dy*dy);
+
+        if (u<0)
+	{
+		cout << "R was < 0 " << endl;
+		return p.squareDistance(A); 
+	}
+
+        if (u>1)
+	{
+		cout << "R was > 1 " << endl;
+		return p.squareDistance(B);
+	}
+
+	point px;
+	px.m_x = A.m_x + u * (B.m_x - A.m_x);
+	px.m_y = A.m_y + u * (B.m_y - A.m_y);
+
+	cout << "R was between 0 and 1, u is " << u << " px : " << px.m_x << "," << px.m_y << endl;
+
+	return p.squareDistance(px);
+}
+
 
 DSOEXPORT bool edge::is_straight() const
 {

Index: server/shape.h
===================================================================
RCS file: /sources/gnash/gnash/server/shape.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/shape.h	19 Feb 2007 10:41:57 -0000	1.19
+++ server/shape.h	23 Apr 2007 18:09:54 -0000	1.20
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.h,v 1.19 2007/02/19 10:41:57 strk Exp $ */
+/* $Id: shape.h,v 1.20 2007/04/23 18:09:54 strk Exp $ */
 
 #ifndef GNASH_SHAPE_H
 #define GNASH_SHAPE_H
@@ -34,6 +34,12 @@
 		void	tesselate_curve() const;
 		bool	is_straight() const;
 		
+		/// Return squared distance between point pt and segment A-B
+		static float squareDistancePtSeg(const point& pt, const point& A, const point& B);
+
+		/// Return distance between point pt and segment A-B
+		static float distancePtSeg(const point& pt, const point& A, const point& B);
+		
 	//private:
 		// *quadratic* bezier: point = p0 * t^2 + p1 * 2t(1-t) + p2 * (1-t)^2
 		float	m_cx, m_cy;		// "control" point

Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- testsuite/server/Makefile.am	23 Apr 2007 16:40:08 -0000	1.27
+++ testsuite/server/Makefile.am	23 Apr 2007 18:09:55 -0000	1.28
@@ -35,6 +35,7 @@
 check_PROGRAMS = \
 	MatrixTest \
 	PointTest \
+	EdgeTest \
 	PropertyListTest \
 	GetterSetterTest \
 	as_prop_flagsTest \
@@ -68,6 +69,11 @@
 	$(GNASH_LIBS) \
 	$(NULL)
 
+EdgeTest_SOURCES = EdgeTest.cpp
+EdgeTest_LDADD = \
+	$(GNASH_LIBS) \
+	$(NULL)
+
 PropertyListTest_SOURCES = PropertyListTest.cpp
 PropertyListTest_LDADD = \
 	$(GNASH_LIBS) \

Index: testsuite/server/EdgeTest.cpp
===================================================================
RCS file: testsuite/server/EdgeTest.cpp
diff -N testsuite/server/EdgeTest.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/server/EdgeTest.cpp	23 Apr 2007 18:09:55 -0000	1.1
@@ -0,0 +1,81 @@
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gnash.h" // for point !!
+#include "shape.h" // for edge
+#include <iostream>
+#include <sstream>
+#include <cassert>
+
+#include "check.h"
+
+using namespace std;
+using namespace gnash;
+
+// for double comparison
+struct D {
+	double _d;
+	double _t; // tolerance
+
+	D(double d) : _d(d), _t(1e-4) {}
+
+	// Set tolerance
+	D(double d, double t) : _d(d), _t(t) {}
+
+	// Return true if the difference between the two
+	// doubles is below the minimum tolerance defined for the two
+	bool operator==(const D& d)
+	{
+		double tol = std::min(_t, d._t);
+		double delta = fabs(_d - d._d);
+		bool ret = delta < tol;
+		//cout << "D " << _d << "operator==(const D " << d._d <<") returning " << ret << " (delta is " << delta << ") " << endl;
+		return ret;
+	}
+};
+std::ostream& operator<<(std::ostream& os, const D& d)
+{
+	return os << d._d << " [tol: " << d._t << "]";
+}
+
+int
+main(int /*argc*/, char** /*argv*/)
+{
+
+	//
+	// Test distance
+	//
+
+	check_equals(edge::distancePtSeg(point(0,0), point(9, 0), point(9, 0)), 9);
+
+	check_equals(edge::distancePtSeg(point(0,0), point(0, 0), point(3, 0)), 0);
+
+	check_equals(edge::distancePtSeg(point(-5,0), point(0, 0), point(3, 0)), 5);
+
+	check_equals(edge::distancePtSeg(point(5,0), point(0, 0), point(3, 0)), 2);
+
+	check_equals(D(edge::distancePtSeg(point(0,0), point(-10, 0), point(3, 0))), 0);
+
+	check_equals(edge::distancePtSeg(point(0,0), point(-10, 0), point(-10, 30)), 10);
+
+	check_equals(edge::distancePtSeg(point(5,5), point(-10, 0), point(10, 0)), 5);
+
+}
+



From MAILER-DAEMON Mon Apr 23 14:26:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg3FT-00027z-TP
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 14:26:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg3FS-00027u-Ql
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:26:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg3FR-00027i-39
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:26:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg3FQ-00027f-Ub
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:26:48 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1Hg3A0-0006Yi-22
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 14:21:12 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3NIL6U4007073;
	Mon, 23 Apr 2007 20:21:10 +0200
Date: Mon, 23 Apr 2007 20:21:02 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <6110457207.20070423202102@nova-sys.net>
To: Sandro Santilli <strk@keybit.net>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <20070423153230.GC3258@keybit.net>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
	<29647252.20070423171701@nova-sys.net>
	<20070423153230.GC3258@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 18:26:50 -0000

Hello Sandro,

Monday, April 23, 2007, 5:32:30 PM, you wrote:
SS> Try make check again, might be a random memory corruption problem,
SS> or it might be a dejagnu timeout...

I removed Dejagnu so I can run the tests at least...

Udo




From MAILER-DAEMON Mon Apr 23 15:25:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg4A0-0003MC-50
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 15:25:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg49w-0003Le-Fj
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:25:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg49u-0003LK-1V
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:25:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg49t-0003LH-OH
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:25:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hg44S-00055E-Jw
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:19:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hg44R-0005lg-Fc
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 19:19:31 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hg44R-0005ld-42
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 19:19:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hg44R-0005ld-42@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 19:19:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gui.cpp server/shape.cpp se...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 19:25:12 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 19:19:30

Modified files:
	.              : ChangeLog 
	gui            : gui.cpp 
	server         : shape.cpp shape.h types.cpp 
	server/parser  : shape_character_def.cpp 
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp 

Log message:
	        * server/shape.{cpp,h}: add path::withinSquareDistance.
	        * server/types.cpp (point::distance): return 0 for 0 squaredDistance
	          (not 1).
	        * server/parser/shape_character_def.cpp (point_test_local):
	          test for point falling in the shape stroke, taking thickness
	          in consideration.
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more
	          tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2973&r2=1.2974
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2973
retrieving revision 1.2974
diff -u -b -r1.2973 -r1.2974
--- ChangeLog	23 Apr 2007 18:09:54 -0000	1.2973
+++ ChangeLog	23 Apr 2007 19:19:30 -0000	1.2974
@@ -1,5 +1,16 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* server/shape.{cpp,h}: add path::withinSquareDistance.
+	* server/types.cpp (point::distance): return 0 for 0 squaredDistance
+	  (not 1).
+	* server/parser/shape_character_def.cpp (point_test_local):
+	  test for point falling in the shape stroke, taking thickness
+	  in consideration.
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more
+	  tests.
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* server/shape.{cpp,h}: add primitive distance functions
 	  for point-segment
 	* testsuite/server/: Makefile.am, EdgeTest.cpp: add tests 

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- gui/gui.cpp	18 Apr 2007 09:35:41 -0000	1.73
+++ gui/gui.cpp	23 Apr 2007 19:19:30 -0000	1.74
@@ -245,7 +245,7 @@
 {
 	movie_root* m = get_current_root();
 
-	//log_msg(_("mouse @ %d,%d"), x, y);
+	log_msg(_("mouse @ %d,%d"), x, y);
 	if ( m->notify_mouse_moved(x, y) )
 	{
 		// any action triggered by the

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/shape.cpp	23 Apr 2007 18:09:54 -0000	1.32
+++ server/shape.cpp	23 Apr 2007 19:19:30 -0000	1.33
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.cpp,v 1.32 2007/04/23 18:09:54 strk Exp $ */
+/* $Id: shape.cpp,v 1.33 2007/04/23 19:19:30 strk Exp $ */
 
 #include "shape.h"
 
@@ -87,13 +87,13 @@
 
         if (u<0)
 	{
-		cout << "R was < 0 " << endl;
+		//cout << "R was < 0 " << endl;
 		return p.squareDistance(A); 
 	}
 
         if (u>1)
 	{
-		cout << "R was > 1 " << endl;
+		//cout << "R was > 1 " << endl;
 		return p.squareDistance(B);
 	}
 
@@ -101,7 +101,7 @@
 	px.m_x = A.m_x + u * (B.m_x - A.m_x);
 	px.m_y = A.m_y + u * (B.m_y - A.m_y);
 
-	cout << "R was between 0 and 1, u is " << u << " px : " << px.m_x << "," << px.m_y << endl;
+	//cout << "R was between 0 and 1, u is " << u << " px : " << px.m_x << "," << px.m_y << endl;
 
 	return p.squareDistance(px);
 }
@@ -157,29 +157,10 @@
     // Point-in-shape test.  Return true if the query point is on the filled
     // interior of this shape.
 {
-    if (m_edges.size() <= 0) {
-	return false;
-    }
-#if 0
-    // This test makes no sense: m_fill0 is unsigned and "1-based" -martin
-    if (m_fill0 < 0) {
-	// No interior fill.
-	
-	// @@ This isn't quite right due to some paths
-	// doing double-duty with both fill0 and fill1
-	// styles.
-	
-	// TODO: get rid of this stupid fill0/fill1
-	// business -- a path should always be
-	// counterclockwise and have one fill.  For
-	// input paths with fill1, generate a separate
-	// reversed path with fill set to fill1.
-	// Group all paths with the same fill into a
-	// path group; do the point_test on the whole
-	// group.
-	return false;
-    }
-#endif
+    if ( m_edges.empty() ) return false;
+
+    // No fill, nothing more to check.
+    if (m_fill0 == 0 && m_fill1 == 0) return false;
     
     // Shoot a horizontal ray from (x,y) to the right, and
     // count the number of edge crossings.  An even number
@@ -354,6 +335,29 @@
 	}
 }
 
+bool
+path::withinSquareDistance(const point& p, float dist)
+{
+	size_t nedges = m_edges.size();
+
+	if ( ! nedges ) return false;
+
+	// TODO: FIXME: we're not considering the control
+	//       point at all so the check will only work
+	//       for straight lines
+
+	point px(m_ax, m_ay);
+	for (size_t i=0; i<nedges; ++i)
+	{
+		const edge& e = m_edges[i];
+		point np(e.m_ax, e.m_ay);
+		float d = edge::squareDistancePtSeg(p, px, np);
+		if ( d < dist ) return true;
+	}
+
+	return false;
+}
+
 // Utility.
 
 

Index: server/shape.h
===================================================================
RCS file: /sources/gnash/gnash/server/shape.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/shape.h	23 Apr 2007 18:09:54 -0000	1.20
+++ server/shape.h	23 Apr 2007 19:19:30 -0000	1.21
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.h,v 1.20 2007/04/23 18:09:54 strk Exp $ */
+/* $Id: shape.h,v 1.21 2007/04/23 19:19:30 strk Exp $ */
 
 #ifndef GNASH_SHAPE_H
 #define GNASH_SHAPE_H
@@ -235,6 +235,13 @@
 		/// Close this path with a straight line, if not already closed
 		void close();
 
+		/// return true if the given point is withing the given squared distance
+		//
+		/// NOTE: if the path is empty, false is returned.
+		///
+		bool withinSquareDistance(const point& p, float dist);
+
+
 	//private:
 
 		/// Left fill style index (1-based)
@@ -254,6 +261,7 @@
 
 		/// ?
 		bool m_new_shape;
+
 	};
 
 	/// For holding a pre-tesselated shape.

Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/types.cpp	23 Apr 2007 16:40:08 -0000	1.23
+++ server/types.cpp	23 Apr 2007 19:19:30 -0000	1.24
@@ -46,7 +46,9 @@
 
 	float point::distance(const point& other) const
 	{
-		return sqrt(squareDistance(other));
+		float sd = squareDistance(other);
+		if ( ! sd ) return sd;
+		else return sqrt(squareDistance(other));
 	}
 
 

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/shape_character_def.cpp	18 Apr 2007 14:07:32 -0000	1.16
+++ server/parser/shape_character_def.cpp	23 Apr 2007 19:19:30 -0000	1.17
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.16 2007/04/18 14:07:32 jgilmore Exp $ */
+/* $Id: shape_character_def.cpp,v 1.17 2007/04/23 19:19:30 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -607,12 +607,27 @@
 	return false;
     }
 
+    point pt(x, y);
+
     // Try each of the paths.
-    for (unsigned int i = 0; i < m_paths.size(); i++) {
-	if (m_paths[i].point_test(x, y))
+    for (unsigned int i = 0; i < m_paths.size(); i++)
 	    {
-		return true;
+	path& pth = m_paths[i];
+
+	if ( pth.m_edges.empty() ) continue;
+
+	// If it has 
+	if ( pth.m_line != 0 )
+	{
+		assert(m_line_styles.size() >= pth.m_line);
+		line_style& ls = m_line_styles[pth.m_line-1];
+		int thickness = ls.get_width();
+		//cout << "Thickness of line is " << thickness << endl;
+		float dist = thickness/2;
+		if ( pth.withinSquareDistance(pt, dist*dist) ) return true;
 	    }
+
+	if (pth.point_test(x, y)) return true;
     }
 
     return false;

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/DrawingApiTest.as	23 Apr 2007 13:32:15 -0000	1.2
+++ testsuite/misc-ming.all/DrawingApiTest.as	23 Apr 2007 19:19:30 -0000	1.3
@@ -16,9 +16,12 @@
 with (a)
 {
 	clear();
+
+	// The thick red line
 	lineStyle(20, 0xFF0000, 100);
 	moveTo(100, 100);
 	lineTo(200, 200);
+
 	moveTo(100, 200);
 	lineStyle(5, 0xFF00FF, 50);
 	lineTo(200, 250);

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 13:45:18 -0000	1.5
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 19:19:30 -0000	1.6
@@ -99,5 +99,14 @@
 	check(tester.isMouseOverMouseEntity());
 	check_pixel(82, 127, 2, black, 2);
 
+	// In the middle of an imaginary line between
+	// first and last point of the green curve
+	tester.movePointerTo(355, 156);
+	xcheck(!tester.isMouseOverMouseEntity()); // fails due to edge::withinSquareDistance bug
+	check_pixel(355, 156, 2, white, 2);
+
+	tester.movePointerTo(376, 139);
+	xcheck(tester.isMouseOverMouseEntity()); // fails due to edge::withinSquareDistance bug
+	xcheck_pixel(376, 139, 2, green, 2); // fails due to bug in AGG
 }
 



From MAILER-DAEMON Mon Apr 23 15:28:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg4Cy-0004BK-Ny
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 15:28:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg4Cx-0004Av-6x
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:28:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg4Cv-0004Ab-Rm
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:28:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg4Cv-0004AY-MF
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:28:17 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hg47U-0005Qv-JR
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:22:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hg47U-0005wF-7Z
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 19:22:40 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hg47T-0005w9-Vy
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 19:22:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hg47T-0005w9-Vy@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 19:22:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/gui gui.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 19:28:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 19:22:39

Modified files:
	gui            : gui.cpp 

Log message:
	spurious debugging output commented out again

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.74&r2=1.75

Patches:
Index: gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- gui.cpp	23 Apr 2007 19:19:30 -0000	1.74
+++ gui.cpp	23 Apr 2007 19:22:39 -0000	1.75
@@ -245,7 +245,7 @@
 {
 	movie_root* m = get_current_root();
 
-	log_msg(_("mouse @ %d,%d"), x, y);
+	//log_msg(_("mouse @ %d,%d"), x, y);
 	if ( m->notify_mouse_moved(x, y) )
 	{
 		// any action triggered by the



From MAILER-DAEMON Mon Apr 23 15:32:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg4HH-0005Jp-Bz
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 15:32:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg4HF-0005JR-HV
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:32:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg4HF-0005JF-6r
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:32:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg4HF-0005J7-0X
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:32:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hg4Bn-0005vK-W4
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 15:27:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hg4Bn-0006BR-H2
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 19:27:07 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hg4Bn-0006BJ-4z
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 19:27:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hg4Bn-0006BJ-4z@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 19:27:07 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTest.as...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 19:32:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 19:27:07

Modified files:
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp 

Log message:
	Add an hairline style line to expose a bug in AGG 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- DrawingApiTest.as	23 Apr 2007 19:19:30 -0000	1.3
+++ DrawingApiTest.as	23 Apr 2007 19:27:07 -0000	1.4
@@ -22,6 +22,11 @@
 	moveTo(100, 100);
 	lineTo(200, 200);
 
+	// The hairlined horizontal black line
+	lineStyle(0, 0x000000, 100);
+	moveTo(220, 180);
+	lineTo(280, 180);
+
 	moveTo(100, 200);
 	lineStyle(5, 0xFF00FF, 50);
 	lineTo(200, 250);

Index: DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- DrawingApiTestRunner.cpp	23 Apr 2007 19:19:30 -0000	1.6
+++ DrawingApiTestRunner.cpp	23 Apr 2007 19:27:07 -0000	1.7
@@ -89,6 +89,11 @@
 	check(tester.isMouseOverMouseEntity());
 	xcheck_pixel(146, 146, 2, red, 2);
 
+	// Over the black "hairlined" line
+	tester.movePointerTo(250, 180);
+	check(tester.isMouseOverMouseEntity());
+	xcheck_pixel(250, 180, 1, black, 2);
+
 	// Inside the yellow line
 	tester.movePointerTo(270, 232);
 	check(tester.isMouseOverMouseEntity());



From MAILER-DAEMON Mon Apr 23 16:11:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hg4sJ-0003YK-Rc
	for mharc-gnash-commit@gnu.org; Mon, 23 Apr 2007 16:11:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hg4sI-0003Xv-5g
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 16:11:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hg4sH-0003Xj-Kg
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 16:11:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hg4sH-0003Xg-I0
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 16:11:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hg4mq-00030s-6t
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 16:05:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hg4mo-00015Y-2M
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 20:05:22 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hg4mn-00015U-Bj
	for gnash-commit@gnu.org; Mon, 23 Apr 2007 20:05:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hg4mn-00015U-Bj@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 23 Apr 2007 20:05:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/DynamicShape.cpp server/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Apr 2007 20:11:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/23 20:05:21

Modified files:
	.              : ChangeLog 
	server         : DynamicShape.cpp DynamicShape.h 
	                 sprite_instance.cpp sprite_instance.h 
	server/parser  : shape_character_def.cpp 
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp 

Log message:
	        * server/DynamicShape.{h,cpp} (lineStyle): add a line style even
	          if it is for specifying a thickness of 0 (hairline);
	          add a resetLineStyle() function for dropping any style.
	        * server/sprite_instance.{cpp,h}: add resetLineStyle() for
	          drawing api.
	        * server/parser/shape_character_def.cpp (point_test_local):
	          Use a tolerance of a single twip distance when detecting
	          collision of hairlined strokes.
	        * testsuite/misc-ming.all/DrawingApiTest.as: add more comments, and
	          an hairlined line.
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2974&r2=1.2975
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/DynamicShape.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.251&r2=1.252
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2974
retrieving revision 1.2975
diff -u -b -r1.2974 -r1.2975
--- ChangeLog	23 Apr 2007 19:19:30 -0000	1.2974
+++ ChangeLog	23 Apr 2007 20:05:19 -0000	1.2975
@@ -1,5 +1,19 @@
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
+	* server/DynamicShape.{h,cpp} (lineStyle): add a line style even
+	  if it is for specifying a thickness of 0 (hairline);
+	  add a resetLineStyle() function for dropping any style.
+	* server/sprite_instance.{cpp,h}: add resetLineStyle() for
+	  drawing api.
+	* server/parser/shape_character_def.cpp (point_test_local):
+	  Use a tolerance of a single twip distance when detecting
+	  collision of hairlined strokes.
+	* testsuite/misc-ming.all/DrawingApiTest.as: add more comments, and
+	  an hairlined line.
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more tests.
+
+2007-04-23 Sandro Santilli <strk@keybit.net>
+
 	* server/shape.{cpp,h}: add path::withinSquareDistance.
 	* server/types.cpp (point::distance): return 0 for 0 squaredDistance
 	  (not 1).

Index: server/DynamicShape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/DynamicShape.cpp	23 Apr 2007 13:45:18 -0000	1.5
+++ server/DynamicShape.cpp	23 Apr 2007 20:05:20 -0000	1.6
@@ -16,7 +16,7 @@
 
 
 
-/* $Id: DynamicShape.cpp,v 1.5 2007/04/23 13:45:18 strk Exp $ */
+/* $Id: DynamicShape.cpp,v 1.6 2007/04/23 20:05:20 strk Exp $ */
 
 #include "DynamicShape.h"
 
@@ -114,13 +114,15 @@
 void
 DynamicShape::lineStyle(uint16_t thickness, const rgba& color)
 {
-	if ( thickness ) {
 		line_style style(thickness, color);
 		_currline = add_line_style(style);
-	} else {
-		_currline = 0;
-	}
+	startNewPath();
+}
 
+void
+DynamicShape::resetLineStyle()
+{
+	_currline = 0;
 	startNewPath();
 }
 

Index: server/DynamicShape.h
===================================================================
RCS file: /sources/gnash/gnash/server/DynamicShape.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/DynamicShape.h	19 Feb 2007 21:40:32 -0000	1.2
+++ server/DynamicShape.h	23 Apr 2007 20:05:20 -0000	1.3
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: DynamicShape.h,v 1.2 2007/02/19 21:40:32 strk Exp $ */
+/* $Id: DynamicShape.h,v 1.3 2007/04/23 20:05:20 strk Exp $ */
 
 #ifndef GNASH_DYNAMIC_SHAPE_H
 #define GNASH_DYNAMIC_SHAPE_H
@@ -57,9 +57,12 @@
 	/// Close an existing filled path, if any.
 	void endFill();
 
-	/// Set current line style
+	/// Set current line style and start a new path.
 	void lineStyle(uint16_t thickness, const rgba& color);
 
+	/// Reset line style to no style and start a new path.
+	void resetLineStyle();
+
 	/// \brief
 	/// Add a fill style, possibly reusing an existing
 	/// one if existent.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -b -r1.251 -r1.252
--- server/sprite_instance.cpp	21 Apr 2007 21:07:40 -0000	1.251
+++ server/sprite_instance.cpp	23 Apr 2007 20:05:20 -0000	1.252
@@ -922,8 +922,12 @@
 	uint8_t a = 255;
 
 
-	if ( fn.nargs > 0 )
+	if ( ! fn.nargs )
 	{
+		sprite->resetLineStyle();
+		return as_value();
+	}
+
 		thickness = uint16_t(PIXELS_TO_TWIPS(uint16_t(fclamp(fn.arg(0).to_number(), 0, 255))));
 
 		if ( fn.nargs > 1 )
@@ -941,8 +945,6 @@
 			}
 		}
 
-	}
-
 
 	rgba color(r, g, b, a);
 	//log_msg("Color: %s", color.toString().c_str());

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/sprite_instance.h	21 Apr 2007 21:07:40 -0000	1.101
+++ server/sprite_instance.h	23 Apr 2007 20:05:20 -0000	1.102
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.101 2007/04/21 21:07:40 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.102 2007/04/23 20:05:20 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -695,6 +695,11 @@
 		_drawable->lineStyle(thickness, color);
 	}
 
+	void resetLineStyle()
+	{
+		_drawable->resetLineStyle();
+	}
+
 	void beginFill(const rgba& color)
 	{
 		_drawable->beginFill(color);

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/parser/shape_character_def.cpp	23 Apr 2007 19:19:30 -0000	1.17
+++ server/parser/shape_character_def.cpp	23 Apr 2007 20:05:20 -0000	1.18
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.17 2007/04/23 19:19:30 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.18 2007/04/23 20:05:20 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -622,9 +622,19 @@
 		assert(m_line_styles.size() >= pth.m_line);
 		line_style& ls = m_line_styles[pth.m_line-1];
 		int thickness = ls.get_width();
-		//cout << "Thickness of line is " << thickness << endl;
+		float sqdist;
+		if ( thickness == 0 )
+		{
+			// hairline has always a tolerance of a single twip
+			sqdist = 1;
+		}
+		else
+		{
 		float dist = thickness/2;
-		if ( pth.withinSquareDistance(pt, dist*dist) ) return true;
+			sqdist = dist*dist;
+		}
+		//cout << "Thickness of line is " << thickness << " squared is " << sqdist << endl;
+		if ( pth.withinSquareDistance(pt, sqdist) ) return true;
 	}
 
 	if (pth.point_test(x, y)) return true;

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/misc-ming.all/DrawingApiTest.as	23 Apr 2007 19:27:07 -0000	1.4
+++ testsuite/misc-ming.all/DrawingApiTest.as	23 Apr 2007 20:05:20 -0000	1.5
@@ -17,28 +17,41 @@
 {
 	clear();
 
+#if 1
 	// The thick red line
 	lineStyle(20, 0xFF0000, 100);
 	moveTo(100, 100);
 	lineTo(200, 200);
+#endif
 
 	// The hairlined horizontal black line
 	lineStyle(0, 0x000000, 100);
 	moveTo(220, 180);
 	lineTo(280, 180);
+#if 1
 
+	// The violet line
 	moveTo(100, 200);
 	lineStyle(5, 0xFF00FF, 50);
 	lineTo(200, 250);
+
+	// The yellow line
 	lineStyle(10, 0xFFFF00, 100);
 	lineTo(400, 200);
+
+	// The green curve
 	lineStyle(8, 0x00FF00, 100);
 	curveTo(400, 120, 300, 100);
+
+	// Transparent line
 	lineStyle();
 	lineTo(80, 100);
+
+	// The black thick vertical line
 	lineStyle(20);
 	lineTo(80, 150);
 
+	// The ugly blue-fill red-stroke thingy
 	moveTo(80, 180);
 	lineStyle(2, 0xFF0000);
 	beginFill(0x0000FF, 100);
@@ -78,6 +91,7 @@
 	lineTo(240, 100);
 	lineTo(260, 100);
 	endFill();
+#endif
 }
 
 // Make the MovieClip "active" (grabbing mouse events)

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 19:27:07 -0000	1.7
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 20:05:20 -0000	1.8
@@ -94,6 +94,16 @@
 	check(tester.isMouseOverMouseEntity());
 	xcheck_pixel(250, 180, 1, black, 2);
 
+	// Over the transparent line (244,100)
+	tester.movePointerTo(244, 100);
+	xcheck(!tester.isMouseOverMouseEntity());
+	xcheck_pixel(244, 100, 2, white, 2);
+
+	// Over the violet line (146,225)
+	tester.movePointerTo(146, 225);
+	check(tester.isMouseOverMouseEntity());
+	xcheck_pixel(146, 225, 1, violet, 2);
+
 	// Inside the yellow line
 	tester.movePointerTo(270, 232);
 	check(tester.isMouseOverMouseEntity());



From MAILER-DAEMON Tue Apr 24 01:23:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgDUT-0001yq-GP
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 01:23:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgDUQ-0001yB-ER
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 01:22:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgDUO-0001xz-En
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 01:22:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgDUO-0001xw-4d
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 01:22:56 -0400
Received: from wr-out-0506.google.com ([64.233.184.238])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HgDOu-0006zZ-47
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 01:17:16 -0400
Received: by wr-out-0506.google.com with SMTP id i23so1759455wra
	for <gnash-commit@gnu.org>; Mon, 23 Apr 2007 22:17:15 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Tt37ikjpY0ideu4qcE+mBsa+ggSGnLEsl4pSeOkPxwTVKh73RC9htHw5ilgkSNIDDjgn+7SBsIDXOGDnYcQnNuUJJ8QQIiLyUTiMgKdvkhPKs9ir4O1iRByFEl4f6hqZhvmAbvgfjuYNDndArnS08wHMmQ8Udp8i1dEMpHRJHoo=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=DX7rOrhKI7RzUwyYkiIi4SdXzSCfA5xCkbb4dS4OTDig1a14kcgBV5UQhVh70RYGAHcnZXYvLNpQE2dhWXVQm0h7CUtA2JV5TUnc5n7/x75PBijJv+aJ5fd56TvKm5XJr7Q8GVNT01AP3ekIZ5tLRMfp+/WCcyevul+WHDS8+ps=
Received: by 10.114.77.1 with SMTP id z1mr2883379waa.1177391834416;
	Mon, 23 Apr 2007 22:17:14 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Mon, 23 Apr 2007 22:17:14 -0700 (PDT)
Message-ID: <ca4b43ff0704232217k427d7207g92579e3df703e314@mail.gmail.com>
Date: Tue, 24 Apr 2007 13:17:14 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am server/mo...
In-Reply-To: <20070423153230.GC3258@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
	<29647252.20070423171701@nova-sys.net>
	<20070423153230.GC3258@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 05:22:59 -0000

On 4/23/07, Sandro Santilli <strk@keybit.net> wrote:
> On Mon, Apr 23, 2007 at 05:17:01PM +0200, Udo Giacomozzi wrote:
> > Hello Sandro,
> >
> > Monday, April 23, 2007, 5:05:00 PM, you wrote:
> > >> FAIL: clip_as_button2-TestRunner died prematurely (hangup)
> > >> FAIL: gotoFrameOnKeyEvent-TestRunner died prematurely (hangup)
> >
> > SS> Try to run them manually, might be that they don't find the input.
> >
> > Strange, in that case they run fine:
>
config  -enable-renderer=agg  --with-pixelformat=RGBA32  could
reproduce the problem here, even run them mannually.

config -enable-render=agg  --with-pixelformat=RGB24, everything works fine.



From MAILER-DAEMON Tue Apr 24 02:59:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgF0C-0005ib-QX
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 02:59:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgF0A-0005iV-Lr
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 02:59:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgF08-0005iH-VK
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 02:59:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgF08-0005iE-Qj
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 02:59:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HgEue-0000b9-Eu
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 02:54:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgEud-0006fL-3k
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:54:07 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HgEuc-0006fI-P6
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:54:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgEuc-0006fI-P6@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Tue, 24 Apr 2007 06:54:06 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 06:59:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/24 06:54:06

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am key_event_test.c 
	server/swf     : PlaceObject2Tag.h PlaceObject2Tag.cpp 

Log message:
	activate testcases

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2975&r2=1.2976
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_test.c?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2975
retrieving revision 1.2976
diff -u -b -r1.2975 -r1.2976
--- ChangeLog	23 Apr 2007 20:05:19 -0000	1.2975
+++ ChangeLog	24 Apr 2007 06:54:06 -0000	1.2976
@@ -1,3 +1,12 @@
+2007-04-24 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/Makefile.am
+	  activate testcases committed yestoday
+	* testsuite/misc-ming.all/key_event_test.c
+	  fix a typo
+	* server/swf/PlaceObject2Tag.{h,cpp}
+		minor clean up, keep the "all_event_flags" for future use.
+	  
 2007-04-23 Sandro Santilli <strk@keybit.net>
 
 	* server/DynamicShape.{h,cpp} (lineStyle): add a line style even

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- testsuite/misc-ming.all/Makefile.am	23 Apr 2007 12:30:08 -0000	1.97
+++ testsuite/misc-ming.all/Makefile.am	24 Apr 2007 06:54:06 -0000	1.98
@@ -109,7 +109,10 @@
 	frame_label_test \
 	path_format_test \
 	duplicate_movie_clip_test \
+  event_handler_scope_test \
 	masks_testrunner \
+  key_event_test \
+	key_event_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS
@@ -148,6 +151,7 @@
 	frame_label_testrunner \
 	path_format_testrunner \
 	duplicate_movie_clip_testrunner \
+  event_handler_scope_testrunner \
 	matrix_testrunner \
 	$(NULL)
 
@@ -311,6 +315,32 @@
 	$(top_builddir)/testsuite/libtestsuite.la \
 	$(NULL)
 
+
+key_event_test_SOURCES =	\
+	key_event_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+key_event_test_LDADD = $(MING_LIBS)
+
+key_event_test.swf: key_event_test
+	./key_event_test $(top_srcdir)/testsuite/media
+
+key_event_testrunner_SOURCES = \
+	key_event_testrunner.cpp \
+	$(NULL)
+key_event_testrunner_LDADD = \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	$(NULL)
+key_event_testrunner_CXXFLAGS = \
+	-DSRCDIR='"$(srcdir)"' \
+	-DTGTDIR='"$(abs_builddir)"' \
+	$(NULL)
+key_event_testrunner_DEPENDENCIES = \
+	key_event_test.swf \
+	$(top_builddir)/testsuite/libtestsuite.la \
+	$(NULL)
+
 place_object_test_SOURCES =	\
 	place_object_test.c	\
 	ming_utils.h		\
@@ -475,6 +505,21 @@
 	sh $< -r5 $(top_builddir) duplicate_movie_clip_test.swf > $@
 	chmod 755 $@
 	
+
+event_handler_scope_test_SOURCES =	\
+	event_handler_scope_test.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+event_handler_scope_test_LDADD = $(MING_LIBS)
+
+event_handler_scope_test.swf: event_handler_scope_test
+	./event_handler_scope_test $(top_srcdir)/testsuite/media
+
+event_handler_scope_testrunner: $(srcdir)/../generic-testrunner.sh event_handler_scope_test.swf
+	sh $< -r5 $(top_builddir) event_handler_scope_test.swf > $@
+	chmod 755 $@
+		
 attachMovieTest_SOURCES =	\
 	attachMovieTest.c	\
 	ming_utils.h		\
@@ -989,7 +1034,9 @@
 	frame_label_testrunner \
 	path_format_testrunner \
 	duplicate_movie_clip_testrunner \
+  event_handler_scope_testrunner \
 	masks_testrunner \
+	key_event_testrunner \
 	$(NULL)
 
 if MAKESWF_SUPPORTS_PREBUILT_CLIPS

Index: testsuite/misc-ming.all/key_event_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/key_event_test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/key_event_test.c	23 Apr 2007 11:15:38 -0000	1.1
+++ testsuite/misc-ming.all/key_event_test.c	24 Apr 2007 06:54:06 -0000	1.2
@@ -58,7 +58,7 @@
 
   dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
-  add_actions(mo, "x1=0; x2=0; x3=0; x=0; x5=0; x6=0; ");
+  add_actions(mo, "x1=0; x2=0; x3=0; x4=0; x5=0; x6=0; ");
   SWFMovie_nextFrame(mo);  /* 1st frame */
 
   

Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/swf/PlaceObject2Tag.h	11 Apr 2007 17:54:22 -0000	1.2
+++ server/swf/PlaceObject2Tag.h	24 Apr 2007 06:54:06 -0000	1.3
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: PlaceObject2Tag.h,v 1.2 2007/04/11 17:54:22 bjacques Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.3 2007/04/24 06:54:06 zoulunkai Exp $ */
 
 #ifndef GNASH_SWF_PLACEOBJECT2TAG_H
 #define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -99,6 +99,7 @@
 	int		m_depth;
 	uint16_t	m_character_id;
 	int 	m_clip_depth;
+	uint32_t all_event_flags; 
 
 	enum place_type
 	{

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/swf/PlaceObject2Tag.cpp	18 Apr 2007 14:07:33 -0000	1.4
+++ server/swf/PlaceObject2Tag.cpp	24 Apr 2007 06:54:06 -0000	1.5
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.4 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.5 2007/04/24 06:54:06 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -71,13 +71,10 @@
 	assert(reserved == 0);	// must be 0
 
 	// The logical 'or' of all the following handlers.
-	// I don't think we care about this...
-	uint32_t all_flags = (movie_version >= 6) ?
-		in->read_u32() : in->read_u16();
-	UNUSED(all_flags);
+	all_event_flags = (movie_version >= 6) ? in->read_u32() : in->read_u16();
 
 	IF_VERBOSE_PARSE (
-		log_parse(_("  actions: flags = 0x%X"), all_flags);
+		log_parse(_("  actions: flags = 0x%X"), all_event_flags);
 	);
 
 	// Read swf_events.
@@ -88,9 +85,8 @@
 
 		uint32_t flags = (movie_version >= 6) ? in->read_u32() : in->read_u16();
 
-		if (flags == 0)
+		if (flags == 0) // no other events
 		{
-			// Done with events.
 			break;
 		}
 
@@ -109,7 +105,7 @@
 
 		uint8_t ch = key::INVALID;
 
-		if (flags & (1 << 17))	// has keypress event
+		if (flags & (1 << 17))	// has KeyPress event
 		{
 			ch = in->read_u8();
 			event_length--;
@@ -145,7 +141,8 @@
 		}
 
 		// 13 bits reserved, 19 bits used
-		static const event_id s_code_bits[19] =
+		const int total_known_events = 19;
+		static const event_id s_code_bits[total_known_events] =
 		{
 			event_id::LOAD,
 			event_id::ENTER_FRAME,
@@ -171,22 +168,23 @@
 		};
 
 		// Let's see if the event flag we received is for an event that we know of
-		if ((pow(2.0, int( sizeof(s_code_bits) / sizeof(s_code_bits[0]) )) - 1) < flags)
+
+		//check if all unused bits are zero!
+		if( !(flags & (1 << total_known_events)) )
 		{
 			IF_VERBOSE_MALFORMED_SWF(
 			log_swferror(_("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"), flags);
 			);
 		}
 
-		for (int i = 0, mask = 1; i < int(sizeof(s_code_bits)/sizeof(s_code_bits[0])); i++, mask <<= 1)
+		for (int i = 0, mask = 1; i < total_known_events; i++, mask <<= 1)
 		{
 			if (flags & mask)
 			{
 				std::auto_ptr<swf_event> ev ( new swf_event(s_code_bits[i], action) );
 				//log_action("---- actions for event %s", ev->event().get_function_name().c_str());
 
-				// hack
-				if (i == 17)	// has keypress event ?
+				if (i == 17)	// has KeyPress event
 				{
 					ev->event().setKeyCode(ch);
 				}
@@ -194,7 +192,7 @@
 				m_event_handlers.push_back(ev.release());
 			}
 		}
-	}
+	} //end of for(;;)
 }
 
 // read SWF::PLACEOBJECT2



From MAILER-DAEMON Tue Apr 24 03:20:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgFKX-0004xb-Ox
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 03:20:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgFKW-0004xS-Km
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:20:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgFKW-0004xE-2Y
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:20:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgFKV-0004xB-S4
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:20:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgFF1-0003Ds-CA
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:15:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgFEz-0007Fk-EV
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 07:15:09 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgFEz-0007Fh-28
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 07:15:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgFEz-0007Fh-28@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 07:15:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/shape.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 07:20:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 07:15:08

Modified files:
	.              : ChangeLog 
	server         : shape.cpp 

Log message:
	        * server/shape.cpp: substitute hash_wrapper with std::map,
	          cleanups.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2976&r2=1.2977
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.33&r2=1.34

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2976
retrieving revision 1.2977
diff -u -b -r1.2976 -r1.2977
--- ChangeLog	24 Apr 2007 06:54:06 -0000	1.2976
+++ ChangeLog	24 Apr 2007 07:15:08 -0000	1.2977
@@ -1,3 +1,8 @@
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
+	* server/shape.cpp: substitute hash_wrapper with std::map,
+	  cleanups.
+
 2007-04-24 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/Makefile.am

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/shape.cpp	23 Apr 2007 19:19:30 -0000	1.33
+++ server/shape.cpp	24 Apr 2007 07:15:08 -0000	1.34
@@ -1,27 +1,33 @@
-// shape.cpp	-- Thatcher Ulrich <tu@tulrich.com> 2003
-
-// This source code has been donated to the Public Domain.  Do
-// whatever you want with it.
-
-// Quadratic bezier outline shapes, the basis for most SWF rendering.
+// shape.cpp:  shape path, edge and meshes
+// 
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//
 
-/* $Id: shape.cpp,v 1.33 2007/04/23 19:19:30 strk Exp $ */
 
 #include "shape.h"
 
-#include "impl.h"
-//#include "log.h"
-#include "render.h"
-#include "stream.h"
+#include "tu_file.h"
 #include "tesselate.h"
-#include "movie_definition.h" // TODO: check if really needed
-#include "bitmap_character_def.h"
-
 
 #include "hash_wrapper.h"
 #include "tu_file.h"
 
 #include <cfloat>
+#include <map>
 
 
 namespace gnash {
@@ -613,21 +619,38 @@
 	mesh_set*	m;	// the mesh_set that receives trapezoids.
 
 	// strips-in-progress.
-	hash_wrapper<int, tri_stripper*>	m_strips;
+	typedef std::map<int, tri_stripper*> StripsMap;
+	//typedef hash_wrapper<int, tri_stripper*> StripsMap; 
+	StripsMap m_strips;
 
 	collect_traps(mesh_set* set) : m(set) {}
-	virtual ~collect_traps() {}
+
+	~collect_traps()
+	{
+		// Delete any unflushed strip
+		for (StripsMap::const_iterator it = m_strips.begin();
+			it != m_strips.end(); ++it)
+		{
+		    tri_stripper* s = it->second;
+		    delete s;
+		}
+	}
 
 	// Overrides from trapezoid_accepter
-	virtual void	accept_trapezoid(int style, const tesselate::trapezoid& tr)
+	void	accept_trapezoid(int style, const tesselate::trapezoid& tr)
 	    {
 		// Add trapezoid to appropriate stripper.
 
+		StripsMap::iterator it = m_strips.find(style);
 		tri_stripper*	s = NULL;
-		m_strips.get(style, &s);
-		if (s == NULL) {
+		if ( it == m_strips.end() )
+		{
 		    s = new tri_stripper;
-		    m_strips.add(style, s);
+			m_strips[style] = s;
+		}
+		else
+		{
+			s = it->second;
 		}
 
 		s->add_trapezoid(
@@ -637,24 +660,26 @@
 		    point(tr.m_rx1, tr.m_y1));
 	    }
 
-	virtual void	accept_line_strip(int style, const point coords[], int coord_count)
 	    // Remember this line strip in our mesh set.
+	void	accept_line_strip(int style, const point coords[], int coord_count)
 	    {
 		m->add_line_strip(style, coords, coord_count);
 	    }
 
-	void	flush() const
 	    // Push our strips into the mesh set.
+	void	flush() 
 	    {
-		for (hash_wrapper<int, tri_stripper*>::const_iterator it = m_strips.begin();
+		for (StripsMap::const_iterator it = m_strips.begin();
 		     it != m_strips.end();
-		     ++it) {
+		     ++it)
+		{
 		    // Push strip into m.
 		    tri_stripper*	s = it->second;
 		    s->flush(m, it->first);
 					
 		    delete s;
 		}
+		m_strips.clear();
 	    }
     };
     collect_traps	accepter(this);



From MAILER-DAEMON Tue Apr 24 03:31:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgFUR-0007hx-83
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 03:31:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgFUP-0007hQ-24
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:31:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgFUN-0007gu-VW
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:31:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgFUN-0007gr-Qi
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:31:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgFOt-0004fG-0R
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 03:25:23 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgFOq-0007fY-RA
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 07:25:20 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgFOq-0007fQ-EY
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 07:25:20 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgFOq-0007fQ-EY@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 07:25:20 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 07:31:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 07:25:20

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/misc-ming.all: action_execution_order_extend_test.c 
	testsuite/swfdec: PASSING gen_run_swfdec_testsuite.sh 

Log message:
	        * server/sprite_instance.cpp (on_event): call user-defined function
	          even if clip-events have been found.
	        * testsuite/misc-ming.all/action_execution_order_extend_test.c:
	          one more success.
	        * testsuite/swfdec/PASSING: event-order.swf now succeeds.
	        * testsuite/swfdec/gen_run_swfdec_testsuite.sh: match full lines
	          in the PASSING file, to avoid partial mathes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2977&r2=1.2978
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.252&r2=1.253
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_extend_test.c?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2977
retrieving revision 1.2978
diff -u -b -r1.2977 -r1.2978
--- ChangeLog	24 Apr 2007 07:15:08 -0000	1.2977
+++ ChangeLog	24 Apr 2007 07:25:19 -0000	1.2978
@@ -1,5 +1,12 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (on_event): call user-defined function
+	  even if clip-events have been found.
+	* testsuite/misc-ming.all/action_execution_order_extend_test.c:
+	  one more success.
+	* testsuite/swfdec/PASSING: event-order.swf now succeeds.
+	* testsuite/swfdec/gen_run_swfdec_testsuite.sh: match full lines
+	  in the PASSING file, to avoid partial mathes.
 	* server/shape.cpp: substitute hash_wrapper with std::map,
 	  cleanups.
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -b -r1.252 -r1.253
--- server/sprite_instance.cpp	23 Apr 2007 20:05:20 -0000	1.252
+++ server/sprite_instance.cpp	24 Apr 2007 07:25:20 -0000	1.253
@@ -1933,7 +1933,7 @@
 
 	bool called = false;
 			
-	// First, check for built-in event handler.
+	// First, check for clip event handler.
 	{
 		std::auto_ptr<ExecutableCode> code ( get_event_handler(id) );
 		if ( code.get() )
@@ -1942,19 +1942,10 @@
 			code->execute();
 
 			called = true;
-			// Fall through and call the function also, if it's defined!
-			// (@@ Seems to be the behavior for mouse events; not tested & verified for
-			// every event type.)
 		}
 	}
 
-	// If we called a built-in event handler
-	// we stop here. If we don't do this,
-	// MOUSE_UP, MOUSE_DOWN and MOUSE_MOVE will
-	// be called twice !
-	// Don't know if this is generally valid for every
-	// kind of event, but we do have testcases for this one...
-	if ( called ) return true;
+	// Fall through and call the function also, if it's defined!
 
 	// Check for member function.
 	{

Index: testsuite/misc-ming.all/action_execution_order_extend_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_extend_test.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/misc-ming.all/action_execution_order_extend_test.c	11 Apr 2007 14:20:21 -0000	1.7
+++ testsuite/misc-ming.all/action_execution_order_extend_test.c	24 Apr 2007 07:25:20 -0000	1.8
@@ -157,7 +157,7 @@
   SWFMovie_nextFrame(mo); /* 4th frame */
   
   /* mc_red onload is only called IFF onClipEvent(load) is also defined! */
-  xcheck_equals(mo, "_root.y1", "'mc_red onLoad called'");
+  check_equals(mo, "_root.y1", "'mc_red onLoad called'");
   check_equals(mo, "_root.y1bis", "'mc_red onClipLoad called'");
   /* actions in main timeline is executed *after* mc_red.onEnterFrame */
   check_equals(mo, "_root.y2", "'as_in_root'");

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/swfdec/PASSING	19 Apr 2007 10:27:10 -0000	1.17
+++ testsuite/swfdec/PASSING	24 Apr 2007 07:25:20 -0000	1.18
@@ -55,3 +55,4 @@
 height4.swf
 divide-7.swf
 object-math-7.swf
+event-order.swf

Index: testsuite/swfdec/gen_run_swfdec_testsuite.sh
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/gen_run_swfdec_testsuite.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/swfdec/gen_run_swfdec_testsuite.sh	7 Mar 2007 15:11:24 -0000	1.1
+++ testsuite/swfdec/gen_run_swfdec_testsuite.sh	24 Apr 2007 07:25:20 -0000	1.2
@@ -45,7 +45,7 @@
 for test in \`ls ${SWFDECTRACEDIR}/*.swf\`; do
 	testname=\`basename \${test}\`
 	expectpass=no
-	if grep -q \${testname} \${EXPECTPASS}; then
+	if grep -q "^\${testname}\$" \${EXPECTPASS}; then
 		expectpass="yes"
 	fi
 	echo "NOTE: running \${testname} (expect pass: \${expectpass})"



From MAILER-DAEMON Tue Apr 24 04:12:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgG8p-0005uh-KL
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 04:12:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgG8o-0005t3-97
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:12:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgG8l-0005qn-Ov
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:12:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgG8l-0005qW-Dm
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:12:47 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HgG3G-0001Aw-EN
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:07:06 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3O86SU4006997;
	Tue, 24 Apr 2007 10:06:32 +0200
Date: Tue, 24 Apr 2007 10:06:24 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <939011811.20070424100624@nova-sys.net>
To: "zou lunkai" <zoulunkai@gmail.com>
Subject: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <ca4b43ff0704232217k427d7207g92579e3df703e314@mail.gmail.com>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<1043777274.20070411174506@nova-sys.net>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
	<29647252.20070423171701@nova-sys.net>
	<20070423153230.GC3258@keybit.net>
	<ca4b43ff0704232217k427d7207g92579e3df703e314@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 08:12:50 -0000

Hello zou,

Tuesday, April 24, 2007, 7:17:14 AM, you wrote:
zl> config  -enable-renderer=agg  --with-pixelformat=RGBA32  could
zl> reproduce the problem here, even run them mannually.

Uh oh! What GUI are you using? Please post complete ./configure
summary. Do you get any output when running manually (try -v option) ?





From MAILER-DAEMON Tue Apr 24 04:28:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgGOQ-0001mx-RT
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 04:28:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgGON-0001mb-KW
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:28:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgGOK-0001mH-Al
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:28:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgGOJ-0001m2-SA
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:28:52 -0400
Received: from nz-out-0506.google.com ([64.233.162.235])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HgGIp-0002yN-0K
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:23:11 -0400
Received: by nz-out-0506.google.com with SMTP id 12so346325nzp
	for <gnash-commit@gnu.org>; Tue, 24 Apr 2007 01:23:10 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=tU1dXzsC5aN+2o0JJsLppojWMpvNSkV56rvG9f6fkqQp8tY6B1gt5aFDUr9IJt9P+fiAZCkl0bPYM0sC06g6O+832XeDPB854VGfKRn38m0WEqgbMLW9Y8zfRyeC8HzDPDNVe8OxQrFhFGhhTrDTxLO6SAgIfnGwa50Dr2+67yU=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=BTpwjbcaG6sFmDYBfOq3nPaK/7TMCRJcAWh/dlDSdxtj/prU39+k6DbjgeA454NsiYcS3aVNmGxVbwwsqTvq/K+T74rhQSdDV+/dDi9IICg8LM8i3EHm/0nu74lAVZZajJePNATtKEngluY0wdNbvzJYXBMQ+8V5mVnh13jY+O0=
Received: by 10.115.107.1 with SMTP id j1mr2935107wam.1177402990169;
	Tue, 24 Apr 2007 01:23:10 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Tue, 24 Apr 2007 01:23:10 -0700 (PDT)
Message-ID: <ca4b43ff0704240123o2aee9c76leb588a08a159ceff@mail.gmail.com>
Date: Tue, 24 Apr 2007 16:23:10 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>
Subject: Re: Re[2]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <939011811.20070424100624@nova-sys.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
	<29647252.20070423171701@nova-sys.net>
	<20070423153230.GC3258@keybit.net>
	<ca4b43ff0704232217k427d7207g92579e3df703e314@mail.gmail.com>
	<939011811.20070424100624@nova-sys.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 08:28:56 -0000

>
> Tuesday, April 24, 2007, 7:17:14 AM, you wrote:
> zl> config  -enable-renderer=agg  --with-pixelformat=RGBA32  could
> zl> reproduce the problem here, even run them mannually.
>
> Uh oh! What GUI are you using? Please post complete ./configure
gui: sdl
renderer: agg
--with-pixelformat=RGBA32

> summary. Do you get any output when running manually (try -v option) ?
>
with the above config,
I can not remember the output exactly, something like this
frame buffer: RGB24
Unknown pixelformat: RGB24
and then abort.

I don't want to do it again right now. I'll give a detailed
information the next time I get this problem:)



From MAILER-DAEMON Tue Apr 24 04:33:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgGSP-0002q6-8d
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 04:33:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgGSM-0002oK-5Z
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:33:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgGSJ-0002mo-LE
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:33:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgGSJ-0002mE-3C
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:32:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgGMo-0003QT-4V
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:27:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgGMf-0002uV-7o
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:27:09 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgGMf-0002uS-2g
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:27:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgGMf-0002uS-2g@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 08:27:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTest.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 08:33:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 08:27:09

Modified files:
	testsuite/misc-ming.all: DrawingApiTest.as 

Log message:
	removed spurious debugging lines

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- DrawingApiTest.as	23 Apr 2007 20:05:20 -0000	1.5
+++ DrawingApiTest.as	24 Apr 2007 08:27:08 -0000	1.6
@@ -17,18 +17,15 @@
 {
 	clear();
 
-#if 1
 	// The thick red line
 	lineStyle(20, 0xFF0000, 100);
 	moveTo(100, 100);
 	lineTo(200, 200);
-#endif
 
 	// The hairlined horizontal black line
 	lineStyle(0, 0x000000, 100);
 	moveTo(220, 180);
 	lineTo(280, 180);
-#if 1
 
 	// The violet line
 	moveTo(100, 200);
@@ -91,7 +88,6 @@
 	lineTo(240, 100);
 	lineTo(260, 100);
 	endFill();
-#endif
 }
 
 // Make the MovieClip "active" (grabbing mouse events)



From MAILER-DAEMON Tue Apr 24 04:58:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgGrF-00041t-LL
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 04:58:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgGrC-0003yw-Ac
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:58:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgGrB-0003xl-7j
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:58:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgGrA-0003xZ-Uo
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:58:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgGlg-0000l9-1R
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 04:53:00 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgGlc-0005kn-O3
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:52:56 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgGlc-0005kg-Bm
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:52:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgGlc-0005kg-Bm@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 08:52:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 08:58:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 08:52:56

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp 

Log message:
	        * server/sprite_instance.cpp (sprite_lineStyle): alpha value is given
	          in percent, always pass the env to number converters.
	        * testsuite/misc-ming.all/DrawingApiTest.as: add test checking that
	          valueOf is invoked on arguments.
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2978&r2=1.2979
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.253&r2=1.254
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2978
retrieving revision 1.2979
diff -u -b -r1.2978 -r1.2979
--- ChangeLog	24 Apr 2007 07:25:19 -0000	1.2978
+++ ChangeLog	24 Apr 2007 08:52:55 -0000	1.2979
@@ -1,5 +1,13 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (sprite_lineStyle): alpha value is given
+	  in percent, always pass the env to number converters.
+	* testsuite/misc-ming.all/DrawingApiTest.as: add test checking that
+	  valueOf is invoked on arguments.
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp: more successes.
+
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp (on_event): call user-defined function
 	  even if clip-events have been found.
 	* testsuite/misc-ming.all/action_execution_order_extend_test.c:

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -b -r1.253 -r1.254
--- server/sprite_instance.cpp	24 Apr 2007 07:25:20 -0000	1.253
+++ server/sprite_instance.cpp	24 Apr 2007 08:52:55 -0000	1.254
@@ -928,20 +928,20 @@
 		return as_value();
 	}
 
-	thickness = uint16_t(PIXELS_TO_TWIPS(uint16_t(fclamp(fn.arg(0).to_number(), 0, 255))));
+	thickness = uint16_t(PIXELS_TO_TWIPS(uint16_t(fclamp(fn.arg(0).to_number(&fn.env()), 0, 255))));
 
 	if ( fn.nargs > 1 )
 	{
 		// 2^24 is the max here
-		uint32_t rgbval = uint32_t(fclamp(fn.arg(1).to_number(), 0, 16777216));
+		uint32_t rgbval = uint32_t(fclamp(fn.arg(1).to_number(&fn.env()), 0, 16777216));
 		r = uint8_t( (rgbval&0xFF0000) >> 16);
 		g = uint8_t( (rgbval&0x00FF00) >> 8);
 		b = uint8_t( (rgbval&0x0000FF) );
 
 		if ( fn.nargs > 2 )
 		{
-			float alphaval = fclamp(fn.arg(2).to_number(), 0, 255);
-			a = uint8_t(alphaval);
+			float alphaval = fclamp(fn.arg(2).to_number(&fn.env()), 0, 100);
+			a = uint8_t( 255 * (alphaval/100) );
 		}
 	}
 

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 08:27:08 -0000	1.6
+++ testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 08:52:55 -0000	1.7
@@ -13,12 +13,21 @@
 // ... or on a statically-created one
 //a = _root;
 
+red = new Object();
+red.valueOf = function() { return 0xFF0000; };
+
+thick = new Object();
+thick.valueOf = function() { return 20; };
+
+halftransparent = new Object();
+halftransparent.valueOf = function() { return 50; };
+
 with (a)
 {
 	clear();
 
 	// The thick red line
-	lineStyle(20, 0xFF0000, 100);
+	lineStyle(thick, red, 100);
 	moveTo(100, 100);
 	lineTo(200, 200);
 
@@ -29,7 +38,7 @@
 
 	// The violet line
 	moveTo(100, 200);
-	lineStyle(5, 0xFF00FF, 50);
+	lineStyle(5, 0xFF00FF, halftransparent);
 	lineTo(200, 250);
 
 	// The yellow line

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	23 Apr 2007 20:05:20 -0000	1.8
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 08:52:55 -0000	1.9
@@ -58,6 +58,7 @@
 	rgba yellow(255, 255, 0, 255);
 	rgba black(0, 0, 0, 255);
 	rgba violet(255, 0, 255, 255);
+	rgba halftrans_violet(255, 128, 255, 255);
 
 	// Out of any drawing
 	tester.movePointerTo(50, 50);
@@ -87,27 +88,27 @@
 	// Inside red "thick" line
 	tester.movePointerTo(146, 146);
 	check(tester.isMouseOverMouseEntity());
-	xcheck_pixel(146, 146, 2, red, 2);
+	check_pixel(146, 146, 2, red, 2);
 
 	// Over the black "hairlined" line
 	tester.movePointerTo(250, 180);
 	check(tester.isMouseOverMouseEntity());
-	xcheck_pixel(250, 180, 1, black, 2);
+	check_pixel(250, 180, 1, black, 2);
 
-	// Over the transparent line (244,100)
-	tester.movePointerTo(244, 100);
-	xcheck(!tester.isMouseOverMouseEntity());
-	xcheck_pixel(244, 100, 2, white, 2);
+	// Over the transparent line (150,100)
+	tester.movePointerTo(150, 100);
+	xcheck(!tester.isMouseOverMouseEntity()); // fails due to shape_character_def::point_test_local bug 
+	check_pixel(150, 100, 2, white, 2); 
 
 	// Over the violet line (146,225)
 	tester.movePointerTo(146, 225);
 	check(tester.isMouseOverMouseEntity());
-	xcheck_pixel(146, 225, 1, violet, 2);
+	check_pixel(146, 225, 1, halftrans_violet, 2);
 
 	// Inside the yellow line
 	tester.movePointerTo(270, 232);
 	check(tester.isMouseOverMouseEntity());
-	xcheck_pixel(270, 232, 2, yellow, 2);
+	check_pixel(270, 232, 2, yellow, 2);
 
 	// Inside the black vertical line
 	tester.movePointerTo(82, 127);
@@ -122,6 +123,6 @@
 
 	tester.movePointerTo(376, 139);
 	xcheck(tester.isMouseOverMouseEntity()); // fails due to edge::withinSquareDistance bug
-	xcheck_pixel(376, 139, 2, green, 2); // fails due to bug in AGG
+	check_pixel(376, 139, 2, green, 2); // fails due to bug in AGG
 }
 



From MAILER-DAEMON Tue Apr 24 05:13:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgH5M-0007lW-Of
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 05:13:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgH5L-0007lP-6J
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:13:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgH5K-0007lD-8R
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:13:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgH5K-0007lA-3Y
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:13:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgGzp-0003LB-1a
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:07:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgGzk-0006YE-Nm
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 09:07:32 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgGzk-0006YB-Ht
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 09:07:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgGzk-0006YB-Ht@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 09:07:32 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTest.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 09:13:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 09:07:32

Modified files:
	testsuite/misc-ming.all: DrawingApiTest.as 

Log message:
	more comments

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DrawingApiTest.as	24 Apr 2007 08:52:55 -0000	1.7
+++ DrawingApiTest.as	24 Apr 2007 09:07:32 -0000	1.8
@@ -68,7 +68,7 @@
 	endFill();
 	lineTo(50, 150);
 
-	// clockwise
+	// The clockwise blue-stroke, cyan-fill square
 	moveTo(200, 100);
 	lineStyle(1, 0x00FF00);
 	beginFill(0x00FFFF, 100);
@@ -78,7 +78,7 @@
 	lineTo(200, 100);
 	endFill();
 
-	// counter-clockwise
+	// The counter-clockwise cyan-stroke, green-fill square
 	moveTo(230, 100);
 	lineStyle(1, 0x00FFFF);
 	beginFill(0x00FF00, 50);
@@ -88,7 +88,7 @@
 	lineTo(230, 100);
 	endFill();
 
-	// clockwise, move after beginFill
+	// The clockwise green-stroke, violet-fill square, with move after beginFill
 	lineStyle(1, 0x00FF00);
 	beginFill(0xFF00FF, 100);
 	moveTo(260, 100);



From MAILER-DAEMON Tue Apr 24 05:26:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgHHi-00041I-FR
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 05:26:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgHHh-00041D-8k
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:26:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgHHf-00040n-Jl
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:26:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgHHf-00040h-Dw
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:26:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgHC9-0005gA-WA
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:20:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgHC4-0007Ha-9n
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 09:20:16 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgHC4-0007HU-1I
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 09:20:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgHC4-0007HU-1I@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 09:20:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/shape.cpp server/shape.h ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 09:26:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 09:20:15

Modified files:
	server         : shape.cpp shape.h 
	.              : ChangeLog 

Log message:
	        * server/shape.{cpp,h}: const-corrected point_test and
	          wihinSquareDistance();

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.h?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2979&r2=1.2980

Patches:
Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/shape.cpp	24 Apr 2007 07:15:08 -0000	1.34
+++ server/shape.cpp	24 Apr 2007 09:20:15 -0000	1.35
@@ -159,9 +159,7 @@
 }
 
 
-bool	path::point_test(float x, float y)
-    // Point-in-shape test.  Return true if the query point is on the filled
-    // interior of this shape.
+bool	path::point_test(float x, float y) const
 {
     if ( m_edges.empty() ) return false;
 
@@ -342,7 +340,7 @@
 }
 
 bool
-path::withinSquareDistance(const point& p, float dist)
+path::withinSquareDistance(const point& p, float dist) const
 {
 	size_t nedges = m_edges.size();
 

Index: server/shape.h
===================================================================
RCS file: /sources/gnash/gnash/server/shape.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/shape.h	23 Apr 2007 19:19:30 -0000	1.21
+++ server/shape.h	24 Apr 2007 09:20:15 -0000	1.22
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.h,v 1.21 2007/04/23 19:19:30 strk Exp $ */
+/* $Id: shape.h,v 1.22 2007/04/24 09:20:15 strk Exp $ */
 
 #ifndef GNASH_SHAPE_H
 #define GNASH_SHAPE_H
@@ -106,7 +106,18 @@
 			return is_empty();
 		}
 
-		bool	point_test(float x, float y);
+		/// Point-in-shape test. 
+		//
+		/// Return true if the query point is on the filled
+		/// interior of this shape.
+		///
+		/// Return false if this path has no associated fill.
+		///
+		/// WARNING: often a filled shape is composed by multiple
+		///          paths. we probably fail in those cases.
+		///
+		///
+		bool	point_test(float x, float y) const;
 
 		/// Push the path into the tesselator.
 		void	tesselate() const;
@@ -239,7 +250,7 @@
 		//
 		/// NOTE: if the path is empty, false is returned.
 		///
-		bool withinSquareDistance(const point& p, float dist);
+		bool withinSquareDistance(const point& p, float dist) const;
 
 
 	//private:

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2979
retrieving revision 1.2980
diff -u -b -r1.2979 -r1.2980
--- ChangeLog	24 Apr 2007 08:52:55 -0000	1.2979
+++ ChangeLog	24 Apr 2007 09:20:15 -0000	1.2980
@@ -1,5 +1,7 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/shape.{cpp,h}: const-corrected point_test and
+	  wihinSquareDistance();
 	* server/sprite_instance.cpp (sprite_lineStyle): alpha value is given
 	  in percent, always pass the env to number converters.
 	* testsuite/misc-ming.all/DrawingApiTest.as: add test checking that



From MAILER-DAEMON Tue Apr 24 05:47:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgHbx-0002Dr-QN
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 05:47:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgHbv-0002Cv-ER
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:46:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgHbt-0002CK-15
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:46:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgHbs-0002CH-Nw
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:46:56 -0400
Received: from server2.indunet.it ([217.70.144.109])
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <udo.gnu@nova-sys.net>) id 1HgHWN-000163-8T
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 05:41:15 -0400
Received: from UDO-LAPTOP (sadsl-246098.rol.raiffeisen.net [195.254.246.98])
	(authenticated bits=0)
	by server2.indunet.it (8.12.8/8.12.5) with ESMTP id l3O9eoU4016921;
	Tue, 24 Apr 2007 11:40:54 +0200
Date: Tue, 24 Apr 2007 11:40:46 +0200
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
X-Mailer: The Bat! (v3.98.4) Professional
Organization: NOVASYS
X-Priority: 3 (Normal)
Message-ID: <1812270675.20070424114046@nova-sys.net>
To: "zou lunkai" <zoulunkai@gmail.com>
Subject: Re[4]: [Gnash-commit] gnash ChangeLog server/vm/Makefile.am
	server/mo...
In-Reply-To: <ca4b43ff0704240123o2aee9c76leb588a08a159ceff@mail.gmail.com>
References: <E1HWD1r-0007WY-8u@savannah.gnu.org>
	<20070421210759.GA80819@keybit.net>
	<1818758251.20070423100738@nova-sys.net>
	<20070423081630.GA93115@keybit.net>
	<802222433.20070423170030@nova-sys.net>
	<20070423150500.GB3258@keybit.net>
	<29647252.20070423171701@nova-sys.net>
	<20070423153230.GC3258@keybit.net>
	<ca4b43ff0704232217k427d7207g92579e3df703e314@mail.gmail.com>
	<939011811.20070424100624@nova-sys.net>
	<ca4b43ff0704240123o2aee9c76leb588a08a159ceff@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.4-2.6
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: Udo Giacomozzi <udo.gnu@nova-sys.net>
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 09:46:59 -0000

Hello zou,

Tuesday, April 24, 2007, 10:23:10 AM, you wrote:
>> Uh oh! What GUI are you using? Please post complete ./configure
zl> gui: sdl
zl> renderer: agg
zl> --with-pixelformat=RGBA32

I never tried SDL but at least GTK is fixed to RGB24. Configure
selects this pixel format when using GTK. Using --with-pixelformat
might override it. Rob Savoye wrote this part of ./configure.

>> summary. Do you get any output when running manually (try -v option) ?
>>
zl> with the above config,
zl> I can not remember the output exactly, something like this
zl> frame buffer: RGB24
zl> Unknown pixelformat: RGB24
zl> and then abort.

This means that the GUI wanted a 24 bit buffer but AGG was compiled
for 32 bits only (because of --with-pixelformat).

Udo




From MAILER-DAEMON Tue Apr 24 06:07:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgHvu-0008NX-4w
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 06:07:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgHvs-0008NP-Ef
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:07:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgHvq-0008M5-Cy
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:07:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgHvq-0008Lw-8K
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:07:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgHqK-0003Y5-VA
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:01:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgHqH-00039O-3l
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 10:01:49 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgHqG-00039J-AR
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 10:01:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgHqG-00039J-AR@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 10:01:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/shape.cpp server/shape.h...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 10:07:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 10:01:47

Modified files:
	.              : ChangeLog 
	server         : shape.cpp shape.h 
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	        * server/shape.{cpp,h} (point_test): only check for the
	          "interior" of the shape, forget its boundaries.
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: one
	          more success.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2980&r2=1.2981
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.cpp?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shape.h?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2980
retrieving revision 1.2981
diff -u -b -r1.2980 -r1.2981
--- ChangeLog	24 Apr 2007 09:20:15 -0000	1.2980
+++ ChangeLog	24 Apr 2007 10:01:46 -0000	1.2981
@@ -1,5 +1,12 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/shape.{cpp,h} (point_test): only check for the
+	  "interior" of the shape, forget its boundaries.
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp: one
+	  more success.
+
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
 	* server/shape.{cpp,h}: const-corrected point_test and
 	  wihinSquareDistance();
 	* server/sprite_instance.cpp (sprite_lineStyle): alpha value is given

Index: server/shape.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shape.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/shape.cpp	24 Apr 2007 09:20:15 -0000	1.35
+++ server/shape.cpp	24 Apr 2007 10:01:46 -0000	1.36
@@ -187,8 +187,8 @@
 	    // See if (x0,y0)-(x1,y1) crosses (x,y)-(infinity,y)
 	    
 	    // Does the segment straddle the horizontal ray?
-	    bool cross_up = (y0 < y && y1 >= y);
-	    bool cross_down = (!cross_up) && (y0 > y && y1 <= y);
+	    bool cross_up = (y0 < y && y1 > y);
+	    bool cross_down = (!cross_up) && (y0 > y && y1 < y);
 	    if (cross_up || cross_down)	{
 		// Straddles.
 		

Index: server/shape.h
===================================================================
RCS file: /sources/gnash/gnash/server/shape.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/shape.h	24 Apr 2007 09:20:15 -0000	1.22
+++ server/shape.h	24 Apr 2007 10:01:46 -0000	1.23
@@ -5,7 +5,7 @@
 
 // Quadratic bezier outline shapes, the basis for most SWF rendering.
 
-/* $Id: shape.h,v 1.22 2007/04/24 09:20:15 strk Exp $ */
+/* $Id: shape.h,v 1.23 2007/04/24 10:01:46 strk Exp $ */
 
 #ifndef GNASH_SHAPE_H
 #define GNASH_SHAPE_H
@@ -111,6 +111,10 @@
 		/// Return true if the query point is on the filled
 		/// interior of this shape.
 		///
+		/// Note that boundaries are NOT checked (a point of the boundary
+		/// will return false here).
+		/// Use withinSquareDistance() for boundary checking.
+		///
 		/// Return false if this path has no associated fill.
 		///
 		/// WARNING: often a filled shape is composed by multiple

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 08:52:55 -0000	1.9
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 10:01:47 -0000	1.10
@@ -97,7 +97,7 @@
 
 	// Over the transparent line (150,100)
 	tester.movePointerTo(150, 100);
-	xcheck(!tester.isMouseOverMouseEntity()); // fails due to shape_character_def::point_test_local bug 
+	check(!tester.isMouseOverMouseEntity()); 
 	check_pixel(150, 100, 2, white, 2); 
 
 	// Over the violet line (146,225)



From MAILER-DAEMON Tue Apr 24 06:11:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgHzq-0001Xc-OY
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 06:11:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgHzp-0001W5-A9
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:11:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgHzp-0001Vt-1n
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:11:41 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgHzo-0001Vq-QK
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:11:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgHuJ-00045m-BZ
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 06:05:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgHuG-0003P3-1H
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 10:05:56 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgHuF-0003Oz-QE
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 10:05:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgHuF-0003Oz-QE@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 10:05:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/parser shape_character_def.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 10:11:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 10:05:55

Modified files:
	server/parser  : shape_character_def.cpp 

Log message:
	cleanups and more comments

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- shape_character_def.cpp	23 Apr 2007 20:05:20 -0000	1.18
+++ shape_character_def.cpp	24 Apr 2007 10:05:55 -0000	1.19
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.18 2007/04/23 20:05:20 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.19 2007/04/24 10:05:55 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -607,16 +607,20 @@
 	return false;
     }
 
+    size_t npaths = m_paths.size();
+    
+    if ( ! npaths ) return false;
+    
     point pt(x, y);
 
     // Try each of the paths.
-    for (unsigned int i = 0; i < m_paths.size(); i++)
+    for (size_t i = 0; i < npaths; ++i)
     {
-	path& pth = m_paths[i];
+	const path& pth = m_paths[i];
 
-	if ( pth.m_edges.empty() ) continue;
+	if ( pth.empty() ) continue;
 
-	// If it has 
+	// If it has a line style, check for strokes there
 	if ( pth.m_line != 0 )
 	{
 		assert(m_line_styles.size() >= pth.m_line);
@@ -637,6 +641,7 @@
 		if ( pth.withinSquareDistance(pt, sqdist) ) return true;
 	}
 
+	// Check for point in polygon (if filled - but that test is in point_test itself)
 	if (pth.point_test(x, y)) return true;
     }
 



From MAILER-DAEMON Tue Apr 24 08:01:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgJiC-0005fE-PP
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 08:01:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgJiB-0005eJ-KU
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:01:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgJi6-0005Zu-DB
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:01:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgJi6-0005Zi-5h
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:01:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgJca-0001iJ-BU
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 07:55:48 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgJcL-0000tX-HZ
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 11:55:33 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgJcL-0000tU-7I
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 11:55:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgJcL-0000tU-7I@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 11:55:33 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 12:01:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 11:55:33

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp 

Log message:
	        * testsuite/misc-ming.all/: DrawingApiTest.as,
	          DrawingApiTestRunner.cpp: Add a circle drawing and
	          test for collision detection of curved fills.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2981&r2=1.2982
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2981
retrieving revision 1.2982
diff -u -b -r1.2981 -r1.2982
--- ChangeLog	24 Apr 2007 10:01:46 -0000	1.2981
+++ ChangeLog	24 Apr 2007 11:55:32 -0000	1.2982
@@ -1,5 +1,11 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/: DrawingApiTest.as,
+	  DrawingApiTestRunner.cpp: Add a circle drawing and
+	  test for collision detection of curved fills.
+
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
 	* server/shape.{cpp,h} (point_test): only check for the
 	  "interior" of the shape, forget its boundaries.
 	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp: one

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 09:07:32 -0000	1.8
+++ testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 11:55:33 -0000	1.9
@@ -22,6 +22,29 @@
 halftransparent = new Object();
 halftransparent.valueOf = function() { return 50; };
 
+// Draw a circle with given center and radius
+// Uses 8 curves to approximate the circle
+drawCircle = function (where, x, y, rad)
+{
+        var ctl = Math.sin(24*Math.PI/180)*rad;
+        var cos = Math.cos(45*Math.PI/180)*rad;
+        var sin = Math.sin(45*Math.PI/180)*rad;
+
+        with (where)
+        {
+                moveTo(x, y-rad);
+                curveTo(x+ctl, y-rad, x+cos, y-sin);
+                curveTo(x+rad, y-ctl, x+rad, y);
+                curveTo(x+rad, y+ctl, x+cos, y+sin);
+                curveTo(x+ctl, y+rad, x, y+rad);
+                curveTo(x-ctl, y+rad, x-cos, y+sin);
+                curveTo(x-rad, y+ctl, x-rad, y);
+                curveTo(x-rad, y-ctl, x-cos, y-sin);
+                curveTo(x-ctl, y-rad, x, y-rad);
+        }
+};
+
+
 with (a)
 {
 	clear();
@@ -97,6 +120,11 @@
 	lineTo(240, 100);
 	lineTo(260, 100);
 	endFill();
+
+	// The green circle
+	lineStyle(8, 0x000000);
+	beginFill(0x00FF00, 100);
+	drawCircle(a, 330, 160, 35);
 }
 
 // Make the MovieClip "active" (grabbing mouse events)

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 10:01:47 -0000	1.10
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 11:55:33 -0000	1.11
@@ -70,6 +70,13 @@
 	check(tester.isMouseOverMouseEntity());
 	check_pixel(60, 215, 2, blue, 1);
 
+	// Inside bottom-left blue fill but in the 
+	// curve internal to check if the point_test
+	// works for filled curves
+	tester.movePointerTo(40, 205);
+	check(tester.isMouseOverMouseEntity());
+	check_pixel(40, 205, 2, blue, 1);
+
 	// Inside cyan clockwise fill
 	tester.movePointerTo(190, 112);
 	check(tester.isMouseOverMouseEntity());
@@ -117,12 +124,23 @@
 
 	// In the middle of an imaginary line between
 	// first and last point of the green curve
-	tester.movePointerTo(355, 156);
+	tester.movePointerTo(376, 180);
 	xcheck(!tester.isMouseOverMouseEntity()); // fails due to edge::withinSquareDistance bug
-	check_pixel(355, 156, 2, white, 2);
+	check_pixel(376, 180, 2, white, 2);
 
+	// Over the green curve
 	tester.movePointerTo(376, 139);
 	xcheck(tester.isMouseOverMouseEntity()); // fails due to edge::withinSquareDistance bug
 	check_pixel(376, 139, 2, green, 2); // fails due to bug in AGG
+
+	// Over the center of the green circle fill
+	tester.movePointerTo(330, 160);
+	check(tester.isMouseOverMouseEntity()); 
+	check_pixel(330, 160, 2, green, 2); 
+
+	// Over the boundary of the green circle fill
+	tester.movePointerTo(363, 174);
+	xcheck(tester.isMouseOverMouseEntity());  // fails due to edge::withinSquareDistance bug
+	check_pixel(363, 174, 2, black, 2); 
 }
 



From MAILER-DAEMON Tue Apr 24 08:07:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgJo5-00009D-LS
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 08:07:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgJo3-00008y-EY
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:07:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgJo1-00008m-UW
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:07:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgJo1-00008j-Pn
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:07:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HgJiV-0003E7-TB
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:01:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgJiV-00018z-KR
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 12:01:55 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HgJiV-00018v-97
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 12:01:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgJiV-00018v-97@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 24 Apr 2007 12:01:55 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libgeometry/Range2d.h server/re...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 12:07:39 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/24 12:01:55

Modified files:
	.              : ChangeLog 
	libgeometry    : Range2d.h 
	server         : rect.h 
	server/parser  : shape_character_def.cpp 

Log message:
	new expandToCircle() and correct calculate_bounds()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2982&r2=1.2983
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Range2d.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/rect.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2982
retrieving revision 1.2983
diff -u -b -r1.2982 -r1.2983
--- ChangeLog	24 Apr 2007 11:55:32 -0000	1.2982
+++ ChangeLog	24 Apr 2007 12:01:54 -0000	1.2983
@@ -1,3 +1,10 @@
+2007-04-24 Udo Giacomozzi <udo.gnu@nova-sys.net>
+
+	* libgeometry/Range2d.h: added expandToCircle()
+	* server/rect.h: added expand_to_circle()
+	* server/parser/shape_character_def.cpp: corrected compute_bound()
+	  to respect outline widths
+	    	
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/: DrawingApiTest.as,

Index: libgeometry/Range2d.h
===================================================================
RCS file: /cvsroot/gnash/gnash/libgeometry/Range2d.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- libgeometry/Range2d.h	28 Feb 2007 22:53:24 -0000	1.13
+++ libgeometry/Range2d.h	24 Apr 2007 12:01:54 -0000	1.14
@@ -19,7 +19,7 @@
 //
 
 
-/* $Id: Range2d.h,v 1.13 2007/02/28 22:53:24 strk Exp $ */
+/* $Id: Range2d.h,v 1.14 2007/04/24 12:01:54 udog Exp $ */
 
 #ifndef GNASH_RANGE2D_H
 #define GNASH_RANGE2D_H
@@ -333,6 +333,24 @@
 		return *this;
 	}
 
+	/// Expand this Range2d to enclose the given circle.
+	//
+	/// @return a reference to this instance
+	///
+	Range2d<T>& expandToCircle(T x, T y, T radius)
+	{
+		// A WORLD range already enclose every point
+		if ( isWorld() ) return *this;
+
+        expandTo(x-radius, y);
+        expandTo(x+radius, y);
+
+        expandTo(x, y-radius);
+        expandTo(x, y+radius);
+
+		return *this;
+	}
+
 	/// Set ourself to bound the given point
 	//
 	/// @return a reference to this instance

Index: server/rect.h
===================================================================
RCS file: /cvsroot/gnash/gnash/server/rect.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/rect.h	6 Dec 2006 12:48:51 -0000	1.16
+++ server/rect.h	24 Apr 2007 12:01:55 -0000	1.17
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: rect.h,v 1.16 2006/12/06 12:48:51 strk Exp $ */
+/* $Id: rect.h,v 1.17 2007/04/24 12:01:55 udog Exp $ */
 
 #ifndef GNASH_RECT_H
 #define GNASH_RECT_H
@@ -114,6 +114,12 @@
 		_range.expandTo(x, y);
 	}
 
+	/// Expand this rectangle to enclose the given circle.
+	void	expand_to_circle(float x, float y, float radius)
+	{
+		_range.expandToCircle(x, y, radius);
+	}
+
 	/// Set ourself to bound the given point
 	void	enclose_point(float x, float y)
 	{

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/parser/shape_character_def.cpp	24 Apr 2007 10:05:55 -0000	1.19
+++ server/parser/shape_character_def.cpp	24 Apr 2007 12:01:55 -0000	1.20
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.19 2007/04/24 10:05:55 strk Exp $ */
+/* $Id: shape_character_def.cpp,v 1.20 2007/04/24 12:01:55 udog Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -668,15 +668,35 @@
 
     for (unsigned int i = 0; i < m_paths.size(); i++)
     {
+    
 	const path&	p = m_paths[i];
+
 	size_t nedges = p.m_edges.size();
 	if ( ! nedges ) continue;
+        
+        if (p.m_line==0) {
+
 	r->expand_to_point(p.m_ax, p.m_ay);
 	for (unsigned int j = 0; j<nedges; j++)
 	{
 		r->expand_to_point(p.m_edges[j].m_ax, p.m_edges[j].m_ay);
 		r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
 	}
+            
+        } else {        
+            
+            // NOTE: Half of get_width() would be enough (and correct) for
+            // radius, but that would not match how Flash calculates the
+            // bounds using the drawing API.                        
+            float radius = m_line_styles[p.m_line-1].get_width();
+            
+            r->expand_to_circle(p.m_ax, p.m_ay, radius);
+            for (unsigned int j = 0; j<nedges; j++)
+            {
+                r->expand_to_circle(p.m_edges[j].m_ax, p.m_edges[j].m_ay, radius);
+                r->expand_to_circle(p.m_edges[j].m_cx, p.m_edges[j].m_cy, radius);
+            }
+        }
     }
 }
 



From MAILER-DAEMON Tue Apr 24 08:32:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgKBr-0000kH-QX
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 08:32:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgKBp-0000jw-UL
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:32:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgKBp-0000jk-EJ
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:32:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgKBp-0000jh-8c
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:32:13 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <udo.gnu@nova-sys.net>)
	id 1HgK6J-0006Sp-9x
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 08:26:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgK6J-0002Ht-62
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 12:26:31 +0000
Received: from udog by cvs with local (Exim 4.50) id 1HgK6I-0002Hq-Tm
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 12:26:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgK6I-0002Hq-Tm@cvs>
From: Udo Giacomozzi <udo.gnu@nova-sys.net>
Date: Tue, 24 Apr 2007 12:26:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/libgeometry/Range2dTe...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 12:32:14 -0000

CVSROOT:	/cvsroot/gnash
Module name:	gnash
Changes by:	Udo Giacomozzi <udog>	07/04/24 12:26:30

Modified files:
	.              : ChangeLog 
	testsuite/libgeometry: Range2dTest.cpp 

Log message:
	added test for expandToCircle()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2983&r2=1.2984
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libgeometry/Range2dTest.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/gnash/gnash/ChangeLog,v
retrieving revision 1.2983
retrieving revision 1.2984
diff -u -b -r1.2983 -r1.2984
--- ChangeLog	24 Apr 2007 12:01:54 -0000	1.2983
+++ ChangeLog	24 Apr 2007 12:26:30 -0000	1.2984
@@ -4,6 +4,8 @@
 	* server/rect.h: added expand_to_circle()
 	* server/parser/shape_character_def.cpp: corrected compute_bound()
 	  to respect outline widths
+	* testsuite/libgeometry/Range2dTest.cpp: added test for 
+	  expandToCircle()
 	    	
 2007-04-24 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/libgeometry/Range2dTest.cpp
===================================================================
RCS file: /cvsroot/gnash/gnash/testsuite/libgeometry/Range2dTest.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/libgeometry/Range2dTest.cpp	27 Feb 2007 11:24:11 -0000	1.6
+++ testsuite/libgeometry/Range2dTest.cpp	24 Apr 2007 12:26:30 -0000	1.7
@@ -68,6 +68,15 @@
 	check( fIntRange1 != nullIntRange1 );
 
 	//
+	// Test expandToCircle()
+	//
+	
+	Range2d<float> circleRange;
+    circleRange.expandToCircle(50.0, 100.0, 10.0);
+    check_equals( circleRange, Range2d<float>(40.0, 90.0, 60.0, 110.0));  
+
+
+	//
 	// Test growBy()
 	//
 



From MAILER-DAEMON Tue Apr 24 13:58:35 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgPHf-0003Td-47
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 13:58:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgPHe-0003TX-8V
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 13:58:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgPHc-0003TL-Uu
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 13:58:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgPHc-0003TI-Rn
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 13:58:32 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HgPC5-0007vZ-49
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 13:52:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgPC4-0003A4-BL
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 17:52:48 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HgPC4-0003A0-4D
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 17:52:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgPC4-0003A0-4D@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Tue, 24 Apr 2007 17:52:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash configure.ac Makefile.am ChangeLog extens...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 17:58:34 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/24 17:52:47

Modified files:
	.              : configure.ac Makefile.am ChangeLog 
	extensions     : Makefile.am 
	extensions/fileio: fileio.cpp 
	cygnal         : cygnal.cpp 

Log message:
		* configure.ac: Remove --enable-extension. Add --with-extensions=
		that takes a comma delimited list of extension so you can seclect
		with ones you want to build.
		* Makefile.am: Always add the extensions directory.
		* extensions/Makefile.am: Use new conditionals to select builds
		directories.
		* cygnal/cygnal.cpp: Include posix_time.hpp.
		* extensions/fileio/fileio.cpp: Use intrusive pointers instead of
		explicit pointers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.292&r2=1.293
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2984&r2=1.2985
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/Makefile.am?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/fileio/fileio.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/cygnal.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- configure.ac	19 Apr 2007 14:39:13 -0000	1.292
+++ configure.ac	24 Apr 2007 17:52:47 -0000	1.293
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.292 2007/04/19 14:39:13 bjacques Exp $
+dnl $Id: configure.ac,v 1.293 2007/04/24 17:52:47 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -85,6 +85,8 @@
 
 CFLAGS="$save_CFLAGS";
 
+AC_ARG_WITH(top_level, AC_HELP_STRING([--with-top-level], [top level directory for cross compiling files]), with_top_level=${withval})
+
 AC_ARG_ENABLE(debugger,
   AC_HELP_STRING([--disable-debugger],[Disable the Flash debugger]),
 [case "${enableval}" in
@@ -124,17 +126,6 @@
   AC_DEFINE([WRITE_FILE], [], [Write files while streaming])
 fi
 
-dnl Don't build the extensions if specified.
-AC_ARG_ENABLE(extensions,
-  AC_HELP_STRING([--enable-extensions], [Enable support for Gnash EXTENSIONS]),
-[case "${enableval}" in
-  yes) extensions=yes ;;
-  no)  extensions=no ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for enable-extensions option]) ;;
-esac],extensions=no)
-
-AM_CONDITIONAL(EXTENSIONS, test x$extensions = xyes)
-
 dnl Don't build the cygnal server if specified.
 AC_ARG_ENABLE(cygnal,
   AC_HELP_STRING([--disable-cygnal], [Disable support for the Cygnal server]),
@@ -307,6 +298,71 @@
 )
 
 dnl --------------------------------------------------------
+dnl Figure out which extensions to build.
+dnl --------------------------------------------------------
+
+extensions_list=
+ext_dejagnu=no
+ext_mysql=no
+ext_fileio=no
+ext_gtk=no
+ext_all=no
+AC_ARG_WITH(extensions,
+  AC_HELP_STRING([--with-extensions=], [Specify which extensions to build]),
+  if test -n ${withval}; then
+    extlist="${withval}"
+    withval=`echo ${withval} | tr '\054' ' ' `
+  fi
+  while test -n "${withval}" ; do
+    val=`echo ${withval} | cut -d ' ' -f 1`
+    extensions_list="${extensions_list} ${val}"
+    [case "${val}" in
+      dejagnu|DEJAGNU|dj|DJ)
+        AC_DEFINE(USE_DEJAGNU_EXT, [1], [Build the DejaGnu extension])
+        AC_MSG_NOTICE([Adding DejaGnu extension])
+        ext_dejagnu=yes
+        ;;
+      mysql|MYSQL|sql|SQL)
+        AC_DEFINE(USE_MYSQL_EXT, [1], [Build the MySQL extension])
+        AC_MSG_NOTICE([Adding MySql extension])
+        ext_mysql=yes
+        ;;
+      fileio|FILEIO|io|IO)
+        AC_DEFINE(USE_FILEIO_EXT, [1], [Build the FileIO extension])
+        AC_MSG_NOTICE([Adding FileIO extension])
+        ext_fileio=yes
+        ;;
+      gtk|GTK|gtk2|GTK2)
+        AC_DEFINE(USE_GTK_EXT, [1], [Build the FileIO extension])
+        ext_gtk=yes
+        ;;
+      all|ALL)
+        AC_DEFINE(USE_GTK_EXT, [1], [Build the FileIO extension])
+        ext_dejagnu=yes
+        ext_mysql=yes
+        ext_fileio=yes
+        ext_gtk=yes
+        ext_all=yes
+        ;;
+      *) AC_MSG_ERROR([invalid extension specified: ${withval} given (accept: MYSQL|DEJAGNU|FILEIO|GTK|ALL)])
+         ;;
+      esac]
+    withval=`echo ${withval} | cut -d ' ' -f 2-6`
+    if test x$val = x$withval; then
+      break;
+    fi
+  done
+)
+
+AM_CONDITIONAL(BUILD_DEJAGNU_EXT, [ test x$ext_dejagnu = xyes ])
+AM_CONDITIONAL(BUILD_FILEIO_EXT, [ test x$ext_fileio = xyes ])
+AM_CONDITIONAL(BUILD_MYSQL_EXT, [ test x$ext_mysql = xyes ])
+AM_CONDITIONAL(BUILD_GTK_EXT, [ test x$ext_gtk = xyes ])
+if test x$ext_mysql = xyes; then
+  GNASH_PATH_MYSQL
+fi
+
+dnl --------------------------------------------------------
 dnl Figure out development tool stuff
 dnl --------------------------------------------------------
 
@@ -348,8 +404,8 @@
 if test x$cross_compiling = xyes; then
   AC_MSG_NOTICE([Configuring Gnash for cross compilation])
   export pkgroot=`$CXX -print-search-dirs | grep "install:" | sed -e 's/install: //' -e 's:/lib/gcc/.*::'`
-  export incllist="${pkgroot}/${host_alias}/include ${pkgroot}/include"
-  export libslist="${pkgroot}/${host_alias}/lib ${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib"
+  export incllist="${with_top_level}/include ${pkgroot}/${host_alias}/include ${pkgroot}/include"
+  export libslist="${with_top_level}/lib ${pkgroot}/${host_alias}/lib ${pkgroot}/lib64 ${pkgroot}/lib32 ${pkgroot}/lib"
   export pathlist="${pkgroot}/${host_alias}/bin:${pkgroot}/bin"
   LDFLAGS="${LDFLAGS} -Wl,--as-needed"
   plugin=no
@@ -547,6 +603,7 @@
 AC_CHECK_FUNCS(strlcat, AC_DEFINE(HAVE_STRLCAT_PROTO, [1],[Define if you have the strlcat prototype]))
 dnl Look for Win32 networking stuff
 AC_CHECK_HEADERS(winsock.h)
+AC_CHECK_HEADERS(winsock2.h)
 AC_CHECK_HEADERS(sys/endian.h)
 AC_CHECK_HEADERS(machine/endian.h)
 AC_CHECK_HEADERS(endian.h)
@@ -573,15 +630,6 @@
 GNASH_PKG_FIND(jpeg, [jpeglib.h], [jpeg images], jpeg_mem_init)
 GNASH_PKG_INCLUDES([dejagnu], [dejagnu.h])
 
-dnl if we're not building the extensions, then the _FLAGS and _LIBS settings
-dnl found in these tests are blank. This way they can be used in
-dnl Makefiles, but won't add bloat to the Makefiles.
-if test x$extensions = xyes; then
-  GNASH_PATH_MYSQL
-  AC_DEFINE(USE_EXTENSIONS, [], [Defined if you enable building the exetensions])
-fi
-AM_CONDITIONAL(ENABLE_MYSQL, [ test x"$mysql" = xyes ])
-
 AC_PATH_MING
 AM_CONDITIONAL(ENABLE_MING, [ test x"$MAKESWF" != x ])
 AM_CONDITIONAL(MAKESWF_SUPPORTS_PREBUILT_CLIPS,
@@ -1041,11 +1089,11 @@
   echo "        GNOME help disabled (default). Use --enable-ghelp to enable."
 fi
 
-if test x"$extensions" = x"yes"; then
-  echo "        Building extensions enabled (default). Use --disable-extensions to disable."
-else
-  echo "        Building Gnash extensions disabled."
-fi
+dnl if test x"$extensions" = x"yes"; then
+dnl   echo "        Building extensions enabled (default). Use --disable-extensions to disable."
+dnl else
+dnl   echo "        Building Gnash extensions disabled."
+dnl fi
 
 if test x"$cygnal" = x"yes"; then
   echo "        Building Cygnal media server enabled (default). Use --disable-cygnal to disable."
@@ -1059,11 +1107,19 @@
   echo "        Building the Flash debugger is disabled."
 fi
 
+if test x"$with-top_level" != x; then
+  echo "        Top level for cross compiling support files is: $with_top_level"
+fi
+
 if test x"$gui" = xgtk -a x"$pixelformat" = xrgb565; then
   echo "        WARNING: Pixel format RGB565 selected in combination with the"
   echo "        GTK GUI. Only a hacked GTK will work (e.g. on the OLPC)."
 fi
 
+if test x"$extensions_list" != x; then
+  echo "        Building extensions: ${extensions_list}"
+fi
+
 echo "        Renderer engine: "$renderer
 echo "        GUI: "$gui
 echo "        Media handler: "$media_handler
@@ -1100,7 +1156,7 @@
   fi
 fi
 
-if test x$extensions = xyes; then
+if test x$ext_mysql = xyes; then
   if test x$mysql != xno; then
     if test x"$MYSQL_LIBS" != x; then
       echo "        MYSQL flags are: $MYSQC_CFLAGS"
@@ -1564,19 +1620,23 @@
  to play compressed SWF (most of them from version 6 up). "
 fi
 
-if test x$extensions = xyes; then
+if test x$ext_mysql = xyes; then
   if test x$mysql != xno; then
     if test x"$MYSQL_LIBS" != x; then
       echo "        MYSQL flags are: $MYSQC_CFLAGS"
       echo "        MYSQL libs are: $MYSQL_LIBS"
     else
       echo "        ERROR: No MySQL development package is installed."
-      echo "               Either reconfigure with --disable-extensions, or install"
+      echo "               Either reconfigure with --with-extensions=mysql, or install"
       echo "               libmysqlclient-dev (using apt-get) or something-else (using yum)"
     fi
   fi
 fi
 
+if test x$cross_compiling = xyes; then
+  AC_MSG_NOTICE([This build is setup for cross compiling])
+fi
+
 # If anything critical is missing, don't bother to continue
 if test x"$nogo" = x"true"; then
 echo ""

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- Makefile.am	6 Apr 2007 07:58:15 -0000	1.67
+++ Makefile.am	24 Apr 2007 17:52:47 -0000	1.68
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.67 2007/04/06 07:58:15 jgilmore Exp $
+# $Id: Makefile.am,v 1.68 2007/04/24 17:52:47 rsavoye Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -53,9 +53,7 @@
 CYGNAL_DIRS = cygnal
 endif
 
-if EXTENSIONS
 EXTEND_DIRS = extensions
-endif
 
 SUBDIRS      = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(EXTEND_DIRS) $(CYGNAL_DIRS)
 
@@ -205,7 +203,7 @@
 	@echo "	DMALLOC_CFLAGS is $(DMALLOC_CFLAGS)"
 	@echo "	DMALLOC_LIBS is $(DMALLOC_LIBS)"
 endif
-if EXTENSIONS
+if BUILD_MYSQL_EXT
 	@echo "MYSQL_CFLAGS is $(MYSQL_CFLAGS)"
 	@echo "MYSQL_LIBS is $(MYSQL_LIBS)"
 endif

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2984
retrieving revision 1.2985
diff -u -b -r1.2984 -r1.2985
--- ChangeLog	24 Apr 2007 12:26:30 -0000	1.2984
+++ ChangeLog	24 Apr 2007 17:52:47 -0000	1.2985
@@ -1,3 +1,15 @@
+2007-04-24  Rob Savoye  <rob@ute.welcomehome.org>
+
+	* configure.ac: Remove --enable-extension. Add --with-extensions=
+	that takes a comma delimited list of extension so you can seclect
+	with ones you want to build.
+	* Makefile.am: Always add the extensions directory.
+	* extensions/Makefile.am: Use new conditionals to select builds
+	directories.
+	* cygnal/cygnal.cpp: Include posix_time.hpp.
+	* extensions/fileio/fileio.cpp: Use intrusive pointers instead of
+	explicit pointers.
+
 2007-04-24 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* libgeometry/Range2d.h: added expandToCircle()

Index: extensions/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- extensions/Makefile.am	27 Feb 2007 09:10:20 -0000	1.5
+++ extensions/Makefile.am	24 Apr 2007 17:52:47 -0000	1.6
@@ -18,9 +18,27 @@
 AUTOMAKE_OPTIONS = 
 
 # Don't try to build the MySQL extension unless MySQL is actually installed.
-if ENABLE_MYSQL
-MYSQL_DIR = mysql
+OTHER_DIRS =
+if BUILD_MYSQL_EXT
+OTHER_DIRS += mysql
 endif
 
-DISTSUBDIRS = dejagnu fileio mysql gtk2
-SUBDIRS = dejagnu fileio $(MYSQL_DIR)
+if BUILD_DEJAGNU_EXT
+OTHER_DIRS += dejagnu
+endif
+
+if BUILD_FILEIO_EXT
+OTHER_DIRS += fileio
+endif
+
+if USE_GUI_FLTK
+OTHER_DIRS += fltk2
+endif
+
+if BUILD_GTK_EXT
+if USE_GUI_GTK
+OTHER_DIRS += gtk2
+endif
+endif
+DIST_SUBDIRS = dejagnu fileio mysql gtk2
+SUBDIRS = $(OTHER_DIRS)

Index: extensions/fileio/fileio.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/fileio/fileio.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- extensions/fileio/fileio.cpp	22 Mar 2007 22:37:45 -0000	1.10
+++ extensions/fileio/fileio.cpp	24 Apr 2007 17:52:47 -0000	1.11
@@ -317,7 +317,7 @@
 fileio_fopen(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio *)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     
     if (fn.nargs > 0) {
@@ -331,7 +331,7 @@
 fileio_fclose(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio *)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     
     return as_value(ptr->fclose());
@@ -341,7 +341,7 @@
 fileio_fread(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
 		
 		string str;
@@ -357,7 +357,7 @@
 fileio_fgetc(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     int i = ptr->fgetc();
     char *c = reinterpret_cast<char *>(&i);
@@ -368,7 +368,7 @@
 fileio_fgets(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     string str; 
     str = ptr->fgets(str);
@@ -379,7 +379,7 @@
 fileio_gets(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);    
     char buf[BUFSIZE];
     memset(buf, 0, BUFSIZE);
@@ -392,7 +392,7 @@
 fileio_getchar(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     int i = ::getchar();
     char *c = reinterpret_cast<char *>(&i);
@@ -403,7 +403,7 @@
 fileio_fwrite(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     string str = fn.arg(0).to_string();
     return as_value(ptr->fputs(str));
@@ -413,7 +413,7 @@
 fileio_fputc(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);    
     int c = (int) fn.arg(0).to_number();
     return as_value(ptr->fputc(c));
@@ -423,7 +423,7 @@
 fileio_fputs(const fn_call& fn)
 {
     //   GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);    
     string str = fn.arg(0).to_string();
     return as_value(ptr->fputs(str));
@@ -442,7 +442,7 @@
 fileio_putchar(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);    
     string x = fn.arg(0).to_string();
     return as_value(::putchar(x[0]));
@@ -452,7 +452,7 @@
 fileio_fflush(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);    
     return as_value(ptr->fflush());
 }
@@ -461,7 +461,7 @@
 fileio_fseek(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);    
     long c = (long) fn.arg(0).to_number();
     return as_value(ptr->fseek(c));
@@ -471,7 +471,7 @@
 fileio_ftell(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     int i = ptr->ftell();
     return as_value(i);
@@ -481,7 +481,7 @@
 fileio_unlink(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    Fileio *ptr = (Fileio*)fn.this_ptr;
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
     assert(ptr);
     string str = fn.arg(0).to_string();
     return as_value(ptr->unlink(str));
@@ -494,11 +494,13 @@
 
 		// TODO: Check optional second parameter and sort array if it's true
 		// or missing.
+    boost::intrusive_ptr<Fileio> ptr = ensureType<Fileio>(fn.this_ptr);
 
-    Fileio *ptr = (Fileio*)fn.this_ptr;
     assert(ptr);    
     string str = fn.arg(0).to_string();
-    ptr->scandir(str, fn.result);
+    as_value val;
+    ptr->scandir(str, &val);
+    return val;
 }
 
 std::auto_ptr<as_object>

Index: cygnal/cygnal.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/cygnal.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- cygnal/cygnal.cpp	8 Apr 2007 23:06:16 -0000	1.8
+++ cygnal/cygnal.cpp	24 Apr 2007 17:52:47 -0000	1.9
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: cygnal.cpp,v 1.8 2007/04/08 23:06:16 rsavoye Exp $ */
+/* $Id: cygnal.cpp,v 1.9 2007/04/24 17:52:47 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,6 +57,8 @@
 #include <locale.h>
 #endif
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
 



From MAILER-DAEMON Tue Apr 24 15:28:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgQh8-0002HT-Ux
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 15:28:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgQh7-0002HN-DN
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 15:28:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgQh5-0002HB-Vz
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 15:28:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgQh5-0002H8-Q3
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 15:28:55 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HgQbX-0003s7-Qx
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 15:23:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgQbX-0007p8-Ag
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 19:23:11 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HgQbX-0007p5-41
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 19:23:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgQbX-0007p5-41@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Tue, 24 Apr 2007 19:23:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/extensions Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 19:28:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/24 19:23:11

Modified files:
	extensions     : Makefile.am 

Log message:
	No FLTK extension just yet...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/Makefile.am?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Makefile.am	24 Apr 2007 17:52:47 -0000	1.6
+++ Makefile.am	24 Apr 2007 19:23:10 -0000	1.7
@@ -31,10 +31,6 @@
 OTHER_DIRS += fileio
 endif
 
-if USE_GUI_FLTK
-OTHER_DIRS += fltk2
-endif
-
 if BUILD_GTK_EXT
 if USE_GUI_GTK
 OTHER_DIRS += gtk2



From MAILER-DAEMON Tue Apr 24 17:45:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgSph-000805-Go
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 17:45:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgSpf-0007zV-5d
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 17:45:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgSpe-0007z9-Er
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 17:45:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgSpe-0007z4-BC
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 17:45:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HgSk5-0004jc-MU
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 17:40:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgSk4-0000yb-RC
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:40:08 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HgSk4-0000yY-LG
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:40:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgSk4-0000yY-LG@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Tue, 24 Apr 2007 21:40:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/doc/C/asspec asspec-C.omf
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 21:45:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/24 21:40:08

Added files:
	doc/C/asspec   : asspec-C.omf 

Log message:
	Add OMF file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/asspec-C.omf?cvsroot=gnash&rev=1.1

Patches:
Index: asspec-C.omf
===================================================================
RCS file: asspec-C.omf
diff -N asspec-C.omf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ asspec-C.omf	24 Apr 2007 21:40:08 -0000	1.1
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<omf>
+  <resource>
+    <creator>
+     rob@senecass.com (Rob Savoye)
+    </creator>
+    <maintainer>
+     rob@senecass.com (Rob Savoye)
+    </maintainer>
+    <title>
+     Free Flash Specification
+    </title>
+    <date>
+     2006-02-06
+    </date>
+    <version identifier="0.1.1" date="2006-02-06" description="First release."/>
+    <subject category="GNOME|Applications|Sound and Video"/>
+    <description>
+        This is a community produced specification of Flash and ActionScript.
+    </description>
+    <type>
+     manual
+    </type>
+    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
+    <identifier url=""/>
+    <language code="C"/>
+    <relation seriesid="31a101ca-363a-11d6-93d3-b34a9c6ce2e6"/>
+    <rights type="GNU FDL" license.version="1.1" license="http://www.gnu.org/licenses/fdl.html" holder="Rob Savoye"/>
+  </resource>
+</omf>
+



From MAILER-DAEMON Tue Apr 24 19:31:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgUTa-0001nO-O2
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 19:31:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgUTZ-0001mk-IM
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 19:31:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgUTY-0001mY-52
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 19:31:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgUTX-0001mV-Vr
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 19:31:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HgUNy-0002B2-Qn
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 19:25:26 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgUNy-0005PY-9e
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 23:25:26 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HgUNy-0005PV-3z
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 23:25:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgUNy-0005PV-3z@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Tue, 24 Apr 2007 23:25:26 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/doc/C/asspec Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Apr 2007 23:31:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/24 23:25:26

Modified files:
	doc/C/asspec   : Makefile.am 

Log message:
	Remove actionscript.texi.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Makefile.am	29 Mar 2007 22:09:44 -0000	1.1
+++ Makefile.am	24 Apr 2007 23:25:25 -0000	1.2
@@ -77,7 +77,6 @@
 	$(xml_files) \
 	$(omffile) \
 	asspec.texi \
-	actionscript.texi \
 	asspec-man.xml \
 	asspec.info \
 	asspec.html \



From MAILER-DAEMON Tue Apr 24 20:14:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgV92-0005V2-Vx
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgV91-0005T5-5E
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgV90-0005Sm-HC
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgV90-0005Sj-8R
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgV3Q-0007Cn-Su
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:08:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgS6Q-0006Ia-Lj
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:59:10 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgS6Q-0006IX-GC
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:59:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgS6Q-0006IX-GC@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 20:59:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite MovieTester.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 00:14:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 20:59:10

Modified files:
	testsuite      : MovieTester.cpp 

Log message:
	commented out debugging line

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/MovieTester.cpp?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: MovieTester.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/MovieTester.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- MovieTester.cpp	23 Apr 2007 10:19:47 -0000	1.30
+++ MovieTester.cpp	24 Apr 2007 20:59:10 -0000	1.31
@@ -212,7 +212,7 @@
 	const char* X="";
 	if ( expectFailure ) X="X";
 
-	cout <<"chekPixel(" << color << ") called" << endl;
+	//cout <<"chekPixel(" << color << ") called" << endl;
 
 	for (TRenderers::const_iterator it=_testingRenderers.begin(), itE=_testingRenderers.end();
 				it != itE; ++it)



From MAILER-DAEMON Tue Apr 24 20:14:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgV99-0005bQ-6M
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgV97-0005ZN-AW
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:09 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgV96-0005YR-FQ
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgV96-0005YK-50
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgV3W-0007E1-KZ
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:08:22 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgStG-0001H4-38
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:49:38 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgStF-0001H0-L9
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:49:38 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgStF-0001H0-L9@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 21:49:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 00:14:10 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 21:49:37

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/sprite_instance.cpp: globalToLocal and localToGlobal
	          implemented.
	        * testsuite/actionscript.all/MovieClip.as: test localToGlobal
	          and globalToLocal.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2988&r2=1.2989
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.255&r2=1.256
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.66&r2=1.67

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2988
retrieving revision 1.2989
diff -u -b -r1.2988 -r1.2989
--- ChangeLog	24 Apr 2007 21:11:18 -0000	1.2988
+++ ChangeLog	24 Apr 2007 21:49:37 -0000	1.2989
@@ -1,5 +1,12 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp: globalToLocal and localToGlobal
+	  implemented.
+	* testsuite/actionscript.all/MovieClip.as: test localToGlobal
+	  and globalToLocal.
+
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp: stubbed localToGlobal and setMask
 	* testsuite/actionscript.all/MovieClip.as: test availability of
 	  localToGlobal and setMask.

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -b -r1.255 -r1.256
--- server/sprite_instance.cpp	24 Apr 2007 21:11:18 -0000	1.255
+++ server/sprite_instance.cpp	24 Apr 2007 21:49:37 -0000	1.256
@@ -49,6 +49,7 @@
 #include "URLAccessManager.h" // for loadVariables
 #include "LoadVariablesThread.h" 
 #include "ExecutableCode.h"
+#include "gnash.h" // for point class !
 
 #include <vector>
 #include <string>
@@ -849,30 +850,139 @@
 sprite_globalToLocal(const fn_call& fn)
 {
 	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
-	UNUSED(sprite);
+
+	as_value ret;
+
+	if ( fn.nargs < 1 )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.globalToLocal() takes one arg"));
+		);
+		return ret;
+	}
+
+	boost::intrusive_ptr<as_object> obj = fn.arg(0).to_object();
+	if ( ! obj )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.globalToLocal(%s): "
+				"first argument doesn't cast to an object"),
+			fn.arg(0).to_debug_string().c_str());
+		);
+		return ret;
+	}
+
+	as_value tmp;
+	float x = 0;
+	float y = 0;
+
+	if ( ! obj->get_member("x", &tmp) )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.globalToLocal(%s): "
+				"object parameter doesn't have an 'x' member"),
+			fn.arg(0).to_debug_string().c_str());
+		);
+		return ret;
+	}
+	x = PIXELS_TO_TWIPS(tmp.to_number(&fn.env()));
+
+	if ( ! obj->get_member("y", &tmp) )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.globalToLocal(%s): "
+				"object parameter doesn't have an 'y' member"),
+			fn.arg(0).to_debug_string().c_str());
+		);
+		return ret;
+	}
+	y = PIXELS_TO_TWIPS(tmp.to_number(&fn.env()));
+
+	point pt(x, y);
+	matrix world_mat = sprite->get_world_matrix();
+	world_mat.transform_by_inverse(pt);
+
+	obj->set_member("x", TWIPS_TO_PIXELS(round(pt.m_x)));
+	obj->set_member("y", TWIPS_TO_PIXELS(round(pt.m_y)));
 
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_unimpl("MovieClip.globalToLocal()");
+		log_msg("MovieClip.globalToLocal() TESTING");
 		warned=true;
 	}
-	return as_value();
+
+	return ret;
 }
 
 static as_value
 sprite_localToGlobal(const fn_call& fn)
 {
 	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
-	UNUSED(sprite);
+
+	as_value ret;
+
+	if ( fn.nargs < 1 )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.localToGlobal() takes one arg"));
+		);
+		return ret;
+	}
+
+	boost::intrusive_ptr<as_object> obj = fn.arg(0).to_object();
+	if ( ! obj )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.localToGlobal(%s): "
+				"first argument doesn't cast to an object"),
+			fn.arg(0).to_debug_string().c_str());
+		);
+		return ret;
+	}
+
+	as_value tmp;
+	float x = 0;
+	float y = 0;
+
+	if ( ! obj->get_member("x", &tmp) )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.localToGlobal(%s): "
+				"object parameter doesn't have an 'x' member"),
+			fn.arg(0).to_debug_string().c_str());
+		);
+		return ret;
+	}
+	x = PIXELS_TO_TWIPS(tmp.to_number(&fn.env()));
+
+	if ( ! obj->get_member("y", &tmp) )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("MovieClip.localToGlobal(%s): "
+				"object parameter doesn't have an 'y' member"),
+			fn.arg(0).to_debug_string().c_str());
+		);
+		return ret;
+	}
+	y = PIXELS_TO_TWIPS(tmp.to_number(&fn.env()));
+
+	point pt(x, y);
+	matrix world_mat = sprite->get_world_matrix();
+	world_mat.transform(pt);
+
+	obj->set_member("x", TWIPS_TO_PIXELS(round(pt.m_x)));
+	obj->set_member("y", TWIPS_TO_PIXELS(round(pt.m_y)));
 
 	static bool warned = false;
 	if ( ! warned )
 	{
-		log_unimpl("MovieClip.localToGlobal()");
+		log_msg("MovieClip.localToGlobal() TESTING");
 		warned=true;
 	}
-	return as_value();
+
+	return ret;
+
 }
 
 static as_value

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- testsuite/actionscript.all/MovieClip.as	24 Apr 2007 21:11:18 -0000	1.66
+++ testsuite/actionscript.all/MovieClip.as	24 Apr 2007 21:49:37 -0000	1.67
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.66 2007/04/24 21:11:18 strk Exp $";
+rcsid="$Id: MovieClip.as,v 1.67 2007/04/24 21:49:37 strk Exp $";
 
 #include "check.as"
 
@@ -741,3 +741,114 @@
 check_equals(b.yMax, 40);
 
 #endif // OUTPUT_VERSION >= 6
+
+//----------------------------------------------
+// Test localToGlobal and globalToLocal
+//----------------------------------------------
+
+static_clip_name = "__shared_assets";
+static_clip = __shared_assets;
+if ( typeof(static_clip) == 'movieclip' )
+{
+	o = {x:0, y:0};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 0);
+	check_equals(o.y, 0);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 0);
+	check_equals(o.y, 0);
+
+	static_clip._x += 50;
+	static_clip._y -= 30;
+
+	o = {x:0, y:0};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 50);
+	check_equals(o.y, -30);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 0);
+	check_equals(o.y, 0);
+
+	o = {x:1, y:1};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 51);
+	check_equals(o.y, -29);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 1);
+	check_equals(o.y, 1);
+
+	static_clip._xscale *= 2;
+	static_clip._yscale *= 0.5;
+
+	o = {x:0, y:0};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 50);
+	check_equals(o.y, -30);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 0);
+	check_equals(o.y, 0);
+
+	o = {x:2, y:2};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 54);
+	check_equals(o.y, -29);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 2);
+	check_equals(o.y, 2);
+
+	static_clip._rotation = 90;
+
+	o = {x:0, y:0};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 50);
+	check_equals(o.y, -30);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 0);
+	check_equals(o.y, 0);
+
+	o = {x:2, y:2};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 49);
+	check_equals(o.y, -26);
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 2);
+	check_equals(o.y, 2);
+
+	// omit the 'y' member (invalid call)
+	o = {x:2};
+	static_clip.localToGlobal(o);
+	check_equals(o.x, 2);
+	check_equals(typeof(o.y), 'undefined');
+	static_clip.globalToLocal(o);
+	check_equals(o.x, 2);
+	check_equals(typeof(o.y), 'undefined');
+
+	// Upper case
+	o = {X:2, Y:2};
+	static_clip.localToGlobal(o);
+#if OUTPUT_VERSION < 7
+	check_equals(o.X, 49);
+	check_equals(o.Y, -26);
+#else // OUTPUT_VERSION >= 7
+	check_equals(o.X, 2);
+	check_equals(o.Y, 2);
+	check_equals(typeof(o.x), 'undefined');
+	check_equals(typeof(o.y), 'undefined');
+#endif
+	static_clip.globalToLocal(o);
+	check_equals(o.X, 2);
+	check_equals(o.Y, 2);
+
+	static_clip._rotation = 0;
+	static_clip._x -= 50;
+	static_clip._y += 30;
+	static_clip._xscale *= 0.5;
+	static_clip._yscale *= 2;
+
+	// TODO: try with x/y being getter-setter of the localToGlobal and globalToLocal parameter
+}
+else
+{
+	note("There is not '"+static_clip_name+"' clip statically-defined, so we could not test localToGlobal() and globalToLocal() against it");
+
+}



From MAILER-DAEMON Tue Apr 24 20:15:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgV9y-00065L-DP
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgV9w-000650-9g
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgV9v-00063o-Be
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgV9v-00063i-6x
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:14:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgV4L-0007JH-I6
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:09:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgTPM-0002GZ-Mv
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 22:22:48 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgTPM-0002GW-CN
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 22:22:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgTPM-0002GW-CN@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 22:22:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 00:15:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 22:22:48

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 

Log message:
	        * server/sprite_instance.cpp (sprite_hit_test): implement
	          hitTest() - not all call types tested.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2989&r2=1.2990
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.256&r2=1.257

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2989
retrieving revision 1.2990
diff -u -b -r1.2989 -r1.2990
--- ChangeLog	24 Apr 2007 21:49:37 -0000	1.2989
+++ ChangeLog	24 Apr 2007 22:22:48 -0000	1.2990
@@ -1,5 +1,10 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp (sprite_hit_test): implement
+	  hitTest() - not all call types tested.
+
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
 	* server/sprite_instance.cpp: globalToLocal and localToGlobal
 	  implemented.
 	* testsuite/actionscript.all/MovieClip.as: test localToGlobal

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -b -r1.256 -r1.257
--- server/sprite_instance.cpp	24 Apr 2007 21:49:37 -0000	1.256
+++ server/sprite_instance.cpp	24 Apr 2007 22:22:48 -0000	1.257
@@ -616,6 +616,8 @@
 	static bool warned_2_arg = false;
 	static bool warned_3_arg = false;
 
+	as_environment& env = fn.env();
+
 	switch (fn.nargs)
 	{
 		case 1: // target
@@ -626,38 +628,55 @@
 			{
 				IF_VERBOSE_ASCODING_ERRORS(
 				log_aserror(_("Can't find hitTest target %s"),
-					tgt_val.to_string().c_str());
+					tgt_val.to_debug_string().c_str());
 				);
 				return as_value();
 			}
+
+			geometry::Range2d<float> thisbounds = sprite->getBounds();
+			matrix thismat = sprite->get_world_matrix();
+			thismat.transform(thisbounds);
+
+			geometry::Range2d<float> tgtbounds = target->getBounds();
+			matrix tgtmat = target->get_world_matrix();
+			tgtmat.transform(tgtbounds);
+
 			if ( ! warned_1_arg ) {
-				log_unimpl("hitTest(target)");
+				log_warning("MovieClip.hitTest(%s) TESTING", tgt_val.to_debug_string().c_str());
 				warned_1_arg=true;
 			}
+
+			return thisbounds.intersects(tgtbounds);
+
 			break;
 		}
 
 		case 2: // x, y
 		{
-			double x = fn.arg(0).to_number();
-			double y = fn.arg(1).to_number();
+			float x = PIXELS_TO_TWIPS(fn.arg(0).to_number(&env));
+			float y = PIXELS_TO_TWIPS(fn.arg(1).to_number(&env));
+
 			if ( ! warned_2_arg ) {
-				log_unimpl("hitTest(%g,%g)", x,y);
+				log_warning("MovieClip.hitTest(%g,%g) TESTING", x,y);
 				warned_2_arg=true;
 			}
-			break;
+
+			return sprite->pointInBounds(x, y);
 		}
 
 		case 3: // x, y, shapeFlag
 		{
-			double x = fn.arg(0).to_number();
-			double y = fn.arg(1).to_number();
+			double x = PIXELS_TO_TWIPS(fn.arg(0).to_number(&env));
+			double y = PIXELS_TO_TWIPS(fn.arg(1).to_number(&env));
 			bool shapeFlag = fn.arg(2).to_bool();
+
 			if ( ! warned_3_arg ) {
-				log_unimpl("hitTest(%g,%g,%d)", x,y,shapeFlag);
+				log_msg("MovieClip.hitTest(%g,%g,%d) TESTING", x,y,shapeFlag);
 				warned_3_arg=true;
 			}
-			break;
+
+			if ( ! shapeFlag ) return sprite->pointInBounds(x, y);
+			else return sprite->pointInVisibleShape(x, y);
 		}
 
 		default:



From MAILER-DAEMON Tue Apr 24 20:15:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgVAH-000685-IO
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgVAF-00067R-8h
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgVAE-00067C-Dl
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgVAE-000677-6J
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgV4e-0007Kt-Nn
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:09:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgS9V-0006RO-Gx
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:02:21 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgS9V-0006RL-4W
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:02:21 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgS9V-0006RL-4W@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 21:02:21 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 00:15:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 21:02:20

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DrawingApiTest.as 
	                         DrawingApiTestRunner.cpp Makefile.am 

Log message:
	        * testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as,
	          DrawingApiTestRunner.cpp: Prepared a test for invalidated
	          bounds checking. Gnash clearly fails, but no actual automated
	          tests added to the test runner yet.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2986&r2=1.2987
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.98&r2=1.99

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2986
retrieving revision 1.2987
diff -u -b -r1.2986 -r1.2987
--- ChangeLog	24 Apr 2007 20:38:26 -0000	1.2986
+++ ChangeLog	24 Apr 2007 21:02:20 -0000	1.2987
@@ -1,5 +1,12 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as,
+	  DrawingApiTestRunner.cpp: Prepared a test for invalidated
+	  bounds checking. Gnash clearly fails, but no actual automated
+	  tests added to the test runner yet.
+
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
 	* server/vm/ActionExec.{cpp,h}: add delObjectMember() method.
 	* server/vm/ASHandlers.cpp (ActionDelete): hopefully fixed -
 	  at least as far as we can tell...

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 11:55:33 -0000	1.9
+++ testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 21:02:20 -0000	1.10
@@ -125,9 +125,35 @@
 	lineStyle(8, 0x000000);
 	beginFill(0x00FF00, 100);
 	drawCircle(a, 330, 160, 35);
+	endFill();
 }
 
 // Make the MovieClip "active" (grabbing mouse events)
 // This allows testing of fill styles and "thick" lines
 a.onRollOver = function() {};
 
+frameno = 0;
+a.createEmptyMovieClip("b", 2);
+a.onEnterFrame = function()
+{
+	if ( ++frameno > 8 )
+	{
+		//this.clear();
+		frameno = 0;
+		ret = delete this.onEnterFrame;
+		if ( ret ) {
+			trace("PASSED: delete this.onEnterFrame returned "+ret);
+		} else {
+			trace("FAILED: delete this.onEnterFrame returned "+ret);
+		}
+	}
+	else
+	{
+		this.b.clear();
+		this.b.lineStyle(2, 0xFF0000);
+		this.b.beginFill(0xFFFF00, 100);
+		drawCircle(this.b, (50*frameno), 280, 10);
+		this.b.endFill();
+	}
+};
+

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 11:55:33 -0000	1.11
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 21:02:20 -0000	1.12
@@ -142,5 +142,10 @@
 	tester.movePointerTo(363, 174);
 	xcheck(tester.isMouseOverMouseEntity());  // fails due to edge::withinSquareDistance bug
 	check_pixel(363, 174, 2, black, 2); 
+
+	// TODO: check invalidated bounds and drawing on advance !
+	//       there should be a yellow-fill, red-stroke circle moving from bottom-left to bottom-right
+	//       for 8 advancements.
+	for (int i=0; i<10; ++i) tester.advance();
 }
 

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- testsuite/misc-ming.all/Makefile.am	24 Apr 2007 06:54:06 -0000	1.98
+++ testsuite/misc-ming.all/Makefile.am	24 Apr 2007 21:02:20 -0000	1.99
@@ -966,7 +966,7 @@
 
 
 DrawingApiTest.swf: $(srcdir)/DrawingApiTest.as 
-	$(MAKESWF) -o $@ $(srcdir)/DrawingApiTest.as
+	$(MAKESWF) -r2 -o $@ $(srcdir)/DrawingApiTest.as
 
 DrawingApiTestRunner_SOURCES = \
 	DrawingApiTestRunner.cpp \



From MAILER-DAEMON Tue Apr 24 20:15:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgVAH-00068O-S2
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:21 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgVAF-00067q-Rg
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgVAF-00067T-AY
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:19 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgVAF-00067O-4b
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgV4f-0007Kz-LK
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:09:33 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgSIB-0006uJ-2q
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:11:19 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgSIA-0006uG-LY
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 21:11:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgSIA-0006uG-LY@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 21:11:18 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/sprite_instance.cpp test...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 00:15:20 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 21:11:18

Modified files:
	.              : ChangeLog 
	server         : sprite_instance.cpp 
	testsuite/actionscript.all: MovieClip.as 

Log message:
	        * server/sprite_instance.cpp: stubbed localToGlobal and setMask
	        * testsuite/actionscript.all/MovieClip.as: test availability of
	          localToGlobal and setMask.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2987&r2=1.2988
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.254&r2=1.255
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/MovieClip.as?cvsroot=gnash&r1=1.65&r2=1.66

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2987
retrieving revision 1.2988
diff -u -b -r1.2987 -r1.2988
--- ChangeLog	24 Apr 2007 21:02:20 -0000	1.2987
+++ ChangeLog	24 Apr 2007 21:11:18 -0000	1.2988
@@ -1,5 +1,8 @@
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
+	* server/sprite_instance.cpp: stubbed localToGlobal and setMask
+	* testsuite/actionscript.all/MovieClip.as: test availability of
+	  localToGlobal and setMask.
 	* testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as,
 	  DrawingApiTestRunner.cpp: Prepared a test for invalidated
 	  bounds checking. Gnash clearly fails, but no actual automated

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -b -r1.254 -r1.255
--- server/sprite_instance.cpp	24 Apr 2007 08:52:55 -0000	1.254
+++ server/sprite_instance.cpp	24 Apr 2007 21:11:18 -0000	1.255
@@ -861,6 +861,36 @@
 }
 
 static as_value
+sprite_localToGlobal(const fn_call& fn)
+{
+	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
+	UNUSED(sprite);
+
+	static bool warned = false;
+	if ( ! warned )
+	{
+		log_unimpl("MovieClip.localToGlobal()");
+		warned=true;
+	}
+	return as_value();
+}
+
+static as_value
+sprite_setMask(const fn_call& fn)
+{
+	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
+	UNUSED(sprite);
+
+	static bool warned = false;
+	if ( ! warned )
+	{
+		log_unimpl("MovieClip.setMask()");
+		warned=true;
+	}
+	return as_value();
+}
+
+static as_value
 sprite_endFill(const fn_call& fn)
 {
 	boost::intrusive_ptr<sprite_instance> sprite = ensureType<sprite_instance>(fn.this_ptr);
@@ -1262,9 +1292,11 @@
 	o.init_member("getURL", new builtin_function(sprite_getURL));
 	o.init_member("getBounds", new builtin_function(sprite_getBounds));
 	o.init_member("globalToLocal", new builtin_function(sprite_globalToLocal));
+	o.init_member("localToGlobal", new builtin_function(sprite_localToGlobal));
 	if ( target_version  < 6 ) return;
 
 	// SWF6 or higher
+	o.init_member("setMask", new builtin_function(sprite_setMask));
 	o.init_member("beginFill", new builtin_function(sprite_beginFill));
 	o.init_member("beginGradientFill", new builtin_function(sprite_beginGradientFill));
 	o.init_member("clear", new builtin_function(sprite_clear));

Index: testsuite/actionscript.all/MovieClip.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/MovieClip.as,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- testsuite/actionscript.all/MovieClip.as	20 Apr 2007 10:03:12 -0000	1.65
+++ testsuite/actionscript.all/MovieClip.as	24 Apr 2007 21:11:18 -0000	1.66
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: MovieClip.as,v 1.65 2007/04/20 10:03:12 zoulunkai Exp $";
+rcsid="$Id: MovieClip.as,v 1.66 2007/04/24 21:11:18 strk Exp $";
 
 #include "check.as"
 
@@ -53,12 +53,13 @@
 // Check methods existance
 
 // SWF5 or higher
-check(mc.attachMovie);
-check(mc.getBytesLoaded);
-check(mc.getBytesTotal);
-check(mc.getBounds);
-check(mc.globalToLocal);
-check_equals(typeOf(mc.unloadMovie), 'function');
+check_equals(typeof(mc.attachMovie), 'function');
+check_equals(typeof(mc.getBytesLoaded), 'function');
+check_equals(typeof(mc.getBytesTotal), 'function');
+check_equals(typeof(mc.getBounds), 'function');
+check_equals(typeof(mc.globalToLocal), 'function');
+check_equals(typeof(mc.localToGlobal), 'function');
+check_equals(typeof(mc.unloadMovie), 'function');
 
 // This seems unavailable
 // when targetting SWF > 6
@@ -69,6 +70,7 @@
 #endif
 
 #if OUTPUT_VERSION >= 6
+	check_equals(typeof(mc.setMask), 'function');
 	check_equals(typeof(mc.beginFill), 'function');
 	check_equals(typeof(mc.beginGradientFill), 'function');
         check_equals(typeof(mc.clear), 'function');
@@ -112,8 +114,6 @@
     // maybe we should just NOT use the _root for this ?
     //check(mc.loadVariables != undefined);
 
-    xcheck(mc.localToGlobal);
-    xcheck(mc.setMask);
     check(mc.startDrag);
     check(mc.stopDrag);
     xcheck(mc.enabled);



From MAILER-DAEMON Tue Apr 24 20:15:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgVAK-00069V-3m
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgVAI-00068w-OM
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgVAF-00067m-RA
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgVAF-00067g-LW
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:15:19 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgV4g-0007L5-7o
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:09:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgRmN-0005MX-Ch
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:38:27 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgRmN-0005MT-2A
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 20:38:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgRmN-0005MT-2A@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Tue, 24 Apr 2007 20:38:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp server...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 00:15:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/24 20:38:26

Modified files:
	.              : ChangeLog 
	server/vm      : ActionExec.cpp ActionExec.h ASHandlers.cpp 
	testsuite/actionscript.all: delete.as 

Log message:
	        * server/vm/ActionExec.{cpp,h}: add delObjectMember() method.
	        * server/vm/ASHandlers.cpp (ActionDelete): hopefully fixed -
	          at least as far as we can tell...
	        * testsuite/actionscript.all/delete.as: more tests for ActionDelete.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2985&r2=1.2986
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/delete.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2985
retrieving revision 1.2986
diff -u -b -r1.2985 -r1.2986
--- ChangeLog	24 Apr 2007 17:52:47 -0000	1.2985
+++ ChangeLog	24 Apr 2007 20:38:26 -0000	1.2986
@@ -1,3 +1,10 @@
+2007-04-24 Sandro Santilli <strk@keybit.net>
+
+	* server/vm/ActionExec.{cpp,h}: add delObjectMember() method.
+	* server/vm/ASHandlers.cpp (ActionDelete): hopefully fixed -
+	  at least as far as we can tell...
+	* testsuite/actionscript.all/delete.as: more tests for ActionDelete.
+
 2007-04-24  Rob Savoye  <rob@ute.welcomehome.org>
 
 	* configure.ac: Remove --enable-extension. Add --with-extensions=

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/vm/ActionExec.cpp	20 Apr 2007 12:13:34 -0000	1.28
+++ server/vm/ActionExec.cpp	24 Apr 2007 20:38:26 -0000	1.29
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.28 2007/04/20 12:13:34 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.29 2007/04/24 20:38:26 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -342,6 +342,21 @@
 	return env.del_variable_raw(namei, with_stack);
 }
 
+bool
+ActionExec::delObjectMember(as_object& obj, const std::string& name)
+{
+	VM& vm = VM::get();
+
+	std::string namei = name;
+
+	if ( vm.getSWFVersion() < 7 ) {
+	    boost::to_lower(namei, vm.getLocale());
+	} 
+
+	std::pair<bool,bool> ret = obj.delProperty(namei);
+	return ret.second;
+}
+
 void
 ActionExec::setVariable(const std::string& name, const as_value& val)
 {

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/vm/ActionExec.h	28 Mar 2007 16:24:39 -0000	1.14
+++ server/vm/ActionExec.h	24 Apr 2007 20:38:26 -0000	1.15
@@ -228,6 +228,19 @@
 	///
 	bool delVariable(const std::string& name);
 
+	/// Delete a named object member.
+	//
+	/// @param obj
+	///	The object to remove the member/property from.
+	///
+	/// @param name
+	///	Name of the member. 
+	///	Name is converted to lowercase if SWF version is < 7.
+	///
+	/// @return true if the member was successfully removed, false otherwise.
+	///
+	bool delObjectMember(as_object& obj, const std::string& name);
+
 	/// Set a named variable, seeking for it in the with stack if any.
 	//
 	/// @param name

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- server/vm/ASHandlers.cpp	19 Apr 2007 14:25:41 -0000	1.99
+++ server/vm/ASHandlers.cpp	24 Apr 2007 20:38:26 -0000	1.100
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.99 2007/04/19 14:25:41 martinwguy Exp $ */
+/* $Id: ASHandlers.cpp,v 1.100 2007/04/24 20:38:26 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2112,32 +2112,39 @@
 void
 SWFHandlers::ActionDelete(ActionExec& thread)
 {
-//	GNASH_REPORT_FUNCTION;
+	//GNASH_REPORT_FUNCTION;
 	as_environment& env = thread.env;
 
 	assert(thread.code[thread.pc] == SWF::ACTION_DELETE); // 0x3A
 
-	size_t stacksize = env.stack_size();
+	thread.ensureStack(2); // obj, member
 
-	if ( stacksize < 1 )
+	// TODO: some parameter checking ?
+	const std::string& propname = env.top(0).to_string(&env);
+	boost::intrusive_ptr<as_object> obj = env.top(1).to_object();
+
+	if ( ! obj )
 	{
-		IF_VERBOSE_MALFORMED_SWF(
-			log_swferror(_("No elements on the stack "
-				"at ActionDelete (0x3A). "
-				"Returning FALSE."));
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror("delete %s.%s : first element is not an object",
+			env.top(1).to_debug_string().c_str(),
+			env.top(0).to_debug_string().c_str());
 		);
-		env.push(as_value(false));
+		env.top(1).set_bool(false);
+		env.drop(1);
 		return;
 	}
 
-	// What's the difference between this and ActionDelete2 ??
-	env.top(0) = thread.delVariable(env.top(0).to_string(&env));
+	env.top(1).set_bool(thread.delObjectMember(*obj, propname));
+
+	env.drop(1);
+
 }
 
 void
 SWFHandlers::ActionDelete2(ActionExec& thread)
 {
-//	GNASH_REPORT_FUNCTION;
+	//GNASH_REPORT_FUNCTION;
 
 	as_environment& env = thread.env;
 

Index: testsuite/actionscript.all/delete.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/delete.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/delete.as	15 Mar 2007 22:39:54 -0000	1.9
+++ testsuite/actionscript.all/delete.as	24 Apr 2007 20:38:26 -0000	1.10
@@ -1,4 +1,4 @@
-rcsid="$Id: delete.as,v 1.9 2007/03/15 22:39:54 strk Exp $";
+rcsid="$Id: delete.as,v 1.10 2007/04/24 20:38:26 strk Exp $";
 
 #include "check.as"
 
@@ -57,3 +57,17 @@
 check(!delete func.prototype);
 check_equals(typeof(func.prototype), 'object');
 check_equals(func.prototype.appended_value, 4);
+
+//
+// Deleting an object's member
+//
+
+obj = new Object;
+obj.a = 1;
+check_equals(obj.a, 1);
+check(delete obj.a);
+check_equals(typeof(obj.a), 'undefined');
+check(!delete obj.a);
+check(!delete unexistent.a);
+
+// TODO: try other malformed ActionDelete calls



From MAILER-DAEMON Tue Apr 24 22:24:33 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgXBJ-0001eZ-Cu
	for mharc-gnash-commit@gnu.org; Tue, 24 Apr 2007 22:24:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgXBH-0001eU-4l
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 22:24:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgXBF-0001eI-P4
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 22:24:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgXBF-0001eF-Ik
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 22:24:29 -0400
Received: from nz-out-0506.google.com ([64.233.162.224])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HgX5f-0004Cf-Eh
	for gnash-commit@gnu.org; Tue, 24 Apr 2007 22:18:43 -0400
Received: by nz-out-0506.google.com with SMTP id 12so70899nzp
	for <gnash-commit@gnu.org>; Tue, 24 Apr 2007 19:18:42 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=bzwJ2yqD0BMIsiwmm4yOk7cofjmbcuLi3TgUHggnRoixb9BCxtkG5gj2VRoj3ad6h/bq3ou2tdlK8bZeIUIEaGBGtHWI+D3nbDBWYNQZCPBLCZBN+QynkQ58dyvysxzp7GoWRwrzf9bc5NseFcU9AHu2yRX6Pl+sWQSKqlA0sco=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=OFTK8j1BJZwT68F9L/1pisZCjSsHCnZtqZkgsCexb+vdtX7NEOwujNcmVDLGu9pfd5+Xqf+rowrBLRcKjUBRrD7HjdeGJarefw6IG/hYyNjCaQW8MLuiABiraP+/gHcmJJzkCe8f1rUbzcSlz3nkyG3X/a44UL4rTXd4XnvoZGk=
Received: by 10.114.209.1 with SMTP id h1mr35880wag.1177467522043;
	Tue, 24 Apr 2007 19:18:42 -0700 (PDT)
Received: by 10.114.113.14 with HTTP; Tue, 24 Apr 2007 19:18:41 -0700 (PDT)
Message-ID: <ca4b43ff0704241918w61e592d6jf30ce8989a32a37a@mail.gmail.com>
Date: Wed, 25 Apr 2007 10:18:41 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Udo Giacomozzi" <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
In-Reply-To: <20070419190045.GE92773@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HeadU-0002ww-Ur@cvs> <3610341590.20070419194751@nova-sys.net>
	<20070419190045.GE92773@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: Sandro Santilli <strk@keybit.net>
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 02:24:31 -0000

+/*public*/
+const std::string
+character::getTarget() const
+{
+
+  // TODO: maybe cache computed target?
+
+       std::string target_dot;
+
+       std::string levelString = "_level0"; // TODO: support real levels!
+
+       const std::string& targetPath = getTargetPath();
+       if ( targetPath == "/" ) target_dot = levelString;
+       else
+       {
+               target_dot = levelString + targetPath;
+               for (std::string::size_type i=0; i<target_dot.length(); ++i)
+               {
+                       if ( target_dot[i] == '/' ) target_dot[i] = '.';
+               }
+       }
+
+       return target_dot;
+}
+
+/*public*/
+const char*   <----------------------------------[1]
+character::get_text_value() const
+{
+       return getTarget().c_str();
+}
+

[1] return a pointer to a local string!!! We won't get any text value
from it.   This caused odd problem with my event related testcase(just
changed the event order without invoking any other obvious problem),
and cost me an hour to track this. Our testsuite seems too weak to
prevent any thing.

Please fix this!



From MAILER-DAEMON Wed Apr 25 03:04:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgbYc-0003WK-W6
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 03:04:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgbYa-0003UN-OQ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:04:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgbYY-0003SV-Bf
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:04:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgbYY-0003SI-6c
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:04:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HgbSw-0007j6-ON
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 02:59:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgbSs-0000XP-Ad
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 06:58:58 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HgbSr-0000XJ-ED
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 06:58:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgbSr-0000XJ-ED@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 06:58:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/debugger.xml server/debug...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 07:04:53 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 06:58:57

Modified files:
	.              : ChangeLog 
	doc/C          : debugger.xml 
	server         : debugger.cpp debugger.h 
	server/vm      : ActionExec.cpp 

Log message:
	Fix spello: dissasemble -> disassemble

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2990&r2=1.2991
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/debugger.xml?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.h?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.29&r2=1.30

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2990
retrieving revision 1.2991
diff -u -b -r1.2990 -r1.2991
--- ChangeLog	24 Apr 2007 22:22:48 -0000	1.2990
+++ ChangeLog	25 Apr 2007 06:58:54 -0000	1.2991
@@ -1,3 +1,8 @@
+2007-04-25 Martin Guy <martinwguy@yahoo.it>
+
+	* ChangeLog,server/debugger.{cpp,h},server/vm/ActionExec.cpp:
+	  spello dissasemble -> disassemble
+
 2007-04-24 Sandro Santilli <strk@keybit.net>
 
 	* server/sprite_instance.cpp (sprite_hit_test): implement
@@ -39,6 +44,7 @@
 	* extensions/fileio/fileio.cpp: Use intrusive pointers instead of
 	explicit pointers.
 
+>>>>>>> 1.2990
 2007-04-24 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* libgeometry/Range2d.h: added expandToCircle()
@@ -4473,13 +4479,13 @@
 
 2007-02-06 Sandro Santilli <strk@keybit.net>
 
-	* server/debugger.{h,cpp}: (dissasemble): first argument
+	* server/debugger.{h,cpp}: (disassemble): first argument
 	  can safely be passed as a 'const' pointer.
 	* server/parser/action_buffer.h: added get_buffer() to
 	  return an unsugned char.
 	* server/vm/ActionExec.cpp (operator()): use
 	  action_buffer::get_buffer() to fetch an appropriate argument
-	  for Debugger::dissasemble.
+	  for Debugger::disassemble.
 
 2007-02-06 Martin Guy <martinwguy@yahoo.it>
 
@@ -15568,7 +15574,7 @@
 	reduce the chance of name collision. Use the new library names to
 	link.
 	
-	* server/action.cpp: Add missing opcodes to dissasembler table,a
+	* server/action.cpp: Add missing opcodes to disassembler table,a
 	and rename the unsupported ones to have a "_fixme" attached when
 	printing debug information.
 	* backend/Makefile.am (AM_LDFLAGS): Add $(X_LIBS) so we can link

Index: doc/C/debugger.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/debugger.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- doc/C/debugger.xml	10 Feb 2007 04:30:51 -0000	1.1
+++ doc/C/debugger.xml	25 Apr 2007 06:58:56 -0000	1.2
@@ -52,7 +52,7 @@
       <term>t</term>
       <listitem>
 	<para>
-	  Toggle Trace Mode on or off. Trace mode prints a dissasemble
+	  Toggle Trace Mode on or off. Trace mode prints a disassemble
 	  for each opcode as it executes in a similar fashion to the
 	  <emphasis>-va</emphasis> option.
 	</para>

Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/debugger.cpp	20 Apr 2007 12:13:34 -0000	1.17
+++ server/debugger.cpp	25 Apr 2007 06:58:56 -0000	1.18
@@ -194,7 +194,7 @@
 	      cin >> var;
 	      switch (var[0]) {
 		case 'd':
-		    this->dissasemble();
+		    this->disassemble();
 		  break;
 		case 'i':
 		    this->dumpMovieInfo();
@@ -314,14 +314,14 @@
 }
 
 void
-Debugger::dissasemble()
+Debugger::disassemble()
 {
 //    GNASH_REPORT_FUNCTION;
-    this->dissasemble(_pc);
+    this->disassemble(_pc);
 }
 
 void
-Debugger::dissasemble(const unsigned char *data)
+Debugger::disassemble(const unsigned char *data)
 {
 //    GNASH_REPORT_FUNCTION;
     as_arg_t fmt = ARG_HEX;

Index: server/debugger.h
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/debugger.h	16 Apr 2007 18:23:05 -0000	1.11
+++ server/debugger.h	25 Apr 2007 06:58:56 -0000	1.12
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: debugger.h,v 1.11 2007/04/16 18:23:05 strk Exp $ */
+/* $Id: debugger.h,v 1.12 2007/04/25 06:58:56 martinwguy Exp $ */
 
 #ifndef __DEBUGGER_H__
 #define __DEBUGGER_H__
@@ -48,8 +48,8 @@
 
     void dumpMovieInfo();
 
-    void dissasemble(const unsigned char *data);
-    void dissasemble();
+    void disassemble(const unsigned char *data);
+    void disassemble();
     void setBreakPoint(const std::string &var, bool enabled);
     void removeBreakPoint(const std::string &var);
     void dumpBreakPoints();

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/vm/ActionExec.cpp	24 Apr 2007 20:38:26 -0000	1.29
+++ server/vm/ActionExec.cpp	25 Apr 2007 06:58:57 -0000	1.30
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.29 2007/04/24 20:38:26 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.30 2007/04/25 06:58:57 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -203,7 +203,7 @@
  	debugger.setFramePointer(code.getFramePointer(pc));
  	debugger.setEnvStack(&env);
 	if (debugger.isTracing()) {
-	    debugger.dissasemble();
+	    debugger.disassemble();
 	}
 #endif
 	



From MAILER-DAEMON Wed Apr 25 03:10:10 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgbdi-0006oa-N3
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 03:10:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgbdg-0006oV-PI
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:10:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgbdf-0006oJ-9h
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:10:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgbdf-0006oG-3s
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:10:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HgbY3-0008VX-DO
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 03:04:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgbY1-0000xW-Qf
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:04:17 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HgbXz-0000xK-Tf
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:04:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgbXz-0000xK-Tf@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 07:04:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog macros/lib-link.m4 macros/lib-l...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 07:10:08 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 07:04:13

Modified files:
	.              : ChangeLog 
	macros         : lib-link.m4 
Removed files:
	macros         : lib-ld.m4 

Log message:
	remove repeated test for GNU ld. Closes bug #19623

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2991&r2=1.2992
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lib-link.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/lib-ld.m4?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2991
retrieving revision 1.2992
diff -u -b -r1.2991 -r1.2992
--- ChangeLog	25 Apr 2007 06:58:54 -0000	1.2991
+++ ChangeLog	25 Apr 2007 07:04:12 -0000	1.2992
@@ -2,6 +2,9 @@
 
 	* ChangeLog,server/debugger.{cpp,h},server/vm/ActionExec.cpp:
 	  spello dissasemble -> disassemble
+	* macros/lib-ld.m4(removed),macros/lib-link.m4:
+	  remove repeated test for GNU ld (libtool does this).
+	  Closes bug #19623
 
 2007-04-24 Sandro Santilli <strk@keybit.net>
 

Index: macros/lib-link.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/lib-link.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/lib-link.m4	6 Apr 2007 07:49:55 -0000	1.1
+++ macros/lib-link.m4	25 Apr 2007 07:04:13 -0000	1.2
@@ -98,7 +98,7 @@
   dnl Tell automake >= 1.10 to complain if config.rpath is missing.
   m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
-  AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
+  AC_REQUIRE([AC_PROG_LD])                dnl we use $LD, $with_gnu_ld
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
   AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
   AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [

Index: macros/lib-ld.m4
===================================================================
RCS file: macros/lib-ld.m4
diff -N macros/lib-ld.m4
--- macros/lib-ld.m4	6 Apr 2007 07:49:55 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,110 +0,0 @@
-# lib-ld.m4 serial 3 (gettext-0.13)
-dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
-dnl with libtool.m4.
-
-dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  acl_cv_prog_gnu_ld=yes ;;
-*)
-  acl_cv_prog_gnu_ld=no ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-1.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]* | [A-Za-z]:[\\/]*)]
-      [re_direlt='/[^/][^/]*/\.\./']
-      # Canonicalize the path of ld
-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(acl_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      acl_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break ;;
-      *)
-	test "$with_gnu_ld" != yes && break ;;
-      esac
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])



From MAILER-DAEMON Wed Apr 25 04:26:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgcpv-0003U1-Kl
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 04:26:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgcps-0003SY-Rq
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:26:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgcpq-0003Rm-ET
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:26:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgcpp-0003RW-Sv
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:26:46 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgckD-0000fb-4q
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:20:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hgck2-0007gw-2Q
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:20:46 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hgcjx-0007gV-4n
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:20:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hgcjx-0007gV-4n@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 25 Apr 2007 08:20:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/asspec/date.xml doc/C/ass...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 08:26:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/25 08:20:34

Modified files:
	.              : ChangeLog 
	doc/C/asspec   : date.xml movieclip.xml 

Log message:
	        * doc/C/asspec/date.xml: fixed typos preventing the asspec
	          from building.
	        * doc/C/asspec/movieclip.xml: add brief doc and conformancy
	          for localToGlobal(), globalToLocal() and hitTest() methods.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2992&r2=1.2993
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/date.xml?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/movieclip.xml?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2992
retrieving revision 1.2993
diff -u -b -r1.2992 -r1.2993
--- ChangeLog	25 Apr 2007 07:04:12 -0000	1.2992
+++ ChangeLog	25 Apr 2007 08:20:27 -0000	1.2993
@@ -1,3 +1,10 @@
+2007-04-25 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/asspec/date.xml: fixed typos preventing the asspec
+	  from building.
+	* doc/C/asspec/movieclip.xml: add brief doc and conformancy
+	  for localToGlobal(), globalToLocal() and hitTest() methods.
+
 2007-04-25 Martin Guy <martinwguy@yahoo.it>
 
 	* ChangeLog,server/debugger.{cpp,h},server/vm/ActionExec.cpp:

Index: doc/C/asspec/date.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/date.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/asspec/date.xml	18 Apr 2007 13:47:24 -0000	1.2
+++ doc/C/asspec/date.xml	25 Apr 2007 08:20:31 -0000	1.3
@@ -328,6 +328,7 @@
 		If no parameters are given, or if the parameter cannot
 		be converted to a number, the Date's value is set to
 		NotANumber. Any extra parameters are ignored.
+	    </para>
 	  </listitem>
 	</varlistentry>
 
@@ -444,6 +445,7 @@
 	    <para>
 		If no parameters are supplied, or if the parameter cannot be
 		converted to a number, the Date's value is set to NotANumber.
+	    </para>
 	  </listitem>
 	</varlistentry>
 

Index: doc/C/asspec/movieclip.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/movieclip.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/C/asspec/movieclip.xml	20 Apr 2007 07:50:40 -0000	1.2
+++ doc/C/asspec/movieclip.xml	25 Apr 2007 08:20:32 -0000	1.3
@@ -163,9 +163,12 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>globalToLocal()</term>
+	  <term>globalToLocal(obj)</term>
 	  <listitem>
 	    <para>
+		Take members 'x', and 'y' in the object 'obj' and transform them from global to local coordinate space.
+		If the parameter doesn't cast to an object, or the object doesn't contain both 'x' and 'y', the call is invalid 
+		and nothing is modified.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -187,9 +190,13 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>hitTest()</term>
+	  <term>hitTest(target)</term>
+	  <term>hitTest(x,y)</term>
+	  <term>hitTest(x,y,shapeFlag)</term>
 	  <listitem>
 	    <para>
+		In the first form, check for the bounding boxes of this and target characters to intersect.
+		In the second and third form, check if the given point is inside the bounding box or the visible shape of this character; shapeFlag (false) in the 2 args version says wheter actual shape or just bounds has to be checked.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -227,9 +234,12 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>localToGlobal()</term>
+	  <term>localToGlobal(obj)</term>
 	  <listitem>
 	    <para>
+		Take members 'x', and 'y' in the object 'obj' and transform them from local to global coordinate space.
+		If the parameter doesn't cast to an object, or the object doesn't contain both 'x' and 'y', the call is invalid 
+		and nothing is modified.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -964,7 +974,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested in Gnash.
 		</para>
 	      </entry>
 	    </row>
@@ -994,7 +1004,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested in Gnash.
 		</para>
 	      </entry>
 	    </row>
@@ -1044,7 +1054,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested in Gnash.
 		</para>
 	      </entry>
 	    </row>



From MAILER-DAEMON Wed Apr 25 04:31:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgcup-0005xb-If
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 04:31:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgcuo-0005vh-21
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:31:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgcum-0005v5-S5
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:31:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgcum-0005ul-Lk
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:31:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HgcpA-0001WB-NH
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 04:26:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hgcp9-0008Bw-4U
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:26:03 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hgcp8-0008Bo-FP
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:26:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hgcp8-0008Bo-FP@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 25 Apr 2007 08:26:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/doc/C/asspec movieclip.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 08:31:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/25 08:26:02

Modified files:
	doc/C/asspec   : movieclip.xml 

Log message:
	hitTest coordinates are in stage space

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/movieclip.xml?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: movieclip.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/movieclip.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- movieclip.xml	25 Apr 2007 08:20:32 -0000	1.3
+++ movieclip.xml	25 Apr 2007 08:26:00 -0000	1.4
@@ -196,7 +196,7 @@
 	  <listitem>
 	    <para>
 		In the first form, check for the bounding boxes of this and target characters to intersect.
-		In the second and third form, check if the given point is inside the bounding box or the visible shape of this character; shapeFlag (false) in the 2 args version says wheter actual shape or just bounds has to be checked.
+		In the second and third form, check if the given point is inside the bounding box or the visible shape of this character; shapeFlag (false) in the 2 args version says wheter actual shape or just bounds has to be checked; coordinates values are in Stage coordinate space.
 	    </para>
 	  </listitem>
 	</varlistentry>



From MAILER-DAEMON Wed Apr 25 05:21:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgdge-0000kM-Fz
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 05:21:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgdgW-0000iG-U2
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 05:21:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgdgS-0000gY-BQ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 05:21:12 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgdgR-0000gI-Gq
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 05:21:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hgdap-0000PV-Bi
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 05:15:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgdZl-00038D-4j
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 09:14:13 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HgdZk-000388-LZ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 09:14:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgdZk-000388-LZ@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 25 Apr 2007 09:14:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/asspec/movieclip.xml
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 09:21:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/25 09:14:12

Modified files:
	.              : ChangeLog 
	doc/C/asspec   : movieclip.xml 

Log message:
	More documentation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2993&r2=1.2994
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/movieclip.xml?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2993
retrieving revision 1.2994
diff -u -b -r1.2993 -r1.2994
--- ChangeLog	25 Apr 2007 08:20:27 -0000	1.2993
+++ ChangeLog	25 Apr 2007 09:14:11 -0000	1.2994
@@ -2,8 +2,8 @@
 
 	* doc/C/asspec/date.xml: fixed typos preventing the asspec
 	  from building.
-	* doc/C/asspec/movieclip.xml: add brief doc and conformancy
-	  for localToGlobal(), globalToLocal() and hitTest() methods.
+	* doc/C/asspec/movieclip.xml: add docs and conformancy for
+	  a few methods.
 
 2007-04-25 Martin Guy <martinwguy@yahoo.it>
 

Index: doc/C/asspec/movieclip.xml
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/movieclip.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- doc/C/asspec/movieclip.xml	25 Apr 2007 08:26:00 -0000	1.4
+++ doc/C/asspec/movieclip.xml	25 Apr 2007 09:14:12 -0000	1.5
@@ -27,9 +27,11 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>beginFill()</term>
+	  <term>beginFill([rgba])</term>
 	  <listitem>
 	    <para>
+		Set fill color for subsequent drawing. The value is interpreted as a 32bit integer composed of red (highest byte), green, blue and 
+		alpha (lowest byte). If first argument is missing the fill color will be black with alpha 255.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -46,14 +48,20 @@
 	  <term>clear()</term>
 	  <listitem>
 	    <para>
+		Clear all dynamic drawing on this MovieClip.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>createEmptyMovieClip()</term>
+	  <term>createEmptyMovieClip(name, depth)</term>
 	  <listitem>
 	    <para>
+		Create an empty movieclip and place it in this clip displaylist at the given depth.
+		Return a reference to the created clip.
+		If called with less the two arguments the method returns undefined and no action is taken.
+		TOCHECK: what if a character with the given name already exist ?
+		TOCHECK: what if a character at the given depth already exist ?
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -67,17 +75,26 @@
 	</varlistentry>
 
 	<varlistentry>
-	  <term>curveTo()</term>
+	  <term>curveTo(cx, cy, ax, ay)</term>
 	  <listitem>
 	    <para>
+		Draw a quadratic bezier curve with current linestyle and current fill from current pen position to the anchor point ax,ay using control point cx, cy. If any argument is missing nothing is drawn. The function always returns undefined.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>duplicateMovieClip()</term>
+	  <term>duplicateMovieClip(newname, newdepth, [initObject])</term>
 	  <listitem>
 	    <para>
+		Make a clone of this MovieClip and place it in this MovieClip parent's DisplayList.
+		If given a third argument, it will be taken as an object to use for initializing properties
+		of the clone.
+		Return the cloned object.
+		An absolute root movieclip (_levelx) can not be duplicated, if attempted, no action is taken and undefined is returned.
+		TOCHECK: what if a character with the given name already exists in parent's display list ?
+		TOCHECK: what if a character at the given depth already exists in parent's display list ?
+		TODO: add info about what does it mean to 'clone' (what's cloned and what not).
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -86,14 +103,20 @@
 	  <term>endFill()</term>
 	  <listitem>
 	    <para>
+		Reset any fill information. Next drawing calls will not be filled.
+		If a fill was in effect (see beginFill and beginGradientFill) the current path is closed so that
+		last point equals the first point of the filled shape.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>getBounds()</term>
+	  <term>getBounds([target])</term>
 	  <listitem>
 	    <para>
+		Returns an object  with members 'xMin', 'yMin', 'xMax' and 'yMax' representing the bounding box of this MovieClip.
+		When called with no args the bounding box is in local coordinate space.
+		When given an character as first argument, the bounding box is in the given character's coordinate space.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -118,6 +141,8 @@
 	  <term>getDepth()</term>
 	  <listitem>
 	    <para>
+		Return the depth on this character in its parent DisplayList.
+		TOCHECK: what's returned when called against a character with no parent (_levelx) ?
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -134,6 +159,9 @@
 	  <term>getNextHighestDepth()</term>
 	  <listitem>
 	    <para>
+		Return the next available depth for placing a new character in this MovieClip displaylist.
+		TOCHECK: if depths 1 and 3 are occupied, returns 4, not 2 , right ?
+		NOTE: this function always return a number >= 0, negative depths are never returned.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -142,6 +170,7 @@
 	  <term>getSWFVersion()</term>
 	  <listitem>
 	    <para>
+		TOCHECK : I don't think there's such a function ... 
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -203,16 +232,27 @@
 
 	<varlistentry>
 	  <term>lineStyle()</term>
+	  <term>lineStyle(thickness, [color])</term>
 	  <listitem>
 	    <para>
+		In the first form (no args) it will reset all line style info so that next drawing will have a transparent drawing.
+		Note that by 'transparent' is not intended 0-alpha as no color transformation will be able to augment the alpha value.
+		The line is simply always invisible instead.
+	    </para>
+	    <para>
+		In the second form, set thickness and color of strokes for subsequent drawing.
+		If color is omitted, it defaults to black with 255 alpha.
+		If thickness is zero the line will always be an 'hariline', which is always displaied with the
+		same width at any scale. Other thickness will be in pixels and scale togheter with the MovieClip itself.
 	    </para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>lineTo()</term>
+	  <term>lineTo(x, y)</term>
 	  <listitem>
 	    <para>
+		Draw a straight line from current position to point x,y using current styles.
 	    </para>
 	  </listitem>
 	</varlistentry>
@@ -804,7 +844,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -824,7 +864,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -834,7 +874,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested. Needs more tests for corner cases (ie: depth occupied or name existing).
 		</para>
 	      </entry>
 	    </row>
@@ -854,7 +894,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -864,7 +904,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested. Needs more testing.
 		</para>
 	      </entry>
 	    </row>
@@ -874,7 +914,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -884,7 +924,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -914,7 +954,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -934,7 +974,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested. Needs more tests.
 		</para>
 	      </entry>
 	    </row>
@@ -1014,7 +1054,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>
@@ -1024,7 +1064,7 @@
 	      </entry>
 	      <entry valign="top" align="center">
 		<para>
-		  This method has an unknown status.
+		  Implemented and tested.
 		</para>
 	      </entry>
 	    </row>



From MAILER-DAEMON Wed Apr 25 06:16:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HgeY8-0007wc-Ml
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 06:16:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HgeY6-0007vu-Kd
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 06:16:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HgeY4-0007v0-9J
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 06:16:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HgeY4-0007ur-26
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 06:16:32 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HgeSP-0000HA-8b
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 06:10:43 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3PA4fr18411;
	Wed, 25 Apr 2007 12:04:41 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Wed, 25 Apr 2007 12:04:41 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
Message-ID: <20070425100440.GB3044@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>,
	Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HeadU-0002ww-Ur@cvs> <3610341590.20070419194751@nova-sys.net>
	<20070419190045.GE92773@keybit.net>
	<ca4b43ff0704241918w61e592d6jf30ce8989a32a37a@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704241918w61e592d6jf30ce8989a32a37a@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 10:16:35 -0000

On Wed, Apr 25, 2007 at 10:18:41AM +0800, zou lunkai wrote:
> +/*public*/
> +const std::string
> +character::getTarget() const
> +{
> +
> +  // TODO: maybe cache computed target?
> +
> +       std::string target_dot;
...
> +       return target_dot;
> +}

Returning const std::string makes no sense, it's no const if we return by value !
Same for getTargetPath().
Note that the original code was in sprite_instance, which kept a "cache", so returned by const ref.


> +const char*   <----------------------------------[1]
> +character::get_text_value() const
> +{
> +       return getTarget().c_str();
> +}
> +
> 
> [1] return a pointer to a local string!!! We won't get any text value
> from it.   This caused odd problem with my event related testcase(just
> changed the event order without invoking any other obvious problem),
> and cost me an hour to track this. Our testsuite seems too weak to
> prevent any thing.

Again, this worked for sprite_instance because it kept a cache of the target 
paths. If we don't keep a cache we'll have to modify get_text_value() to return by
string value instead (no trivial change). Alternatively we reintroduce the cache just for the
sake of returning bu const-ref.

> Please fix this!

Indeed. UdoG, I think it's your turn :)

--strk;



From MAILER-DAEMON Wed Apr 25 07:35:05 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgfm4-0006UW-Sw
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 07:35:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgfm3-0006To-Sz
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:35:03 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgfm2-0006SR-IX
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:35:03 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgfm2-0006SN-FQ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:35:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HgfgP-0004BB-LY
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:29:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgfgP-0003xb-1c
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:29:13 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HgfgO-0003xY-Ph
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:29:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgfgO-0003xY-Ph@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 11:29:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash libbase/tu_swap.h libamf/amf.cpp server/p...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 11:35:04 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 11:29:12

Modified files:
	libbase        : tu_swap.h 
	libamf         : amf.cpp 
	server/parser  : action_buffer.cpp 
	server/swf     : tag_loaders.cpp 

Log message:
	Replace compile-time endianness checking with runtime checks.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.91&r2=1.92

Patches:
Index: libbase/tu_swap.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_swap.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/tu_swap.h	11 Apr 2007 17:54:21 -0000	1.7
+++ libbase/tu_swap.h	25 Apr 2007 11:29:12 -0000	1.8
@@ -3,16 +3,13 @@
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
-// Basic endian-swapping stuff.
-
+// Basic swapping stuff and endian-dependent code.
 
 #ifndef TU_SWAP_H
 #define TU_SWAP_H
 
-
 #include "tu_config.h"
-#include "tu_types.h"
-
+//#include "tu_types.h"
 
 template<class T>
 void	swap(T* a, T* b)
@@ -23,125 +20,6 @@
 	*b = temp;
 }
 
-
-//
-// endian conversions
-//
-
-#ifdef swap16
-#undef swap16
-#endif
-
-inline uint16_t swap16(uint16_t u)
-{ 
-	return ((u & 0x00FF) << 8) | 
-		((u & 0xFF00) >> 8);
-}
-
-#ifdef swap32
-#undef swap32
-#endif
-inline uint32_t swap32(uint32_t u)
-{ 
-	return ((u & 0x000000FF) << 24) | 
-		((u & 0x0000FF00) << 8)  |
-		((u & 0x00FF0000) >> 8)  |
-		((u & 0xFF000000) >> 24);
-}
-
-#ifdef swap64
-#undef swap64
-#endif
-inline uint64_t swap64(uint64_t u)
-{
-#ifdef __GNUC__
-	return ((u & 0x00000000000000FFLL) << 56) |
-		((u & 0x000000000000FF00LL) << 40)  |
-		((u & 0x0000000000FF0000LL) << 24)  |
-		((u & 0x00000000FF000000LL) << 8) |
-		((u & 0x000000FF00000000LL) >> 8) |
-		((u & 0x0000FF0000000000LL) >> 24) |
-		((u & 0x00FF000000000000LL) >> 40) |
-		((u & 0xFF00000000000000LL) >> 56);
-#else
-	return ((u & 0x00000000000000FF) << 56) | 
-		((u & 0x000000000000FF00) << 40)  |
-		((u & 0x0000000000FF0000) << 24)  |
-		((u & 0x00000000FF000000) << 8) |
-		((u & 0x000000FF00000000) >> 8) |
-		((u & 0x0000FF0000000000) >> 24) |
-		((u & 0x00FF000000000000) >> 40) |
-		((u & 0xFF00000000000000) >> 56);
-#endif
-}
-
-
-inline uint64_t	swap_le64(uint64_t le_64)
-// Given a 64-bit little-endian piece of data, return it as a 64-bit
-// integer in native endian-ness.  I.e., do a swap if we're on a
-// big-endian machine.
-{
-#ifdef _TU_LITTLE_ENDIAN_
-	return le_64;
-#else	// not _TU_LITTLE_ENDIAN_
-	return swap64(le_64);	// convert to big-endian.
-#endif	// not _TU_LITTLE_ENDIAN_
-}
-
-
-inline uint32_t	swap_le32(uint32_t le_32)
-// Given a 32-bit little-endian piece of data, return it as a 32-bit
-// integer in native endian-ness.  I.e. on a little-endian machine,
-// this just returns the input; on a big-endian machine, this swaps
-// the bytes around first.
-{
-#ifdef _TU_LITTLE_ENDIAN_
-	return le_32;
-#else	// not _TU_LITTLE_ENDIAN_
-	return swap32(le_32);	// convert to big-endian.
-#endif	// not _TU_LITTLE_ENDIAN_
-}
-
-
-inline uint16_t	swap_le16(uint16_t le_16)
-// Given a 16-bit little-endian piece of data, return it as a 16-bit
-// integer in native endianness.
-{
-#ifdef _TU_LITTLE_ENDIAN_
-	return le_16;
-#else	// not _TU_LITTLE_ENDIAN_
-	return swap16(le_16);	// convert to big-endian.
-#endif	// not _TU_LITTLE_ENDIAN_
-}
-
-
-inline uint32_t	swap_be32(uint32_t le_32)
-// Given a 32-bit big-endian piece of data, return it as a 32-bit
-// integer in native endian-ness.  I.e. on a little-endian machine,
-// this swaps the bytes around; on a big-endian machine, it just
-// returns the input.
-{
-#ifdef _TU_LITTLE_ENDIAN_
-	return swap32(le_32);	// convert to little-endian.
-#else	// not _TU_LITTLE_ENDIAN_
-	return le_32;
-#endif	// not _TU_LITTLE_ENDIAN_
-}
-
-
-inline uint16_t	swap_be16(uint16_t le_16)
-// Given a 16-bit big-endian piece of data, return it as a 16-bit
-// integer in native endianness.
-{
-#ifdef _TU_LITTLE_ENDIAN_
-	return swap16(le_16);	// convert to little-endian.
-#else	// not _TU_LITTLE_ENDIAN_
-	return le_16;
-#endif	// not _TU_LITTLE_ENDIAN_
-}
-
-
-
 #endif // TU_SWAP_H
 
 // Local Variables:

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- libamf/amf.cpp	18 Apr 2007 17:27:02 -0000	1.31
+++ libamf/amf.cpp	25 Apr 2007 11:29:12 -0000	1.32
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.31 2007/04/18 17:27:02 martinwguy Exp $ */
+/* $Id: amf.cpp,v 1.32 2007/04/25 11:29:12 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -114,40 +114,59 @@
 
 /// \brief Swap bytes from big to little endian.
 ///
-/// All Numberic values for AMF files are 64bit big endian, so we have
+/// All Numeric values for AMF files are big endian, so we have
 /// to swap the bytes to be little endian for most machines. Don't do
-/// anything if we happend to be on a big-endian machine.
+/// anything if we happen to be on a big-endian machine.
+///
+/// Returns its first parameter, pointing to the (maybe-byte-swapped) data.
 void *
 AMF::swapBytes(void *word, int size)
 {
-#if    __BYTE_ORDER == __LITTLE_ENDIAN
-    unsigned char       c;
-    unsigned short      s;
-    unsigned long       l;
-    char *x = static_cast<char *>(word);
+    union {
+	uint16_t s;
+	struct {
+	    uint8_t c0;
+	    uint8_t c1;
+	} c;
+    } u;
+	   
+    u.s = 1;
+    if (u.c.c0 == 0) {
+	// Big-endian machine: do nothing
+        return word;
+    }
+
+    // Little-endian machine: byte-swap the word
+
+    // A conveniently-typed pointer to the source data
+    unsigned char *x = static_cast<unsigned char *>(word);
 
     switch (size) {
-      case 2: // swap two bytes
-          c = *x;
-          *x = *(x+1);
-          *(x+1) = c;
-          break;
-      case 4: // swap two shorts (2-byte words)
-          s = *(unsigned short *)x;
-          *(unsigned short *)x = *((unsigned short *)x + 1);
-          *((unsigned short *)x + 1) = s;
-          swapBytes((char *)x, 2);
-          swapBytes((char *)((unsigned short *)x+1), 2);
-          break;
-      case 8: // swap two longs (4-bytes words)
-          l = *(unsigned long *)x;
-          *(unsigned long *)x = *((unsigned long *)x + 1);
-          *((unsigned long *)x + 1) = l;
-          swapBytes((char *)x, 4);
-          swapBytes((char *)((unsigned long *)x+1), 4);
+    case 2: // 16-bit integer
+      {
+	unsigned char c;
+	c=x[0]; x[0]=x[1]; x[1]=c;
           break;
     }
-#endif
+    case 4: // 32-bit integer
+      {
+	unsigned char c;
+	c=x[0]; x[0]=x[3]; x[3]=c;
+	c=x[1]; x[1]=x[2]; x[2]=c;
+	break;
+      }
+    case 8: // 64-bit integer
+      {
+	unsigned char c;
+	c=x[0]; x[0]=x[7]; x[7]=c;
+	c=x[1]; x[1]=x[6]; x[6]=c;
+	c=x[2]; x[2]=x[5]; x[5]=c;
+	c=x[3]; x[3]=x[4]; x[4]=c;
+	break;
+      }
+    default:
+	assert(0);
+    }
 
     return word;
 }
@@ -166,6 +185,8 @@
     return true;
 }
 
+// @@ I don't believe this works, since it only advances x over the
+// @@ object's metafields (length etc), but not over its contents. -martin
 char *
 AMF::readElement(void *in)
 {
@@ -184,6 +205,7 @@
     x++;                        // skip the type byte
     switch (type) {
       case NUMBER:
+	  // AMF numbers are 64-bit big-endian integers.
           num = *(amfnum_t *)swapBytes(x+1, 8);
           log_msg("Number is " AMFNUM_F, num);
           break;
@@ -255,6 +277,9 @@
       case TYPED_OBJECT:
           log_msg("TypedObject is unimplemented\n");
           break;
+      default:
+          log_msg("Warning: Unknown AMF element type %d\n", type);
+          break;
     }
     
     return x;

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- server/parser/action_buffer.cpp	20 Apr 2007 12:13:34 -0000	1.18
+++ server/parser/action_buffer.cpp	25 Apr 2007 11:29:12 -0000	1.19
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: action_buffer.cpp,v 1.18 2007/04/20 12:13:34 strk Exp $ */
+/* $Id: action_buffer.cpp,v 1.19 2007/04/25 11:29:12 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -43,6 +43,10 @@
 
 namespace gnash {
 
+// Forward declarations
+static float convert_float_little(const void *p);
+static double convert_double_wacky(const void *p);
+
 action_buffer::action_buffer()
     :
     m_decl_dict_processed_at(-1)
@@ -251,17 +255,9 @@
 		    dbglogfile << "\t\"" << str.c_str() << "\"" << endl;
 		} else if (type == 1) {
 		    // float (little-endian)
-		    union {
-			float	f;
-			uint32_t	i;
-		    } u;
-		    compiler_assert(sizeof(u) == sizeof(u.i));
-		    
-		    memcpy(&u.i, instruction_data + 3 + i, 4);
-		    u.i = swap_le32(u.i);
+		    float f = convert_float_little(instruction_data + 3 + i);
 		    i += 4;
-		    
-		    dbglogfile << "(float) " << u.f << endl;
+		    dbglogfile << "(float) " << f << endl;
 		} else if (type == 2) {
 		    dbglogfile << "NULL" << endl;
 		} else if (type == 3) {
@@ -276,24 +272,10 @@
 		    i++;
 		    dbglogfile << "bool(" << bool_val << ")" << endl;
 		} else if (type == 6) {
-		    // double
-		    // wacky format: 45670123
-		    union {
-			double	d;
-			uint64_t	i;
-			struct {
-			    uint32_t	lo;
-			    uint32_t	hi;
-			} sub;
-		    } u;
-		    compiler_assert(sizeof(u) == sizeof(u.i));
-		    
-		    memcpy(&u.sub.hi, instruction_data + 3 + i, 4);
-		    memcpy(&u.sub.lo, instruction_data + 3 + i + 4, 4);
-		    u.i = swap_le64(u.i);
+		    // double in wacky format: 45670123
+		    double d = convert_double_wacky(instruction_data + 3 + i);
 		    i += 8;
-		    
-		    dbglogfile << "(double) " << u.d << endl;
+		    dbglogfile << "(double) " << d << endl;
 		} else if (type == 7) {
 		    // int32_t
 		    int32_t	val = instruction_data[3 + i]
@@ -414,44 +396,150 @@
 	disasm(instruction_data);
 }
 
-
-float
-action_buffer::read_float_little(size_t pc) const
+// Endian conversion routines.
+//
+// Flash format stores integers as little-endian,
+// floats as little-endian IEEE754,
+// and doubles as little-endian IEEE754 with the two 32-bit words swapped over.
+//
+// We detect endianness at runtime.
+// It looks hairy but the cost is small (one assignment, one switch),
+// and it is less of a maintenance/portability nightmare.
+// It also allows us to detect three existing variants instead of two and
+// to reject incompatible (non-IEEE754) floating point formats (VAX etc).
+// For these we would need to interpret the IEEE bitvalues explicitly.
+
+// Read a little-endian 32-bit float from m_buffer[pc]
+// and return it as a host-endian float.
+static float
+convert_float_little(const void *p)
 {
+	// Hairy union for endian detection and munging
 	union {
 		float	f;
 		uint32_t	i;
+		struct {	// for endian detection
+			uint16_t s0;
+			uint16_t s1;
+		} s;
+		struct {	// for byte-swapping
+			uint8_t c0;
+			uint8_t c1;
+			uint8_t c2;
+			uint8_t c3;
+		} c;
 	} u;
-	compiler_assert(sizeof(u) == sizeof(u.i));
-	memcpy(&u.i, &m_buffer[pc], 4);
-	u.i = swap_le32(u.i);
+
+	u.f = 1.0;
+	switch (u.s.s0) {
+	case 0x0000:	// little-endian host
+		memcpy(&u.i, p, 4);
+		break;
+	case 0x3f80:	// big-endian host
+	    {
+		const uint8_t *cp = (const uint8_t *) p;
+		u.c.c0 = cp[3];
+		u.c.c1 = cp[2];
+		u.c.c2 = cp[1];
+		u.c.c3 = cp[0];
+	    }
+	    break;
+	default:
+	    log_error(_("Native floating point format not recognised"));
+	    assert(0);
+	}
+	
 	return u.f;
 }
 
-double
-action_buffer::read_double_wacky(size_t pc) const
+// Read a 64-bit double from memory, stored in word-swapped little-endian
+// format and return it as a host-endian double.
+// "Wacky format" is 45670123.
+static double
+convert_double_wacky(const void *p)
 {
-	// double
-	// wacky format: 45670123
+	const uint8_t *cp = (const uint8_t *)p;	// Handy uchar version
 	union {
 		double	d;
 		uint64_t	i;
 		struct {
-			uint32_t	lo;
-			uint32_t	hi;
-		} sub;
+			uint32_t l0;
+			uint32_t l1;
+		} l;
+		struct {
+			uint16_t s0;
+			uint16_t s1;
+			uint16_t s2;
+			uint16_t s3;
+		} s;
+		struct {
+			uint8_t c0;
+			uint8_t c1;
+			uint8_t c2;
+			uint8_t c3;
+			uint8_t c4;
+			uint8_t c5;
+			uint8_t c6;
+			uint8_t c7;
+		} c;
 	} u;
 
 	compiler_assert(sizeof(u) == sizeof(u.i));
 
-	// this works, but is pretty dirty
-	memcpy(&u.sub.hi, &m_buffer[pc], 4);
-	memcpy(&u.sub.lo, &m_buffer[pc + 4], 4);
-	u.i = swap_le64(u.i);
+	// Detect endianness of doubles by storing a value that is
+	// exactly representable and that has different values in the
+	// four 16-bit words.
+	// 0x11223344 is represented as 0x41b1 2233 4400 0000 (bigendian)
+	u.d = (double) 0x11223344;
+	switch (u.s.s0) {
+	case 0x0000:	// pure little-endian host: swap words only.
+		memcpy(&u.l.l1, cp, 4);
+		memcpy(&u.l.l0, cp + 4, 4);
+		break;
+	case 0x41b1:	// pure big-endian host: swap contents of 32-bit words
+		u.c.c0 = cp[3];
+		u.c.c1 = cp[2];
+		u.c.c2 = cp[1];
+		u.c.c3 = cp[0];
+		u.c.c4 = cp[7];
+		u.c.c5 = cp[6];
+		u.c.c6 = cp[5];
+		u.c.c7 = cp[4];
+		break;
+	case 0x2233:	// word-swapped little-endian host (PDP / ARM FPA)
+			// is the same as wacky format.
+		memcpy(&u.i, cp, 8);
+		break;
+	case 0x4400:	// word-swapped big-endian host: does this exist?
+		u.c.c0 = cp[7];
+		u.c.c1 = cp[6];
+		u.c.c2 = cp[5];
+		u.c.c3 = cp[4];
+		u.c.c4 = cp[3];
+		u.c.c5 = cp[2];
+		u.c.c6 = cp[1];
+		u.c.c7 = cp[0];
+		break;
+	default:
+		log_error(_("Native double floating point format not recognised"));
+		assert(0);
+	}
 
 	return u.d;
 }
 
+float
+action_buffer::read_float_little(size_t pc) const
+{
+	return(convert_float_little(&m_buffer[pc]));
+}
+
+double
+action_buffer::read_double_wacky(size_t pc) const
+{
+	return(convert_double_wacky(&m_buffer[pc]));
+}
+
 }
 
 // Local Variables:

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/swf/tag_loaders.cpp	18 Apr 2007 21:05:15 -0000	1.91
+++ server/swf/tag_loaders.cpp	25 Apr 2007 11:29:12 -0000	1.92
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.91 2007/04/18 21:05:15 martinwguy Exp $ */
+/* $Id: tag_loaders.cpp,v 1.92 2007/04/25 11:29:12 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1176,6 +1176,9 @@
 // Sound
 //
 
+// @@ There are two sets of code to decode/expand/byteswap audio here.
+// @@ There should be one (search for ADPCM).
+
 // Load a DefineSound tag.
 void
 define_sound_loader(stream* in, tag_type tag, movie_definition* m)
@@ -1235,19 +1238,37 @@
 		    data[i] = in->read_u8();
 		}
 
+		// Samples are always little-endian.
 		// Swap bytes on behalf of the host, to make it easier for the handler.
 		// @@ I'm assuming this is a good idea?	 Most sound handlers will prefer native endianness?
 		if (format == sound_handler::FORMAT_UNCOMPRESSED
 		    && sample_16bit)
 		{
-#ifndef _TU_LITTLE_ENDIAN_
+		    // Runtime detection of host endianness costs almost
+		    // nothing and is less of a continual maintenance headache
+		    // than attempting compile-time detection.
+		    union u {
+		    	uint16_t s;
+			struct {
+			    uint8_t c0;
+			    uint8_t c1;
+			} c;
+		    } u;
+		    u.s = 0x0001;
+		    switch (u.c.c0) {
+		    case 0x01:	// Little-endian host: sample is already native.
+			break;
+		    case 0x00:  // Big-endian host
 		    // Swap sample bytes to get big-endian format.
 		    for (int i = 0; i < data_bytes - 1; i += 2)
 		    {
 			swap(&data[i], &data[i+1]);
 		    }
-#endif // not _TU_LITTLE_ENDIAN_
-
+			break;
+		    default:	// Impossible
+			log_error(_("Host endianness not detected in define-sound_loader"));
+			assert(0);
+		    }
 		    format = sound_handler::FORMAT_NATIVE16;
 		}
 	    }
@@ -1435,6 +1456,10 @@
 
 	// Swap bytes on behalf of the host, to make it easier for the handler.
 	// @@ I'm assuming this is a good idea?	 Most sound handlers will prefer native endianness?
+	// I dunno why this is commented-out, but if you want to re-enable it,
+	// recode it with the same runtime endian order detection as above.
+	// Or, better, unify the two routines as there is a lot of duplicated
+	// code here.
 	/*if (format == sound_handler::FORMAT_UNCOMPRESSED && sample_16bit)
 	{
 #ifndef _TU_LITTLE_ENDIAN_



From MAILER-DAEMON Wed Apr 25 07:59:30 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgg9i-00065Q-RL
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 07:59:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgg9i-00064N-62
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:59:30 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgg9h-00063a-Ov
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:59:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgg9h-00063R-MY
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:59:29 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1Hgg44-0007vf-U8
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:53:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hgg44-0006fV-37
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:53:40 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1Hgg43-0006fS-PZ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:53:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hgg43-0006fS-PZ@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 11:53:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 11:59:30 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 11:53:39

Modified files:
	.              : ChangeLog 

Log message:
	ChangeLog for runtime endianness hacks

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2994&r2=1.2995

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2994
retrieving revision 1.2995
diff -u -b -r1.2994 -r1.2995
--- ChangeLog	25 Apr 2007 09:14:11 -0000	1.2994
+++ ChangeLog	25 Apr 2007 11:53:39 -0000	1.2995
@@ -12,6 +12,14 @@
 	* macros/lib-ld.m4(removed),macros/lib-link.m4:
 	  remove repeated test for GNU ld (libtool does this).
 	  Closes bug #19623
+	* libamf/amf.cpp,libbase/tu_swap.h,server/parser/action_buffer.cpp,
+	  server/swf/tag_loaders.cpp:
+	  Replace compile-time endianness checking with runtime because
+	  it costs almost nothing and reduces maintenance forever.
+	  As a side-effect, also now handles architectures with
+	  middle-endian IEEE754 doubles and detects non-IEEE arches.
+	  Only the Mozilla devkit stuff now detects endianness
+	  using its own set of built-in rules.
 
 2007-04-24 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Wed Apr 25 08:00:21 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HggAW-0006o4-Sd
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 08:00:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HggAV-0006n3-FO
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:00:19 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HggAU-0006mH-Mz
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:00:18 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HggAU-0006m7-II
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:00:18 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1Hgg4r-00086L-Pd
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 07:54:29 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hgg4q-0006iA-IY
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:54:28 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1Hgg4q-0006i4-6M
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:54:28 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hgg4q-0006i4-6M@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 11:54:28 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libbase tu_swap.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 12:00:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 11:54:28

Modified files:
	libbase        : tu_swap.h 

Log message:
	Fix comment

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: tu_swap.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_swap.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- tu_swap.h	25 Apr 2007 11:29:12 -0000	1.8
+++ tu_swap.h	25 Apr 2007 11:54:28 -0000	1.9
@@ -3,7 +3,7 @@
 // This source code has been donated to the Public Domain.  Do
 // whatever you want with it.
 
-// Basic swapping stuff and endian-dependent code.
+// Basic swapping stuff
 
 #ifndef TU_SWAP_H
 #define TU_SWAP_H



From MAILER-DAEMON Wed Apr 25 08:31:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hggf8-0002av-Qj
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 08:31:58 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hggf7-0002aL-TJ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:31:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hggf7-0002a7-Fg
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:31:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hggf7-0002a4-C4
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:31:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HggZU-0006QJ-Dl
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:26:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HggZT-00005M-IZ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 12:26:07 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HggZT-00005H-6h
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 12:26:07 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HggZT-00005H-6h@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 12:26:07 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libamf amf.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 12:31:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 12:26:07

Modified files:
	libamf         : amf.cpp 

Log message:
	Fix breakage *sigh*

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.32&r2=1.33

Patches:
Index: amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- amf.cpp	25 Apr 2007 11:29:12 -0000	1.32
+++ amf.cpp	25 Apr 2007 12:26:07 -0000	1.33
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.32 2007/04/25 11:29:12 martinwguy Exp $ */
+/* $Id: amf.cpp,v 1.33 2007/04/25 12:26:07 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -164,8 +164,6 @@
 	c=x[3]; x[3]=x[4]; x[4]=c;
 	break;
       }
-    default:
-	assert(0);
     }
 
     return word;



From MAILER-DAEMON Wed Apr 25 08:42:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HggpR-0001VG-QP
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 08:42:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HggpQ-0001Uz-Sg
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:42:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HggpP-0001Sl-4P
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:42:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HggpO-0001Sh-UY
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:42:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1Hggjl-0007y6-VY
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 08:36:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hggjl-00023R-9Y
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 12:36:45 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1Hggjl-00023O-1J
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 12:36:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hggjl-00023O-1J@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Wed, 25 Apr 2007 12:36:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/gui gtk_glue_gtkglext.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 12:42:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/25 12:36:45

Modified files:
	gui            : gtk_glue_gtkglext.h 

Log message:
	Silence compiler warnings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_gtkglext.h?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: gtk_glue_gtkglext.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_gtkglext.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtk_glue_gtkglext.h	29 Oct 2006 18:34:10 -0000	1.7
+++ gtk_glue_gtkglext.h	25 Apr 2007 12:36:44 -0000	1.8
@@ -17,7 +17,7 @@
 //
 //
 
-/* $Id: gtk_glue_gtkglext.h,v 1.7 2006/10/29 18:34:10 rsavoye Exp $ */
+/* $Id: gtk_glue_gtkglext.h,v 1.8 2007/04/25 12:36:44 martinwguy Exp $ */
 
 #include "gtk_glue.h"
 
@@ -47,7 +47,7 @@
     void prepDrawingArea(GtkWidget *drawing_area);
     render_handler* createRenderHandler();
     void render();
-    void render(int minx, int miny, int maxx, int maxy) { render(); };
+    void render(int /*minx*/, int /*miny*/, int /*maxx*/, int /*maxy*/) { render(); };
     void configure(GtkWidget *const widget, GdkEventConfigure *const event);
   private:
     GdkGLConfig *_glconfig;



From MAILER-DAEMON Wed Apr 25 10:05:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgi7R-00075n-PM
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 10:05:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgi7P-00075J-NF
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 10:05:15 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgi7N-00074O-Ec
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 10:05:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgi7N-00074J-77
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 10:05:13 -0400
Received: from welcomehome.org ([69.15.127.230] helo=darkstar.welcomehome.org)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <rob@welcomehome.org>) id 1Hgi1j-0002GT-It
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 09:59:23 -0400
Received: from ute.welcomehome.org (wap1.welcomehome.org [10.0.1.2])
	by darkstar.welcomehome.org (8.13.8/8.13.8) with ESMTP id
	l3PDxMdT003919; Wed, 25 Apr 2007 07:59:22 -0600
Message-ID: <462F5EC0.5040201@welcomehome.org>
Date: Wed, 25 Apr 2007 07:59:28 -0600
From: Rob Savoye <rob@welcomehome.org>
User-Agent: Thunderbird 2.0.0.0 (X11/20070326)
MIME-Version: 1.0
To: Martin Guy <martinwguy@yahoo.it>
Subject: Re: [Gnash-commit] gnash libbase/tu_swap.h libamf/amf.cpp server/p...
References: <E1HgfgO-0003xY-Ph@cvs>
In-Reply-To: <E1HgfgO-0003xY-Ph@cvs>
X-Enigmail-Version: 0.95.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
X-detected-kernel: Linux 2.6 (newer, 3)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 14:05:16 -0000

Martin Guy wrote:

> Log message:
> 	Replace compile-time endianness checking with runtime checks.

  While I'll admit tu_swap.h has been a total mess, why drop compile
time tests ? The boost endian.hpp header has the correct macros on all
the platforms we have to support, so we should use them for endianess
detection.

	- rob -



From MAILER-DAEMON Wed Apr 25 11:02:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgj0Q-0003ub-C2
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 11:02:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgj0P-0003uO-Lg
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:02:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgj0N-0003tB-PH
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:02:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgj0N-0003sx-Jc
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:02:03 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1Hgiuj-00027o-Ag
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 10:56:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hgiui-0004jf-VG
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 14:56:13 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1Hgiui-0004jc-Qi
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 14:56:12 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hgiui-0004jc-Qi@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Wed, 25 Apr 2007 14:56:12 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/doc/C/asspec Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 15:02:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/25 14:56:12

Modified files:
	doc/C/asspec   : Makefile.am 

Log message:
	Clean up the dist target so distcheck works again.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/asspec/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/asspec/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- Makefile.am	24 Apr 2007 23:25:25 -0000	1.2
+++ Makefile.am	25 Apr 2007 14:56:12 -0000	1.3
@@ -77,10 +77,8 @@
 	$(xml_files) \
 	$(omffile) \
 	asspec.texi \
-	asspec-man.xml \
 	asspec.info \
-	asspec.html \
-	asspec.1
+	asspec.html
 
 if ENABLE_FOP
 .xml.pdf:



From MAILER-DAEMON Wed Apr 25 11:53:12 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgjns-0007mC-NM
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 11:53:12 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgjnq-0007m7-Sw
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:53:10 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgjnp-0007lv-Gn
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:53:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgjnp-0007ls-B3
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:53:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HgjiB-0000vd-FN
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 11:47:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgjiB-0000pD-Hj
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 15:47:19 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HgjiB-0000pA-BN
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 15:47:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgjiB-0000pA-BN@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Wed, 25 Apr 2007 15:47:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/extensions/gtk2 Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 15:53:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/25 15:47:19

Modified files:
	extensions/gtk2: Makefile.am 

Log message:
	Don't build hello test case.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/gtk2/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/extensions/gtk2/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- Makefile.am	15 Feb 2007 20:11:23 -0000	1.1
+++ Makefile.am	25 Apr 2007 15:47:19 -0000	1.2
@@ -26,6 +26,7 @@
 INCLUDES = -I$(srcdir)  \
 	-I$(top_srcdir)/libbase \
 	-I$(top_srcdir)/libgeometry \
+	-I$(top_srcdir)/gui \
 	-I$(top_srcdir)/server \
 	-I$(top_srcdir)/server/vm \
 	-I$(top_srcdir)/server/parser \
@@ -63,19 +64,18 @@
 gtkext_la_LDFLAGS = -module -avoid-version # -no-undefined
 gtkext_la_LIBDADD = $(LIBADD_DL) $(LIBLTDL) $(AM_LDFLAGS)
 
-
-check_PROGRAMS = hello
+# check_PROGRAMS = hello
 CLEANFILES = \
 	gnash-dbg.log\
 	hello.swf.frame0.pp \
 	hello.swf \
 	logfile
 
+# hello: hello.swf
+# 	../../utilities/gprocessor hello.swf
 
-hello: hello.swf
-	../../utilities/gprocessor hello.swf
-
-hello.swf: hello.as
+# noinst_SCRIPTS = hello.as
+# hello.swf: hello.as
 
 SUFFIXES = as swf
 .as.swf: 



From MAILER-DAEMON Wed Apr 25 13:35:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HglOv-00078V-TE
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 13:35:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HglOt-00078Q-PB
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 13:35:31 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HglOp-00078E-FX
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 13:35:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HglOp-00078B-Aw
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 13:35:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HglJA-0007LY-Sf
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 13:29:36 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HglJ4-0007Ca-Gz
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 17:29:30 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HglJ4-0007CX-7I
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 17:29:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HglJ4-0007CX-7I@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Wed, 25 Apr 2007 17:29:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog README_CVS
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Apr 2007 17:35:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/25 17:29:30

Modified files:
	.              : ChangeLog 
Added files:
	.              : README_CVS 

Log message:
	* README_CVS: some info for CVS users.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2995&r2=1.2996
http://cvs.savannah.gnu.org/viewcvs/gnash/README_CVS?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2995
retrieving revision 1.2996
diff -u -b -r1.2995 -r1.2996
--- ChangeLog	25 Apr 2007 11:53:39 -0000	1.2995
+++ ChangeLog	25 Apr 2007 17:29:29 -0000	1.2996
@@ -1,5 +1,6 @@
 2007-04-25 Sandro Santilli <strk@keybit.net>
 
+	* README_CVS: some info for CVS users.
 	* doc/C/asspec/date.xml: fixed typos preventing the asspec
 	  from building.
 	* doc/C/asspec/movieclip.xml: add docs and conformancy for

Index: README_CVS
===================================================================
RCS file: README_CVS
diff -N README_CVS
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ README_CVS	25 Apr 2007 17:29:30 -0000	1.1
@@ -0,0 +1,22 @@
+$Id: README_CVS,v 1.1 2007/04/25 17:29:30 strk Exp $
+
+Using Gnash CVS repository.
+
+Building gnash from CVS requires the following additional packages:
+
+	- automake (version?)
+	- autoheader (version?)
+	- aclocal (version?)
+	- autoconf (version?)
+	- intltool (version?)
+	- xml-i18n-toolize (version?)
+	- libtool (version?)
+	- glib-gettextize (version?)
+	- libltdl (version?)
+
+All the above tools are used by the ./autogen.sh script, which you'd run
+to setup the build scripts as they are distributed.
+If anything is missing, autogen.sh should tell you.
+
+Once ./autogen.sh completes successfully you can go on with normal
+instructions found in the README file.



From MAILER-DAEMON Wed Apr 25 22:51:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgu5H-0005jz-KB
	for mharc-gnash-commit@gnu.org; Wed, 25 Apr 2007 22:51:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgu5F-0005jU-Gx
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 22:51:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgu5D-0005jI-Po
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 22:51:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgu5D-0005jF-KJ
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 22:51:47 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <gnu@savannah-gnu-org.toad.com>)
	id 1HgtzW-00051U-Ep
	for gnash-commit@gnu.org; Wed, 25 Apr 2007 22:45:54 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HgtzU-0005g4-CO
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 02:45:52 +0000
Received: from jgilmore by cvs with local (Exim 4.50) id 1HgtzT-0005g1-Vv
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 02:45:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HgtzT-0005g1-Vv@cvs>
From: John Gilmore <gnu@savannah-gnu-org.toad.com>
Date: Thu, 26 Apr 2007 02:45:51 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash README README_CVS ChangeLog po/.cvsignore
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 02:51:49 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	John Gilmore <jgilmore>	07/04/26 02:45:51

Modified files:
	.              : README README_CVS ChangeLog 
	po             : .cvsignore 

Log message:
	* README, README_CVS:  Improve configuration instructions.
	  More work is needed to make it match the code.
	* po/.cvsignore:  Ignore all generated .gmo files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/README?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/README_CVS?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2996&r2=1.2997
http://cvs.savannah.gnu.org/viewcvs/gnash/po/.cvsignore?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: README
===================================================================
RCS file: /sources/gnash/gnash/README,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- README	20 Apr 2007 11:41:26 -0000	1.26
+++ README	26 Apr 2007 02:45:51 -0000	1.27
@@ -1,4 +1,4 @@
-$Id: README,v 1.26 2007/04/20 11:41:26 jgilmore Exp $
+$Id: README,v 1.27 2007/04/26 02:45:51 jgilmore Exp $
 
 		    Gnash: the GNU Flash Player
 
@@ -7,7 +7,7 @@
 plugin, or as a library used by other programs.  It is not yet complete;
 it does not correctly handle every .swf file.
 
-This is the README file for the soon to be released Gnash-0.7.2.
+This is the README file for the Gnash-0.8XXXXXX release (or CVS snapshot).
 
 Gnash is originally based on the code of GameSWF, by Thatcher Ulrich.
 GameSWF was the most advanced among free flash movie players; it
@@ -52,13 +52,9 @@
 Unimplemented Opcodes are: Throw, Implements, Extends, EnumObject, Try,
 NewMethod, MDLength, MDSubstring, MDChr, Delete, GetTarget.
 
-There is currently no FLV video, only minimal AMF data support,
+There is currently some FLV video support, only minimal AMF data support,
 and no loading of external jpegs.
 
-There is now experimental sound support if you configure this into
-your build. What works now is the sdl sound handler with either the
-ffmpeg or libMad decoder.
-
 Plugin:	
 -------
 
@@ -72,10 +68,10 @@
 in Firefox, which prevents the plugin from being loaded. In these cases
 I "view source" and then use wget to grab the movie for testing.
 
-By default, the configure script looks for the GtkGl extension, and if
-that can't be found, it defaults to using SDL. The plugin works by
-using the standalone player, so which ever graphics library Gnash
-uses, it's the same as the standalone player.
+By default, the configure script looks for the GtkGl extension, and
+if that can't be found, it defaults to using SDL. The plugin works by
+forking and running the standalone player, so whichever graphics library
+Gnash uses will also be used by the plugin.
 
 The GTK version has full event handling, and supports a right-click
 mouse menu to control the movie. The SDL version has no event
@@ -84,26 +80,36 @@
 boundaries. The GTK version requires GtkGlExt, and defaults to SDL if
 GtkGlExt is not installed, or if --disable-glext is passed to configure.
 
-All Flash movies are downloaded in full to /tmp, and then played from there.
-Gnash is not yet able to play a Flash file "as it arrives" over the
-network. Adding the ability to handle input streams is on the TODO list.
-
 Configure with --with-plugindir= to set the directory that "make
 install" will install the plugin in. By default it will be installed
-in the users .mozilla/plugins or .firefox/plugins directory.
+in the user's .mozilla/plugins or .firefox/plugins directory.
 
 
 Building Gnash:
 ---------------
 
-See the generic installation instructions in the file called
-"INSTALL". As the configure script is not included in CVS, you need to
-run ./autogen.sh to produce this file. This depends on having
-autoconf, automake, and libtool installed on your system. After
-producing the configure script, executing it as "./configure" should
-be all that is necessary to buuild Gnash.
+See the generic installation instructions in the file called "INSTALL".
+(If you are building from a fresh CVS checkout, first see the file
+"README_CVS" for additional instructions.)
+
+Gnash can be configured and built in three main variations.  They
+differ in the graphics and multimedia libraries used to display
+flash files.  The three variants are configured with the options:
+
+   --enable-renderer=opengl
+   --enable-renderer=cairo
+or --enable-renderer=agg
+
+Only one can be specified.  In addition, Gnash can use different multimedia
+back-ends for sound and/or video:
+
+   --enable-media=GST			Gstreamer
+   --enable-media=ffmpeg		Ffmpeg
+   --enable-media=mad			libmad (MP3 audio decoding only)
+
+The "media" setting is independent of the "renderer" setting.
 
-You will also need the following development packages installed to
+You will need the following development packages installed to
 build the player with GTK support: glib, atk, pango, cairo, gtk2,
 gtkglext.
 
@@ -111,25 +117,22 @@
 dependent packages: OpenGL(libMesa), SDL.
 
 The GTK support is more developed and featureful, while the SDL
-support has less dependancies on other packages.
+support has fewer dependancies on other packages.
 
-Other required packages are libxml2, libpng, libjpeg, and gettext.
-If gettext is missing, gnash will compile, but you'll get errors when
-trying to build or install its message translations in the po/ directory.
+Other required packages are libxml2, libpng, and libjpeg.
+If gettext support is installed, or is present in the standard C library,
+gnash will support translation of its messages into other languages.
 
 At this time the sound support is experimental until the new sound
 support is completed. This will support both Gstreamer and
-ffmpeg. Current the ffmpeg support is the only one that works, and
-this only works with the sdl sound support.
+ffmpeg.
 
-When the Gstreamer support is working, Gstreamer version 0.10 will be
-required becasue earlier versions wouldn't let you insert clips into
-an existing sound stream as Gnash needs to do.
+Gstreamer version 0.10 is required because earlier versions wouldn't
+let you insert clips into an existing sound stream, as Gnash needs to do.
 
 You no longer need the Mozilla or Firefox development packages to
-build Gnash. All the required files are now included in Gnash so the
-plugin can be built as long as the other development libraries are
-installed.
+build Gnash. All the required files are now included in Gnash, so the
+plugin can be built whenever the main gnash program can be built.
 
 To build Klash, the Konqueror plugin, you need to have the KDE
 development packages installed. This now installs a KDE executable
@@ -170,10 +173,10 @@
 For information about contributing to the GNU Project, please read How
 to help GNU at <http://www.gnu.org/help/help.html>.
 
-If you think you have found a bug in Gnash, then you should file as
-complete a report as possible at 
-https://savannah.gnu.org/bugs/?group=gnash.  Please include the
-operating system name and version, and which gnash version you are
-using, in your bug reports. Please try to reproduce your bug reports
-with Gnash cvs HEAD, as bugs are fixed there that may be broken in a
-standard release.
+If you think you have found a bug in Gnash, then
+you should file as complete a report as possible at
+https://savannah.gnu.org/bugs/?group=gnash.  Please include the operating
+system name and version, and which gnash version you are using, in your
+bug reports. Please try to reproduce your bug reports with the most
+recent version of Gnash in CVS, as bugs are fixed there that may be
+broken in a standard release.

Index: README_CVS
===================================================================
RCS file: /sources/gnash/gnash/README_CVS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- README_CVS	25 Apr 2007 17:29:30 -0000	1.1
+++ README_CVS	26 Apr 2007 02:45:51 -0000	1.2
@@ -1,22 +1,58 @@
-$Id: README_CVS,v 1.1 2007/04/25 17:29:30 strk Exp $
+$Id: README_CVS,v 1.2 2007/04/26 02:45:51 jgilmore Exp $
 
-Using Gnash CVS repository.
+		Building Gnash from its CVS repository
 
-Building gnash from CVS requires the following additional packages:
+The source code of Gnash is checked into a CVS repository.  (See the main
+web page for Gnash for the current details on where that repository is.)
+The instructions for building Gnash in README and INSTALL assume that
+you are starting from a released "tarball" (e.g. gnash-VERSION.tar.gz).
+The tarball contains some files that are not in the original source code
+in CVS.  They are generated using tools that not everyone is expected
+to have.  This simplifies the process of building Gnash releases, for
+ordinary people.
 
-	- automake (version?)
-	- autoheader (version?)
-	- aclocal (version?)
-	- autoconf (version?)
-	- intltool (version?)
-	- xml-i18n-toolize (version?)
-	- libtool (version?)
-	- glib-gettextize (version?)
-	- libltdl (version?)
-
-All the above tools are used by the ./autogen.sh script, which you'd run
-to setup the build scripts as they are distributed.
-If anything is missing, autogen.sh should tell you.
+People who are actively working on maintaining Gnash need to have these
+extra tools.  They are used to build configuration files, international
+message translation catalogs, and such.  After you check out the source
+code of Gnash from CVS, you'll have to run a single script that rebuilds
+all these files.  This script is called "./autogen.sh", and it lives
+in the top-level directory of gnash.  You run it without any arguments.
+When it finishes, you can run "./configure", with or without arguments,
+as instructed in the README and INSTALL files.
 
-Once ./autogen.sh completes successfully you can go on with normal
+A variety of GNU programs are required when checking out the
+CVS tree and building the auto-generated files.  If anything is
+missing, ./autogen.sh will (probably) tell you, or produce a relatively
+understandable error message.  When in doubt, look at the *first*
+error message.  Here are the programs required:
+
+GNU		Minimum		RPM or DEB package names:
+Package		Version  Debian		Ubuntu		Fedora		Gentoo
+-------         -------  ------         ------          ------		------
+automake	1.6.0	automake	automake	automake
+autoconf	2.59			autoconf	autoconf
+cvs		1.11.22			cvs		cvs
+gettext		0.14.6			gettext		gettext
+libtool		1.5.22			libtool		libtool
+		1.5.22			libltdl3-dev	libtool
+
+The "Minimum Version" is not necessarily the lowest version that will work;
+it's the lowest version that the Gnash team has recently tested with.  
+(You'll also need some very common tools, for example the standard Unix/GNU
+core utilities (ls, mv); text utilities (grep, sed), and shell (sh).
+Unless your system is very unusual, these will already be installed.)
+
+The version dependencies among these tools are, unfortunately, more
+complicated than we can describe here.  When ./autogen.sh is failing
+for you, either upgrade all the things in the above table to the latest
+version available (which may break other packages you're trying to build),
+or seek a compatible set of tools, perhaps the set that comes by default
+in your operating system (if any).
+
+If you are unable to run ./autogen.sh successfully on your system, consider
+building Gnash from a tarball release.  Or, move the CVS tree to a system
+on which you can run ./autogen.sh successfully, then move it back to the
+system you are trying to build on.
+
+Once ./autogen.sh completes successfully, you can go on with the normal
 instructions found in the README file.

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2996
retrieving revision 1.2997
diff -u -b -r1.2996 -r1.2997
--- ChangeLog	25 Apr 2007 17:29:29 -0000	1.2996
+++ ChangeLog	26 Apr 2007 02:45:51 -0000	1.2997
@@ -1,3 +1,9 @@
+2007-04-25  John Gilmore  <gnu@toad.com>
+
+	* README, README_CVS:  Improve configuration instructions.
+	  More work is needed to make it match the code.
+	* po/.cvsignore:  Ignore all generated .gmo files.
+
 2007-04-25 Sandro Santilli <strk@keybit.net>
 
 	* README_CVS: some info for CVS users.

Index: po/.cvsignore
===================================================================
RCS file: /sources/gnash/gnash/po/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/.cvsignore	12 Apr 2007 09:53:08 -0000	1.1
+++ po/.cvsignore	26 Apr 2007 02:45:51 -0000	1.2
@@ -1,5 +1,5 @@
 Makefile
 Makefile.in
 POTFILES
-es.gmo
+*.gmo
 stamp-po



From MAILER-DAEMON Thu Apr 26 03:06:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgy3i-0000Nj-Po
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 03:06:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgy3g-0000NG-6b
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:06:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgy3d-0000N4-UP
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:06:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgy3d-0000N1-Mm
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:06:25 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hgxxu-0007lc-Sb
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:00:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hgxxu-0006yt-Gr
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:00:30 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hgxxu-0006yq-8Y
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:00:30 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hgxxu-0006yq-8Y@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 07:00:30 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/array.h server/as_enviro...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 07:06:28 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 07:00:29

Modified files:
	.              : ChangeLog 
	server         : array.h as_environment.cpp as_function.h 
	                 as_object.cpp as_object.h character.cpp 
	                 character.h edit_text_character.cpp 
	                 edit_text_character.h 
	server/asobj   : Boolean.cpp Color.cpp ContextMenu.cpp 
	                 CustomActions.cpp Error.cpp LoadVars.cpp 
	                 Microphone.cpp Mouse.cpp Number.cpp 
	                 Selection.cpp SharedObject.cpp Stage.h 
	                 TextSnapshot.cpp Video.cpp gen-asclass.pl 
	                 gen-asclass.sh string.cpp 
	testsuite/server: GetterSetterTest.cpp 

Log message:
	Changed get_text_value interface to return by std::string value. Closes bug #19695.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2997&r2=1.2998
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.h?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Boolean.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Color.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ContextMenu.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/CustomActions.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Error.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/LoadVars.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Microphone.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Mouse.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Number.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Selection.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/SharedObject.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Stage.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/TextSnapshot.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Video.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.pl?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/gen-asclass.sh?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/GetterSetterTest.cpp?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2997
retrieving revision 1.2998
diff -u -b -r1.2997 -r1.2998
--- ChangeLog	26 Apr 2007 02:45:51 -0000	1.2997
+++ ChangeLog	26 Apr 2007 07:00:29 -0000	1.2998
@@ -1,3 +1,21 @@
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
+	* server/array.h, server/as_environment.cpp, server/as_function.h,
+	  server/as_object.cpp, server/as_object.h, server/character.cpp,
+	  server/character.h, server/edit_text_character.cpp,
+	  server/edit_text_character.h, server/asobj/Boolean.cpp,
+	  server/asobj/Color.cpp, server/asobj/ContextMenu.cpp,
+	  server/asobj/CustomActions.cpp, server/asobj/Error.cpp,
+	  server/asobj/LoadVars.cpp, server/asobj/Microphone.cpp,
+	  server/asobj/Mouse.cpp, server/asobj/Number.cpp,
+	  server/asobj/Selection.cpp, server/asobj/SharedObject.cpp,
+	  server/asobj/Stage.h, server/asobj/TextSnapshot.cpp,
+	  server/asobj/Video.cpp, server/asobj/gen-asclass.pl,
+	  server/asobj/gen-asclass.sh, server/asobj/string.cpp,
+	  testsuite/server/GetterSetterTest.cpp:
+	  Changed get_text_value interface to return by std::string
+	  value. Closes bug #19695.
+	
 2007-04-25  John Gilmore  <gnu@toad.com>
 
 	* README, README_CVS:  Improve configuration instructions.

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- server/array.h	4 Apr 2007 10:32:42 -0000	1.24
+++ server/array.h	26 Apr 2007 07:00:29 -0000	1.25
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -93,10 +93,9 @@
 	std::string toString(as_environment* env=NULL) const;
 
 	// override from as_object
-	const char* get_text_value() const
+	std::string get_text_value() const
 	{
-		_strval = toString();
-		return _strval.c_str();
+		return toString();
 	}
 
 	unsigned int size() const;
@@ -182,10 +181,6 @@
 	// if the string does not refer to an index, or an appropriate int if the string does refer to an index
 	int index_requested(const std::string& name);
 
-	// Required due to dumb as_object::get_text_value()
-	// method returning by 'const' char *
-	mutable std::string _strval;
-
 };
 
 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- server/as_environment.cpp	18 Apr 2007 09:35:42 -0000	1.70
+++ server/as_environment.cpp	26 Apr 2007 07:00:29 -0000	1.71
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.70 2007/04/18 09:35:42 jgilmore Exp $ */
+/* $Id: as_environment.cpp,v 1.71 2007/04/26 07:00:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -69,7 +69,7 @@
 			    is_slash_based ? "_slashsyntax" : "_dotsyntax",
 			    path.c_str(),
 			    varname.c_str(),
-			    m_target->get_text_value()
+			    m_target->get_text_value().c_str()
 			    );
 	    );
 
@@ -774,7 +774,7 @@
 		{
 			IF_VERBOSE_ASCODING_ERRORS(
 			log_aserror(_("'..' in path '%s' follows a character with no parent (%s : %p) (root is %p)"),
-					path.c_str(), ch->get_text_value(), ch, VM::get().getRoot().get_root_movie());
+					path.c_str(), ch->get_text_value().c_str(), ch, VM::get().getRoot().get_root_movie());
 			);
 			// if we override env, getvariable.as fails [line 57]
 			//env = ch;

Index: server/as_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/as_function.h	20 Mar 2007 17:14:27 -0000	1.13
+++ server/as_function.h	26 Apr 2007 07:00:29 -0000	1.14
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -116,7 +116,7 @@
 
 	/// TODO: check if a user-defined 'toString'
 	///       will be used when available.
-	const char* get_text_value() const
+	std::string get_text_value() const
 	{
 		return "[type Function]";
 	}

Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/as_object.cpp	18 Apr 2007 09:35:42 -0000	1.48
+++ server/as_object.cpp	26 Apr 2007 07:00:29 -0000	1.49
@@ -583,8 +583,8 @@
 {
 	boost::intrusive_ptr<as_object> obj = fn.this_ptr;
 
-	const char* text_val = obj->get_text_value();
-	if ( text_val )
+	std::string text_val = obj->get_text_value();
+	if ( ! text_val.empty() ) // TODO: check if still possible
 	{
 		return as_value(text_val);
 	}

Index: server/as_object.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/as_object.h	15 Apr 2007 10:52:09 -0000	1.54
+++ server/as_object.h	26 Apr 2007 07:00:29 -0000	1.55
@@ -123,7 +123,7 @@
 	virtual ~as_object() {}
 	
 	/// Return a text representation for this object
-	virtual const char* get_text_value() const { return "[object Object]"; }
+	virtual std::string get_text_value() const { return "[object Object]"; }
 
 	/// Return the numeric value of this object
 	//
@@ -131,8 +131,8 @@
 	/// to a number, override for a more performant implementation
 	///
 	virtual double get_numeric_value() const {
-		const char* txt = get_text_value();
-		if ( txt ) return atof(get_text_value());
+		std::string txt = get_text_value();
+		if ( ! txt.empty() ) return atof(txt.c_str());
 		else return 0; 
 	}
 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/character.cpp	19 Apr 2007 17:41:35 -0000	1.37
+++ server/character.cpp	26 Apr 2007 07:00:29 -0000	1.38
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.37 2007/04/19 17:41:35 udog Exp $ */
+/* $Id: character.cpp,v 1.38 2007/04/26 07:00:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -786,7 +786,7 @@
 }
 
 /*public*/
-const std::string
+std::string
 character::getTargetPath() const
 {
 
@@ -797,7 +797,7 @@
 
 
 /*public*/
-const std::string
+std::string
 character::getTarget() const
 {
 
@@ -822,10 +822,10 @@
 }
 
 /*public*/
-const char*
+std::string
 character::get_text_value() const
 {
-	return getTarget().c_str();
+	return getTarget();
 }
 
 

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/character.h	20 Apr 2007 15:03:24 -0000	1.71
+++ server/character.h	26 Apr 2007 07:00:29 -0000	1.72
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.71 2007/04/20 15:03:24 udog Exp $ */
+/* $Id: character.h,v 1.72 2007/04/26 07:00:29 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -841,16 +841,16 @@
 	//
 	/// e.g. "/sprite1/sprite2/ourSprite"
 	///
-	const std::string getTargetPath() const;
+	std::string getTargetPath() const;
 
 	/// Return full path to this object, in dot notation
 	//
 	/// e.g. "_level0.sprite1.sprite2.ourSprite"
 	///
-	const std::string getTarget() const;
+	std::string getTarget() const;
 	
   // override from as_object
-	virtual const char* get_text_value() const;	
+	virtual std::string get_text_value() const;	
 	
 };
 

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/edit_text_character.cpp	19 Apr 2007 14:25:40 -0000	1.60
+++ server/edit_text_character.cpp	26 Apr 2007 07:00:29 -0000	1.61
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.60 2007/04/19 14:25:40 martinwguy Exp $ */
+/* $Id: edit_text_character.cpp,v 1.61 2007/04/26 07:00:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -593,7 +593,7 @@
 character*
 edit_text_character::get_topmost_mouse_entity(float x, float y)
 {
-	//log_msg("get_topmost_mouse_entity called on edit_text_character %p, labeled '%s'", (void*)this, get_text_value());
+	//log_msg("get_topmost_mouse_entity called on edit_text_character %p, labeled '%s'", (void*)this, get_text_value().c_str());
 
 	if (get_visible() == false)
 	{
@@ -646,7 +646,7 @@
 
 }
 
-const char*
+std::string
 edit_text_character::get_text_value() const
 {
 	// we need the const_cast here because registerTextVariable
@@ -657,7 +657,7 @@
 	// with a pre-existing value.
 	const_cast<edit_text_character*>(this)->registerTextVariable();
 
-	return _text.c_str();
+	return _text;
 }
 
 void

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/edit_text_character.h	18 Apr 2007 13:24:44 -0000	1.29
+++ server/edit_text_character.h	26 Apr 2007 07:00:29 -0000	1.30
@@ -81,7 +81,7 @@
 	void	set_text_value(const char* new_text);
 
  	/// Return value of our text.
-	const char* get_text_value() const;
+	std::string get_text_value() const;
 
 	/// We have a "text" member.
 	void set_member(const std::string& name, const as_value& val);

Index: server/asobj/Boolean.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Boolean.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/Boolean.cpp	4 Apr 2007 20:30:45 -0000	1.13
+++ server/asobj/Boolean.cpp	26 Apr 2007 07:00:29 -0000	1.14
@@ -71,7 +71,7 @@
 	}
 	
 	// override from as_object ?
-	//const char* get_text_value() const { return "Boolean"; }
+	//std::string get_text_value() const { return "Boolean"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }	

Index: server/asobj/Color.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Color.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Color.cpp	18 Apr 2007 11:00:29 -0000	1.9
+++ server/asobj/Color.cpp	26 Apr 2007 07:00:29 -0000	1.10
@@ -68,7 +68,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Color"; }
+	//std::string get_text_value() const { return "Color"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/ContextMenu.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ContextMenu.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/ContextMenu.cpp	18 Apr 2007 11:00:29 -0000	1.12
+++ server/asobj/ContextMenu.cpp	26 Apr 2007 07:00:29 -0000	1.13
@@ -58,7 +58,7 @@
 	static void registerConstructor(as_object& global);
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "ContextMenu"; }
+	//std::string get_text_value() const { return "ContextMenu"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/CustomActions.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/CustomActions.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/CustomActions.cpp	18 Apr 2007 11:00:29 -0000	1.7
+++ server/asobj/CustomActions.cpp	26 Apr 2007 07:00:29 -0000	1.8
@@ -68,7 +68,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "CustomActions"; }
+	//std::string get_text_value() const { return "CustomActions"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/Error.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Error.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/Error.cpp	18 Apr 2007 11:00:29 -0000	1.8
+++ server/asobj/Error.cpp	26 Apr 2007 07:00:29 -0000	1.9
@@ -64,7 +64,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Error"; }
+	//std::string get_text_value() const { return "Error"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/LoadVars.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/LoadVars.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/asobj/LoadVars.cpp	21 Apr 2007 21:07:40 -0000	1.23
+++ server/asobj/LoadVars.cpp	26 Apr 2007 07:00:29 -0000	1.24
@@ -102,7 +102,7 @@
 	static void attachLoadVarsInterface(as_object& o);
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "LoadVars"; }
+	//std::string get_text_value() const { return "LoadVars"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/Microphone.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Microphone.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/asobj/Microphone.cpp	18 Apr 2007 11:00:29 -0000	1.7
+++ server/asobj/Microphone.cpp	26 Apr 2007 07:00:29 -0000	1.8
@@ -70,7 +70,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Microphone"; }
+	//std::string get_text_value() const { return "Microphone"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/Mouse.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Mouse.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/Mouse.cpp	18 Apr 2007 11:00:29 -0000	1.8
+++ server/asobj/Mouse.cpp	26 Apr 2007 07:00:29 -0000	1.9
@@ -68,7 +68,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Mouse"; }
+	//std::string get_text_value() const { return "Mouse"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/Number.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Number.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/asobj/Number.cpp	18 Apr 2007 11:00:30 -0000	1.28
+++ server/asobj/Number.cpp	26 Apr 2007 07:00:29 -0000	1.29
@@ -1,4 +1,4 @@
-// Number.cpp:  ActionScript Number class, for Gnash.
+/*/ Number.cpp:  ActionScript Number class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Number.cpp,v 1.28 2007/04/18 11:00:30 jgilmore Exp $ */
+/* $Id: Number.cpp,v 1.29 2007/04/26 07:00:29 strk Exp $ */
 
 #include "log.h"
 #include "tu_config.h"
@@ -103,7 +103,7 @@
 	}
 
 	// override from as_object
-	const char* get_text_value() const
+	std::string get_text_value() const
 	{
 		number_val_to_str(_val, _str);
 		return _str;

Index: server/asobj/Selection.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Selection.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/Selection.cpp	18 Apr 2007 11:00:30 -0000	1.8
+++ server/asobj/Selection.cpp	26 Apr 2007 07:00:29 -0000	1.9
@@ -76,7 +76,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Selection"; }
+	//std::string get_text_value() const { return "Selection"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/SharedObject.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/SharedObject.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/SharedObject.cpp	18 Apr 2007 11:00:30 -0000	1.9
+++ server/asobj/SharedObject.cpp	26 Apr 2007 07:00:29 -0000	1.10
@@ -75,7 +75,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "SharedObject"; }
+	//std::string get_text_value() const { return "SharedObject"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/Stage.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Stage.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/asobj/Stage.h	29 Mar 2007 12:37:31 -0000	1.6
+++ server/asobj/Stage.h	26 Apr 2007 07:00:29 -0000	1.7
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 	Stage();
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Stage"; }
+	//std::string get_text_value() const { return "Stage"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/TextSnapshot.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/TextSnapshot.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/asobj/TextSnapshot.cpp	18 Apr 2007 14:07:32 -0000	1.8
+++ server/asobj/TextSnapshot.cpp	26 Apr 2007 07:00:29 -0000	1.9
@@ -79,7 +79,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "TextSnapshot"; }
+	//std::string get_text_value() const { return "TextSnapshot"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/Video.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Video.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Video.cpp	18 Apr 2007 14:07:32 -0000	1.9
+++ server/asobj/Video.cpp	26 Apr 2007 07:00:29 -0000	1.10
@@ -64,7 +64,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "Video"; }
+	//std::string get_text_value() const { return "Video"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/gen-asclass.pl
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/asobj/gen-asclass.pl	18 Apr 2007 14:07:32 -0000	1.3
+++ server/asobj/gen-asclass.pl	26 Apr 2007 07:00:29 -0000	1.4
@@ -182,7 +182,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "$args{class}"; }
+	//std::string get_text_value() const { return "$args{class}"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/gen-asclass.sh
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/gen-asclass.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/asobj/gen-asclass.sh	18 Apr 2007 14:07:32 -0000	1.12
+++ server/asobj/gen-asclass.sh	26 Apr 2007 07:00:29 -0000	1.13
@@ -196,7 +196,7 @@
 	{}
 
 	// override from as_object ?
-	//const char* get_text_value() const { return "${asname}"; }
+	//std::string get_text_value() const { return "${asname}"; }
 
 	// override from as_object ?
 	//double get_numeric_value() const { return 0; }

Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/asobj/string.cpp	19 Apr 2007 10:27:09 -0000	1.30
+++ server/asobj/string.cpp	26 Apr 2007 07:00:29 -0000	1.31
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: string.cpp,v 1.30 2007/04/19 10:27:09 strk Exp $ */
+/* $Id: string.cpp,v 1.31 2007/04/26 07:00:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -114,15 +114,15 @@
             as_object(getStringInterface())
     {}
 
-    const char* get_text_value() const
+    std::string get_text_value() const
     {
-        return _string.c_str();
+        return _string;
     }
 
     as_value get_primitive_value() const
 
     {
-        return as_value(_string.c_str());
+        return as_value(_string);
     }
 
     std::string& str()

Index: testsuite/server/GetterSetterTest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/GetterSetterTest.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/server/GetterSetterTest.cpp	16 Apr 2007 18:23:06 -0000	1.10
+++ testsuite/server/GetterSetterTest.cpp	26 Apr 2007 07:00:29 -0000	1.11
@@ -42,7 +42,7 @@
 {
 	boost::intrusive_ptr<as_object> o = fn.this_ptr;
 	assert(fn.nargs == 0);
-	const char* txt = o->get_text_value();
+	std::string txt = o->get_text_value();
 	return as_value(txt);
 }
 
@@ -67,7 +67,8 @@
 
 	const string& getText() const { return textval; }
 
-	const char* get_text_value() const { return textval.c_str(); }
+	std::string get_text_value() const { return textval; }
+
 	void set_member(const std::string& , const as_value& val )
 	{
 		textval = val.to_string();



From MAILER-DAEMON Thu Apr 26 03:11:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hgy84-0003q6-B9
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 03:11:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hgy82-0003o2-C2
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:10:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hgy80-0003mN-JB
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:10:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hgy80-0003mK-Bv
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:10:56 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hgy2H-0008HN-8Y
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 03:05:01 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3Q74sj37020;
	Thu, 26 Apr 2007 09:04:54 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Thu, 26 Apr 2007 09:04:54 +0200
From: Sandro Santilli <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>, Udo Giacomozzi <udo.gnu@nova-sys.net>,
	gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
Message-ID: <20070426070454.GA28074@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>,
	Udo Giacomozzi <udo.gnu@nova-sys.net>, gnash-commit@gnu.org
References: <E1HeadU-0002ww-Ur@cvs> <3610341590.20070419194751@nova-sys.net>
	<20070419190045.GE92773@keybit.net>
	<ca4b43ff0704241918w61e592d6jf30ce8989a32a37a@mail.gmail.com>
	<20070425100440.GB3044@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070425100440.GB3044@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 07:10:59 -0000

On Wed, Apr 25, 2007 at 12:04:41PM +0200, Sandro Santilli wrote:

> paths. If we don't keep a cache we'll have to modify get_text_value() to return by
> string value instead (no trivial change). Alternatively we reintroduce the cache just for the
> sake of returning bu const-ref.

I changed get_text_value interface to return by string value.
Tests welcome.
See bug # 19695
--strk;



From MAILER-DAEMON Thu Apr 26 05:59:08 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh0km-0003mY-EQ
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 05:59:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh0kk-0003lc-9U
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 05:59:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh0kj-0003lP-EP
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 05:59:05 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh0kj-0003lI-8K
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 05:59:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh0f0-0002WN-0q
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 05:53:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh0es-0000T5-2a
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:53:02 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh0er-0000Ss-H0
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:53:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh0er-0000Ss-H0@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 09:53:01 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp testsuite/a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 09:59:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 09:53:01

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp 
	testsuite/actionscript.all: Function.as 

Log message:
	        * server/as_value.cpp (equals): don't abort on object==movieclip !
	        * testsuite/actionscript.all/Function.as: add more tests 'this'
	          reference in 'with' and 'function' scope (see bug #19704).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2998&r2=1.2999
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.39&r2=1.40

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2998
retrieving revision 1.2999
diff -u -b -r1.2998 -r1.2999
--- ChangeLog	26 Apr 2007 07:00:29 -0000	1.2998
+++ ChangeLog	26 Apr 2007 09:53:00 -0000	1.2999
@@ -1,5 +1,11 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp (equals): don't abort on object==movieclip !
+	* testsuite/actionscript.all/Function.as: add more tests 'this'
+	  reference in 'with' and 'function' scope (see bug #19704).
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* server/array.h, server/as_environment.cpp, server/as_function.h,
 	  server/as_object.cpp, server/as_object.h, server/character.cpp,
 	  server/character.h, server/edit_text_character.cpp,

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/as_value.cpp	19 Apr 2007 18:58:45 -0000	1.44
+++ server/as_value.cpp	26 Apr 2007 09:53:01 -0000	1.45
@@ -633,7 +633,11 @@
 	return this_nulltype == v_nulltype;
     }
 
+    bool obj_or_func = (m_type == OBJECT || m_type == AS_FUNCTION);
+    bool v_obj_or_func = (v.m_type == OBJECT || v.m_type == AS_FUNCTION);
+
     /// Compare to same type
+    if ( obj_or_func && v_obj_or_func ) return equalsSameType(v);
     if ( m_type == v.m_type ) return equalsSameType(v);
 
     else if (m_type == STRING)
@@ -653,7 +657,16 @@
     else if (m_type == BOOLEAN)
     {
 	return m_boolean_value == v.to_bool();
+    }
 
+    else if (m_type == MOVIECLIP || v.m_type == MOVIECLIP)
+    {
+        // if both are movieclips they should be compared by same value
+	// (see top of this function).
+	// In any other case we always return false.
+	// TODO: check if it's allowed that the primitive value
+	//       of an object is a movieclip (maybe with an ActionScript hack...)
+        return false;
     }
 
     else if (is_object())

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- testsuite/actionscript.all/Function.as	21 Mar 2007 14:37:20 -0000	1.39
+++ testsuite/actionscript.all/Function.as	26 Apr 2007 09:53:01 -0000	1.40
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.39 2007/03/21 14:37:20 strk Exp $";
+rcsid="$Id: Function.as,v 1.40 2007/04/26 09:53:01 strk Exp $";
 
 #include "check.as"
 
@@ -581,3 +581,61 @@
 check_equals(myMail.to, undefined);
 check_equals(myMail.message, undefined);
 #endif
+
+//-----------------------------------------------------
+// Test the 'this' reference
+//-----------------------------------------------------
+
+getThis = function() { return this; };
+
+check_equals(getThis(), this);
+
+o = new Object;
+o.getThis = getThis;
+check_equals(o.getThis(), o);
+
+o.sub = new Object;
+o.sub.getThis = getThis;
+
+ret = o.sub.getThis();
+check_equals(typeof(ret), 'object');
+check_equals(ret, o.sub);
+
+
+with(o) {
+	with(sub) {
+		ret = getThis();
+		check_equals(typeof(ret), 'object');
+		check_equals(ret, o.sub);
+	}
+
+	ret = getThis();
+	check_equals(typeof(ret), 'object');
+	check_equals(ret, o);
+
+	ret = sub.getThis();
+	check_equals(typeof(ret), 'object');
+	check_equals(ret, sub);
+}
+
+check(delete o.sub.getThis);
+
+with(o) {
+	with (sub) {
+		ret = getThis();
+		check_equals(typeof(ret), 'object');
+		xcheck_equals(getThis(), o);
+	}
+}
+
+function testInFunctionContext(o)
+{
+	with(o) {
+		// see bug #19704
+		ret = getThis();
+		xcheck_equals(typeof(ret), 'object');
+		xcheck_equals(ret, o);
+	}
+}
+
+testInFunctionContext(o);



From MAILER-DAEMON Thu Apr 26 06:01:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh0nV-00052e-Tq
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 06:01:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh0nT-00052S-1n
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:01:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh0nR-00052G-0V
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:01:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh0nQ-00052D-UY
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:01:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh0hh-0002oE-Tq
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 05:55:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh0hg-0000Vo-QZ
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:55:56 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh0hg-0000Vl-K0
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:55:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh0hg-0000Vl-K0@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 09:55:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/actionscript.all Function.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 10:01:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 09:55:56

Modified files:
	testsuite/actionscript.all: Function.as 

Log message:
	Add a test showing that the just-committed fix for as_value::equals is still bogus

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.40&r2=1.41

Patches:
Index: Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- Function.as	26 Apr 2007 09:53:01 -0000	1.40
+++ Function.as	26 Apr 2007 09:55:56 -0000	1.41
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.40 2007/04/26 09:53:01 strk Exp $";
+rcsid="$Id: Function.as,v 1.41 2007/04/26 09:55:56 strk Exp $";
 
 #include "check.as"
 
@@ -639,3 +639,7 @@
 }
 
 testInFunctionContext(o);
+
+// Quick test to verify that a movieclip is never equal to an object, despite it's primitive value
+o = new Object(); o.valueOf = function() { return _root; };
+xcheck_equals(_root, o);



From MAILER-DAEMON Thu Apr 26 06:23:57 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh18n-0008M5-LA
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 06:23:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh18l-0008LY-Fc
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:23:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh18k-0008LD-D0
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:23:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh18k-0008LA-3E
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:23:54 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh130-00059K-Nc
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:17:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh12z-00013g-2I
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 10:17:57 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh12y-00013d-QY
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 10:17:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh12y-00013d-QY@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 10:17:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 10:23:55 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 10:17:56

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	testsuite/actionscript.all: Function.as 

Log message:
	        * server/as_value.{cpp,h}: to_primitive() made private, and had
	          calling any user-defined valueOf for objects; (equals): only
	          return false when to_primitive() returns the same type we were
	          already.
	        * testsuite/actionscript.all/Function.as: two more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2999&r2=1.3000
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.41&r2=1.42

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2999
retrieving revision 1.3000
diff -u -b -r1.2999 -r1.3000
--- ChangeLog	26 Apr 2007 09:53:00 -0000	1.2999
+++ ChangeLog	26 Apr 2007 10:17:56 -0000	1.3000
@@ -1,5 +1,13 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.{cpp,h}: to_primitive() made private, and had
+	  calling any user-defined valueOf for objects; (equals): only
+	  return false when to_primitive() returns the same type we were 
+	  already.
+	* testsuite/actionscript.all/Function.as: two more successes.
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* server/as_value.cpp (equals): don't abort on object==movieclip !
 	* testsuite/actionscript.all/Function.as: add more tests 'this'
 	  reference in 'with' and 'function' scope (see bug #19704).

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/as_value.cpp	26 Apr 2007 09:53:01 -0000	1.45
+++ server/as_value.cpp	26 Apr 2007 10:17:56 -0000	1.46
@@ -228,19 +228,25 @@
 
 // Conversion to primitive value.
 as_value
-as_value::to_primitive() const
+as_value::to_primitive(as_environment& env) const
 {
-	switch (m_type)
+	if ( m_type == OBJECT || m_type == AS_FUNCTION )
+	{
+		as_object* obj = m_object_value;
+		std::string methodname = "valueOf";
+		lowercase_if_needed(methodname);
+		as_value method;
+		if ( obj->get_member(methodname, &method) )
+		{
+			return call_method0(method, &env, obj);
+		}
+		else
+		{
+			log_msg(_("get_member(%s) returned false"), methodname.c_str());
+		}
+	}
+	else
 	{
-		case OBJECT:
-		case AS_FUNCTION:
-			return m_object_value->get_primitive_value();
-		case UNDEFINED:
-		case NULLTYPE:
-		case BOOLEAN:
-		case STRING:
-		case NUMBER:
-		default:
 			return *this;
 	}
 
@@ -659,38 +665,27 @@
 	return m_boolean_value == v.to_bool();
     }
 
-    else if (m_type == MOVIECLIP || v.m_type == MOVIECLIP)
-    {
-        // if both are movieclips they should be compared by same value
-	// (see top of this function).
-	// In any other case we always return false.
-	// TODO: check if it's allowed that the primitive value
-	//       of an object is a movieclip (maybe with an ActionScript hack...)
-        return false;
-    }
-
-    else if (is_object())
+    else if (m_type == OBJECT || m_type == AS_FUNCTION)
     {
-    	assert ( ! v.is_object() );
+    	assert ( ! (v.m_type == OBJECT || v.m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
-	as_value v2 = to_primitive(); // TODO: should forward environment ?
-	if ( v2.is_object() ) return false;
+	if ( ! env ) return false;
+	as_value v2 = to_primitive(*env); // TODO: should forward environment ?
+	if ( v2.m_type == m_type ) return false; // no conversion 
 	else return v2.equals(v, env);
     }
 
-    else if (v.is_object())
+    else if (v.m_type == OBJECT || v.m_type == AS_FUNCTION)
     {
-    	assert ( ! is_object() );
+    	assert ( ! (m_type == OBJECT || m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
-	as_value v2 = v.to_primitive(); // TODO: should forward environment ?
-	if ( v2.is_object() ) return false;
+	if ( ! env ) return false;
+	as_value v2 = v.to_primitive(*env); // TODO: should forward environment ?
+	if ( v2.m_type == v.m_type ) return false; // no conversion 
 	else return equals(v2, env);
     }
 
-    else
-    {
-	assert(0);
-    }
+    return false;
 }
 	
 // Sets *this to this string plus the given string.

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/as_value.h	19 Apr 2007 14:25:40 -0000	1.49
+++ server/as_value.h	26 Apr 2007 10:17:56 -0000	1.50
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.49 2007/04/19 14:25:40 martinwguy Exp $ */
+/* $Id: as_value.h,v 1.50 2007/04/26 10:17:56 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -358,12 +358,6 @@
 	///
 	bool	to_bool_v5() const;
 
-	/// Return value as a primitive type
-	//
-	/// Primitive types are: undefined, null, boolean, string, number.
-	/// See ECMA-2.6.2 (section 4.3.2).
-	as_value to_primitive() const;
-
 	/// Return value as an object, converting primitive values as needed.
 	//
 	/// Make sure you don't break the intrusive_ptr chain
@@ -529,6 +523,16 @@
 
 private:
 
+	/// Return value as a primitive type
+	//
+	/// Primitive types are: undefined, null, boolean, string, number.
+	/// See ECMA-2.6.2 (section 4.3.2).
+	///
+	/// @param env
+	/// 	The environment to use for calling the valueOf method.
+	///
+	as_value to_primitive(as_environment& env) const;
+
 	/// Compare values of the same type
 	//
 	/// NOTE: will abort if values are not of the same type!

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- testsuite/actionscript.all/Function.as	26 Apr 2007 09:55:56 -0000	1.41
+++ testsuite/actionscript.all/Function.as	26 Apr 2007 10:17:56 -0000	1.42
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.41 2007/04/26 09:55:56 strk Exp $";
+rcsid="$Id: Function.as,v 1.42 2007/04/26 10:17:56 strk Exp $";
 
 #include "check.as"
 
@@ -642,4 +642,5 @@
 
 // Quick test to verify that a movieclip is never equal to an object, despite it's primitive value
 o = new Object(); o.valueOf = function() { return _root; };
-xcheck_equals(_root, o);
+check_equals(_root, o);
+check_equals(o, _root);



From MAILER-DAEMON Thu Apr 26 06:34:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh1JN-0003al-AE
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 06:34:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh1JM-0003aW-D3
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:34:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh1JL-0003aK-Oc
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:34:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh1JL-0003aH-KI
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:34:51 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh1Db-0006A5-LG
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:28:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh1Da-0001TT-4Z
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 10:28:54 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh1DZ-0001TQ-TW
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 10:28:54 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh1DZ-0001TQ-TW@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 10:28:53 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server as_value.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 10:34:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 10:28:53

Modified files:
	server         : as_value.cpp 

Log message:
	(equals) don't recurse if the primitive value of a function is an object or vice-versa

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- as_value.cpp	26 Apr 2007 10:17:56 -0000	1.46
+++ as_value.cpp	26 Apr 2007 10:28:53 -0000	1.47
@@ -670,8 +670,8 @@
     	assert ( ! (v.m_type == OBJECT || v.m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
 	if ( ! env ) return false;
-	as_value v2 = to_primitive(*env); // TODO: should forward environment ?
-	if ( v2.m_type == m_type ) return false; // no conversion 
+	as_value v2 = to_primitive(*env); 
+	if ( v2.m_type == OBJECT || v2.m_type == AS_FUNCTION ) return false; // no valid conversion 
 	else return v2.equals(v, env);
     }
 
@@ -680,8 +680,8 @@
     	assert ( ! (m_type == OBJECT || m_type == AS_FUNCTION) );
 	// convert this value to a primitive and recurse
 	if ( ! env ) return false;
-	as_value v2 = v.to_primitive(*env); // TODO: should forward environment ?
-	if ( v2.m_type == v.m_type ) return false; // no conversion 
+	as_value v2 = v.to_primitive(*env); 
+	if ( v2.m_type == OBJECT || v2.m_type == AS_FUNCTION ) return false; // no valid conversion 
 	else return equals(v2, env);
     }
 



From MAILER-DAEMON Thu Apr 26 07:02:53 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh1kT-0000Ds-5a
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 07:02:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh1kP-0000Ck-JZ
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:02:49 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh1kO-0000CY-SM
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:02:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh1kO-0000CV-O3
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:02:48 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hh1ef-0001Z4-66
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 06:56:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh1ed-0003O8-GD
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 10:56:51 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hh1ed-0003O5-4P
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 10:56:51 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh1ed-0003O5-4P@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 26 Apr 2007 10:56:51 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/action.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 11:02:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/26 10:56:50

Modified files:
	.              : ChangeLog 
	server/vm      : action.cpp 
	server/asobj   : Key.h Key.cpp 
	server         : button_character_instance.cpp 
	                 edit_text_character.cpp character.h 
	                 character.cpp sprite_instance.h 
	                 sprite_instance.cpp 

Log message:
	attempt to fix the key events, actions order is not considered

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3000&r2=1.3001
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.257&r2=1.258

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3000
retrieving revision 1.3001
diff -u -b -r1.3000 -r1.3001
--- ChangeLog	26 Apr 2007 10:17:56 -0000	1.3000
+++ ChangeLog	26 Apr 2007 10:56:50 -0000	1.3001
@@ -1,3 +1,20 @@
+2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
+	*	server/vm/action.cpp:
+		add is_key_event() method
+	*	server/asobj/Key.{h, cpp}:
+		change notify_listeners() to public; set_key_down() and set_key_up()
+		don't trigger event handler now.
+	*	server/button_character_instance.cpp:
+	*	server/edit_text_character.cpp:
+		replace *_keypress_listener() to *_key_listener()
+	*	server/character.{h, cpp},server/movie_root.{h, cpp}
+		trigger onClipKeyUp and onClipKeyDown event handlers
+	*	server/sprite_instance.{h, cpp}
+		bypass user defined key events in on_event(), let the global key object 
+		take over user defined key events.	
+	*	testsuite/misc-ming.all/key_event_testrunner.cpp
+		enable all checks
+
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
 	* server/as_value.{cpp,h}: to_primitive() made private, and had

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/vm/action.cpp	19 Apr 2007 07:09:51 -0000	1.16
+++ server/vm/action.cpp	26 Apr 2007 10:56:50 -0000	1.17
@@ -528,7 +528,6 @@
 {
 	switch (m_id)
 	{
-		case event_id::KEY_PRESS :
 		case event_id::PRESS:
 		case event_id::RELEASE:
 		case event_id::RELEASE_OUTSIDE:
@@ -544,6 +543,20 @@
 	}
 }
 
+bool
+event_id::is_key_event() const
+{
+	switch (m_id)
+	{
+		case event_id::KEY_DOWN:
+		case event_id::KEY_PRESS :
+		case event_id::KEY_UP:
+			return true;
+		default:
+			return false;
+	}
+}
+
 // Standard member lookup.
 // TODO: move to character.h ?
 // TODO: case-insensitive search ?

Index: server/asobj/Key.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/asobj/Key.h	20 Mar 2007 15:01:20 -0000	1.13
+++ server/asobj/Key.h	26 Apr 2007 10:56:50 -0000	1.14
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: Key.h,v 1.13 2007/03/20 15:01:20 strk Exp $ */
+/* $Id: Key.h,v 1.14 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 #ifndef __KEY_H__
 #define __KEY_H__
@@ -28,6 +28,7 @@
 #include "tu_config.h"
 #include "as_object.h" // for inheritance
 #include "fn_call.h"
+#include "Event_id.h"
 #include "gnash.h" // for gnash::key namespace
 
 #ifdef WIN32
@@ -99,8 +100,6 @@
 	std::vector<boost::intrusive_ptr<as_object> >	m_listeners;
 	int	m_last_key_pressed;
 
-	void notify_listeners(const std::string& funcname);
-
 public:
 
 	key_as_object();
@@ -111,6 +110,8 @@
 
 	void set_key_up(int code);
 
+	void notify_listeners(const event_id key_event_type);
+
 	void add_listener(boost::intrusive_ptr<as_object> listener);
 
 	void remove_listener(boost::intrusive_ptr<as_object> listener);

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/asobj/Key.cpp	18 Apr 2007 11:00:29 -0000	1.21
+++ server/asobj/Key.cpp	26 Apr 2007 10:56:50 -0000	1.22
@@ -132,17 +132,8 @@
 	    assert(byte_index >= 0 && byte_index < int(sizeof(m_keymap)/sizeof(m_keymap[0])));
 
 	    m_keymap[byte_index] |= mask;
-
-	std::string funcname = event_id(event_id::KEY_DOWN).get_function_name();
-	VM& vm = VM::get();
-	if ( vm.getSWFVersion() < 7 )
-	{
-		boost::to_lower(funcname, vm.getLocale());
-	}
-	notify_listeners(funcname);
 }
 
-
 void
 key_as_object::set_key_up(int code)
 {
@@ -155,20 +146,19 @@
 	    assert(byte_index >= 0 && byte_index < int(sizeof(m_keymap)/sizeof(m_keymap[0])));
 
 	    m_keymap[byte_index] &= ~mask;
+}
+
+void 
+key_as_object::notify_listeners(const event_id key_event_type)
+{
 
-	std::string funcname = event_id(event_id::KEY_UP).get_function_name();
+	std::string funcname = key_event_type.get_function_name();
 	VM& vm = VM::get();
 	if ( vm.getSWFVersion() < 7 )
 	{
 		boost::to_lower(funcname, vm.getLocale());
 	}
-	notify_listeners(funcname);
-}
 
-// TODO: take a std::string
-void
-key_as_object::notify_listeners(const std::string& funcname)
-{
     // Notify listeners.
     for (std::vector<boost::intrusive_ptr<as_object> >::iterator iter = m_listeners.begin();
          iter != m_listeners.end(); ++iter) {

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- server/button_character_instance.cpp	19 Apr 2007 17:41:35 -0000	1.44
+++ server/button_character_instance.cpp	26 Apr 2007 10:56:50 -0000	1.45
@@ -263,12 +263,12 @@
 
 	attachButtonInterface(*this);
 
-	// check up presence KeyPress events
+	// check up presence Key events
 	for (unsigned int i = 0; i < m_def->m_button_actions.size(); i++)
 	{
 		if (m_def->m_button_actions[i].m_conditions & 0xFE00)	// check up on CondKeyPress: UB[7]
 		{
-			_vm.getRoot().add_keypress_listener(this);
+			_vm.getRoot().add_key_listener(this);
 			break;
 		}
 	}
@@ -277,7 +277,7 @@
 
 button_character_instance::~button_character_instance()
 {
-	_vm.getRoot().remove_keypress_listener(this);
+	_vm.getRoot().remove_key_listener(this);
 }
 
 
@@ -317,7 +317,7 @@
 
 
 
-// called from keypress listener only
+// called from Key listener only
 // (the above line is wrong, it's also called with onConstruct, for instance)
 bool
 button_character_instance::on_event(const event_id& id)

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/edit_text_character.cpp	26 Apr 2007 07:00:29 -0000	1.61
+++ server/edit_text_character.cpp	26 Apr 2007 10:56:50 -0000	1.62
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: edit_text_character.cpp,v 1.61 2007/04/26 07:00:29 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.62 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -498,7 +498,7 @@
 		{
 			if (m_has_focus == false)
 			{
-				_vm.getRoot().add_keypress_listener(this);
+				_vm.getRoot().add_key_listener(this);
 				m_has_focus = true;
 				m_cursor = _text.size();
 				format_text();
@@ -512,7 +512,7 @@
 			{
 				movie_root& root = _vm.getRoot();
 				root.set_active_entity(NULL);
-				root.remove_keypress_listener(this);
+				root.remove_key_listener(this);
 				m_has_focus = false;
 				format_text();
 			}

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/character.h	26 Apr 2007 07:00:29 -0000	1.72
+++ server/character.h	26 Apr 2007 10:56:50 -0000	1.73
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.72 2007/04/26 07:00:29 strk Exp $ */
+/* $Id: character.h,v 1.73 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -405,7 +405,7 @@
 
 	/// Set a built-in function handler for the given event
 	//
-	/// Mark the character as having mouse or keypress event
+	/// Mark the character as having mouse or Key event
 	/// handlers if this is the case.
 	///
 	/// NOTE: this function is only for registering statically-defined
@@ -426,14 +426,14 @@
 
 	/// \brief
 	/// Call this when a character get equipped
-	/// with a keypress event handler
+	/// with a Key event handler
 	//
 	/// TODO: provide a function to *unset*
 	///       the flag. This should happen
-	///       when keypress event handler is
+	///       when Key event handler is
 	///       set to undefined or equivalent..
 	///
-	virtual void has_keypress_event() {}
+	virtual void has_key_event() {}
 
 	/// \brief
 	/// Call this when a character get equipped

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/character.cpp	26 Apr 2007 07:00:29 -0000	1.38
+++ server/character.cpp	26 Apr 2007 10:56:50 -0000	1.39
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: character.cpp,v 1.38 2007/04/26 07:00:29 strk Exp $ */
+/* $Id: character.cpp,v 1.39 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -619,8 +619,10 @@
 	// kind of event is a KEY or MOUSE one 
 	switch (id.m_id)
 	{
+		case event_id::KEY_DOWN:  
 		case event_id::KEY_PRESS:
-			has_keypress_event();
+		case event_id::KEY_UP:    
+			has_key_event();
 			break;
 		case event_id::MOUSE_UP:
 		case event_id::MOUSE_DOWN:
@@ -634,7 +636,7 @@
 
 	// todo: drop the character as a listener
 	//       if it gets no valid handlers for
-	//       mouse or keypress events.
+	//       mouse or Key events.
 }
 
 std::auto_ptr<ExecutableCode>

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/sprite_instance.h	23 Apr 2007 20:05:20 -0000	1.102
+++ server/sprite_instance.h	26 Apr 2007 10:56:50 -0000	1.103
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.102 2007/04/23 20:05:20 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.103 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 // Stateful live Sprite instance
 
@@ -113,8 +113,8 @@
 		TAG_DLIST  = 1<<1
 	};
 
-	virtual void has_keypress_event() {
-		m_has_keypress_event = true;
+	virtual void has_key_event() {
+		m_has_key_event = true;
 	}
 
 	virtual void has_mouse_event();
@@ -755,7 +755,7 @@
 	sprite_instance& operator=(const sprite_instance&) { assert(0); return *this; }
 
 	/// \brief
-	/// Call has_keypress_event() or has_mouse_event()
+	/// Call has_key_event() or has_mouse_event()
 	/// if the given string correspond to an event handler
 	/// for which registering as a listener of Mouse or Key is needed
 	//
@@ -763,7 +763,7 @@
 	/// @param name
 	///	Member name. 
 	///
-	void checkForKeyPressOrMouseEvent(const std::string& name);
+	void checkForKeyOrMouseEvent(const std::string& name);
 
 	/// Duplicate the object with the specified name
 	/// and add it with a new name  at a new depth.
@@ -852,7 +852,8 @@
 	/// Increment m_current_frame, and take care of looping.
 	void increment_frame_and_check_for_loop();
 
-	bool m_has_keypress_event;
+	/// key events are: KEY_DOWN, KEY_PRESS, KEY_UP
+	bool m_has_key_event;
 
 	bool m_has_mouse_event;
 

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- server/sprite_instance.cpp	24 Apr 2007 22:22:48 -0000	1.257
+++ server/sprite_instance.cpp	26 Apr 2007 10:56:50 -0000	1.258
@@ -1692,7 +1692,7 @@
 	m_has_looped(false),
 	m_init_actions_executed(),
 	m_as_environment(),
-	m_has_keypress_event(false),
+	m_has_key_event(false),
 	m_has_mouse_event(false),
 	_text_variables(),
 	m_sound_stream_id(-1),
@@ -1718,9 +1718,9 @@
 sprite_instance::~sprite_instance()
 {
 
-	if (m_has_keypress_event)
+	if (m_has_key_event)
 	{
-		_vm.getRoot().remove_keypress_listener(this);
+		_vm.getRoot().remove_key_listener(this);
 	}
 
 	if (m_has_mouse_event)
@@ -2109,6 +2109,7 @@
 	// Fall through and call the function also, if it's defined!
 
 	// Check for member function.
+	if( ! id.is_key_event ())
 	{
 		boost::intrusive_ptr<as_function> method = 
 			getUserDefinedEventHandler(id.get_function_name());
@@ -2148,7 +2149,7 @@
 
 	if ( val.is_function() )
 	{
-		checkForKeyPressOrMouseEvent(name);
+		checkForKeyOrMouseEvent(name);
 	}
 
 	// Try textfield variables
@@ -2352,9 +2353,9 @@
 #endif
 		on_event(event_id::LOAD);	// clip onload
 
-		if (m_has_keypress_event)
+		if (m_has_key_event)
 		{
-			_vm.getRoot().add_keypress_listener(this);
+			_vm.getRoot().add_key_listener(this);
 		}
 		// Mouse events listening is done in has_mouse_event directly.
 		// This shows to work better for attachMovieTest.swf,
@@ -3565,7 +3566,7 @@
 }
 
 void
-sprite_instance::checkForKeyPressOrMouseEvent(const std::string& name)
+sprite_instance::checkForKeyOrMouseEvent(const std::string& name)
 {
 	// short-cut
 	if ( name.size() < 9 ) return;
@@ -3578,9 +3579,11 @@
 
 	const char* ptr = name.c_str();
 
-	if ( ! cmp(ptr, "onkeypress") )
+	if ( ! cmp(ptr, "onKeyDown") 
+		|| ! cmp(ptr, "onKeypress") 
+		|| ! cmp(ptr, "onKeyUp"))
 	{
-		has_keypress_event();
+		has_key_event();
 	}
 	else if ( ! cmp(ptr, "onMouseDown")
 		|| ! cmp(ptr, "onMouseUp") 



From MAILER-DAEMON Thu Apr 26 07:10:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh1sF-0006NH-7i
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 07:10:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh1sE-0006My-1B
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:10:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh1sD-0006Mk-3C
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:10:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh1sC-0006Mh-T5
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:10:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hh1mT-0002Xh-8o
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:04:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh1mS-0003ZC-Me
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:04:56 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hh1mS-0003Z8-GM
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:04:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh1mS-0003Z8-GM@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 26 Apr 2007 11:04:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server movie_root.h movie_root.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 11:10:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/26 11:04:56

Modified files:
	server         : movie_root.h movie_root.cpp 

Log message:
	attempt to fix the key events, actions order is not considered

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.58&r2=1.59

Patches:
Index: movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- movie_root.h	21 Apr 2007 21:07:40 -0000	1.49
+++ movie_root.h	26 Apr 2007 11:04:56 -0000	1.50
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.49 2007/04/21 21:07:40 strk Exp $ */
+/* $Id: movie_root.h,v 1.50 2007/04/26 11:04:56 zoulunkai Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -75,6 +75,7 @@
 #include "drag_state.h" // for composition
 #include "sprite_instance.h" // for inlines
 #include "timers.h" // for composition
+#include "asobj/Key.h"
 
 #include <vector>
 #include <list>
@@ -376,9 +377,9 @@
 			callback, user_ptr);
 	}
 
-	DSOEXPORT void notify_keypress_listeners(key::code k);
-	void add_keypress_listener(as_object* listener);
-	void remove_keypress_listener(as_object* listener);
+	DSOEXPORT void notify_key_listeners(key::code k, bool down);
+	void add_key_listener(as_object* listener);
+	void remove_key_listener(as_object* listener);
 
 	DSOEXPORT void notify_mouse_listeners(const event_id& event);
 	void add_mouse_listener(as_object* listener);
@@ -426,11 +427,11 @@
 	movie_root& operator=(const movie_root& ) { assert(0); return *this; }
 
 	/// Notify the global Key ActionScript object about a key status change
-	void notify_global_key(key::code k, bool down);
+	key_as_object * notify_global_key(key::code k, bool down);
 
 	/// Remove all listeners with a ref-count of 1
 	/// (only referenced as key listeners)
-	void cleanup_keypress_listeners();
+	void cleanup_key_listeners();
 
 	/// Return the current Stage object
 	//
@@ -475,8 +476,8 @@
 	/// A set of as_objects kept by intrusive_ptr
 	typedef std::set< boost::intrusive_ptr<as_object> > ListenerSet;
 
-	/// Objects listening for keypress events
-	ListenerSet m_keypress_listeners;
+	/// Objects listening for key events
+	ListenerSet m_key_listeners;
 
 	/// Objects listening for mouse events (down,up,move)
 	ListenerSet m_mouse_listeners;

Index: movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- movie_root.cpp	21 Apr 2007 21:07:40 -0000	1.58
+++ movie_root.cpp	26 Apr 2007 11:04:56 -0000	1.59
@@ -29,7 +29,6 @@
 #include "tu_random.h"
 #include "ExecutableCode.h"
 #include "Stage.h"
-#include "Key.h"
 
 #include <iostream>
 #include <string>
@@ -161,14 +160,16 @@
 
 }
 
-void
+
+
+key_as_object *
 movie_root::notify_global_key(key::code k, bool down)
 {
 	VM& vm = VM::get();
 	if ( vm.getSWFVersion() < 6 )
 	{
 		// _global.Key was added in SWF6
-		return;
+		return NULL; 
 	}
 
 	static boost::intrusive_ptr<key_as_object> keyobject = NULL;
@@ -203,21 +204,33 @@
 	{
 		log_error("gnash::notify_key_event(): _global.Key doesn't exist, or isn't the expected built-in\n");
 	}
+
+	return keyobject.get();
 }
 
 bool
 movie_root::notify_key_event(key::code k, bool down)
 {
-//	    GNASH_REPORT_FUNCTION;
-	    
-	// Notify keypress listeners.
-	if (down) notify_keypress_listeners(k);
+//GNASH_REPORT_FUNCTION;
 
 	//
-	// Notify the _global.Key object about key event
+	// First of all, notify the _global.Key object about key event
 	//
+	key_as_object * global_key = notify_global_key(k, down);
 
-	notify_global_key(k, down);
+	// Notify key listeners.
+	notify_key_listeners(k, down);
+
+	if(global_key)
+	{
+		if(down)
+		{
+			global_key->notify_listeners(event_id::KEY_DOWN);
+			global_key->notify_listeners(event_id::KEY_PRESS);
+		}
+		else
+			global_key->notify_listeners(event_id::KEY_UP);
+	}
 
 	processActionQueue();
 
@@ -558,8 +571,8 @@
 		}
 	}
 
-	// Cleanup keypress listeners (remove unloaded characters)
-	cleanup_keypress_listeners();
+	// Cleanup key listeners (remove unloaded characters)
+	cleanup_key_listeners();
 
 	// random should go continuously that:
 	// 1. after restart of the player the situation has not repeated
@@ -658,15 +671,15 @@
 	return _movie->call_method_args(method_name, method_arg_fmt, args);
 }
 
-void movie_root::cleanup_keypress_listeners()
+void movie_root::cleanup_key_listeners()
 {
-#ifdef KEYPRESS_LISTENERS_DEBUG
-	size_t prevsize = m_keypress_listeners.size();
-	log_msg("Cleaning up %u keypress listeners", m_keypress_listeners.size());
+#ifdef KEY_LISTENERS_DEBUG
+	size_t prevsize = m_key_listeners.size();
+	log_msg("Cleaning up %u key listeners", m_key_listeners.size());
 #endif
 
-	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
-			 iter != m_keypress_listeners.end(); )
+	for (ListenerSet::iterator iter = m_key_listeners.begin();
+			 iter != m_key_listeners.end(); )
 	{
 		// TODO: handle non-character objects too !
 		character* ch = dynamic_cast<character*>(iter->get());
@@ -674,8 +687,8 @@
 		{
 			ListenerSet::iterator toremove = iter;
 			++iter;
-			//log_msg("cleanup_keypress_listeners: Removing unloaded keypress listener %p", iter->get());
-			m_keypress_listeners.erase(toremove);
+			//log_msg("cleanup_key_listeners: Removing unloaded key listener %p", iter->get());
+			m_key_listeners.erase(toremove);
 		}
 		else
 		{
@@ -683,49 +696,57 @@
 		}
 	}
 
-#ifdef KEYPRESS_LISTENERS_DEBUG
-	size_t currsize = m_keypress_listeners.size();
+#ifdef key_LISTENERS_DEBUG
+	size_t currsize = m_key_listeners.size();
 	log_msg("Cleaned up %u listeners (from %u to %u)", prevsize-currsize, prevsize, currsize);
 #endif
 }
 
-void movie_root::notify_keypress_listeners(key::code k)
+void movie_root::notify_key_listeners(key::code k, bool down)
 {
 	log_msg("Notifying " SIZET_FMT " keypress listeners", 
-		m_keypress_listeners.size());
-	for (ListenerSet::iterator iter = m_keypress_listeners.begin();
-			 iter != m_keypress_listeners.end(); ++iter)
+		m_key_listeners.size());
+
+	for (ListenerSet::iterator iter = m_key_listeners.begin();
+			 iter != m_key_listeners.end(); ++iter)
 	{
 		// sprite, button & input_edit_text characters
 		// TODO: invoke functions on non-characters !
 		character* ch = dynamic_cast<character*>(iter->get());
 		if ( ch && ! ch->isUnloaded() )
 		{
+			if(down)
+			{
+				// key code for KEY_DOWN and KEY_UP should be invalid
+				ch->on_event(event_id(event_id::KEY_DOWN, key::INVALID)); 
 			ch->on_event(event_id(event_id::KEY_PRESS, k));
 		}
+			else
+				ch->on_event(event_id(event_id::KEY_UP, key::INVALID));   
+		}
 	}
 
 	assert(testInvariant());
 }
 
-void movie_root::add_keypress_listener(as_object* listener)
+void movie_root::add_key_listener(as_object* listener)
 {
-	if ( m_keypress_listeners.insert(listener).second )
+	if ( m_key_listeners.insert(listener).second )
 	{
-		//log_msg("Added keypress listener %p", (void*)listener);
+		//log_msg("Added key listener %p", (void*)listener);
 	}
 	else
 	{
-		//log_msg("Keypress listener %p was already in the known set", (void*)listener);
+		//log_msg("key listener %p was already in the known set", (void*)listener);
 	}
 	assert(testInvariant());
 }
 
-void movie_root::remove_keypress_listener(as_object* listener)
+void movie_root::remove_key_listener(as_object* listener)
 {
-	//log_msg("Removing keypress listener %p - %u listeners currently ", (void*)listener, m_keypress_listeners.size());
-	m_keypress_listeners.erase(listener);
-	//log_msg("After removing keypress listener %p, %u listeners are left", (void*)listener, m_keypress_listeners.size());
+	//log_msg("Removing key listener %p - %u listeners currently ", (void*)listener, m_key_listeners.size());
+	m_key_listeners.erase(listener);
+	//log_msg("After removing key listener %p, %u listeners are left", (void*)listener, m_key_listeners.size());
 	assert(testInvariant());
 }
 



From MAILER-DAEMON Thu Apr 26 07:24:07 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh251-0003pp-AT
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 07:24:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh24z-0003pT-Ak
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:24:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh24y-0003ow-Ch
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:24:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh24y-0003os-9K
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:24:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hh1zE-0004WK-1g
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:18:08 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh1zA-0003qI-B7
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:18:04 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hh1z9-0003qD-TN
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:18:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh1z9-0003qD-TN@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 26 Apr 2007 11:18:03 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Key.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 11:24:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/26 11:18:03

Modified files:
	.              : ChangeLog 
	server/asobj   : Key.h 

Log message:
	a typo

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3001&r2=1.3002
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.h?cvsroot=gnash&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3001
retrieving revision 1.3002
diff -u -b -r1.3001 -r1.3002
--- ChangeLog	26 Apr 2007 10:56:50 -0000	1.3001
+++ ChangeLog	26 Apr 2007 11:18:03 -0000	1.3002
@@ -1,4 +1,8 @@
 2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
+	*	server/asobj/Key.h
+		change "Event_id.h" to "event_id.h"
+	
+2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
 	*	server/vm/action.cpp:
 		add is_key_event() method
 	*	server/asobj/Key.{h, cpp}:

Index: server/asobj/Key.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/Key.h	26 Apr 2007 10:56:50 -0000	1.14
+++ server/asobj/Key.h	26 Apr 2007 11:18:03 -0000	1.15
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: Key.h,v 1.14 2007/04/26 10:56:50 zoulunkai Exp $ */
+/* $Id: Key.h,v 1.15 2007/04/26 11:18:03 zoulunkai Exp $ */
 
 #ifndef __KEY_H__
 #define __KEY_H__
@@ -28,7 +28,7 @@
 #include "tu_config.h"
 #include "as_object.h" // for inheritance
 #include "fn_call.h"
-#include "Event_id.h"
+#include "event_id.h"
 #include "gnash.h" // for gnash::key namespace
 
 #ifdef WIN32



From MAILER-DAEMON Thu Apr 26 07:42:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh2Mx-0004eb-8z
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 07:42:39 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh2Mv-0004eW-PT
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:42:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh2Mu-0004eC-QN
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:42:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh2Mu-0004e9-M5
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:42:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hh2HA-0006lC-Ef
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 07:36:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh2H4-0005fk-Om
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:36:34 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hh2H4-0005fg-Fu
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:36:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh2H4-0005fg-Fu@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Thu, 26 Apr 2007 11:36:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/event_id.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 11:42:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/26 11:36:34

Modified files:
	.              : ChangeLog 
	server         : event_id.h 

Log message:
	forgot to commit this in last step

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3002&r2=1.3003
http://cvs.savannah.gnu.org/viewcvs/gnash/server/event_id.h?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3002
retrieving revision 1.3003
diff -u -b -r1.3002 -r1.3003
--- ChangeLog	26 Apr 2007 11:18:03 -0000	1.3002
+++ ChangeLog	26 Apr 2007 11:36:34 -0000	1.3003
@@ -1,6 +1,8 @@
 2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
 	*	server/asobj/Key.h
 		change "Event_id.h" to "event_id.h"
+	*	server/event_id.h
+		forgot to commit it in last commit
 	
 2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
 	*	server/vm/action.cpp:

Index: server/event_id.h
===================================================================
RCS file: /sources/gnash/gnash/server/event_id.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/event_id.h	11 Apr 2007 14:20:20 -0000	1.5
+++ server/event_id.h	26 Apr 2007 11:36:34 -0000	1.6
@@ -102,10 +102,13 @@
 		m_id(id),
 		m_key_code((unsigned char) c)
 	{
-		// For the button key events, you must supply a keycode.
-		// Otherwise, don't.
-		assert((m_key_code == key::INVALID && (m_id != KEY_PRESS))
-			|| (m_key_code != key::INVALID && (m_id == KEY_PRESS)));
+		// you must supply a key code for KEY_PRESS event
+		// 
+		// we do have a testcase with m_id == KEY_PRESS, and m_key_code==0(KEY_INVALID)
+		// see key_event_test.swf(produced by Ming)
+		// 
+		//assert((m_key_code == key::INVALID && (m_id != KEY_PRESS))
+		//	|| (m_key_code != key::INVALID && (m_id == KEY_PRESS)));
 	}
 
 	void setKeyCode(unsigned char key)
@@ -134,6 +137,10 @@
 	/// (triggerable with a mouse activity)
 	bool is_mouse_event() const;
 
+  /// \brief
+	/// Return true if this is a key event
+	bool is_key_event() const;
+
 	id_code id() const { return m_id; }
 };
 



From MAILER-DAEMON Thu Apr 26 08:07:48 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh2lI-0000az-FC
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 08:07:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh2lH-0000ae-86
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:07:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh2lF-0000aS-GU
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:07:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh2lF-0000aP-BX
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:07:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh2fV-0001t8-Cs
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:01:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh2fU-00065g-2k
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:01:48 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh2fT-00065d-SV
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:01:48 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh2fT-00065d-SV@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 12:01:47 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 12:07:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 12:01:47

Modified files:
	.              : ChangeLog 

Log message:
	indenting...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3003&r2=1.3004

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3003
retrieving revision 1.3004
diff -u -b -r1.3003 -r1.3004
--- ChangeLog	26 Apr 2007 11:36:34 -0000	1.3003
+++ ChangeLog	26 Apr 2007 12:01:47 -0000	1.3004
@@ -1,10 +1,12 @@
 2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
+
 	*	server/asobj/Key.h
 		change "Event_id.h" to "event_id.h"
 	*	server/event_id.h
 		forgot to commit it in last commit
 	
 2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
+
 	*	server/vm/action.cpp:
 		add is_key_event() method
 	*	server/asobj/Key.{h, cpp}:



From MAILER-DAEMON Thu Apr 26 08:12:38 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh2py-0002ly-Bg
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 08:12:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh2pw-0002ip-PF
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:12:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh2pw-0002iD-AF
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:12:36 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh2pw-0002hv-4m
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:12:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh2kC-0002T8-8f
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:06:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh2kC-0006AH-67
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:06:40 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh2kB-0006AE-Ni
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:06:40 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh2kB-0006AE-Ni@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 12:06:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash server/as_value.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 12:12:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 12:06:39

Modified files:
	server         : as_value.cpp 
	.              : ChangeLog 

Log message:
	        * server/as_value.cpp (to_primitive): fix missing return
	          from non-void function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3004&r2=1.3005

Patches:
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/as_value.cpp	26 Apr 2007 10:28:53 -0000	1.47
+++ server/as_value.cpp	26 Apr 2007 12:06:39 -0000	1.48
@@ -245,10 +245,8 @@
 			log_msg(_("get_member(%s) returned false"), methodname.c_str());
 		}
 	}
-	else
-	{
+
 		return *this;
-	}
 
 }
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3004
retrieving revision 1.3005
diff -u -b -r1.3004 -r1.3005
--- ChangeLog	26 Apr 2007 12:01:47 -0000	1.3004
+++ ChangeLog	26 Apr 2007 12:06:39 -0000	1.3005
@@ -1,3 +1,8 @@
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
+	* server/as_value.cpp (to_primitive): fix missing return
+	  from non-void function.
+
 2007-04-26 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/asobj/Key.h



From MAILER-DAEMON Thu Apr 26 08:16:17 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh2tV-00071j-Po
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 08:16:17 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh2tU-00071W-AW
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:16:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh2tT-00071K-NS
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:16:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh2tT-00071H-Ig
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:16:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh2nj-0002xY-Ku
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:10:19 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh2nj-0006EY-3w
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:10:19 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh2ni-0006EV-Rl
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:10:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh2ni-0006EV-Rl@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 12:10:18 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/key_eve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 12:16:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 12:10:18

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: key_event_testrunner.cpp 

Log message:
	        * testsuite/misc-ming.all/key_event_testrunner.cpp: no more
	          failures expected (thanks kai).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3005&r2=1.3006
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3005
retrieving revision 1.3006
diff -u -b -r1.3005 -r1.3006
--- ChangeLog	26 Apr 2007 12:06:39 -0000	1.3005
+++ ChangeLog	26 Apr 2007 12:10:18 -0000	1.3006
@@ -1,5 +1,7 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/key_event_testrunner.cpp: no more
+	  failures expected (thanks kai).
 	* server/as_value.cpp (to_primitive): fix missing return
 	  from non-void function.
 

Index: testsuite/misc-ming.all/key_event_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/misc-ming.all/key_event_testrunner.cpp	23 Apr 2007 11:20:00 -0000	1.2
+++ testsuite/misc-ming.all/key_event_testrunner.cpp	26 Apr 2007 12:10:18 -0000	1.3
@@ -65,9 +65,9 @@
 
   // check that onClipKeyUp/KeyDown have been triggered
   check(root->get_member("x1", &tmp));
-  xcheck_equals(tmp.to_string(), "A");
+  check_equals(tmp.to_string(), "A");
   check(root->get_member("x2", &tmp));
-  xcheck_equals(tmp.to_number(), key::A);
+  check_equals(tmp.to_number(), key::A);
 
   // check that user defined onKeyUp/KeyDown are not triggered
   check(root->get_member("x4", &tmp));
@@ -89,9 +89,9 @@
 
   // check that onClipKeyUp/KeyDown have been triggered
   check(root->get_member("x1", &tmp));
-  xcheck_equals(tmp.to_string(), "C");
+  check_equals(tmp.to_string(), "C");
   check(root->get_member("x2", &tmp));
-  xcheck_equals(tmp.to_number(), key::C);
+  check_equals(tmp.to_number(), key::C);
   
   // check that user defined onKeyUp/KeyDown have been triggered
   check(root->get_member("x4", &tmp));



From MAILER-DAEMON Thu Apr 26 08:37:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh3EG-0000GI-Vt
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 08:37:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh3EF-0000GC-Ie
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:37:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh3EE-0000Fr-65
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:37:43 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh3ED-0000Fo-VS
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:37:42 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh38T-0005ek-VL
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 08:31:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh38S-00071g-TO
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:31:45 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh38S-00071Z-Kf
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:31:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh38S-00071Z-Kf@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 12:31:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.h server/...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 12:37:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 12:31:44

Modified files:
	.              : ChangeLog 
	server         : as_environment.h movie_root.h sprite_instance.h 
	server/vm      : action.cpp 

Log message:
	        * server/as_environment.h, server/movie_root.h,
	          server/sprite_instance.h, server/vm/action.cpp:
	          Remove some unused code, remove Id tags from headers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3006&r2=1.3007
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3006
retrieving revision 1.3007
diff -u -b -r1.3006 -r1.3007
--- ChangeLog	26 Apr 2007 12:10:18 -0000	1.3006
+++ ChangeLog	26 Apr 2007 12:31:44 -0000	1.3007
@@ -1,5 +1,11 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.h, server/movie_root.h,
+	  server/sprite_instance.h, server/vm/action.cpp:
+	  Remove some unused code, remove Id tags from headers.
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/misc-ming.all/key_event_testrunner.cpp: no more
 	  failures expected (thanks kai).
 	* server/as_value.cpp (to_primitive): fix missing return

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/as_environment.h	16 Apr 2007 16:47:29 -0000	1.45
+++ server/as_environment.h	26 Apr 2007 12:31:44 -0000	1.46
@@ -14,8 +14,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_environment.h,v 1.45 2007/04/16 16:47:29 strk Exp $ */
-
 #ifndef GNASH_AS_ENVIRONMENT_H
 #define GNASH_AS_ENVIRONMENT_H
 
@@ -109,7 +107,7 @@
 
 	/// Get stack value at the given distance from bottom.
 	//
-	/// bottom(0) is actual stack top
+	/// bottom(stack_size()-1) is actual stack top
 	///
 	as_value& bottom(size_t index)
 	{
@@ -151,14 +149,6 @@
 	///
 	as_value get_variable(const std::string& varname) const;
 
-	/// Return the (possibly UNDEFINED) value of the named variable.
-	//
-	/// @param varname 
-	///	Variable name. Can not contain path elements.
-	///	TODO: should be case-insensitive up to SWF6.
-	///
-	as_value get_variable_raw(const std::string& varname) const;
-
 	/// \brief
 	/// Delete a variable, w/out support for the path, using
 	/// a ScopeStack.
@@ -514,6 +504,14 @@
 	/// Movie target. 
 	character* _original_target;
 
+	/// Return the (possibly UNDEFINED) value of the named variable.
+	//
+	/// @param varname 
+	///	Variable name. Can not contain path elements.
+	///	TODO: should be case-insensitive up to SWF6.
+	///
+	as_value get_variable_raw(const std::string& varname) const;
+
 	/// Given a variable name, set its value (no support for path)
 	void set_variable_raw(const std::string& path, const as_value& val,
 		const ScopeStack& with_stack);

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/movie_root.h	26 Apr 2007 11:04:56 -0000	1.50
+++ server/movie_root.h	26 Apr 2007 12:31:44 -0000	1.51
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.50 2007/04/26 11:04:56 zoulunkai Exp $ */
+/* $Id: movie_root.h,v 1.51 2007/04/26 12:31:44 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -367,16 +367,6 @@
 	void * get_userdata() { return m_userdata; }
 	void set_userdata(void * ud ) { m_userdata = ud;  }
 
-	/// Delegate to wrapped movie_instance
-	void attach_display_callback(
-			const char* path_to_object,
-			void (*callback)(void* user_ptr),
-			void* user_ptr)
-	{
-		_movie->attach_display_callback(path_to_object,
-			callback, user_ptr);
-	}
-
 	DSOEXPORT void notify_key_listeners(key::code k, bool down);
 	void add_key_listener(as_object* listener);
 	void remove_key_listener(as_object* listener);

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/sprite_instance.h	26 Apr 2007 10:56:50 -0000	1.103
+++ server/sprite_instance.h	26 Apr 2007 12:31:44 -0000	1.104
@@ -17,7 +17,6 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.103 2007/04/26 10:56:50 zoulunkai Exp $ */
 
 // Stateful live Sprite instance
 
@@ -598,24 +597,6 @@
 	virtual const char* call_method_args(const char* method_name,
 		const char* method_arg_fmt, va_list args);
 
-	virtual void	attach_display_callback(
-		const char* path_to_object,
-		void (*callback)(void*), void* user_ptr)
-	{
-//                  GNASH_REPORT_FUNCTION;
-	  
-		// should only be called on the root movie.
-		assert(m_parent == NULL);
-
-		as_value obj = m_as_environment.get_variable(std::string(path_to_object));
-		boost::intrusive_ptr<as_object> as_obj = obj.to_object();
-		boost::intrusive_ptr<character> ch = boost::dynamic_pointer_cast<character>(as_obj);
-		if (ch)
-		{
-			ch->set_display_callback(callback, user_ptr);
-		}
-	}
-
 	// inherited from character class, see dox in character.h
 	as_environment& get_environment() {
 		return m_as_environment;

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/vm/action.cpp	26 Apr 2007 10:56:50 -0000	1.17
+++ server/vm/action.cpp	26 Apr 2007 12:31:44 -0000	1.18
@@ -258,92 +258,17 @@
     return call_method(method, env, this_ptr, 0, env->get_top_index() + 1);
 }
 
+// Printf-like vararg interface for calling ActionScript.
+// Handy for external binding.
 const char*	call_method_parsed(
     as_environment* env,
     as_object* this_ptr,
     const char* method_name,
     const char* method_arg_fmt,
     va_list args)
-    // Printf-like vararg interface for calling ActionScript.
-    // Handy for external binding.
 {
     log_msg(_("FIXME(%d): %s"), __LINE__, __FUNCTION__);
 
-#if 0
-    static const int	BUFSIZE = 1000;
-    char	buffer[BUFSIZE];
-    std::vector<const char*>	tokens;
-
-    // Brutal crap parsing.  Basically null out any
-    // delimiter characters, so that the method name and
-    // args sit in the buffer as null-terminated C
-    // strings.  Leave an intial ' character as the first
-    // char in a string argument.
-    // Don't verify parens or matching quotes or anything.
-    {
-	strncpy(buffer, method_call, BUFSIZE);
-	buffer[BUFSIZE - 1] = '\0';
-	char*	p = buffer;
-
-	char	in_quote = 0;
-	bool	in_arg = false;
-	for (;; p++)
-	    {
-		char	c = *p;
-		if (c == 0)
-		    {
-			// End of string.
-			break;
-		    }
-		else if (c == in_quote)
-		    {
-			// End of quotation.
-			assert(in_arg);
-			*p = 0;
-			in_quote = 0;
-			in_arg = false;
-		    }
-		else if (in_arg)
-		    {
-			if (in_quote == 0)
-			    {
-				if (c == ')' || c == '(' || c == ',' || c == ' ')
-				    {
-					// End of arg.
-					*p = 0;
-					in_arg = false;
-				    }
-			    }
-		    }
-		else
-		    {
-			// Not in arg.  Watch for start of arg.
-			assert(in_quote == 0);
-			if (c == '\'' || c == '\"')
-			    {
-				// Start of quote.
-				in_quote = c;
-				in_arg = true;
-				*p = '\'';	// ' at the start of the arg, so later we know this is a string.
-				tokens.push_back(p);
-			    }
-			else if (c == ' ' || c == ',')
-			    {
-				// Non-arg junk, null it out.
-				*p = 0;
-			    }
-			else
-			    {
-				// Must be the start of a numeric arg.
-				in_arg = true;
-				tokens.push_back(p);
-			    }
-		    }
-	    }
-    }
-#endif // 0
-
-
     // Parse va_list args
     int	starting_index = env->get_top_index();
     const char* p = method_arg_fmt;



From MAILER-DAEMON Thu Apr 26 09:40:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh4CY-0001Hn-CU
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 09:40:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh4CW-0001Gj-7F
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:40:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh4CV-0001GX-73
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:39:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh4CV-0001GU-1K
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:39:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh46k-0005qi-Nd
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:34:02 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh46j-0001tE-EY
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:34:01 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh46j-0001t6-2S
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:34:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh46j-0001t6-2S@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 13:34:01 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 13:40:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 13:34:00

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_environment.h 

Log message:
	        * server/as_environment.{cpp,h}: refactor local variables
	          so they are stored into a proper object. Will help introducing
	          a VariableRef class that associates a Property to an as_object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3007&r2=1.3008
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.71&r2=1.72
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3007
retrieving revision 1.3008
diff -u -b -r1.3007 -r1.3008
--- ChangeLog	26 Apr 2007 12:31:44 -0000	1.3007
+++ ChangeLog	26 Apr 2007 13:34:00 -0000	1.3008
@@ -1,5 +1,11 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.{cpp,h}: refactor local variables
+	  so they are stored into a proper object. Will help introducing
+	  a VariableRef class that associates a Property to an as_object.
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* server/as_environment.h, server/movie_root.h,
 	  server/sprite_instance.h, server/vm/action.cpp:
 	  Remove some unused code, remove Id tags from headers.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/as_environment.cpp	26 Apr 2007 07:00:29 -0000	1.71
+++ server/as_environment.cpp	26 Apr 2007 13:34:00 -0000	1.72
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.71 2007/04/26 07:00:29 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.72 2007/04/26 13:34:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -31,6 +31,8 @@
 #include "with_stack_entry.h"
 #include "VM.h"
 #include "log.h"
+#include "Property.h"
+#include "as_object.h"
 
 #include <string>
 #include <utility> // for std::pair
@@ -102,15 +104,15 @@
 {
     assert(strchr(varname.c_str(), ':') == NULL);
 
+    as_value	val;
+
     // Check locals for getting them
-    as_environment::frame_slot slot;
-    if ( findLocal(varname, slot, true) ) // do we really want to descend here ??
+    //as_environment::frame_slot slot;
+    if ( findLocal(varname, val, true) ) // do we really want to descend here ??
     {
-	return slot.m_value;
+	return val;
     }
 
-    as_value	val;
-
     // Check the with-stack.
     for (size_t i = with_stack.size(); i > 0; --i) {
         // const_cast needed due to non-const as_object::get_member 
@@ -271,7 +273,6 @@
 {
 
 	// Check locals for setting them
-	as_environment::frame_slot slot;
 	if ( setLocal(varname, val, true) )
 	{
 		return;
@@ -314,7 +315,7 @@
 	// Is it in the current frame already?
 	// TODO: should we descend to upper frames ?
 	//       (probably not as we want to update it)
-	as_environment::frame_slot slot;
+	//as_environment::frame_slot slot;
 	if ( setLocal(varname, val, false) )
 	{
 		return;
@@ -325,7 +326,8 @@
 		assert(_localFrames.size());
 		assert(varname.length() > 0);	// null varnames are invalid!
 		LocalVars& locals = _localFrames.back().locals;
-		locals.push_back(as_environment::frame_slot(varname, val));
+		//locals.push_back(as_environment::frame_slot(varname, val));
+		locals->set_member(varname, val);
 	}
 }
 	
@@ -335,14 +337,17 @@
 {
 	// TODO: should we descend to upper frames ?
 	//       (probably not as we want to declare it)
-	as_environment::frame_slot slot;
-	if ( ! findLocal(varname, slot, false) )
+	//as_environment::frame_slot slot;
+
+	as_value tmp;
+	if ( ! findLocal(varname, tmp, false) )
 	{
 		// Not in frame; create a new local var.
 		assert(_localFrames.size());
 		assert(varname.length() > 0);	// null varnames are invalid!
 		LocalVars& locals = _localFrames.back().locals;
-		locals.push_back(as_environment::frame_slot(varname, as_value()));
+		//locals.push_back(as_environment::frame_slot(varname, as_value()));
+		locals->set_member(varname, as_value());
 	}
 }
 	
@@ -870,6 +875,8 @@
 static void
 dump(const as_environment::LocalVars& locals, std::ostream& out)
 {
+	log_msg("FIXME: implement dumper for local variables now that they are simple objects");
+#if 0
 	for (size_t i=0; i<locals.size(); ++i)
 	{
 		const as_environment::frame_slot& slot = locals[i];
@@ -878,6 +885,7 @@
 		out << slot.m_name << "==" << slot.m_value;
 	}
 	out << std::endl;
+#endif
 }
 
 void
@@ -913,7 +921,7 @@
 
 /*private*/
 bool
-as_environment::findLocal(const std::string& varname, as_environment::frame_slot& ret, bool descend)
+as_environment::findLocal(const std::string& varname, as_value& ret, bool descend)
 {
 	if ( _localFrames.empty() ) return false;
 	if ( ! descend ) return findLocal(_localFrames.back().locals, varname, ret);
@@ -934,8 +942,10 @@
 
 /* static private */
 bool
-as_environment::findLocal(LocalVars& locals, const std::string& name, as_environment::frame_slot& ret)
+as_environment::findLocal(LocalVars& locals, const std::string& name, as_value& ret)
 {
+	return locals->get_member(name, &ret);
+#if 0
 	for (size_t i=0; i<locals.size(); ++i)
 	{
 		const as_environment::frame_slot& slot = locals[i];
@@ -946,12 +956,15 @@
 		}
 	}
 	return false;
+#endif
 }
 
 /* static private */
 bool
 as_environment::delLocal(LocalVars& locals, const std::string& varname)
 {
+	return locals->delProperty(varname).second;
+#if 0
 	for (size_t i=0; i<locals.size(); ++i)
 	{
 		const as_environment::frame_slot& slot = locals[i];
@@ -962,6 +975,7 @@
 		}
 	}
 	return false;
+#endif
 }
 
 /* private */
@@ -1011,6 +1025,11 @@
 as_environment::setLocal(LocalVars& locals,
 		const std::string& varname, const as_value& val)
 {
+	Property* prop = locals->getOwnProperty(varname);
+	if ( ! prop ) return false;
+	prop->setValue(*locals, val);
+	return true;
+#if 0
 	for (size_t i=0; i<locals.size(); ++i)
 	{
 		as_environment::frame_slot& slot = locals[i];
@@ -1021,6 +1040,7 @@
 		}
 	}
 	return false;
+#endif
 }
 
 
@@ -1054,6 +1074,23 @@
 	m_target = target;
 }
 
+void
+as_environment::add_local(const std::string& varname, const as_value& val)
+{
+	assert(varname.length() > 0);	// null varnames are invalid!
+	assert(_localFrames.size());
+	LocalVars& locals = _localFrames.back().locals;
+	//locals.push_back(frame_slot(varname, val));
+	locals->set_member(varname, val);
+}
+
+as_environment::CallFrame::CallFrame(as_function* funcPtr)
+	:
+	locals(new as_object()),
+	func(funcPtr)
+{
+}
+
 } // end of gnash namespace
 
 

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- server/as_environment.h	26 Apr 2007 12:31:44 -0000	1.46
+++ server/as_environment.h	26 Apr 2007 13:34:00 -0000	1.47
@@ -23,6 +23,7 @@
 
 #include "as_value.h" // for composition (vector + frame_slot)
 #include "StringPredicates.h" // for Variables 
+#include "as_object.h"
 
 #include <map> // for composition (Variables)
 #include <string> // for frame_slot name
@@ -46,6 +47,7 @@
 	/// Stack of as_values in this environment
 	std::vector<as_value>	m_stack;
 
+#if 0
 	/// For local vars.  Use empty names to separate frames.
 	class frame_slot
 	{
@@ -64,6 +66,7 @@
 		{
 		}
 	};
+#endif
 
 	as_environment()
 		:
@@ -248,13 +251,7 @@
 	/// doesn't exist yet, since it's faster than set_local();
 	/// e.g. when setting up args for a function.
 	///
-	void add_local(const std::string& varname, const as_value& val)
-	{
-		assert(varname.length() > 0);	// null varnames are invalid!
-		assert(_localFrames.size());
-		LocalVars& locals = _localFrames.back().locals;
-		locals.push_back(frame_slot(varname, val));
-	}
+	void add_local(const std::string& varname, const as_value& val);
 
 	/// Create the specified local var if it doesn't exist already.
 	void	declare_local(const std::string& varname);
@@ -432,16 +429,14 @@
 	typedef std::map<std::string, as_value, StringNoCaseLessThen> Variables;
 
 	/// The locals container 
-	typedef std::vector<frame_slot>	LocalVars;
+	//typedef std::vector<frame_slot>	LocalVars;
+	typedef boost::intrusive_ptr<as_object> LocalVars;
 
 	typedef std::vector<as_value> Registers;
 
 	struct CallFrame
 	{
-		CallFrame(as_function* funcPtr)
-			:
-			func(funcPtr)
-		{}
+		CallFrame(as_function* funcPtr);
 
 		/// function use this 
 		LocalVars locals;
@@ -537,9 +532,9 @@
 	///
 	/// @return true if the variable was found, false otherwise
 	///
-	bool findLocal(const std::string& varname, frame_slot& ret, bool descend=false);
+	bool findLocal(const std::string& varname, as_value& ret, bool descend=false);
 
-	bool findLocal(const std::string& varname, frame_slot& ret, bool descend=false) const
+	bool findLocal(const std::string& varname, as_value& ret, bool descend=false) const
 	{
 		return const_cast<as_environment*>(this)->findLocal(varname, ret, descend);
 	}
@@ -555,7 +550,7 @@
 	///
 	/// @return true if the variable was found, false otherwise
 	///
-	static bool findLocal(LocalVars& locals, const std::string& name, frame_slot& ret);
+	static bool findLocal(LocalVars& locals, const std::string& name, as_value& ret);
 
 	/// Delete a local variable
 	//
@@ -566,7 +561,7 @@
 	///	If true the seek don't stop at current call frame, but
 	///	descends in upper frames. By default it is false.
 	///
-	/// @return true if the variable was found, false otherwise
+	/// @return true if the variable was found and deleted, false otherwise
 	///
 	bool delLocal(const std::string& varname, bool descend=false);
 



From MAILER-DAEMON Thu Apr 26 09:50:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh4MK-000343-Rw
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 09:50:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh4MI-00032l-LW
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:50:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh4MI-00031t-07
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:50:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh4MH-00031n-Pi
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:50:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh4GX-00072o-Ga
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 09:44:09 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh4GW-0002h8-Eh
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:44:08 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh4GW-0002h5-2w
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:44:08 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh4GW-0002h5-2w@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 13:44:08 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Func...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 13:50:06 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 13:44:07

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Function.as 

Log message:
	        * testsuite/actionscript.all/Function.as: test for 'this' in
	          local function.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3008&r2=1.3009
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.42&r2=1.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3008
retrieving revision 1.3009
diff -u -b -r1.3008 -r1.3009
--- ChangeLog	26 Apr 2007 13:34:00 -0000	1.3008
+++ ChangeLog	26 Apr 2007 13:44:07 -0000	1.3009
@@ -1,5 +1,7 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/Function.as: test for 'this' in
+	  local function.
 	* server/as_environment.{cpp,h}: refactor local variables
 	  so they are stored into a proper object. Will help introducing
 	  a VariableRef class that associates a Property to an as_object.

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- testsuite/actionscript.all/Function.as	26 Apr 2007 10:17:56 -0000	1.42
+++ testsuite/actionscript.all/Function.as	26 Apr 2007 13:44:07 -0000	1.43
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.42 2007/04/26 10:17:56 strk Exp $";
+rcsid="$Id: Function.as,v 1.43 2007/04/26 13:44:07 strk Exp $";
 
 #include "check.as"
 
@@ -630,6 +630,16 @@
 
 function testInFunctionContext(o)
 {
+	var localGetThis = function() { return this; };
+	ret = localGetThis();
+	xcheck_equals(typeof(ret), 'object');
+#if OUTPUT_VERSION < 6
+	xcheck(ret == testInFunctionContext);
+#else
+	check(ret != testInFunctionContext);
+#endif
+	xcheck(ret != this);
+
 	with(o) {
 		// see bug #19704
 		ret = getThis();



From MAILER-DAEMON Thu Apr 26 11:58:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh6M4-0007dI-I4
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 11:58:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh6M2-0007dD-HZ
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:57:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh6M0-0007d1-4s
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:57:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh6Lz-0007cy-VT
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:57:56 -0400
Received: from wr-out-0506.google.com ([64.233.184.238])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <martinwguy@gmail.com>) id 1Hh6GF-0000lc-4N
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 11:51:59 -0400
Received: by wr-out-0506.google.com with SMTP id i23so650826wra
	for <gnash-commit@gnu.org>; Thu, 26 Apr 2007 08:51:58 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=naC/zVo3NLUisWphT7YR0h/3yTMda15G5Bt94klwjQgKlfc0anh1FQywwmrxKlQuxCTU8U5GEcgS1EI/GElvI6ZlGtk2jO88+XArrKZh5ZWRTbedIYIU73WahgMEmJyhLkzTuPMwdoIhJGbxRVre28/Riyck/oho5gD2nxZRzvc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references:x-google-sender-auth;
	b=i0ywg5ZnGmvjmftKT3ofnEuJ/2cx+Z1QhXg8/mF5N0DunHqOA70Y15Lue+Cx9sBKlNYXwsDvdvLvTt/qJGOJHb3PpIgJMrQ4puBPZ2d7zSBvoDjqg3SPGTCtJUL+xXk0+57FZAR2ZU6yAl/FzV91BRKCN0JKzz1nQua6osL+zgg=
Received: by 10.78.18.3 with SMTP id 3mr536647hur.1177602717787;
	Thu, 26 Apr 2007 08:51:57 -0700 (PDT)
Received: by 10.78.165.11 with HTTP; Thu, 26 Apr 2007 08:51:57 -0700 (PDT)
Message-ID: <56d259a00704260851i6fe38adev465b590a0ff8da06@mail.gmail.com>
Date: Thu, 26 Apr 2007 16:51:57 +0100
From: "Martin Guy" <martinwguy@yahoo.it>
Sender: martinwguy@gmail.com
To: "Rob Savoye" <rob@welcomehome.org>
Subject: Re: [Gnash-commit] gnash libbase/tu_swap.h libamf/amf.cpp server/p...
In-Reply-To: <462F5EC0.5040201@welcomehome.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HgfgO-0003xY-Ph@cvs> <462F5EC0.5040201@welcomehome.org>
X-Google-Sender-Auth: 74d9d642d40bec4c
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 15:57:59 -0000

> why drop compile time tests ?

Because it trades a negligible speed thing against eternal porting
maintenance. It costs one assignment and a switch or a test (I didn't
figure out how to statically initialise one member of a union in C++)

John said they had used this technique in another project with great
relief. It went against the grain for me, but thinking on it I agreed.
Then I realised it would also let us handle hosts with middle-endian
IEEE754 doubles, which are still in use on ARM systems (and are a
Flash movie's native double format!), as well as opening a path for
non-IEEE754 floating point systems like IBM and Vax by having a final
catch-all option to interpret the floating point words explicitly.

> The boost endian.hpp header has the correct macros on all
> the platforms we have to support, so we should use them for endianess
> detection.

They don't seem to detect middle-endian (PDP-endian) doubles, which
still exist today on ARM systems that do floating point emulation
using the nwpfe emulator that is in the linux kernel (the real
PDP-endian "FPA" that it emulates stopped being made in silicon in the
90s, but its ghost will not rest).

The point of compile-time tests is speed and code size, but there's
virtually nothing to be gained here. However, if someone wants to put
compile-time tests back in where integers are involved, I have no
problem with that:
$ find . -type f | xargs -d\\n grep -i endian
should find them all.

     M

while (chit_chat_over_trivia) actual_work--;



From MAILER-DAEMON Thu Apr 26 12:32:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh6t2-0007hA-1Y
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 12:32:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh6t0-0007ga-EZ
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:32:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh6sz-0007fz-Ks
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:32:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh6sz-0007fs-Fm
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:32:01 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh6nE-00079x-AH
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 12:26:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh6nC-00024p-Rp
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 16:26:02 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh6nC-00024m-IP
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 16:26:02 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh6nC-00024m-IP@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 16:26:02 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp tests...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 16:32:02 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 16:26:02

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp 
	testsuite/actionscript.all: Function.as 

Log message:
	        * server/as_environment.cpp (get_variable_raw): elements of
	          the 'with' stack take precedence over locals.
	          See test in Function.as.
	        * testsuite/actionscript.all/Function.as: add test for 'with'
	          stack taking precedence over locals when getting variables.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3009&r2=1.3010
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.43&r2=1.44

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3009
retrieving revision 1.3010
diff -u -b -r1.3009 -r1.3010
--- ChangeLog	26 Apr 2007 13:44:07 -0000	1.3009
+++ ChangeLog	26 Apr 2007 16:26:01 -0000	1.3010
@@ -1,5 +1,13 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.cpp (get_variable_raw): elements of 
+	  the 'with' stack take precedence over locals.
+	  See test in Function.as.
+	* testsuite/actionscript.all/Function.as: add test for 'with'
+	  stack taking precedence over locals when getting variables.
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* testsuite/actionscript.all/Function.as: test for 'this' in
 	  local function.
 	* server/as_environment.{cpp,h}: refactor local variables

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- server/as_environment.cpp	26 Apr 2007 13:34:00 -0000	1.72
+++ server/as_environment.cpp	26 Apr 2007 16:26:01 -0000	1.73
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.72 2007/04/26 13:34:00 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.73 2007/04/26 16:26:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -106,13 +106,6 @@
 
     as_value	val;
 
-    // Check locals for getting them
-    //as_environment::frame_slot slot;
-    if ( findLocal(varname, val, true) ) // do we really want to descend here ??
-    {
-	return val;
-    }
-
     // Check the with-stack.
     for (size_t i = with_stack.size(); i > 0; --i) {
         // const_cast needed due to non-const as_object::get_member 
@@ -123,6 +116,14 @@
 	}
     }
 
+    // Check locals for getting them
+    //as_environment::frame_slot slot;
+    if ( findLocal(varname, val, true) ) // do we really want to descend here ??
+    {
+	return val;
+    }
+
+
     // Check target members.
     if (m_target->get_member(varname.c_str(), &val)) {
 	return val;

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- testsuite/actionscript.all/Function.as	26 Apr 2007 13:44:07 -0000	1.43
+++ testsuite/actionscript.all/Function.as	26 Apr 2007 16:26:02 -0000	1.44
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.43 2007/04/26 13:44:07 strk Exp $";
+rcsid="$Id: Function.as,v 1.44 2007/04/26 16:26:02 strk Exp $";
 
 #include "check.as"
 
@@ -640,17 +640,24 @@
 #endif
 	xcheck(ret != this);
 
+	var num = 4;
 	with(o) {
 		// see bug #19704
 		ret = getThis();
 		xcheck_equals(typeof(ret), 'object');
 		xcheck_equals(ret, o);
+
+		// 'with' stack takes precedence over locals
+		check_equals(num, 5);
 	}
+	check_equals(num, 4);
 }
 
+o.num = 5;
 testInFunctionContext(o);
 
 // Quick test to verify that a movieclip is never equal to an object, despite it's primitive value
-o = new Object(); o.valueOf = function() { return _root; };
+o = new Object();
+o.valueOf = function() { return _root; };
 check_equals(_root, o);
 check_equals(o, _root);



From MAILER-DAEMON Thu Apr 26 13:12:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hh7Vt-000058-4z
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 13:12:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hh7Vs-0008Uf-0s
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:12:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hh7Vq-0008RU-Ax
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:12:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hh7Vq-0008RA-1U
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:12:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hh7Q4-00055A-IF
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 13:06:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hh7Q3-0004l3-P0
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 17:06:11 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hh7Q3-0004kz-Cm
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 17:06:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hh7Q3-0004kz-Cm@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 17:06:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 17:12:12 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 17:06:11

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_environment.h 
	                 as_value.cpp 
	server/vm      : ASHandlers.cpp ActionExec.cpp ActionExec.h 
	testsuite/actionscript.all: Function.as 

Log message:
	        * server/as_value.cpp (equals): compare m_object_value when both
	          operatns are either functions or objects.
	        * server/as_environment.{cpp,h} (get_variable, get_variable_raw,
	          findLocal): accept an additional argument to return the target
	          object the variable was found in.
	        * server/vm/ActionExec.{cpp,h}: provide an additional getVariable
	          method accepting an as_object pointer to return the target object
	          a variable was found in.
	        * server/vm/ASHandlers.cpp (ActionCallFunction): set the 'this'
	          pointer to the object found to contain the function.
	        * testsuite/actionscript.all/Function.as: more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3010&r2=1.3011
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.100&r2=1.101
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.44&r2=1.45

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3010
retrieving revision 1.3011
diff -u -b -r1.3010 -r1.3011
--- ChangeLog	26 Apr 2007 16:26:01 -0000	1.3010
+++ ChangeLog	26 Apr 2007 17:06:10 -0000	1.3011
@@ -1,5 +1,19 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.cpp (equals): compare m_object_value when both 
+	  operatns are either functions or objects.
+	* server/as_environment.{cpp,h} (get_variable, get_variable_raw,
+	  findLocal): accept an additional argument to return the target
+	  object the variable was found in.
+	* server/vm/ActionExec.{cpp,h}: provide an additional getVariable
+	  method accepting an as_object pointer to return the target object
+	  a variable was found in.
+	* server/vm/ASHandlers.cpp (ActionCallFunction): set the 'this'
+	  pointer to the object found to contain the function.
+	* testsuite/actionscript.all/Function.as: more successes.
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* server/as_environment.cpp (get_variable_raw): elements of 
 	  the 'with' stack take precedence over locals.
 	  See test in Function.as.

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- server/as_environment.cpp	26 Apr 2007 16:26:01 -0000	1.73
+++ server/as_environment.cpp	26 Apr 2007 17:06:10 -0000	1.74
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.73 2007/04/26 16:26:01 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.74 2007/04/26 17:06:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,7 +45,7 @@
 // Return the value of the given var, if it's defined.
 as_value
 as_environment::get_variable(const std::string& varname,
-		const ScopeStack& with_stack) const
+		const ScopeStack& with_stack, as_object** retTarget) const
 {
     // Path lookup rigamarole.
     std::string	path;
@@ -63,6 +63,7 @@
 	if (target) {
 	    as_value	val;
 	    target->get_member(var.c_str(), &val);
+	    if ( retTarget ) *retTarget = target;
 	    return val;
 	} else {
 
@@ -75,7 +76,7 @@
 			    );
 	    );
 
-	    as_value tmp = get_variable_raw(path, with_stack);
+	    as_value tmp = get_variable_raw(path, with_stack, retTarget);
 	    if ( ! tmp.is_undefined() )
 	    {
 	    IF_VERBOSE_ASCODING_ERRORS(
@@ -85,7 +86,7 @@
 	    return as_value();
 	}
     } else {
-	return get_variable_raw(varname, with_stack);
+	return get_variable_raw(varname, with_stack, retTarget);
     }
 }
 
@@ -99,7 +100,7 @@
 as_value
 as_environment::get_variable_raw(
     const std::string& varname,
-    const ScopeStack& with_stack) const
+    const ScopeStack& with_stack, as_object** retTarget) const
     // varname must be a plain variable name; no path parsing.
 {
     assert(strchr(varname.c_str(), ':') == NULL);
@@ -112,13 +113,14 @@
 	as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
 	if (obj && obj->get_member(varname.c_str(), &val)) {
 	    // Found the var in this context.
+	    if ( retTarget ) *retTarget = obj;
 	    return val;
 	}
     }
 
     // Check locals for getting them
     //as_environment::frame_slot slot;
-    if ( findLocal(varname, val, true) ) // do we really want to descend here ??
+    if ( findLocal(varname, val, true, retTarget) ) // do we really want to descend here ??
     {
 	return val;
     }
@@ -126,17 +128,20 @@
 
     // Check target members.
     if (m_target->get_member(varname.c_str(), &val)) {
+	if ( retTarget ) *retTarget = m_target;
 	return val;
     }
 
     // Looking for "this"?
     if (varname == "this") {
 	val.set_as_object(m_target);
+	if ( retTarget ) *retTarget = NULL; // correct ??
 	return val;
     }
 
     // Check built-in constants.
     if (varname == "_root" || varname == "_level0") {
+	if ( retTarget ) *retTarget = NULL; // correct ??
 	return as_value(m_target->get_root_movie());
     }
 
@@ -146,11 +151,13 @@
     if ( vm.getSWFVersion() > 5 && varname == "_global" )
     {
 	// The "_global" ref was added in SWF6
+	if ( retTarget ) *retTarget = NULL; // correct ??
 	return as_value(global);
     }
 
     if (global->get_member(varname.c_str(), &val))
     {
+	if ( retTarget ) *retTarget = global;
 	return val;
     }
     
@@ -922,10 +929,18 @@
 
 /*private*/
 bool
-as_environment::findLocal(const std::string& varname, as_value& ret, bool descend)
+as_environment::findLocal(const std::string& varname, as_value& ret, bool descend, as_object** retTarget)
 {
 	if ( _localFrames.empty() ) return false;
-	if ( ! descend ) return findLocal(_localFrames.back().locals, varname, ret);
+	if ( ! descend )
+	{
+		if ( findLocal(_localFrames.back().locals, varname, ret) )
+		{
+			if ( retTarget ) *retTarget = _localFrames.back().locals.get();
+			return true;
+		}
+		return false;
+	}
 
 	for (CallStack::reverse_iterator it=_localFrames.rbegin(),
 			itEnd=_localFrames.rend();
@@ -935,6 +950,7 @@
 		LocalVars& locals = it->locals;
 		if ( findLocal(locals, varname, ret) )
 		{
+			if ( retTarget ) *retTarget = locals.get();
 			return true;
 		}
 	}

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/as_environment.h	26 Apr 2007 13:34:00 -0000	1.47
+++ server/as_environment.h	26 Apr 2007 17:06:10 -0000	1.48
@@ -175,8 +175,12 @@
 	/// @param with_stack
 	///	The Scope stack to use for lookups.
 	///
+	/// @param retTarget
+	///	If not NULL, the pointer will be set to the actual object containing the
+	///	found variable (if found).
+	///
 	as_value get_variable(const std::string& varname,
-		const ScopeStack& with_stack) const;
+		const ScopeStack& with_stack, as_object** retTarget=NULL) const;
 
 	/// \brief
 	/// Given a path to variable, set its value.
@@ -512,8 +516,13 @@
 		const ScopeStack& with_stack);
 
 	/// Same of the above, but no support for path.
+	///
+	/// @param retTarget
+	///	If not NULL, the pointer will be set to the actual object containing the
+	///	found variable (if found).
+	///
 	as_value get_variable_raw(const std::string& varname,
-		const ScopeStack& with_stack) const;
+		const ScopeStack& with_stack, as_object** retTarget=NULL) const;
 
 
 	/// \brief
@@ -530,13 +539,17 @@
 	///	If true the seek don't stop at current call frame, but
 	///	descends in upper frames. By default it is false.
 	///
+	/// @param retTarget
+	///	If not NULL, the pointer will be set to the actual object containing the
+	///	found variable (if found).
+	///
 	/// @return true if the variable was found, false otherwise
 	///
-	bool findLocal(const std::string& varname, as_value& ret, bool descend=false);
+	bool findLocal(const std::string& varname, as_value& ret, bool descend, as_object** retTarget=NULL);
 
-	bool findLocal(const std::string& varname, as_value& ret, bool descend=false) const
+	bool findLocal(const std::string& varname, as_value& ret, bool descend, as_object** retTarget=NULL) const
 	{
-		return const_cast<as_environment*>(this)->findLocal(varname, ret, descend);
+		return const_cast<as_environment*>(this)->findLocal(varname, ret, descend, retTarget);
 	}
 
 	/// Find a variable in the given LocalVars

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/as_value.cpp	26 Apr 2007 12:06:39 -0000	1.48
+++ server/as_value.cpp	26 Apr 2007 17:06:10 -0000	1.49
@@ -641,7 +641,7 @@
     bool v_obj_or_func = (v.m_type == OBJECT || v.m_type == AS_FUNCTION);
 
     /// Compare to same type
-    if ( obj_or_func && v_obj_or_func ) return equalsSameType(v);
+    if ( obj_or_func && v_obj_or_func ) return m_object_value == v.m_object_value;
     if ( m_type == v.m_type ) return equalsSameType(v);
 
     else if (m_type == STRING)

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- server/vm/ASHandlers.cpp	24 Apr 2007 20:38:26 -0000	1.100
+++ server/vm/ASHandlers.cpp	26 Apr 2007 17:06:10 -0000	1.101
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.100 2007/04/24 20:38:26 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.101 2007/04/26 17:06:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2194,7 +2194,8 @@
         as_object* this_ptr = thread.getThisPointer();
         if ( ! env.parse_path(funcname, &this_ptr, function) )
         {
-                function = thread.getVariable(funcname);
+                //function = thread.getVariable(funcname);
+                function = thread.getVariable(funcname, &this_ptr);
         }
 
 	if ( ! function.is_object() )
@@ -2205,7 +2206,9 @@
 	}
 	else if ( ! function.is_function() )
 	{
+		// Calling super ? 
 		boost::intrusive_ptr<as_object> obj = function.to_object();
+        	this_ptr = thread.getThisPointer();
 		if ( ! obj->get_member("constructor", &function) )
 		{
 			IF_VERBOSE_ASCODING_ERRORS (

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/vm/ActionExec.cpp	25 Apr 2007 06:58:57 -0000	1.30
+++ server/vm/ActionExec.cpp	26 Apr 2007 17:06:10 -0000	1.31
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.30 2007/04/25 06:58:57 martinwguy Exp $ */
+/* $Id: ActionExec.cpp,v 1.31 2007/04/26 17:06:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -382,6 +382,19 @@
 	return env.get_variable(namei, getWithStack());
 }
 
+as_value
+ActionExec::getVariable(const std::string& name, as_object** target)
+{
+	VM& vm = VM::get();
+
+	std::string namei = name;
+	if ( vm.getSWFVersion() < 7 ) {
+	    boost::to_lower(namei, vm.getLocale());
+	}
+	
+	return env.get_variable(namei, getWithStack(), target);
+}
+
 void
 ActionExec::setLocalVariable(const std::string& name_, const as_value& val)
 {

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/vm/ActionExec.h	24 Apr 2007 20:38:26 -0000	1.15
+++ server/vm/ActionExec.h	26 Apr 2007 17:06:10 -0000	1.16
@@ -267,6 +267,20 @@
 	///
 	as_value getVariable(const std::string& name);
 
+	/// Get a named variable, seeking for it in the with stack if any.
+	//
+	/// @param name
+	///	Name of the variable. Supports slash and dot syntax.
+	///	Name is converted to lowercase if SWF version is < 7.
+	///
+	/// @param target
+	///	An output parameter, will be set to point to the object
+	///	containing any found variable.
+	///	The pointer may be set to NULL if the variable was not 
+	///	found or it belongs to no object (absolute references, for instance).
+	///
+	as_value getVariable(const std::string& name, as_object** target);
+
 	/// Set an object's member.
 	//
 	/// @param obj

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- testsuite/actionscript.all/Function.as	26 Apr 2007 16:26:02 -0000	1.44
+++ testsuite/actionscript.all/Function.as	26 Apr 2007 17:06:11 -0000	1.45
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.44 2007/04/26 16:26:02 strk Exp $";
+rcsid="$Id: Function.as,v 1.45 2007/04/26 17:06:11 strk Exp $";
 
 #include "check.as"
 
@@ -624,7 +624,7 @@
 	with (sub) {
 		ret = getThis();
 		check_equals(typeof(ret), 'object');
-		xcheck_equals(getThis(), o);
+		check_equals(getThis(), o);
 	}
 }
 
@@ -632,20 +632,20 @@
 {
 	var localGetThis = function() { return this; };
 	ret = localGetThis();
-	xcheck_equals(typeof(ret), 'object');
+	check_equals(typeof(ret), 'object');
 #if OUTPUT_VERSION < 6
 	xcheck(ret == testInFunctionContext);
 #else
 	check(ret != testInFunctionContext);
 #endif
-	xcheck(ret != this);
+	check(ret != this);
 
 	var num = 4;
 	with(o) {
 		// see bug #19704
 		ret = getThis();
-		xcheck_equals(typeof(ret), 'object');
-		xcheck_equals(ret, o);
+		check_equals(typeof(ret), 'object');
+		check_equals(ret, o);
 
 		// 'with' stack takes precedence over locals
 		check_equals(num, 5);



From MAILER-DAEMON Thu Apr 26 16:53:36 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhAy7-0005U3-TA
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 16:53:35 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhAy6-0005Tm-V8
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 16:53:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhAy6-0005Ta-DX
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 16:53:34 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhAy6-0005TW-6E
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 16:53:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhAsJ-0001TX-P5
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 16:47:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhAsI-00087H-Or
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 20:47:34 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhAsI-000878-6c
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 20:47:34 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhAsI-000878-6c@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 26 Apr 2007 20:47:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Func...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Apr 2007 20:53:35 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/26 20:47:33

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Function.as 

Log message:
	        * testsuite/actionscript.all/Function.as: add a test
	          showing an incompatibility of flash with ECMA262 when
	          it comes to the 'arguments' object in functions activation
	          object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3011&r2=1.3012
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3011
retrieving revision 1.3012
diff -u -b -r1.3011 -r1.3012
--- ChangeLog	26 Apr 2007 17:06:10 -0000	1.3011
+++ ChangeLog	26 Apr 2007 20:47:33 -0000	1.3012
@@ -1,5 +1,12 @@
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/Function.as: add a test
+	  showing an incompatibility of flash with ECMA262 when
+	  it comes to the 'arguments' object in functions activation
+	  object.
+
+2007-04-26 Sandro Santilli <strk@keybit.net>
+
 	* server/as_value.cpp (equals): compare m_object_value when both 
 	  operatns are either functions or objects.
 	* server/as_environment.{cpp,h} (get_variable, get_variable_raw,

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- testsuite/actionscript.all/Function.as	26 Apr 2007 17:06:11 -0000	1.45
+++ testsuite/actionscript.all/Function.as	26 Apr 2007 20:47:33 -0000	1.46
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.45 2007/04/26 17:06:11 strk Exp $";
+rcsid="$Id: Function.as,v 1.46 2007/04/26 20:47:33 strk Exp $";
 
 #include "check.as"
 
@@ -352,7 +352,7 @@
 //----------------------------------------------------------
 
 // this is to be called argsChecker(1,2,3)
-function argsChecker()
+function argsChecker(a, b, c, d, e, f, g)
 {
 	check_equals(typeof(arguments), 'object');
 	check(arguments instanceOf Array);
@@ -364,8 +364,12 @@
 	check_equals(arguments[1], 2);
 	check_equals(arguments[2], 3);
 	check_equals(arguments[3], undefined);
+	check_equals(d, undefined);
 	arguments[3] = 3;
 	check_equals(arguments[3], 3);
+	// Changing a member of the 'arguments' object doesn't change
+	// the corresponding named parameter, contrary to ECMA262 specs.
+	check(d != 3);
 	arguments[0] = 'zero';
 	check_equals(arguments[0], 'zero');
 	arguments.length = 10;



From MAILER-DAEMON Thu Apr 26 21:13:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhF1B-0000BD-Sf
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 21:13:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhF19-0000Ab-HK
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:12:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhF18-0000AI-UY
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:12:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhF18-0000A9-Lh
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:12:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HhEvK-00054S-W1
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:06:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhEvK-000630-2u
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 01:06:58 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HhEvJ-00062x-Qe
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 01:06:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhEvJ-00062x-Qe@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Fri, 27 Apr 2007 01:06:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 01:12:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/27 01:06:57

Modified files:
	.              : Makefile.am 

Log message:
	Add po to EXTRA_DIST.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.68&r2=1.69

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- Makefile.am	24 Apr 2007 17:52:47 -0000	1.68
+++ Makefile.am	27 Apr 2007 01:06:57 -0000	1.69
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.68 2007/04/24 17:52:47 rsavoye Exp $
+# $Id: Makefile.am,v 1.69 2007/04/27 01:06:57 rsavoye Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -61,13 +61,7 @@
 
 DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
 
-EXTRA_DIST= config.rpath $(man_MANS) macros/incllist macros/libslist
-#EXTRA_DIST = macros
-# if HTTP
-# SUBDIRS += net $(STD_DIRS)
-# else
-# SUBDIRS += $(STD_DIRS)
-# endif
+EXTRA_DIST= config.rpath $(man_MANS) macros/incllist macros/libslist po
 
 noinst_HEADERS = compatibility_include.h
 



From MAILER-DAEMON Thu Apr 26 21:14:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhF29-0000Lt-HK
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 21:14:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhF27-0000L0-Dj
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:13:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhF26-0000Ke-Mw
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:13:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhF26-0000Ka-Hw
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:13:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HhEwI-0005Ax-Qm
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:07:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhEwI-00065f-0P
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 01:07:58 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HhEwH-00065c-Ke
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 01:07:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhEwH-00065c-Ke@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Fri, 27 Apr 2007 01:07:57 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash configure.ac ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 01:13:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/27 01:07:57

Modified files:
	.              : configure.ac ChangeLog 

Log message:
		* configure.ac: Set a conditional for gettext. Build po/Makefile
		now.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.293&r2=1.294
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3012&r2=1.3013

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -b -r1.293 -r1.294
--- configure.ac	24 Apr 2007 17:52:47 -0000	1.293
+++ configure.ac	27 Apr 2007 01:07:57 -0000	1.294
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.293 2007/04/24 17:52:47 rsavoye Exp $
+dnl $Id: configure.ac,v 1.294 2007/04/27 01:07:57 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -58,6 +58,8 @@
 AC_DISABLE_STATIC dnl Disable building static libs.
 
 AM_GNU_GETTEXT([external])
+AM_CONDITIONAL(HAS_GETTEXT, test x$ac_cv_path_XGETTEXT != x)
+dnl AM_GNU_GETTEXT_VERSION(0.15)
 
 save_CFLAGS="$CFLAGS";
 CFLAGS="$CFLAGS -Werror -Wformat";
@@ -1005,7 +1007,7 @@
 AC_CONFIG_LINKS(testsuite/libbase/gnashrc:testsuite/libbase/gnashrc.in)
 
 AC_OUTPUT(Makefile
-po/Makefile.in
+po/Makefile
 libbase/Makefile
 libgeometry/Makefile
 server/Makefile

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3012
retrieving revision 1.3013
diff -u -b -r1.3012 -r1.3013
--- ChangeLog	26 Apr 2007 20:47:33 -0000	1.3012
+++ ChangeLog	27 Apr 2007 01:07:57 -0000	1.3013
@@ -1,3 +1,31 @@
+2007-04-26  Rob Savoye  <rob@ute.welcomehome.org>
+
+	* Makefile.am: Add po to EXTRA_DIST.
+	* configure.ac: Set a conditional for gettext. Build po/Makefile
+	now.
+	* libbase/Makefile.am: Build all libraries with a release number,
+	and add --export-dynamic and -no-undefined. Add gettext.h.
+	* backend/Makefile.am: Build all libraries with a release number,
+	and add --export-dynamic and -no-undefined.
+	* server/Makefile.am: Build all libraries with a release number,
+	and add --export-dynamic and -no-undefined.
+	* libgeometry/Makefile.am: Build all libraries with a release
+	number, and add --export-dynamic and -no-undefined.
+	* server/vm/Makefile.am: Build all libraries with a release
+	number, and add --export-dynamic and -no-undefined.
+	* server/parser/Makefile.am: Build all libraries with a release
+	number, and add --export-dynamic and -no-undefined.
+	* server/asobjs/Makefile.am: Build all libraries with a release
+	number, and add --export-dynamic and -no-undefined.
+	* extensions/dejagnu/dejagnu.cpp: Use instrusive pointers instead
+	of hard pointers for handlers.
+	* extensions/fileio/fileio.cpp: Use instrusive pointers instead
+	of hard pointers for handlers.
+	* extensions/mysql/mysql_db.cpp: Use instrusive pointers instead
+	of hard pointers for handlers.
+	* extensions/gtk2/gtkext.cpp: Use instrusive pointers instead
+	of hard pointers for handlers.
+	
 2007-04-26 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/actionscript.all/Function.as: add a test



From MAILER-DAEMON Thu Apr 26 21:14:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhF35-0000eO-GO
	for mharc-gnash-commit@gnu.org; Thu, 26 Apr 2007 21:14:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhF34-0000eJ-10
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:14:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhF2z-0000e7-Sm
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:14:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhF2z-0000e4-LE
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:14:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HhExB-0005Gl-2G
	for gnash-commit@gnu.org; Thu, 26 Apr 2007 21:08:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhExA-00068n-6t
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 01:08:52 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HhEx9-00068k-Ty
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 01:08:52 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhEx9-00068k-Ty@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Fri, 27 Apr 2007 01:08:51 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash backend/Makefile.am gui/Makefile.am libam...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 01:14:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/27 01:08:51

Modified files:
	backend        : Makefile.am 
	gui            : Makefile.am 
	libamf         : Makefile.am 
	libbase        : Makefile.am 
	libgeometry    : Makefile.am 
	server/asobj   : Makefile.am 
	server/parser  : Makefile.am 
	server/vm      : Makefile.am 
	server         : Makefile.am 
	extensions/dejagnu: dejagnu.cpp 
	extensions/mysql: mysql_db.cpp 
	extensions/gtk2: gtkext.cpp 
Added files:
	po             : Makefile.am 

Log message:
		* libbase/Makefile.am: Build all libraries with a release number,
		and add --export-dynamic and -no-undefined. Add gettext.h.
		* backend/Makefile.am: Build all libraries with a release number,
		and add --export-dynamic and -no-undefined.
		* server/Makefile.am: Build all libraries with a release number,
		and add --export-dynamic and -no-undefined.
		* libgeometry/Makefile.am: Build all libraries with a release
		number, and add --export-dynamic and -no-undefined.
		* server/vm/Makefile.am: Build all libraries with a release
		number, and add --export-dynamic and -no-undefined.
		* server/parser/Makefile.am: Build all libraries with a release
		number, and add --export-dynamic and -no-undefined.
		* server/asobjs/Makefile.am: Build all libraries with a release
		number, and add --export-dynamic and -no-undefined.
		* extensions/dejagnu/dejagnu.cpp: Use instrusive pointers instead
		of hard pointers for handlers.
		* extensions/fileio/fileio.cpp: Use instrusive pointers instead
		of hard pointers for handlers.
		* extensions/mysql/mysql_db.cpp: Use instrusive pointers instead
		of hard pointers for handlers.
		* extensions/gtk2/gtkext.cpp: Use instrusive pointers instead
		of hard pointers for handlers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.64&r2=1.65
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.62&r2=1.63
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Makefile.am?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/dejagnu/dejagnu.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/mysql/mysql_db.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/extensions/gtk2/gtkext.cpp?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- backend/Makefile.am	28 Mar 2007 23:42:19 -0000	1.52
+++ backend/Makefile.am	27 Apr 2007 01:08:50 -0000	1.53
@@ -125,7 +125,7 @@
 	$(RENDER_SOURCES) \
 	$(SOUND_SOURCES)
 
-libgnashbackend_la_LDFLAGS = -avoid-version
+libgnashbackend_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -b -r1.64 -r1.65
--- gui/Makefile.am	10 Apr 2007 18:18:45 -0000	1.64
+++ gui/Makefile.am	27 Apr 2007 01:08:50 -0000	1.65
@@ -17,7 +17,7 @@
 
 # 
 
-# $Id: Makefile.am,v 1.64 2007/04/10 18:18:45 rsavoye Exp $
+# $Id: Makefile.am,v 1.65 2007/04/27 01:08:50 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 localedir = $(datadir)/locale
@@ -224,7 +224,8 @@
 	$(top_builddir)/server/parser/libgnashparser.la \
 	$(top_builddir)/libgeometry/libgnashgeo.la \
 	$(top_builddir)/libbase/libgnashbase.la \
-	libgnashplayer.la
+	libgnashplayer.la \
+	libgnashgui.la
 
 libgnashplayer_la_SOURCES = \
 	Player.cpp Player.h
@@ -237,7 +238,7 @@
 
 gnash_SOURCES = gnash.cpp 
 # export our symbols so they can be used by Gnash plugins
-gnash_LDFLAGS = -export-dynamic
+gnash_LDFLAGS = -no-undefined -export-dynamic
 gnash_DEPENDENCIES = $(GNASH_LIBS)
 gnash_LDADD = \
 	$(MYSQL_LIBS) \
@@ -274,8 +275,8 @@
 #guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp gtk.cpp 
 #	gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h
 #guitest_LDADD = $(gnash_LDADD)
-libgnashplayer_la_LDFLAGS = -avoid-version
-libgnashgui_la_LDFLAGS = -avoid-version
+libgnashplayer_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashgui_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libamf/Makefile.am	16 Mar 2007 15:00:49 -0000	1.21
+++ libamf/Makefile.am	27 Apr 2007 01:08:50 -0000	1.22
@@ -15,22 +15,20 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.21 2007/03/16 15:00:49 rsavoye Exp $
+# $Id: Makefile.am,v 1.22 2007/04/27 01:08:50 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
 #AM_CXXFLAGS =  $(CXXFLAGS) $(SDL_CFLAGS) $(AM_CPPFLAGS)
 #AM_CPPFLAGS = 
 AM_LDFLAGS = \
-	$(top_builddir)/libbase/libgnashbase.la \
-	$(DMALLOC_LIBS)
-
+	$(top_builddir)/libbase/libgnashbase.la
 
 # AM_LDFLAGS  = $(OPENGL_LIBNS) $(SDL_LIBS)
 
 lib_LTLIBRARIES = libgnashamf.la
 libgnashamf_la_SOURCES = amf.cpp rtmp.cpp
-libgnashamf_la_LDFLAGS = -avoid-version
+libgnashamf_la_LDFLAGS =  -release $(VERSION) -export-dynamic -no-undefined 
 # noinst_HEADERS = amf.h amfutf8.h
 
 AM_CPPFLAGS = -I.. -I$(srcdir) \

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -b -r1.62 -r1.63
--- libbase/Makefile.am	13 Apr 2007 07:35:55 -0000	1.62
+++ libbase/Makefile.am	27 Apr 2007 01:08:50 -0000	1.63
@@ -108,6 +108,7 @@
 	extension.h \
 	embedVideoDecoder.h \
 	GnashException.h \
+	gettext.h \
 	grid_index.h \
 	image.h	\
 	jpeg.h \
@@ -156,7 +157,7 @@
 
 
 # libgnashbase_la_LDFLAGS = -export-dynamic
-libgnashbase_la_LDFLAGS = -avoid-version
+libgnashbase_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # We use our own rule to build the demo so it isn't built by default.
 # Since it doesn't contain a main() routine, we only try to compile,

Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libgeometry/Makefile.am	28 Feb 2007 17:25:26 -0000	1.25
+++ libgeometry/Makefile.am	27 Apr 2007 01:08:50 -0000	1.26
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.25 2007/02/28 17:25:26 udog Exp $
+# $Id: Makefile.am,v 1.26 2007/04/27 01:08:50 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -67,10 +67,9 @@
 	view_state.h	\
 	visual.h
 
-#libgeometry_la_LDFLAGS = -module -avoid-version -no-undefined
 #libgeometry_la_LIBDADD =  #@DL_LIB@  # $(LIBLTDL)
 libgnashgeo_la_LIBADD = $(top_builddir)/libbase/libgnashbase.la
-libgnashgeo_la_LDFLAGS = -avoid-version
+libgnashgeo_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/asobj/Makefile.am	10 Apr 2007 18:18:46 -0000	1.34
+++ server/asobj/Makefile.am	27 Apr 2007 01:08:50 -0000	1.35
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.34 2007/04/10 18:18:46 rsavoye Exp $
+# $Id: Makefile.am,v 1.35 2007/04/27 01:08:50 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -137,7 +137,7 @@
 libgnashasobjs_la_LIBADD += $(MAD_LIBS)
 endif
 
-libgnashasobjs_la_LDFLAGS = -avoid-version
+libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/parser/Makefile.am	10 Apr 2007 18:18:45 -0000	1.28
+++ server/parser/Makefile.am	27 Apr 2007 01:08:51 -0000	1.29
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.28 2007/04/10 18:18:45 rsavoye Exp $
+# $Id: Makefile.am,v 1.29 2007/04/27 01:08:51 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -78,9 +78,7 @@
 libgnashparser_la_LIBADD = \
 	$(top_builddir)/libbase/libgnashbase.la 
 
-libgnashparser_la_LDFLAGS = \
-	-avoid-version \
-	$(BOOST_LIBS)
+libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -release $(VERSION) -no-undefined -export-dynamic
 
 if USE_SOUND_GST
 AM_CPPFLAGS += $(GSTREAMER_CFLAGS)

Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/vm/Makefile.am	10 Apr 2007 18:18:45 -0000	1.9
+++ server/vm/Makefile.am	27 Apr 2007 01:08:51 -0000	1.10
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.9 2007/04/10 18:18:45 rsavoye Exp $
+# $Id: Makefile.am,v 1.10 2007/04/27 01:08:51 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -58,10 +58,9 @@
 	$(NULL)
 
 libgnashvm_la_LIBADD = \
-	$(top_builddir)/libamf/libgnashamf.la \
 	$(top_builddir)/libbase/libgnashbase.la 
 
-libgnashvm_la_LDFLAGS = -avoid-version -export-dynamic
+libgnashvm_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- server/Makefile.am	11 Apr 2007 14:20:20 -0000	1.109
+++ server/Makefile.am	27 Apr 2007 01:08:51 -0000	1.110
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.109 2007/04/11 14:20:20 strk Exp $
+# $Id: Makefile.am,v 1.110 2007/04/27 01:08:51 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -174,9 +174,8 @@
 libgnashserver_la_SOURCES += debugger.cpp
 endif
 
-#libserver_la_LDFLAGS = -module -avoid-version -no-undefined
 #libserver_la_LIBDADD =  #@DL_LIB@  # $(LIBLTDL)
-libgnashserver_la_LDFLAGS = -avoid-version
+libgnashserver_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: extensions/dejagnu/dejagnu.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/dejagnu/dejagnu.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- extensions/dejagnu/dejagnu.cpp	22 Mar 2007 22:37:45 -0000	1.7
+++ extensions/dejagnu/dejagnu.cpp	27 Apr 2007 01:08:51 -0000	1.8
@@ -66,7 +66,7 @@
 }
 
 static as_value
-dejagnu_ctor(const fn_call& fn)
+dejagnu_ctor(const fn_call& /* fn */)
 {
 //    GNASH_REPORT_FUNCTION;
     dejagnu_as_object* obj = new dejagnu_as_object();
@@ -112,12 +112,11 @@
 dejagnu_pass(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    dejagnu_as_object *ptr = (dejagnu_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<dejagnu_as_object> ptr = ensureType<dejagnu_as_object>(fn.this_ptr);
     
     if (fn.nargs > 0) {
-	const char *text = fn.arg(0).to_string();
-	return as_value(ptr->obj.pass(text));
+	string text = fn.arg(0).to_string();
+	return as_value(ptr->obj.pass(text.c_str()));
     }
 }
 
@@ -125,12 +124,11 @@
 dejagnu_fail(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    dejagnu_as_object *ptr = (dejagnu_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<dejagnu_as_object> ptr = ensureType<dejagnu_as_object>(fn.this_ptr);
     
     if (fn.nargs > 0) {
-	const char *text = fn.arg(0).to_string();
-	return as_value(ptr->obj.fail(text));
+	string text = fn.arg(0).to_string();
+	return as_value(ptr->obj.fail(text.c_str()));
     }
 }
 
@@ -138,8 +136,7 @@
 dejagnu_totals(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    dejagnu_as_object *ptr = (dejagnu_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<dejagnu_as_object> ptr = ensureType<dejagnu_as_object>(fn.this_ptr);
     
     ptr->obj.totals();
     return as_value(true);

Index: extensions/mysql/mysql_db.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/mysql/mysql_db.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- extensions/mysql/mysql_db.cpp	18 Apr 2007 09:35:41 -0000	1.8
+++ extensions/mysql/mysql_db.cpp	27 Apr 2007 01:08:51 -0000	1.9
@@ -16,6 +16,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <cstdarg>
 
 #include <mysql/errmsg.h>
@@ -241,7 +245,7 @@
       case CR_SERVER_LOST:
       case CR_COMMANDS_OUT_OF_SYNC:
       case CR_SERVER_GONE_ERROR:
-	  log_error(_("MySQL connection error: %s", mysql_error(_db));
+	  log_error(_("MySQL connection error: %s"), mysql_error(_db));
 	  // Try to reconnect to the database
 // 	  closeDB();
 // 	  openDB();
@@ -298,15 +302,15 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
 
     if (fn.nargs == 4) {
-	const char *host = fn.arg(0).to_string();
-	const char *db = fn.arg(1).to_string();
-	const char *user = fn.arg(2).to_string();
-	const char *passwd = fn.arg(3).to_string();	
-	return as_value(ptr->obj.connect(host, db, user, passwd));
+	string host = fn.arg(0).to_string();
+	string db = fn.arg(1).to_string();
+	string user = fn.arg(2).to_string();
+	string passwd = fn.arg(3).to_string();	
+	return as_value(ptr->obj.connect(host.c_str(), db.c_str(),
+					 user.c_str(), passwd.c_str()));
     } else {
 	return as_value(false);
     }
@@ -317,12 +321,11 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
 
     if (fn.nargs > 0) {
-	const char *sql = fn.arg(0).to_string();
-	as_array_object *arr = (as_array_object *)fn.arg(1).to_object();
+	string sql = fn.arg(0).to_string();
+	as_array_object *arr = (as_array_object *)fn.arg(1).to_object().get();
 //	std::vector< std::vector<const char *> >
 	MySQL::query_t qresult;
 #if 0
@@ -348,8 +351,7 @@
 mysql_free(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
     ptr->obj.free_result();
     return as_value(true);
 }
@@ -358,8 +360,7 @@
 mysql_fields(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
     return as_value(ptr->obj.num_fields());
 }
 
@@ -368,7 +369,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
     if (fn.nargs > 0) {
-	mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
+	boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
 	assert(ptr);
 	MYSQL_ROW res = ptr->obj.fetch_row();
 	as_value aaa = *res;       
@@ -382,8 +383,7 @@
 mysql_store(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
     return as_value(ptr->obj.store_result());
 }
 
@@ -391,11 +391,10 @@
 mysql_query(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
     if (fn.nargs > 0) {
-	const char *sql = fn.arg(0).to_string();
-	assert(ptr);
-	return as_value(ptr->obj.guery(sql));
+	string sql = fn.arg(0).to_string();
+	return as_value(ptr->obj.guery(sql.c_str()));
     }
 }
 
@@ -404,8 +403,7 @@
 {
 //    GNASH_REPORT_FUNCTION;
 
-    mysql_as_object *ptr = (mysql_as_object*)fn.this_ptr;
-    assert(ptr);
+    boost::intrusive_ptr<mysql_as_object> ptr = ensureType<mysql_as_object>(fn.this_ptr);
     return as_value(ptr->obj.disconnect());
 }
 

Index: extensions/gtk2/gtkext.cpp
===================================================================
RCS file: /sources/gnash/gnash/extensions/gtk2/gtkext.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- extensions/gtk2/gtkext.cpp	19 Mar 2007 17:11:14 -0000	1.2
+++ extensions/gtk2/gtkext.cpp	27 Apr 2007 01:08:51 -0000	1.3
@@ -37,6 +37,7 @@
 #include "builtin_function.h" // need builtin_function
 #include "debugger.h"
 #include "gtkext.h"
+//#include "Player.h"
 
 using namespace std;
 
@@ -47,6 +48,7 @@
 #ifdef USE_DEBUGGER
 static Debugger& debugger = Debugger::getDefaultInstance();
 #endif
+//Player& player = Player::getDefaultInstance();
 
 // prototypes for the callbacks required by Gnash
 as_value gtkext_window_new(const fn_call& fn);
@@ -93,7 +95,7 @@
     // FIXME: Delete events don't seem to pass in data in a form we
     // can access it. So for now we just hack in a quit, since we know
     // we're done, we hope...
-    if (*event == NULL) {
+    if (*event == 0) {
 	gtk_main_quit();
 	return;
     } else {
@@ -105,9 +107,10 @@
     env.push_val(handler.to_object());
     env.push(event);
     env.push(handler.to_string());
+    as_object obj = val.to_object();
 
     // Call the AS function defined in the source file using this extension
-    (*as_func)(fn_call(&val, handler.to_object(), &env, 2, 2));
+    (*as_func)(fn_call(&obj, &env, 2, 2));
 }
 
 static void
@@ -164,6 +167,9 @@
 GtkExt::window_new()
 {
     GNASH_REPORT_FUNCTION;
+//    std::auto_ptr<Gui> ggg = player.getGuiHandle();
+//    player.getGuiHandle();
+//    gui.getWindow();
     _window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 }
 
@@ -202,8 +208,7 @@
 as_value gtkext_window_new(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
 
     GtkExt *obj = new GtkExt;
     obj->window_new();
@@ -215,12 +220,11 @@
 as_value gtkext_signal_connect(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
 
     if (fn.nargs > 0) {
-	GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
-	string name = fn.arg(1).to_std_string();
+	GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
+	string name = fn.arg(1).to_string();
 	as_value func = fn.arg(2).to_as_function();
 	int data = fn.arg(3).to_number();
 
@@ -239,11 +243,10 @@
 {
 //    GNASH_REPORT_FUNCTION;
     
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
     
     if (fn.nargs > 0) {
-	GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
+	GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
 	int width = fn.arg(1).to_number();
 	window->container_set_border_width(width);
 	dbglogfile << "set container border width to " << width << " !" << endl;
@@ -256,13 +259,12 @@
 as_value gtkext_button_new_with_label(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
     
     if (fn.nargs > 0) {
-	const char *label = fn.arg(0).to_string();
+	string label = fn.arg(0).to_string();
 	GtkExt *obj = new GtkExt;
-	obj->button_new_with_label(label);
+	obj->button_new_with_label(label.c_str());
 	return as_value(obj);
     }
     return as_value();
@@ -281,15 +283,14 @@
 as_value gtkext_signal_connect_swapped(const fn_call& fn)
 {
     GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
-    
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
 
     if (fn.nargs > 0) {
-	GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
+	GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
 	string name = (fn.arg(1).to_string());
-	GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(3).to_object());
-	as_value *callback = dynamic_cast<as_value *>(fn.arg(2).to_object());
+	GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(3).to_object().get());
+// currently unused
+//	as_value *callback = dynamic_cast<as_value *>(fn.arg(2).to_object());
 
 	// FIXME: This seems to cause an Gobject warning
 	g_signal_connect_swapped (G_OBJECT (child->getWindow()), name.c_str(),
@@ -303,12 +304,11 @@
 as_value gtkext_container_add(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
     
     if (fn.nargs > 0) {
-	GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
-	GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(1).to_object());
+	GtkExt *parent = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
+	GtkExt *child = dynamic_cast<GtkExt *>(fn.arg(1).to_object().get());
 	gtk_container_add (GTK_CONTAINER (parent->getWindow()), child->getWindow());
 	return as_value(true);
     }
@@ -318,11 +318,10 @@
 as_value gtkext_widget_show(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
      
     if (fn.nargs > 0) {
-	GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object());
+	GtkExt *window = dynamic_cast<GtkExt *>(fn.arg(0).to_object().get());
 	gtk_widget_show(window->getWindow());
     }
     return as_value();
@@ -332,8 +331,7 @@
 as_value gtkext_main(const fn_call& fn)
 {
 //    GNASH_REPORT_FUNCTION;
-    GtkExt *ptr = dynamic_cast<GtkExt *>(fn.this_ptr);
-    assert(ptr);
+    boost::intrusive_ptr<GtkExt> ptr = ensureType<GtkExt>(fn.this_ptr);
 
     gtk_main();
     return as_value();
@@ -354,8 +352,8 @@
 	static boost::intrusive_ptr<builtin_function> cl;
 	if (cl == NULL) {
 	    cl = new builtin_function(&gtkext_ctor, getInterface());
-// 	    // replicate all interface to class, to be able to access
-// 	    // all methods as static functions
+ 	    // replicate all interface to class, to be able to access
+ 	    // all methods as static functions
  	    attachInterface(cl.get());
 	}
 	

Index: po/Makefile.am
===================================================================
RCS file: po/Makefile.am
diff -N po/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ po/Makefile.am	27 Apr 2007 01:08:51 -0000	1.1
@@ -0,0 +1,65 @@
+POFILES = AUTO
+
+
+CLEANFILES = \
+	*.gmo \
+	gnash.pot \
+	POTFILES \
+	update-po
+
+translations = es fr
+
+pofiles := $(patsubst %,%.po,$(translations))
+gmofiles := $(patsubst %,%.gmo,$(translations))
+
+dirs =  $(top_srcdir)/libbase \
+	$(top_srcdir)/backend \
+	$(top_srcdir)/server \
+	$(top_srcdir)/server/vm \
+	$(top_srcdir)/server/swf \
+	$(top_srcdir)/server/parser \
+	$(top_srcdir)/server/asobjs \
+	$(top_srcdir)/libgeometry \
+	$(top_srcdir)/utilities \
+	$(top_srcdir)/gui 
+srcfiles := $(foreach dir,$(dirs),$(wildcard $(dir)/*.cpp))
+
+EXTRA_DIST = $(gmofiles)
+
+all: $(gmofiles)
+
+if HAS_GETTEXT
+POTFILES: $(srcfiles)
+	@echo "Building POTFILES..."
+	@rm -f POTFILES
+	@for i in $(srcfiles) ; do \
+	  echo "$$i" >> POTFILES;\
+	done
+
+gnash.pot: POTFILES
+	$(XGETTEXT) --language=C++ --files-from=POTFILES -o gnash.pot \
+	  --default-domain=gnash --force \
+	  --copyright-holder='Free Software Foundation, Inc.'
+
+update-po: gnash.pot
+	@for i in $(pofiles); do \
+	  echo "Merging $$i..." ; \
+	  $(MSGMERGE) --update $(srcdir)/$$i gnash.pot; \
+	done
+	touch update-po
+
+$(gmofiles): update-po
+
+SUFFIXES = .po .gmo
+.po.gmo:
+	msgfmt --statistics --directory=$(srcdir) -o $*.gmo $*.po
+else
+$(gmofiles): force
+	@for i in $(gmofiles); do \
+	  ln -fs $(srcdir)/$$i.in $$i; \
+	done
+endif
+
+force:
+
+# install-hook: rename the es.gmo files to gnash.mo at installtion time



From MAILER-DAEMON Fri Apr 27 03:11:14 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhKbq-0003HL-Fh
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 03:11:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhKbp-0003Gx-AK
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:11:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhKbo-0003Gl-Nf
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:11:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhKbo-0003Gi-Jc
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:11:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HhKVy-0000h2-Pa
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:05:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhKVx-000163-OK
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 07:05:09 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HhKVx-000160-5f
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 07:05:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhKVx-000160-5f@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Fri, 27 Apr 2007 07:05:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/asobj/Key.cpp server/aso...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 07:11:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/27 07:05:08

Modified files:
	.              : ChangeLog 
	server/asobj   : Key.cpp Key.h 
	server         : movie_root.cpp sprite_instance.cpp 
	testsuite/misc-ming.all: key_event_testrunner.cpp 

Log message:
	cleanups, comments, user defined onKeyPress() is not a event handler

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3013&r2=1.3014
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.258&r2=1.259
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3013
retrieving revision 1.3014
diff -u -b -r1.3013 -r1.3014
--- ChangeLog	27 Apr 2007 01:07:57 -0000	1.3013
+++ ChangeLog	27 Apr 2007 07:05:08 -0000	1.3014
@@ -1,3 +1,14 @@
+2007-04-27 Zou Lunkai <zoulunkai@gmail.com>
+
+	* server/asobj/Key.{cpp,h}:
+	  cleanups; don't invoke user defined onKeyPress(), it's just a 
+	  normal function.
+	* server/movie_root.cpp.h, server/sprite_instance.cpp:
+		cleanups and add some comments. don't set m_has_key_event when there 
+		is a user defined onKeyPress() function.
+	* testsuite/misc-ming.all/key_event_testrunner.cpp:	  
+		more tests.
+	  
 2007-04-26  Rob Savoye  <rob@ute.welcomehome.org>
 
 	* Makefile.am: Add po to EXTRA_DIST.

Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/Key.cpp	26 Apr 2007 10:56:50 -0000	1.22
+++ server/asobj/Key.cpp	27 Apr 2007 07:05:08 -0000	1.23
@@ -94,7 +94,7 @@
 	:
 	m_last_key_pressed(0)
 {
-    memset(m_keymap, 0, sizeof(m_keymap));
+    memset(m_unreleased_keys, 0, sizeof(m_unreleased_keys));
 }
 
 bool
@@ -106,9 +106,9 @@
 	    int	bit_index = code - (byte_index << 3);
 	    int	mask = 1 << bit_index;
 
-	    assert(byte_index >= 0 && byte_index < int(sizeof(m_keymap)/sizeof(m_keymap[0])));
+	assert(byte_index >= 0 && byte_index < int(sizeof(m_unreleased_keys)/sizeof(m_unreleased_keys[0])));
 
-	    if (m_keymap[byte_index] & mask)
+	if (m_unreleased_keys[byte_index] & mask)
 		{
 		    return true;
 		}
@@ -129,9 +129,9 @@
 	int	bit_index = code - (byte_index << 3);
 	int	mask = 1 << bit_index;
 
-	assert(byte_index >= 0 && byte_index < int(sizeof(m_keymap)/sizeof(m_keymap[0])));
+	assert(byte_index >= 0 && byte_index < int(sizeof(m_unreleased_keys)/sizeof(m_unreleased_keys[0])));
 
-	m_keymap[byte_index] |= mask;
+	m_unreleased_keys[byte_index] |= mask;
 }
 
 void
@@ -143,9 +143,9 @@
     int	bit_index = code - (byte_index << 3);
     int	mask = 1 << bit_index;
 
-    assert(byte_index >= 0 && byte_index < int(sizeof(m_keymap)/sizeof(m_keymap[0])));
+    assert(byte_index >= 0 && byte_index < int(sizeof(m_unreleased_keys)/sizeof(m_unreleased_keys[0])));
 
-    m_keymap[byte_index] &= ~mask;
+    m_unreleased_keys[byte_index] &= ~mask;
 }
 
 void 
@@ -153,6 +153,10 @@
 {
 	
 	std::string funcname = key_event_type.get_function_name();
+	// There is no user defined "onKeyPress" event handler
+	if( ( funcname != "onKeyDown") && (funcname != "onKeyUp") )
+		return;
+
 	VM& vm = VM::get();
 	if ( vm.getSWFVersion() < 7 )
 	{
@@ -236,7 +240,8 @@
 }
 
 as_value	key_get_ascii(const fn_call& fn)
-    // Return the ascii value of the last key pressed.
+// Return the ascii value of the last key pressed.
+/// FIXME: return the ascii number(not string) of the last pressed key!
 {
     boost::intrusive_ptr<key_as_object> ko = ensureType<key_as_object>(fn.this_ptr);
 

Index: server/asobj/Key.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/asobj/Key.h	26 Apr 2007 11:18:03 -0000	1.15
+++ server/asobj/Key.h	27 Apr 2007 07:05:08 -0000	1.16
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-/* $Id: Key.h,v 1.15 2007/04/26 11:18:03 zoulunkai Exp $ */
+/* $Id: Key.h,v 1.16 2007/04/27 07:05:08 zoulunkai Exp $ */
 
 #ifndef __KEY_H__
 #define __KEY_H__
@@ -96,7 +96,8 @@
 {
 
 private:
-	uint8_t	m_keymap[key::KEYCOUNT / 8 + 1];	// bit-array
+	/// bit-array for recording the unreleased keys
+	uint8_t	m_unreleased_keys[key::KEYCOUNT / 8 + 1];	
 	std::vector<boost::intrusive_ptr<as_object> >	m_listeners;
 	int	m_last_key_pressed;
 
@@ -110,6 +111,8 @@
 
 	void set_key_up(int code);
 
+	/// responsible for user defined key events handlers only;
+	/// take over both characters and non-characters object.
 	void notify_listeners(const event_id key_event_type);
 
 	void add_listener(boost::intrusive_ptr<as_object> listener);

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/movie_root.cpp	26 Apr 2007 11:04:56 -0000	1.59
+++ server/movie_root.cpp	27 Apr 2007 07:05:08 -0000	1.60
@@ -218,9 +218,12 @@
 	//
 	key_as_object * global_key = notify_global_key(k, down);
 
-	// Notify key listeners.
+	// Notify character key listeners.
 	notify_key_listeners(k, down);
 
+	// Notify both character and non-character Key listeners
+	//	for user defined handerlers.
+	// FIXME: this may violates the event order
 	if(global_key)
 	{
 		if(down)
@@ -696,7 +699,7 @@
 		}
 	}
 
-#ifdef key_LISTENERS_DEBUG
+#ifdef KEY_LISTENERS_DEBUG
 	size_t currsize = m_key_listeners.size();
 	log_msg("Cleaned up %u listeners (from %u to %u)", prevsize-currsize, prevsize, currsize);
 #endif
@@ -717,7 +720,7 @@
 		{
 			if(down)
 			{
-				// key code for KEY_DOWN and KEY_UP should be invalid
+				// KEY_UP and KEY_DOWN events are unrelated to any key!
 				ch->on_event(event_id(event_id::KEY_DOWN, key::INVALID)); 
 				ch->on_event(event_id(event_id::KEY_PRESS, k));
 			}

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -b -r1.258 -r1.259
--- server/sprite_instance.cpp	26 Apr 2007 10:56:50 -0000	1.258
+++ server/sprite_instance.cpp	27 Apr 2007 07:05:08 -0000	1.259
@@ -3579,8 +3579,8 @@
 
 	const char* ptr = name.c_str();
 
+	// AFAIK, there is no user defined "onKeyPress" event handler!
 	if ( ! cmp(ptr, "onKeyDown") 
-		|| ! cmp(ptr, "onKeypress") 
 		|| ! cmp(ptr, "onKeyUp"))
 	{
 		has_key_event();

Index: testsuite/misc-ming.all/key_event_testrunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/key_event_testrunner.cpp	26 Apr 2007 12:10:18 -0000	1.3
+++ testsuite/misc-ming.all/key_event_testrunner.cpp	27 Apr 2007 07:05:08 -0000	1.4
@@ -69,7 +69,7 @@
   check(root->get_member("x2", &tmp));
   check_equals(tmp.to_number(), key::A);
 
-  // check that user defined onKeyUp/KeyDown are not triggered
+  // check that user defined onKeyUp/KeyDown were not triggered
   check(root->get_member("x4", &tmp));
   check_equals(tmp.to_number(), 0);
   check(root->get_member("x5", &tmp));
@@ -83,7 +83,7 @@
   check_equals(root->get_current_frame(), 30); // the 31th frame
   check_equals(root->get_play_state(), sprite_instance::STOP);
 
-  // press key 'B' and checks
+  // press key 'C' and checks
   tester.pressKey(key::C);
   tester.releaseKey(key::C);
 
@@ -98,4 +98,14 @@
   check_equals(tmp.to_string(), "C");
   check(root->get_member("x5", &tmp));
   check_equals(tmp.to_number(), key::C);
+  	
+  // check that user onClipKeyPress and user defined onKeyPress were not triggered
+  // onClipKeyPress was not triggered because the event handler binds a invalid key code
+  check(root->get_member("x3", &tmp));
+  check_equals(tmp.to_number(), 0);
+  // onKeyPress was not triggered because I think there is no user defined
+  // KeyPress event handler at all( the defined onKeyPress is just a normal function).
+  check(root->get_member("x6", &tmp));
+  check_equals(tmp.to_number(), 0);
+  
 }



From MAILER-DAEMON Fri Apr 27 03:12:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhKd5-0003uM-2U
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 03:12:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhKd3-0003tp-Gr
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:12:29 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhKd2-0003tP-1A
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:12:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhKd1-0003tM-Uh
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:12:27 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HhKXB-0000yR-Et
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:06:26 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3R766u59484;
	Fri, 27 Apr 2007 09:06:06 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 27 Apr 2007 09:06:06 +0200
To: Rob Savoye <rob@welcomehome.org>
Subject: Re: [Gnash-commit] gnash backend/Makefile.am gui/Makefile.am libam...
Message-ID: <20070427070606.GD58652@keybit.net>
Mail-Followup-To: Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
References: <E1HhEx9-00068k-Ty@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HhEx9-00068k-Ty@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 07:12:29 -0000

On Fri, Apr 27, 2007 at 01:08:51AM +0000, Rob Savoye wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Rob Savoye <rsavoye>	07/04/27 01:08:51

> Added files:
> 	po             : Makefile.am 

make[2]: Entering directory `/home/strk/src/gnash/build/head/gtk_agg_gst/po'
make[2]: *** No rule to make target `/config.status', needed by `Makefile'.  Stop.


--strk;



From MAILER-DAEMON Fri Apr 27 03:15:46 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhKgE-0004Y2-Q2
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 03:15:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhKgD-0004Xx-2o
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:15:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhKgB-0004XX-Oa
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:15:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhKgB-0004XM-Hx
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:15:43 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HhKaL-0001Ks-J2
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:09:42 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3R79ZY59539;
	Fri, 27 Apr 2007 09:09:35 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Fri, 27 Apr 2007 09:09:35 +0200
To: Zou Lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog server/asobj/Key.cpp server/aso...
Message-ID: <20070427070935.GE58652@keybit.net>
Mail-Followup-To: Zou Lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1HhKVx-000160-5f@cvs>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1HhKVx-000160-5f@cvs>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 07:15:45 -0000

On Fri, Apr 27, 2007 at 07:05:09AM +0000, Zou Lunkai wrote:
> CVSROOT:	/sources/gnash
> Module name:	gnash
> Changes by:	Zou Lunkai <zoulunkai>	07/04/27 07:05:08

> Log message:
> 	cleanups, comments, user defined onKeyPress() is not a event handler

> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3013&r2=1.3014
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.22&r2=1.23
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.h?cvsroot=gnash&r1=1.15&r2=1.16
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.59&r2=1.60
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.258&r2=1.259
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/key_event_testrunner.cpp?cvsroot=gnash&r1=1.3&r2=1.4

>  	std::string funcname = key_event_type.get_function_name();
> +	// There is no user defined "onKeyPress" event handler
> +	if( ( funcname != "onKeyDown") && (funcname != "onKeyUp") )
> +		return;
> +

Just a tought:

	1) comparing the event_id would be faster (ints rather then strings)
	2) would it be worth to have get_function_name() return empty() for the events
	   that have no corresponding user-defined handler ?

--strk;



From MAILER-DAEMON Fri Apr 27 03:22:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhKmv-0003wl-1p
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 03:22:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhKms-0003sZ-JP
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:22:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhKmq-0003pi-Nr
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:22:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhKmq-0003pE-9I
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:22:36 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HhKgw-00024Y-Ti
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:16:34 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3R7G5r59687;
	Fri, 27 Apr 2007 09:16:05 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Fri, 27 Apr 2007 09:16:05 +0200
From: strk <strk@keybit.net>
To: Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash backend/Makefile.am gui/Makefile.am libam...
Message-ID: <20070427071605.GF58652@keybit.net>
Mail-Followup-To: Rob Savoye <rob@welcomehome.org>, gnash-commit@gnu.org
References: <E1HhEx9-00068k-Ty@cvs> <20070427070606.GD58652@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070427070606.GD58652@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 07:22:39 -0000

On Fri, Apr 27, 2007 at 09:06:06AM +0200, strk wrote:
> On Fri, Apr 27, 2007 at 01:08:51AM +0000, Rob Savoye wrote:
> > CVSROOT:	/sources/gnash
> > Module name:	gnash
> > Changes by:	Rob Savoye <rsavoye>	07/04/27 01:08:51
> 
> > Added files:
> > 	po             : Makefile.am 
> 
> make[2]: Entering directory `/home/strk/src/gnash/build/head/gtk_agg_gst/po'
> make[2]: *** No rule to make target `/config.status', needed by `Makefile'.  Stop.

False alarm, I had to wipe out te old Makefile and Makefile.in  in the build tree.

--strk;



From MAILER-DAEMON Fri Apr 27 03:55:47 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhLIx-0006cP-G3
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 03:55:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhLIv-0006bo-Qk
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:55:45 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhLIt-0006bb-Cu
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:55:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhLIt-0006bY-86
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:55:43 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhLD3-0005gN-HK
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:49:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhLCz-0003wy-C0
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 07:49:37 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhLCy-0003wv-T9
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 07:49:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhLCy-0003wv-T9@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 07:49:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog cygnal/http.cpp cygnal/netstats...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 07:55:45 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 07:49:36

Modified files:
	.              : ChangeLog 
	cygnal         : http.cpp netstats.cpp statistics.cpp stream.cpp 
	libbase        : network.cpp network.h 

Log message:
	        * libbase/network.{cpp,h}: (writeNet): take a const string ref, not a
	          copy.
	        * cygnal/: http.cpp, netstats.cpp, statistics.cpp, stream.cpp:
	          Hush compiler.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3014&r2=1.3015
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/http.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/netstats.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/statistics.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/cygnal/stream.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.cpp?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/network.h?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3014
retrieving revision 1.3015
diff -u -b -r1.3014 -r1.3015
--- ChangeLog	27 Apr 2007 07:05:08 -0000	1.3014
+++ ChangeLog	27 Apr 2007 07:49:36 -0000	1.3015
@@ -1,3 +1,10 @@
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
+	* libbase/network.{cpp,h}: (writeNet): take a const string ref, not a
+	  copy.
+	* cygnal/: http.cpp, netstats.cpp, statistics.cpp, stream.cpp:
+	  Hush compiler.
+
 2007-04-27 Zou Lunkai <zoulunkai@gmail.com>
 
 	* server/asobj/Key.{cpp,h}:

Index: cygnal/http.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/http.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- cygnal/http.cpp	10 Apr 2007 21:10:56 -0000	1.6
+++ cygnal/http.cpp	27 Apr 2007 07:49:36 -0000	1.7
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: http.cpp,v 1.6 2007/04/10 21:10:56 nihilus Exp $ */
+/* $Id: http.cpp,v 1.7 2007/04/27 07:49:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -57,17 +57,19 @@
 }
 
 HTTP &
-HTTP::operator = (HTTP &obj)
+HTTP::operator = (HTTP& /*obj*/)
 {
     GNASH_REPORT_FUNCTION;
 //    this = obj;
+    // TODO: FIXME !
+    return *this; 
 }
 
 string
-HTTP::waitForGetRequest(Network &net)
+HTTP::waitForGetRequest(Network& /*net*/)
 {
     GNASH_REPORT_FUNCTION;
-    
+    return ""; // TODO: FIXME !
 }
 
 string
@@ -126,10 +128,13 @@
     char *length = strstr(reply, " XX");
     sprintf(length, " %d", filesize);
     
-    if (writeNet(reply, strlen(reply)) == strlen(reply)) {
+    int ret = writeNet(reply, strlen(reply));
+
+    if (ret >= 0 && (unsigned)ret == strlen(reply)) {
         dbglogfile << "Sent GET Reply: " << reply << endl;
     } else {
-        dbglogfile << "Couldn't send GET Reply" << endl;
+        dbglogfile << "Couldn't send GET Reply, writeNet returned " << ret << endl;
+	// TODO: FIXME: shouldn't we return false here ?
     }
     return true; // Default to true
 }

Index: cygnal/netstats.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/netstats.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cygnal/netstats.cpp	10 Apr 2007 18:18:45 -0000	1.3
+++ cygnal/netstats.cpp	27 Apr 2007 07:49:36 -0000	1.4
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: netstats.cpp,v 1.3 2007/04/10 18:18:45 rsavoye Exp $ */
+/* $Id: netstats.cpp,v 1.4 2007/04/27 07:49:36 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -61,6 +61,7 @@
     _bytes = stats.getBytes();
     _codec = stats.getCodec();
     _type = stats.getFileType();
+    return *this;
 }
 
 } // end of cygnal namespace

Index: cygnal/statistics.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/statistics.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cygnal/statistics.cpp	17 Dec 2006 02:34:58 -0000	1.1
+++ cygnal/statistics.cpp	27 Apr 2007 07:49:36 -0000	1.2
@@ -80,7 +80,7 @@
 
 float
 Statistics::getFPS() {
-    
+	return 0.0; // TODO: FIXME !
 }
 
 int

Index: cygnal/stream.cpp
===================================================================
RCS file: /sources/gnash/gnash/cygnal/stream.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- cygnal/stream.cpp	10 Apr 2007 21:10:56 -0000	1.3
+++ cygnal/stream.cpp	27 Apr 2007 07:49:36 -0000	1.4
@@ -153,10 +153,12 @@
 }
 
 bool
-Stream::open(const char *filespec, int netfd) {
+Stream::open(const char *filespec, int /*netfd*/)
+{
     GNASH_REPORT_FUNCTION;
 
-    struct stat stats;
+    //struct stat stats;
+    // TODO: should we use the 'netfd' passed as parameter instead ?
     return open(filespec, _netfd, _statistics);
 }
 
@@ -255,7 +257,7 @@
         }
     }
 
-    int blocksize = 8192;
+    //int blocksize = 8192;
     int nbytes = 0;
     Network net;
 //    while ((_seekptr - _dataptr) >= 0) {
@@ -277,7 +279,7 @@
 
 // Stream a preview, instead of the full movie.
 bool
-Stream::preview(const char *filespec, int frames) {
+Stream::preview(const char* /*filespec*/, int /*frames*/) {
     GNASH_REPORT_FUNCTION;
 
     _state = PREVIEW;
@@ -286,7 +288,7 @@
 
 // Stream a series of thumbnails
 bool
-Stream::thumbnail(const char *filespec, int quantity) {
+Stream::thumbnail(const char* /*filespec*/, int /*quantity*/) {
     GNASH_REPORT_FUNCTION;
     
     _state = THUMBNAIL;
@@ -295,7 +297,7 @@
 
 // Pause the stream
 bool
-Stream::pause(int frame) {
+Stream::pause(int /*frame*/) {
     GNASH_REPORT_FUNCTION;
     
     _state = PAUSE;
@@ -304,7 +306,7 @@
 
 // Seek within the stream
 bool
-Stream::seek(int frame) {
+Stream::seek(int /*frame*/) {
     GNASH_REPORT_FUNCTION;
     
     _state = SEEK;
@@ -313,7 +315,7 @@
 
 // Upload a stream into a sandbox
 bool
-Stream::upload(const char *filespec) {
+Stream::upload(const char* /*filespec*/) {
     GNASH_REPORT_FUNCTION;
     
     _state = UPLOAD;
@@ -321,7 +323,7 @@
 }
 
 // Stream a single "real-time" source.
-bool Stream::multicast(const char *filespec) {
+bool Stream::multicast(const char* /*filespec*/) {
     GNASH_REPORT_FUNCTION;
     
     _state = MULTICAST;

Index: libbase/network.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- libbase/network.cpp	18 Apr 2007 14:07:33 -0000	1.24
+++ libbase/network.cpp	27 Apr 2007 07:49:36 -0000	1.25
@@ -620,7 +620,7 @@
 
 // Write to the connection
 int
-Network::writeNet(std::string buffer)
+Network::writeNet(const std::string& buffer)
 {
     return writeNet(buffer.c_str(), buffer.size());
 }

Index: libbase/network.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/network.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/network.h	8 Apr 2007 23:06:17 -0000	1.15
+++ libbase/network.h	27 Apr 2007 07:49:36 -0000	1.16
@@ -82,7 +82,7 @@
     int readNet(int fd, char *buffer, int nbytes, int timeout);
     
     // Write to the connection
-    int writeNet(std::string buffer);
+    int writeNet(const std::string& buffer);
     int writeNet(char const *buffer);
     int writeNet(char const *buffer, int nbytes);
     int writeNet(const unsigned char *buffer, int nbytes);



From MAILER-DAEMON Fri Apr 27 03:57:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhLKk-0008Be-SF
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 03:57:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhLKj-0008BN-Fv
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:57:37 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhLKi-0008Ag-MG
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:57:37 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhLKi-0008AO-HC
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:57:36 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhLEs-0005ry-S9
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 03:51:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhLEs-00040k-3O
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 07:51:34 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhLEr-00040h-Py
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 07:51:33 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhLEr-00040h-Py@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 07:51:33 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog libbase/triangulate_impl.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 07:57:37 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 07:51:33

Modified files:
	.              : ChangeLog 
	libbase        : triangulate_impl.h 

Log message:
	* libbase/triangulate_impl.h: include config.h.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3015&r2=1.3016
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3015
retrieving revision 1.3016
diff -u -b -r1.3015 -r1.3016
--- ChangeLog	27 Apr 2007 07:49:36 -0000	1.3015
+++ ChangeLog	27 Apr 2007 07:51:33 -0000	1.3016
@@ -1,5 +1,6 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* libbase/triangulate_impl.h: include config.h.
 	* libbase/network.{cpp,h}: (writeNet): take a const string ref, not a
 	  copy.
 	* cygnal/: http.cpp, netstats.cpp, statistics.cpp, stream.cpp:

Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- libbase/triangulate_impl.h	11 Apr 2007 17:54:21 -0000	1.22
+++ libbase/triangulate_impl.h	27 Apr 2007 07:51:33 -0000	1.23
@@ -24,7 +24,11 @@
 // code, see the FIST web page at:
 // http://www.cosy.sbg.ac.at/~held/projects/triang/triang.html
 
-/* $Id: triangulate_impl.h,v 1.22 2007/04/11 17:54:21 bjacques Exp $ */
+/* $Id: triangulate_impl.h,v 1.23 2007/04/27 07:51:33 strk Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "utility.h"
 #include "triangulate.h"



From MAILER-DAEMON Fri Apr 27 04:53:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhMCK-0007du-7u
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 04:53:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhMCG-0007cB-UJ
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 04:52:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhMCD-0007Yt-W8
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 04:52:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhMCD-0007Ye-NP
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 04:52:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhM6N-0003FZ-Lg
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 04:46:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhM6I-0006ff-Mi
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:46:46 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhM6I-0006fc-CS
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:46:46 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhM6I-0006fc-CS@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 08:46:46 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_value.cpp server/as_v...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 08:52:57 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 08:46:46

Modified files:
	.              : ChangeLog 
	server         : as_value.cpp as_value.h 
	server/asobj   : Number.cpp 
	testsuite/swfdec: PASSING 

Log message:
	        * server/as_value.{cpp,h}: add a static doubleToString(double) function
	          moved here from a static in Number.cpp, given its good quality.
	        * server/asobj/Number.cpp: use as_value::doubleToString() for
	          returning text value. Drop the string representation cache, no
	          more needed.
	        * testsuite/swfdec/PASSING: double.swf now succeeds

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3016&r2=1.3017
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Number.cpp?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3016
retrieving revision 1.3017
diff -u -b -r1.3016 -r1.3017
--- ChangeLog	27 Apr 2007 07:51:33 -0000	1.3016
+++ ChangeLog	27 Apr 2007 08:46:45 -0000	1.3017
@@ -1,5 +1,14 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* server/as_value.{cpp,h}: add a static doubleToString(double) function
+	  moved here from a static in Number.cpp, given its good quality.
+	* server/asobj/Number.cpp: use as_value::doubleToString() for
+	  returning text value. Drop the string representation cache, no
+	  more needed.
+	* testsuite/swfdec/PASSING: double.swf now succeeds
+
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
 	* libbase/triangulate_impl.h: include config.h.
 	* libbase/network.{cpp,h}: (writeNet): take a const string ref, not a
 	  copy.

Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/as_value.cpp	26 Apr 2007 17:06:10 -0000	1.49
+++ server/as_value.cpp	27 Apr 2007 08:46:46 -0000	1.50
@@ -88,35 +88,7 @@
 			break;
 
 		case NUMBER:
-			// @@ Moock says if value is a NAN,
-			// then result is "NaN"
-			// INF goes to "Infinity"
-			// -INF goes to "-Infinity"
-			if (isnan(m_number_value))
-			{
-				m_string_value = "NaN";
-			}
-			else if (isinf(m_number_value))
-			{
-				if (m_number_value > 0.0)
-				{
-					m_string_value = "Infinity";
-				}
-				else
-				{
-					m_string_value = "-Infinity";
-				}
-			}
-			else if ( m_number_value == -0.0 || m_number_value == 0.0 )
-			{
-					m_string_value = "0";
-			}
-			else
-			{
-				char buffer[50];
-				snprintf(buffer, 50, "%.14g", m_number_value);
-				m_string_value = buffer;
-			}
+			m_string_value = doubleToString(m_number_value);
 			break;
 
 		case UNDEFINED: 
@@ -851,6 +823,165 @@
 	set_as_object(obj);
 }
 
+
+// Convert numeric value to string value, following ECMA-262 specification
+std::string
+as_value::doubleToString(double _val)
+{
+	// Printing formats:
+	//
+	// If _val > 1, Print up to 15 significant digits, then switch
+	// to scientific notation, rounding at the last place and
+	// omitting trailing zeroes.
+	// e.g. for 9*.1234567890123456789
+	// ...
+	// 9999.12345678901
+	// 99999.123456789
+	// 999999.123456789
+	// 9999999.12345679
+	// 99999999.1234568
+	// 999999999.123457
+	// 9999999999.12346
+	// 99999999999.1235
+	// 999999999999.123
+	// 9999999999999.12
+	// 99999999999999.1
+	// 999999999999999
+	// 1e+16
+	// 1e+17
+	// ...
+	// e.g. for 1*.111111111111111111111111111111111111
+	// ...
+	// 1111111111111.11
+	// 11111111111111.1
+	// 111111111111111
+	// 1.11111111111111e+15
+	// 1.11111111111111e+16
+	// ...
+	// For values < 1, print up to 4 leading zeroes after the
+	// deciman point, then switch to scientific notation with up
+	// to 15 significant digits, rounding with no trailing zeroes
+	// e.g. for 1.234567890123456789 * 10^-i:
+	// 1.23456789012346
+	// 0.123456789012346
+	// 0.0123456789012346
+	// 0.00123456789012346
+	// 0.000123456789012346
+	// 0.0000123456789012346
+	// 0.00000123456789012346
+	// 1.23456789012346e-6
+	// 1.23456789012346e-7
+	// ...
+	//
+	// If the value is negative, just add a '-' to the start; this
+	// does not affect the precision of the printed value.
+	//
+	// This almost corresponds to printf("%.15g") format, except
+	// that %.15g switches to scientific notation at e-05 not e-06,
+	// and %g always prints at least two digits for the exponent.
+
+	// The following code gives the same results as Adobe player
+	// except for
+	// 9.99999999999999[39-61] e{-2,-3}. Adobe prints these as
+	// 0.0999999999999999 and 0.00999999999999 while we print them
+	// as 0.1 and 0.01
+	// These values are at the limit of a double's precision,
+	// for example, in C,
+	// .99999999999999938 printfs as
+	// .99999999999999933387 and
+	// .99999999999999939 printfs as
+	// .99999999999999944489
+	// so this behaviour is probably too compiler-dependent to
+	// reproduce exactly.
+	//
+	// There may be some milage in comparing against
+	// 0.00009999999999999995 and
+	// 0.000009999999999999995 instead.
+
+	// Handle non-numeric values.
+	// "printf" gives "nan", "inf", "-inf", so we check explicitly
+	if(isnan(_val))
+	{
+		//strcpy(_str, "NaN");
+		return "NaN";
+	}
+	else if(isinf(_val))
+	{
+		return _val < 0 ? "-Infinity" : "Infinity";
+		//strcpy(_str, _val < 0 ? "-Infinity" : "Infinity");
+	}
+	else if(_val == 0.0 || _val == -0.0)
+	{
+		return "0";
+		//strcpy(_str, _val < 0 ? "-Infinity" : "Infinity");
+	}
+
+	char _str[256];
+
+	// FP_ZERO, FP_NORMAL and FP_SUBNORMAL
+	if (fabs(_val) < 0.0001 && fabs(_val) >= 0.00001)
+	{
+		// This is the range for which %.15g gives scientific
+		// notation but for which we must give decimal.
+		// We can't easily use %f bcos it prints a fixed number
+		// of digits after the point, not the maximum number of
+		// significant digits with trailing zeroes removed that
+		// we require. So we just get %g to do its non-e stuff
+		// by multiplying the value by ten and then stuffing
+		// an extra zero into the result after the decimal
+		// point. Yuk!
+		char *cp;
+		
+		sprintf(_str, "%.15g", _val * 10.0);
+		if ((cp = strchr(_str, '.')) == NULL || cp[1] != '0') {
+			log_error(_("Internal error: Cannot find \".0\" in %s for %.15g"), _str, _val);
+			// Just give it to them raw instead
+			sprintf(_str, "%.15g", _val);
+		} else {
+#if HAVE_MEMMOVE
+			// Shunt the digits right one place after the
+			// decimal point.
+			memmove(cp+2, cp+1, strlen(cp+1)+1);
+#else
+			// We can't use strcpy() cos the args overlap.
+
+			char c;	// character being moved forward
+			
+			// At this point, cp points at the '.'
+			//
+			// In the loop body it points at where we pick
+			// up the next char to move forward and where
+			// we drop the one we picked up on its left.
+			// We stop when we have just picked up the \0.
+			for (c = '0', cp++; c != '\0'; cp++) {
+				char tmp = *cp; *cp = c; c = tmp;
+			}
+			// Store the '\0' we just picked up
+			*cp = c;
+#endif
+		}
+	}
+	else
+	{
+		// Regular case
+		char *cp;
+
+		sprintf(_str, "%.15g", _val);
+		// Remove a leading zero from 2-digit exponent if any
+		if ((cp = strchr(_str, 'e')) != NULL &&
+		    cp[2] == '0') {
+			// We can't use strcpy() cos its src&dest can't
+			// overlap. However, this can only be "...e+0n"
+			// or ...e-0n;  3+digit exponents never have
+			// leading 0s.
+			cp[2] = cp[3]; cp[3] = '\0';
+		}
+	}
+
+	return std::string(_str);
+}
+
+
 } // namespace gnash
 
 

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/as_value.h	26 Apr 2007 10:17:56 -0000	1.50
+++ server/as_value.h	27 Apr 2007 08:46:46 -0000	1.51
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: as_value.h,v 1.50 2007/04/26 10:17:56 strk Exp $ */
+/* $Id: as_value.h,v 1.51 2007/04/27 08:46:46 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -185,6 +185,7 @@
 	{
 	}
 
+	/// Construct a NUMBER value
 	as_value(long val)
 		:
 		m_type(NUMBER),
@@ -192,6 +193,7 @@
 	{
 	}
 	
+	/// Construct a NUMBER value
 	as_value(unsigned long val)
 		:
 		m_type(NUMBER),
@@ -216,6 +218,7 @@
 		set_as_object(obj);
 	}
 
+	/// Construct an NULL, MOVIECLIP, AS_FUNCTION or OBJECT value
 	as_value(boost::intrusive_ptr<as_object> obj);
 
 	/// Construct a NULL or AS_FUNCTION value
@@ -223,6 +226,12 @@
 
 	~as_value() { drop_refs(); }
 
+	/// Convert numeric value to string value, following ECMA-262 specification
+	//
+	/// TODO: move here some of the good comments found in the function definition.
+	///
+	static std::string doubleToString(double val);
+
 	/// Drop any ref counts we have.
 	//
 	/// This happens prior to changing our value.

Index: server/asobj/Number.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Number.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/asobj/Number.cpp	26 Apr 2007 07:00:29 -0000	1.29
+++ server/asobj/Number.cpp	27 Apr 2007 08:46:46 -0000	1.30
@@ -1,4 +1,4 @@
-/*/ Number.cpp:  ActionScript Number class, for Gnash.
+// Number.cpp:  ActionScript Number class, for Gnash.
 // 
 //   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: Number.cpp,v 1.29 2007/04/26 07:00:29 strk Exp $ */
+/* $Id: Number.cpp,v 1.30 2007/04/27 08:46:46 strk Exp $ */
 
 #include "log.h"
 #include "tu_config.h"
@@ -25,6 +25,7 @@
 #include "smart_ptr.h"
 #include "fn_call.h"
 #include "as_object.h" // for inheritance
+#include "as_value.h" // for doubleToString
 #include "builtin_function.h" // need builtin_function
 
 #include <sstream>
@@ -52,7 +53,7 @@
 namespace gnash {
 
 // Forward declarations
-static void number_val_to_str(double val, char *str);
+//static void number_val_to_str(double val, char *str);
 //static as_value number_to_string(const fn_call& fn);
 
 static void
@@ -91,7 +92,7 @@
 	double _val;
 
 	// string representation of the above number
-	mutable char _str[256];
+	//mutable char _str[256];
 
 public:
 
@@ -105,8 +106,8 @@
 	// override from as_object
 	std::string get_text_value() const
 	{
-		number_val_to_str(_val, _str);
-		return _str;
+		return as_value::doubleToString(_val); // number_val_to_str(_val, _str);
+		//return _str;
 	}
 
 	// override from as_object
@@ -122,146 +123,6 @@
 
 };
 
-// Convert numeric value to string value
-static void
-number_val_to_str(double _val, char *_str)
-{
-	// Printing formats:
-	//
-	// If _val > 1, Print up to 15 significant digits, then switch
-	// to scientific notation, rounding at the last place and
-	// omitting trailing zeroes.
-	// e.g. for 9*.1234567890123456789
-	// ...
-	// 9999.12345678901
-	// 99999.123456789
-	// 999999.123456789
-	// 9999999.12345679
-	// 99999999.1234568
-	// 999999999.123457
-	// 9999999999.12346
-	// 99999999999.1235
-	// 999999999999.123
-	// 9999999999999.12
-	// 99999999999999.1
-	// 999999999999999
-	// 1e+16
-	// 1e+17
-	// ...
-	// e.g. for 1*.111111111111111111111111111111111111
-	// ...
-	// 1111111111111.11
-	// 11111111111111.1
-	// 111111111111111
-	// 1.11111111111111e+15
-	// 1.11111111111111e+16
-	// ...
-	// For values < 1, print up to 4 leading zeroes after the
-	// deciman point, then switch to scientific notation with up
-	// to 15 significant digits, rounding with no trailing zeroes
-	// e.g. for 1.234567890123456789 * 10^-i:
-	// 1.23456789012346
-	// 0.123456789012346
-	// 0.0123456789012346
-	// 0.00123456789012346
-	// 0.000123456789012346
-	// 0.0000123456789012346
-	// 0.00000123456789012346
-	// 1.23456789012346e-6
-	// 1.23456789012346e-7
-	// ...
-	//
-	// If the value is negative, just add a '-' to the start; this
-	// does not affect the precision of the printed value.
-	//
-	// This almost corresponds to printf("%.15g") format, except
-	// that %.15g switches to scientific notation at e-05 not e-06,
-	// and %g always prints at least two digits for the exponent.
-
-	// The following code gives the same results as Adobe player
-	// except for
-	// 9.99999999999999[39-61] e{-2,-3}. Adobe prints these as
-	// 0.0999999999999999 and 0.00999999999999 while we print them
-	// as 0.1 and 0.01
-	// These values are at the limit of a double's precision,
-	// for example, in C,
-	// .99999999999999938 printfs as
-	// .99999999999999933387 and
-	// .99999999999999939 printfs as
-	// .99999999999999944489
-	// so this behaviour is probably too compiler-dependent to
-	// reproduce exactly.
-	//
-	// There may be some milage in comparing against
-	// 0.00009999999999999995 and
-	// 0.000009999999999999995 instead.
-
-	// Handle non-numeric values.
-	// "printf" gives "nan", "inf", "-inf", so we check explicitly
-	if(isnan(_val))
-		strcpy(_str, "NaN");
-	else if(isinf(_val))
-		strcpy(_str, _val < 0 ? "-Infinity" : "Infinity");
-	else{	// FP_ZERO, FP_NORMAL and FP_SUBNORMAL
-		if (fabs(_val) < 0.0001 &&
-		    fabs(_val) >= 0.00001) {
-			// This is the range for which %.15g gives scientific
-			// notation but for which we must give decimal.
-			// We can't easily use %f bcos it prints a fixed number
-			// of digits after the point, not the maximum number of
-			// significant digits with trailing zeroes removed that
-			// we require. So we just get %g to do its non-e stuff
-			// by multiplying the value by ten and then stuffing
-			// an extra zero into the result after the decimal
-			// point. Yuk!
-			char *cp;
-			
-			sprintf(_str, "%.15g", _val * 10.0);
-			if ((cp = strchr(_str, '.')) == NULL || cp[1] != '0') {
-				log_error(_("Internal error: Cannot find \".0\" in %s for %.15g"), _str, _val);
-				// Just give it to them raw instead
-				sprintf(_str, "%.15g", _val);
-			} else {
-#if HAVE_MEMMOVE
-				// Shunt the digits right one place after the
-				// decimal point.
-				memmove(cp+2, cp+1, strlen(cp+1)+1);
-#else
-				// We can't use strcpy() cos the args overlap.
-
-				char c;	// character being moved forward
-				
-				// At this point, cp points at the '.'
-				//
-				// In the loop body it points at where we pick
-				// up the next char to move forward and where
-				// we drop the one we picked up on its left.
-				// We stop when we have just picked up the \0.
-				for (c = '0', cp++; c != '\0'; cp++) {
-					char tmp = *cp; *cp = c; c = tmp;
-				}
-				// Store the '\0' we just picked up
-				*cp = c;
-#endif
-			}
-		} else {
-			// Regular case
-			char *cp;
-
-			sprintf(_str, "%.15g", _val);
-			// Remove a leading zero from 2-digit exponent if any
-			if ((cp = strchr(_str, 'e')) != NULL &&
-			    cp[2] == '0') {
-				// We can't use strcpy() cos its src&dest can't
-				// overlap. However, this can only be "...e+0n"
-				// or ...e-0n;  3+digit exponents never have
-				// leading 0s.
-				cp[2] = cp[3]; cp[3] = '\0';
-			}
-		}
-	}
-}
-
 static as_value
 number_ctor(const fn_call& fn)
 {

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/swfdec/PASSING	24 Apr 2007 07:25:20 -0000	1.18
+++ testsuite/swfdec/PASSING	27 Apr 2007 08:46:46 -0000	1.19
@@ -56,3 +56,4 @@
 divide-7.swf
 object-math-7.swf
 event-order.swf
+double.swf



From MAILER-DAEMON Fri Apr 27 05:49:52 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhN5M-0002Ik-6B
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 05:49:52 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhN5L-0002HZ-5a
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 05:49:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhN5J-0002Fy-NV
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 05:49:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhN5J-0002Fh-I6
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 05:49:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhMzT-0002U1-Dp
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 05:43:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhMzP-0001H1-Tx
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 09:43:44 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhMzP-0001Gy-JO
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 09:43:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhMzP-0001Gy-JO@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 09:43:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/swfdec/swfdec_gnash_t...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 09:49:51 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 09:43:43

Modified files:
	.              : ChangeLog 
	testsuite/swfdec: swfdec_gnash_tester PASSING 

Log message:
	        * testsuite/swfdec/swfdec_gnash_tester: use the .trace.org files when
	          avaiable, as in that case it means that the .trace are just swfdec
	          results (Ben is cheating !)
	        * testsuite/swfdec/PASSING: double.swf fails again.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3017&r2=1.3018
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/swfdec_gnash_tester?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3017
retrieving revision 1.3018
diff -u -b -r1.3017 -r1.3018
--- ChangeLog	27 Apr 2007 08:46:45 -0000	1.3017
+++ ChangeLog	27 Apr 2007 09:43:43 -0000	1.3018
@@ -1,5 +1,12 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/swfdec/swfdec_gnash_tester: use the .trace.org files when
+	  avaiable, as in that case it means that the .trace are just swfdec
+	  results (Ben is cheating !)
+	* testsuite/swfdec/PASSING: double.swf fails again.
+
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
 	* server/as_value.{cpp,h}: add a static doubleToString(double) function
 	  moved here from a static in Number.cpp, given its good quality.
 	* server/asobj/Number.cpp: use as_value::doubleToString() for

Index: testsuite/swfdec/swfdec_gnash_tester
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/swfdec_gnash_tester,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/swfdec/swfdec_gnash_tester	10 Mar 2007 13:34:14 -0000	1.6
+++ testsuite/swfdec/swfdec_gnash_tester	27 Apr 2007 09:43:43 -0000	1.7
@@ -12,13 +12,23 @@
 
 in="$1"
 out=`basename "${in}"`.trace-gnash
+use_orig=0
 exp="${in}.trace"
+if [ -e "${in}.trace.org" ]; then
+	exp="${in}.trace.org"
+	use_orig=1
+fi
 
 ${GPROCESSOR} -r10 -f11 -v "$in"  | grep TRACE | sed 's/.*TRACE: //' | fromdos > $out
 if test "$?" != 0; then
 	echo "gprocessor returned an error"
 	exit 1
 else
+	if [ "$use_orig" != 0 ]; then
+		awk 'BEGIN {body=0;} { if (body) { print $0} else if (/^$/) {body=1} }' "$exp" | diff -u3 - "$out"
+		exit $?
+	else
 	diff -u3 "$exp" "$out"
 	exit $?
+	fi
 fi

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- testsuite/swfdec/PASSING	27 Apr 2007 08:46:46 -0000	1.19
+++ testsuite/swfdec/PASSING	27 Apr 2007 09:43:43 -0000	1.20
@@ -56,4 +56,3 @@
 divide-7.swf
 object-math-7.swf
 event-order.swf
-double.swf



From MAILER-DAEMON Fri Apr 27 06:10:39 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhNPQ-00079I-R6
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 06:10:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhNPI-000750-HK
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:10:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhNPC-00070N-7t
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:10:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhNPA-0006zp-Rz
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:10:21 -0400
Received: from nz-out-0506.google.com ([64.233.162.235])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HhNJK-0005lf-D0
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:04:18 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1061348nzp
	for <gnash-commit@gnu.org>; Fri, 27 Apr 2007 03:04:17 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=NOE0CRgxygOeAp/kLkQxeWQoeP6OsU3dQ1PYANL5UirIhiOxuMmJe/Ar9JfnzK+EqgSsdvmf6R2+XUJiLoCFxqfu9aNM0z1ncoJBajCc7EZWlnPxmmpSe/DN1VRGtbhDCBDzRRDedSDMkOfXvtjxJjunlgTj1xOPFeUP7/lTuco=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=YKY45Ml6Ywj2ND/WwyWtc5BaNjYZRK3IA3AVOOW3zjfkAeBsE3L9w3Fu5yx31LVYl0YY8Gkw6o3BJ1PuIP7+UlQrdQxOX2Z4n53h3Zib5JXEiDrOBG2LIUs3pDFOa3F8gWeIh8mgwnhv+dHhsib0DoPOJcJc4wQcn3OY2ppALxA=
Received: by 10.114.26.1 with SMTP id 1mr937867waz.1177668257030;
	Fri, 27 Apr 2007 03:04:17 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Fri, 27 Apr 2007 03:04:16 -0700 (PDT)
Message-ID: <ca4b43ff0704270304h5d1cc4d3o311d06e3c56c373a@mail.gmail.com>
Date: Fri, 27 Apr 2007 18:04:16 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Zou Lunkai" <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog server/asobj/Key.cpp server/aso...
In-Reply-To: <20070427070935.GE58652@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HhKVx-000160-5f@cvs> <20070427070935.GE58652@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 10:10:30 -0000

>
> >       std::string funcname = key_event_type.get_function_name();
> > +     // There is no user defined "onKeyPress" event handler
> > +     if( ( funcname != "onKeyDown") && (funcname != "onKeyUp") )
> > +             return;
> > +
>
> Just a tought:
>
>        1) comparing the event_id would be faster (ints rather then strings)
>        2) would it be worth to have get_function_name() return empty() for the events
>           that have no corresponding user-defined handler ?
>
yes, you are right. I will change to compare the event_id.



From MAILER-DAEMON Fri Apr 27 06:26:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhNeO-0004AU-SQ
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 06:26:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhNeL-00049G-He
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:26:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhNeJ-00048L-KA
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:26:01 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhNeJ-00048A-8W
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:25:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhNYS-00082t-T2
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 06:19:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhNYE-0002Kr-I1
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 10:19:42 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhNYE-0002Ko-9s
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 10:19:42 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhNYE-0002Ko-9s@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 10:19:42 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog gui/gui.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 10:26:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 10:19:42

Modified files:
	.              : ChangeLog 
	gui            : gui.cpp 

Log message:
	        * gui/gui.cpp: add a DEBUG_MOUSE_COORDINATES define, for making
	          writing test runners easier.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3018&r2=1.3019
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.75&r2=1.76

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3018
retrieving revision 1.3019
diff -u -b -r1.3018 -r1.3019
--- ChangeLog	27 Apr 2007 09:43:43 -0000	1.3018
+++ ChangeLog	27 Apr 2007 10:19:41 -0000	1.3019
@@ -1,5 +1,7 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* gui/gui.cpp: add a DEBUG_MOUSE_COORDINATES define, for making
+	  writing test runners easier.
 	* testsuite/swfdec/swfdec_gnash_tester: use the .trace.org files when
 	  avaiable, as in that case it means that the .trace are just swfdec
 	  results (Ben is cheating !)

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- gui/gui.cpp	23 Apr 2007 19:22:39 -0000	1.75
+++ gui/gui.cpp	27 Apr 2007 10:19:42 -0000	1.76
@@ -46,7 +46,7 @@
 /// debug the GUI part, however (see if blitting the region works), then you 
 /// probably won't define this.
 #ifdef ENABLE_REGION_UPDATES_DEBUGGING 
-//#define REGION_UPDATES_DEBUGGING_FULL_REDRAW 1
+#define REGION_UPDATES_DEBUGGING_FULL_REDRAW 1
 #endif 
 
 #ifdef ENABLE_REGION_UPDATES_DEBUGGING
@@ -56,6 +56,10 @@
 #define IF_DEBUG_REGION_UPDATES(x) 
 #endif
 
+// Define this to have gnash print the mouse pointer coordinates
+// as the mouse moves
+//#define DEBUG_MOUSE_COORDINATES 1
+
 namespace gnash {
 
 Gui::Gui() :
@@ -245,7 +249,9 @@
 {
 	movie_root* m = get_current_root();
 
-	//log_msg(_("mouse @ %d,%d"), x, y);
+#ifdef DEBUG_MOUSE_COORDINATES
+	log_msg(_("mouse @ %d,%d"), x, y);
+#endif
 	if ( m->notify_mouse_moved(x, y) )
 	{
 		// any action triggered by the



From MAILER-DAEMON Fri Apr 27 08:19:49 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhPQT-00073v-39
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 08:19:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhPQR-00073q-OR
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:19:47 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhPQP-00073d-7W
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:19:47 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhPQP-00073a-2c
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:19:45 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhPKY-0000bA-13
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:13:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhPKU-0007cQ-0D
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:13:38 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhPKT-0007cN-M9
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:13:37 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhPKT-0007cN-M9@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 12:13:37 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash libgeometry/snappingrange.h testsuite/lib...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 12:19:47 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 12:13:37

Modified files:
	libgeometry    : snappingrange.h 
	testsuite/libgeometry: snappingrangetest.cpp 
	.              : ChangeLog 

Log message:
	        * libgeometry/snappingrange.h: add contains(SnappingRange2d) method;
	          fixed contains(Range2d) to take a const ref rather then a value.
	        * testsuite/libgeometry/snappingrangetest.cpp: add tests for
	          contains(SnappingRange2d).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libgeometry/snappingrangetest.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3019&r2=1.3020

Patches:
Index: libgeometry/snappingrange.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libgeometry/snappingrange.h	23 Apr 2007 10:19:47 -0000	1.17
+++ libgeometry/snappingrange.h	27 Apr 2007 12:13:37 -0000	1.18
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.17 2007/04/23 10:19:47 strk Exp $
+// $Id: snappingrange.h,v 1.18 2007/04/27 12:13:37 strk Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -338,7 +338,11 @@
 	}
 
 	/// Returns true if any of the ranges contains the range
-	bool contains(RangeType r) const {
+	//
+	/// Note that a NULL range is not contained in any range and
+	/// a WORLD range is onluy contained in another WORLD range.
+	///
+	bool contains(const RangeType& r) const {
 	
 		finalize();
 	
@@ -350,6 +354,46 @@
 	
 	}
 	
+	/// \brief
+	/// Returns true if all ranges in the given SnappingRanges2d 
+	/// are contained in at least one of the ranges composing this
+	/// one.
+	///
+	/// Note that a NULL range is not contained in any range and
+	/// a WORLD range is onluy contained in another WORLD range.
+	///
+	bool contains(const SnappingRanges2d<T>& o) const
+	{
+	
+		finalize();
+		// o.finalize(); // should I finalize the other range too ?
+
+		// Null range set doesn't contain and isn't contained by anything
+		if ( isNull() ) return false;
+		if ( o.isNull() ) return false;
+
+		// World range contains everything (except null ranges)
+		if ( isWorld() ) return true;
+
+		// This snappingrange is neither NULL nor WORLD
+		// The other can still be WORLD, but in that case the
+		// first iteration would return false
+		//
+		/// TODO: use a visitor !
+		///
+		for (unsigned rno=0, rcount=o.size(); rno<rcount; rno++) 
+		{
+			RangeType r = o.getRange(rno);
+			if ( ! contains(r) )
+			{
+				return false;
+			}
+		}
+			
+		return true;
+	
+	}
+	
 	
 	/// Visit the current Ranges set
 	//

Index: testsuite/libgeometry/snappingrangetest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libgeometry/snappingrangetest.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libgeometry/snappingrangetest.cpp	23 Apr 2007 10:19:47 -0000	1.3
+++ testsuite/libgeometry/snappingrangetest.cpp	27 Apr 2007 12:13:37 -0000	1.4
@@ -55,6 +55,7 @@
 	//
 	// Test world range no-op additions
 	//
+
 	Range2d<float> someRange(10.1,20.2,30.3,40.4);
 	worldSnap1.add(someRange);
 	check( ! worldSnap1.isNull() );
@@ -129,6 +130,7 @@
 	//
 	// Test irregular ranges (should not snap)
 	//
+
 	Range2d<float> horiz (10, 10, 500, 20); 
 	Range2d<float> vert (290, 22, 300, 500);
 	SnappingRanges2d<float> irrSnap;
@@ -159,5 +161,60 @@
 	check( irrSnap.contains(Range2d<int>(vert)) );
 	
 	 
+	//
+	// Test ranges containment
+	//
+
+	Range2d<float> nullRange1;
+	SnappingRanges2d<float> nullSnap2;
+	SnappingRanges2d<float> nullSnap3;
+
+	check( ! nullSnap2.contains(nullRange1) );
+	check( ! nullSnap2.contains(nullSnap3) );
+	// null rangeset don't contain themselves
+	check( ! nullSnap2.contains(nullSnap2) );
+
+	Range2d<float> worldRange2(worldRange);
+	SnappingRanges2d<float> worldSnap2; worldSnap2.setWorld();
+
+	check( ! nullSnap2.contains(worldRange2) );
+	check( ! nullSnap2.contains(worldSnap2) );
+	check( worldSnap2.contains(worldRange2) );
+	check( worldSnap2.contains(worldSnap2) );
+	check( ! worldSnap2.contains(nullRange1) );
+	check( ! worldSnap2.contains(nullSnap2) );
+
+	// TODO: test with finite ranges
+
+	SnappingRanges2d<float> finSnap1;
+	SnappingRanges2d<float> finSnap2;
+
+	check(!finSnap2.contains(finSnap1));
+	check(!finSnap1.contains(finSnap2));
+
+	finSnap1.add(Range2d<float>(0, 0, 10, 10));
+
+	check(!finSnap2.contains(finSnap1));
+	check(!finSnap1.contains(finSnap2));
+
+	finSnap2.add(Range2d<float>(90, 90, 180, 180));
+
+	check(!finSnap2.contains(finSnap1));
+	check(!finSnap1.contains(finSnap2));
+
+	finSnap1.add(Range2d<float>(30, 30, 80, 80));
+
+	check(!finSnap2.contains(finSnap1));
+	check(!finSnap1.contains(finSnap2));
+
+	finSnap2.add(Range2d<float>(2, 2, 8, 8));
+
+	check(!finSnap2.contains(finSnap1));
+	check(!finSnap1.contains(finSnap2));
+
+	finSnap1.add(Range2d<float>(85, 85, 185, 185));
+
+	check(!finSnap2.contains(finSnap1));
+	check(finSnap1.contains(finSnap2));
 }
 

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3019
retrieving revision 1.3020
diff -u -b -r1.3019 -r1.3020
--- ChangeLog	27 Apr 2007 10:19:41 -0000	1.3019
+++ ChangeLog	27 Apr 2007 12:13:37 -0000	1.3020
@@ -1,5 +1,12 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* libgeometry/snappingrange.h: add contains(SnappingRange2d) method;
+	  fixed contains(Range2d) to take a const ref rather then a value.
+	* testsuite/libgeometry/snappingrangetest.cpp: add tests for
+	  contains(SnappingRange2d).
+
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
 	* gui/gui.cpp: add a DEBUG_MOUSE_COORDINATES define, for making
 	  writing test runners easier.
 	* testsuite/swfdec/swfdec_gnash_tester: use the .trace.org files when



From MAILER-DAEMON Fri Apr 27 08:48:40 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhPsO-0007rp-C0
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 08:48:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhPsM-0007pg-JV
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:48:38 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhPsL-0007oy-Hf
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:48:38 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhPsL-0007of-AV
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:48:37 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhPmU-0003uE-Aw
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:42:34 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhPmS-00015X-8O
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:42:32 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhPmR-00015T-VH
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:42:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhPmR-00015T-VH@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 12:42:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/libgeometry snappingrange.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 12:48:38 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 12:42:31

Modified files:
	libgeometry    : snappingrange.h 

Log message:
	Const-corrected output operator

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/snappingrange.h?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: snappingrange.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/snappingrange.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- snappingrange.h	27 Apr 2007 12:13:37 -0000	1.18
+++ snappingrange.h	27 Apr 2007 12:42:31 -0000	1.19
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 // 
-// $Id: snappingrange.h,v 1.18 2007/04/27 12:13:37 strk Exp $
+// $Id: snappingrange.h,v 1.19 2007/04/27 12:42:31 strk Exp $
 
 #ifndef GNASH_SNAPPINGRANGE_H
 #define GNASH_SNAPPINGRANGE_H
@@ -73,7 +73,7 @@
 	typedef typename RangeList::size_type size_type;	
 
 	template <typename U>
-	friend std::ostream& operator<< (std::ostream& os, SnappingRanges2d<U>& r);
+	friend std::ostream& operator<< (std::ostream& os, const SnappingRanges2d<U>& r);
 	
 	/// distance (horizontally *plus* vertically) below ranges are snapped
 	/// You should initialize this when single_mode=false! 
@@ -461,7 +461,7 @@
 }; //class SnappingRanges2d
 
 template <class T>
-std::ostream& operator<< (std::ostream& os, SnappingRanges2d<T>& r)
+std::ostream& operator<< (std::ostream& os, const SnappingRanges2d<T>& r)
 {
 	if ( r.isNull() ) return os << "NULL";
 	if ( r.isWorld() ) return os << "WORLD";



From MAILER-DAEMON Fri Apr 27 08:54:42 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhPyE-0004OR-CA
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 08:54:42 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhPyD-0004Lk-2U
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:54:41 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhPyC-0004K3-9y
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:54:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhPyC-0004Jq-5N
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:54:40 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhPsL-0004ca-5j
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 08:48:37 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhPsJ-0001DU-Gr
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:48:35 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhPsI-0001DP-NR
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:48:35 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhPsI-0001DP-NR@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 12:48:34 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/libgeometry snappingrangetest.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 12:54:41 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 12:48:34

Modified files:
	testsuite/libgeometry: snappingrangetest.cpp 

Log message:
	another small test

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libgeometry/snappingrangetest.cpp?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: snappingrangetest.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libgeometry/snappingrangetest.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- snappingrangetest.cpp	27 Apr 2007 12:13:37 -0000	1.4
+++ snappingrangetest.cpp	27 Apr 2007 12:48:34 -0000	1.5
@@ -216,5 +216,12 @@
 
 	check(!finSnap2.contains(finSnap1));
 	check(finSnap1.contains(finSnap2));
+
+	SnappingRanges2d<int> finSnap3;
+	finSnap3.add(Range2d<int>(38,268, 112,292));
+	SnappingRanges2d<int> finSnap4;
+	finSnap4.add(Range2d<int>(40,273, 108,287));
+
+	check(finSnap3.contains(finSnap4));
 }
 



From MAILER-DAEMON Fri Apr 27 09:07:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhQAS-0005um-1c
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 09:07:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhQAQ-0005uT-Dw
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 09:07:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhQAO-0005tM-KA
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 09:07:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhQAO-0005t4-Fc
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 09:07:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhQ4X-0006IK-Ao
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 09:01:13 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhQ4V-0001Ye-UH
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:01:12 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhQ4V-0001YZ-Kn
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:01:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhQ4V-0001YZ-Kn@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 13:01:11 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Drawing...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 13:07:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 13:01:11

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: DrawingApiTestRunner.cpp 

Log message:
	        * testsuite/misc-ming.all/DrawingApiTestRunner.cpp: add test for
	          renderer and invalidated bounds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3020&r2=1.3021
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3020
retrieving revision 1.3021
diff -u -b -r1.3020 -r1.3021
--- ChangeLog	27 Apr 2007 12:13:37 -0000	1.3020
+++ ChangeLog	27 Apr 2007 13:01:10 -0000	1.3021
@@ -4,6 +4,8 @@
 	  fixed contains(Range2d) to take a const ref rather then a value.
 	* testsuite/libgeometry/snappingrangetest.cpp: add tests for
 	  contains(SnappingRange2d).
+	* testsuite/misc-ming.all/DrawingApiTestRunner.cpp: add test for
+	  renderer and invalidated bounds.
 
 2007-04-27 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/misc-ming.all/DrawingApiTestRunner.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTestRunner.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/misc-ming.all/DrawingApiTestRunner.cpp	24 Apr 2007 21:02:20 -0000	1.12
+++ testsuite/misc-ming.all/DrawingApiTestRunner.cpp	27 Apr 2007 13:01:11 -0000	1.13
@@ -31,8 +31,24 @@
 #include <cassert>
 
 using namespace gnash;
+using namespace gnash::geometry;
 using namespace std;
 
+/// Return a Range2d<int> defining the square inscribed in a circle
+//
+/// @param radius
+///	Radius in pixels
+///
+Range2d<int>
+inscribedRect(int x, int y, int radius)
+{
+	Range2d<int> ret;
+	float halfside = ((float)radius * sqrt(2))/2;
+	ret.expandTo(int(round(x-halfside)), int(round(y-halfside)));
+	ret.expandTo(int(round(x+halfside)), int(round(y+halfside)));
+	return ret;
+}
+
 int
 main(int /*argc*/, char** /*argv*/)
 {
@@ -48,7 +64,7 @@
 	check_equals(root->get_frame_count(), 1);
 	check_equals(root->get_current_frame(), 0);
 
-	tester.advance();
+	//tester.advance();
 
 	rgba white(255, 255, 255, 255);
 	rgba blue(0, 0, 255, 255);
@@ -143,9 +159,174 @@
 	xcheck(tester.isMouseOverMouseEntity());  // fails due to edge::withinSquareDistance bug
 	check_pixel(363, 174, 2, black, 2); 
 
-	// TODO: check invalidated bounds and drawing on advance !
-	//       there should be a yellow-fill, red-stroke circle moving from bottom-left to bottom-right
-	//       for 8 advancements.
-	for (int i=0; i<10; ++i) tester.advance();
+	// Check that nothing is drawin in the bottom line
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check that the invalidated bounds to contain the first circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(47, 280, 10)));
+
+	// Check that first circle has been drawn
+	check_pixel(47, 280, 3, yellow, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the first and second circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(47, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(101, 280, 10)));
+
+	// Check that only the second circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 3, yellow, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the second and third circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(101, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(151, 280, 10)));
+
+	// Check that only the third circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 3, yellow, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the third and fourth circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(151, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(201, 280, 10)));
+
+	// Check that only the fourth circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 3, yellow, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the fourth and fifth circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(201, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(250, 280, 10)));
+
+	// Check that only the fifth circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 3, yellow, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the fifth and sixth circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(250, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(303, 280, 10)));
+
+	// Check that only the sixth circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 3, yellow, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the sixth and seventh circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(303, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(351, 280, 10)));
+
+	// Check that only the seventh circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 3, yellow, 2); 
+	check_pixel(400, 280, 10, white, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check invalidated bounds to contain the seventh and eighth circle bounds
+	check(tester.getInvalidatedRanges().contains(inscribedRect(351, 280, 10)));
+	check(tester.getInvalidatedRanges().contains(inscribedRect(400, 280, 10)));
+
+	// Check that only the eighth circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 3, yellow, 2); 
+
+	tester.advance();
+
+	// TODO: check bounds of the child, and hitTest
+
+	// Check that no bounds have been invalidated 
+	check(tester.getInvalidatedRanges().isNull());
+
+	// Check that only the eighth circle is visible
+	check_pixel(47, 280, 10, white, 2); 
+	check_pixel(101, 280, 10, white, 2); 
+	check_pixel(151, 280, 10, white, 2); 
+	check_pixel(201, 280, 10, white, 2); 
+	check_pixel(250, 280, 10, white, 2); 
+	check_pixel(303, 280, 10, white, 2); 
+	check_pixel(351, 280, 10, white, 2); 
+	check_pixel(400, 280, 3, yellow, 2); 
 }
 



From MAILER-DAEMON Fri Apr 27 12:15:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhT6H-00043X-5Z
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 12:15:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhT6F-00043Q-23
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:15:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhT6C-00043D-NI
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:15:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhT6C-00043A-Hl
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:15:08 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhT0K-0002VZ-80
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:09:04 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhT0H-0000p5-NJ
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 16:09:01 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhT0H-0000oz-HL
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 16:09:01 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhT0H-0000oz-HL@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 16:09:01 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 16:15:11 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 16:09:01

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_environment.h 
	                 swf_function.cpp swf_function.h 
	server/vm      : ASHandlers.cpp ActionExec.cpp ActionExec.h 
	testsuite/actionscript.all: Function.as 
	testsuite/swfdec: PASSING 

Log message:
	        * server/as_environment.{cpp,h}: changed the ScopeChain
	          typedef to be just a vector of as_objects.
	        * server/swf_function.{cpp,h}: take a vector of as_objects
	          as ScopeChain, rather then with_entry vector...
	        * server/vm/ActionExec.{cpp,h}: only expose the ScopeChain,
	          not the 'with' stack. When constructed for a function, push
	          the function's activation object to the ScopeChain.
	        * server/vm/ASHandlers.cpp: update calls to ActionExec and
	          swf_function when it comes to setting the ScopeChain.
	        * testsuite/actionscript.all/Function.as: the scope chain test kai
	          added now succeeds.
	        * testsuite/swfdec/PASSING: function-scope-6.swf and function-scope-7.swf
	          now succeed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3021&r2=1.3022
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3021
retrieving revision 1.3022
diff -u -b -r1.3021 -r1.3022
--- ChangeLog	27 Apr 2007 13:01:10 -0000	1.3021
+++ ChangeLog	27 Apr 2007 16:09:00 -0000	1.3022
@@ -1,5 +1,21 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* server/as_environment.{cpp,h}: changed the ScopeChain
+	  typedef to be just a vector of as_objects.
+	* server/swf_function.{cpp,h}: take a vector of as_objects
+	  as ScopeChain, rather then with_entry vector...
+	* server/vm/ActionExec.{cpp,h}: only expose the ScopeChain,
+	  not the 'with' stack. When constructed for a function, push
+	  the function's activation object to the ScopeChain.
+	* server/vm/ASHandlers.cpp: update calls to ActionExec and
+	  swf_function when it comes to setting the ScopeChain.
+	* testsuite/actionscript.all/Function.as: the scope chain test kai
+	  added now succeeds.
+	* testsuite/swfdec/PASSING: function-scope-6.swf and function-scope-7.swf
+	  now succeed.
+
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
 	* libgeometry/snappingrange.h: add contains(SnappingRange2d) method;
 	  fixed contains(Range2d) to take a const ref rather then a value.
 	* testsuite/libgeometry/snappingrangetest.cpp: add tests for

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- server/as_environment.cpp	26 Apr 2007 17:06:10 -0000	1.74
+++ server/as_environment.cpp	27 Apr 2007 16:09:00 -0000	1.75
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.74 2007/04/26 17:06:10 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.75 2007/04/27 16:09:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -45,7 +45,7 @@
 // Return the value of the given var, if it's defined.
 as_value
 as_environment::get_variable(const std::string& varname,
-		const ScopeStack& with_stack, as_object** retTarget) const
+		const ScopeStack& scopeStack, as_object** retTarget) const
 {
     // Path lookup rigamarole.
     std::string	path;
@@ -53,11 +53,11 @@
     //log_msg(_("get_variable(%s)"), varname.c_str());
     bool is_slash_based;
     if (parse_path(varname, path, var, &is_slash_based)) {
-	//as_value target_val = get_variable_raw(path, with_stack);
+	//as_value target_val = get_variable_raw(path, scopeStack);
         //as_object* target = target_val.to_object();
 	// TODO: let find_target return generic as_objects, or use 'with' stack,
 	//       see player2.swf or bug #18758 (strip.swf)
-	// @@ TODO: should we use with_stack here too ?
+	// @@ TODO: should we use scopeStack here too ?
         as_object* target = is_slash_based ? find_object_slashsyntax(path) : find_object_dotsyntax(path); 
 
 	if (target) {
@@ -76,31 +76,31 @@
 			    );
 	    );
 
-	    as_value tmp = get_variable_raw(path, with_stack, retTarget);
+	    as_value tmp = get_variable_raw(path, scopeStack, retTarget);
 	    if ( ! tmp.is_undefined() )
 	    {
 	    IF_VERBOSE_ASCODING_ERRORS(
-		    log_aserror(_("...but get_variable_raw(%s, <with_stack>) succeeded!"), path.c_str());
+		    log_aserror(_("...but get_variable_raw(%s, <scopeStack>) succeeded!"), path.c_str());
 	    )
 	    }
 	    return as_value();
 	}
     } else {
-	return get_variable_raw(varname, with_stack, retTarget);
+	return get_variable_raw(varname, scopeStack, retTarget);
     }
 }
 
 as_value
 as_environment::get_variable(const std::string& varname) const
 {
-	static ScopeStack empty_with_stack;
-	return get_variable(varname, empty_with_stack);
+	static ScopeStack empty_scopeStack;
+	return get_variable(varname, empty_scopeStack);
 }
 
 as_value
 as_environment::get_variable_raw(
     const std::string& varname,
-    const ScopeStack& with_stack, as_object** retTarget) const
+    const ScopeStack& scopeStack, as_object** retTarget) const
     // varname must be a plain variable name; no path parsing.
 {
     assert(strchr(varname.c_str(), ':') == NULL);
@@ -108,9 +108,9 @@
     as_value	val;
 
     // Check the with-stack.
-    for (size_t i = with_stack.size(); i > 0; --i) {
+    for (size_t i = scopeStack.size(); i > 0; --i) {
         // const_cast needed due to non-const as_object::get_member 
-	as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
+	as_object* obj = const_cast<as_object*>(scopeStack[i-1].get());
 	if (obj && obj->get_member(varname.c_str(), &val)) {
 	    // Found the var in this context.
 	    if ( retTarget ) *retTarget = obj;
@@ -174,7 +174,7 @@
 bool
 as_environment::del_variable_raw(
     const std::string& varname,
-    const ScopeStack& with_stack) 
+    const ScopeStack& scopeStack) 
     // varname must be a plain variable name; no path parsing.
 {
 	assert(strchr(varname.c_str(), ':') == NULL);
@@ -184,10 +184,10 @@
 	as_value	val;
 
 	// Check the with-stack.
-	for (size_t i = with_stack.size(); i > 0; --i)
+	for (size_t i = scopeStack.size(); i > 0; --i)
 	{
 		// const_cast needed due to non-const as_object::get_member 
-		as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
+		as_object* obj = const_cast<as_object*>(scopeStack[i-1].get());
 		if (obj)
 		{
 			std::pair<bool,bool> ret = obj->delProperty(varname);
@@ -221,8 +221,8 @@
 as_value
 as_environment::get_variable_raw(const std::string& varname) const
 {
-	static ScopeStack empty_with_stack;
-	return get_variable_raw(varname, empty_with_stack);
+	static ScopeStack empty_scopeStack;
+	return get_variable_raw(varname, empty_scopeStack);
 }
 
 // Given a path to variable, set its value.
@@ -230,7 +230,7 @@
 as_environment::set_variable(
     const std::string& varname,
     const as_value& val,
-    const ScopeStack& with_stack)
+    const ScopeStack& scopeStack)
 {
 	IF_VERBOSE_ACTION (
     log_action("-------------- %s = %s",
@@ -259,7 +259,7 @@
 		);
 	}
     } else {
-	set_variable_raw(varname, val, with_stack);
+	set_variable_raw(varname, val, scopeStack);
     }
 }
 
@@ -268,8 +268,8 @@
 		const std::string& varname,
 		const as_value& val)
 {
-	static ScopeStack empty_with_stack;
-	set_variable(varname, val, empty_with_stack);
+	static ScopeStack empty_scopeStack;
+	set_variable(varname, val, empty_scopeStack);
 }
 
 // No path rigamarole.
@@ -277,7 +277,7 @@
 as_environment::set_variable_raw(
     const std::string& varname,
     const as_value& val,
-    const ScopeStack& with_stack)
+    const ScopeStack& scopeStack)
 {
 
 	// Check locals for setting them
@@ -287,10 +287,10 @@
 	}
 
 	// Check the with-stack.
-	for (size_t i = with_stack.size(); i > 0; --i)
+	for (size_t i = scopeStack.size(); i > 0; --i)
 	{
 		// const_cast needed due to non-const as_object::get_member 
-		as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
+		as_object* obj = const_cast<as_object*>(scopeStack[i-1].get());
 		as_value	dummy;
 		if (obj && obj->get_member(varname.c_str(), &dummy)) {
 		    // This object has the member; so set it here.
@@ -308,8 +308,8 @@
 		const std::string& varname,
 		const as_value& val)
 {
-	static ScopeStack empty_with_stack;
-	set_variable_raw(varname, val, empty_with_stack);
+	static ScopeStack empty_scopeStack;
+	set_variable_raw(varname, val, empty_scopeStack);
 }
 
 // Set/initialize the value of the local variable.

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/as_environment.h	26 Apr 2007 17:06:10 -0000	1.48
+++ server/as_environment.h	27 Apr 2007 16:09:01 -0000	1.49
@@ -34,7 +34,7 @@
 
 // Forward declarations
 class character;
-class with_stack_entry;
+//class with_stack_entry;
 
 /// ActionScript execution environment.
 class as_environment
@@ -42,32 +42,12 @@
 public:
 
 	/// A stack of objects used for variables/members lookup
-	typedef std::vector<with_stack_entry> ScopeStack;
+	//typedef std::vector<with_stack_entry> ScopeStack;
+	typedef std::vector< boost::intrusive_ptr<as_object> > ScopeStack;
 
 	/// Stack of as_values in this environment
 	std::vector<as_value>	m_stack;
 
-#if 0
-	/// For local vars.  Use empty names to separate frames.
-	class frame_slot
-	{
-	public:
-		std::string	m_name;
-		as_value	m_value;
-
-		frame_slot()
-		{
-		}
-
-		frame_slot(const std::string& name, const as_value& val)
-			:
-			m_name(name),
-			m_value(val)
-		{
-		}
-	};
-#endif
-
 	as_environment()
 		:
 		m_target(0)
@@ -160,11 +140,11 @@
 	///	Variable name. Can not contain path elements.
 	///	TODO: should be case-insensitive up to SWF6.
 	///
-	/// @param with_stack
+	/// @param scopeStack
 	///	The Scope stack to use for lookups.
 	///
 	bool del_variable_raw(const std::string& varname,
-			const ScopeStack& with_stack);
+			const ScopeStack& scopeStack);
 
 	/// Return the (possibly UNDEFINED) value of the named var.
 	//
@@ -172,7 +152,7 @@
 	///	Variable name. Can contain path elements.
 	///	TODO: should be case-insensitive up to SWF6.
 	///
-	/// @param with_stack
+	/// @param scopeStack
 	///	The Scope stack to use for lookups.
 	///
 	/// @param retTarget
@@ -180,7 +160,7 @@
 	///	found variable (if found).
 	///
 	as_value get_variable(const std::string& varname,
-		const ScopeStack& with_stack, as_object** retTarget=NULL) const;
+		const ScopeStack& scopeStack, as_object** retTarget=NULL) const;
 
 	/// \brief
 	/// Given a path to variable, set its value.
@@ -227,11 +207,11 @@
 	/// @param val
 	///	The value to assign to the variable.
 	///
-	/// @param with_stack
+	/// @param scopeStack
 	///	The Scope stack to use for lookups.
 	///
 	void set_variable(const std::string& path, const as_value& val,
-		const ScopeStack& with_stack);
+		const ScopeStack& scopeStack);
 
 	/// Set/initialize the value of the local variable.
 	//
@@ -474,6 +454,14 @@
 		_localFrames.pop_back();
 	}
 
+	/// Get top element of the call stack
+	//
+	CallFrame& topCallFrame()
+	{
+		assert(_localFrames.size());
+		return _localFrames.back();
+	}
+
 	/// Return the depth of call stack
 	size_t callStackDepth()
 	{
@@ -513,7 +501,7 @@
 
 	/// Given a variable name, set its value (no support for path)
 	void set_variable_raw(const std::string& path, const as_value& val,
-		const ScopeStack& with_stack);
+		const ScopeStack& scopeStack);
 
 	/// Same of the above, but no support for path.
 	///
@@ -522,7 +510,7 @@
 	///	found variable (if found).
 	///
 	as_value get_variable_raw(const std::string& varname,
-		const ScopeStack& with_stack, as_object** retTarget=NULL) const;
+		const ScopeStack& scopeStack, as_object** retTarget=NULL) const;
 
 
 	/// \brief

Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/swf_function.cpp	22 Mar 2007 22:37:45 -0000	1.28
+++ server/swf_function.cpp	27 Apr 2007 16:09:01 -0000	1.29
@@ -45,13 +45,13 @@
 
 swf_function::swf_function(const action_buffer* ab,
 			as_environment* env,
-			size_t start, const std::vector<with_stack_entry>& with_stack)
+			size_t start, const ScopeStack& scopeStack)
 	:
 	as_function(NULL),
 	//ctor(0),
 	m_action_buffer(ab),
 	m_env(env),
-	m_with_stack(with_stack),
+	_scopeStack(scopeStack),
 	m_start_pc(start),
 	m_length(0),
 	m_is_function2(false),
@@ -169,6 +169,7 @@
 {
 
 	as_environment*	our_env = m_env;
+	assert(our_env);
 	if (our_env == NULL)
 	{
 		our_env = &fn.env();

Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/swf_function.h	11 Apr 2007 17:54:21 -0000	1.12
+++ server/swf_function.h	27 Apr 2007 16:09:01 -0000	1.13
@@ -23,7 +23,8 @@
 
 #include "impl.h"
 #include "as_function.h" // for inheritance
-#include "with_stack_entry.h" // for composition (vector element)
+#include "as_object.h" // for composition (vector element)
+//#include "with_stack_entry.h" // for composition (vector element)
 
 #include <cassert>
 #include <string>
@@ -49,8 +50,10 @@
 	/// @@ might need some kind of ref count here, but beware cycles
 	as_environment*	m_env;
 
-	/// initial with-stack on function entry.
-	std::vector<with_stack_entry>	m_with_stack;
+	typedef std::vector< boost::intrusive_ptr<as_object> > ScopeStack;
+
+	/// Scope stack on function definition.
+	ScopeStack _scopeStack;
 
 	/// \brief
 	/// Offset within the action_buffer where
@@ -175,11 +178,11 @@
 	swf_function(const action_buffer* ab,
 		as_environment* env,
 		size_t start,
-		const std::vector<with_stack_entry>& with_stack);
+		const ScopeStack& with_stack);
 
-	const std::vector<with_stack_entry>& getWithStack() const
+	const ScopeStack& getScopeStack() const
 	{
-		return m_with_stack;
+		return _scopeStack;
 	}
 
 	const action_buffer& getActionBuffer() const

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/vm/ASHandlers.cpp	26 Apr 2007 17:06:10 -0000	1.101
+++ server/vm/ASHandlers.cpp	27 Apr 2007 16:09:01 -0000	1.102
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.101 2007/04/26 17:06:10 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.102 2007/04/27 16:09:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3263,7 +3263,7 @@
 	// contains name and args, while next tag is first tag
 	// of the function body.
 	swf_function* func = new swf_function(
-		&code, &env, thread.next_pc, thread.getWithStack());
+		&code, &env, thread.next_pc, thread.getScopeStack());
 
 	func->set_is_function2();
 
@@ -3384,12 +3384,6 @@
 	thread.ensureStack(1);  // the object
 	boost::intrusive_ptr<as_object> with_obj = env.pop().to_object();
 
-	const vector<with_stack_entry>& with_stack = thread.getWithStack();
-	IF_VERBOSE_ACTION (
-	log_action(_("-------------- with block start: stack size is " SIZET_FMT),
-		   with_stack.size());
-	);
-
 	++pc; // skip tag code
 
 	int tag_length = code.read_int16(pc); // read tag len (should be 2)
@@ -3421,11 +3415,6 @@
 	if ( ! thread.pushWithEntry(with_stack_entry(with_obj, block_end)) )
 	{
 		// skip the full block
-		// FIXME, is this a log_aserror?
-		log_error(_("With-block skipped"
-			" (with stack size exceeds limit of "
-			SIZET_FMT " elements)"),
-			thread.getWithStackLimit());
 		thread.next_pc += block_length;
 	}
 
@@ -3449,7 +3438,7 @@
 	// contains name and args, while next tag is first tag
 	// of the function body.
 	swf_function* func = new swf_function(
-		&code, &env, thread.next_pc, thread.getWithStack());
+		&code, &env, thread.next_pc, thread.getScopeStack());
 
 	size_t i = thread.pc + 3;
 

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- server/vm/ActionExec.cpp	26 Apr 2007 17:06:10 -0000	1.31
+++ server/vm/ActionExec.cpp	27 Apr 2007 16:09:01 -0000	1.32
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ActionExec.cpp,v 1.31 2007/04/26 17:06:10 strk Exp $ */
+/* $Id: ActionExec.cpp,v 1.32 2007/04/27 16:09:01 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -73,7 +73,8 @@
 
 ActionExec::ActionExec(const swf_function& func, as_environment& newEnv, as_value* nRetVal, as_object* this_ptr)
 	:
-	with_stack(func.getWithStack()),
+	with_stack(),
+	_scopeStack(func.getScopeStack()),
 	// See comment in header
 	_with_stack_limit(7),
 	_function_var(func.isFunction2() ? 2 : 1),
@@ -92,11 +93,23 @@
 	if ( env.get_version() > 5 ) {
 	    _with_stack_limit = 15;
 	}
+
+	// SWF version 6 and higher pushes the activation object to the scope stack
+	if ( env.get_version() > 5 )
+	{
+		// We assume that the swf_function () operator already initialized its environment
+		// so that it's activation object is now in the top element of the CallFrame stack
+		//
+		as_environment::CallFrame& topFrame = newEnv.topCallFrame();
+		assert(topFrame.func == &func);
+		_scopeStack.push_back(topFrame.locals);
+	}
 }
 
 ActionExec::ActionExec(const action_buffer& abuf, as_environment& newEnv)
 	:
 	with_stack(),
+	_scopeStack(), // TODO: initialize the scope stack somehow
 	_with_stack_limit(7),
 	_function_var(0),
 	_func(NULL),
@@ -152,7 +165,9 @@
 	    // Cleanup any expired "with" blocks.
 	    while ( ! with_stack.empty() && pc >= with_stack.back().end_pc() ) {
 		// Drop last stack element
+		assert(with_stack.back().object() == _scopeStack.back().get());
 		with_stack.pop_back();
+		_scopeStack.pop_back(); // hopefully nothing gets after the 'with' stack.
 	    }
 
 	// Get the opcode.
@@ -315,18 +330,21 @@
 ActionExec::pushWithEntry(const with_stack_entry& entry)
 {
 	// See comment in header about _with_stack_limit
+	if (with_stack.size() >= _with_stack_limit)
+	{
 	IF_VERBOSE_ASCODING_ERRORS (
-	if (with_stack.size() >= _with_stack_limit) {
 	    log_aserror(_("'With' stack depth (" SIZET_FMT ") "
 			"exceeds the allowed limit for current SWF "
 			"target version (" SIZET_FMT " for version %d)."
 			" Don't expect this movie to work with all players."),
 			with_stack.size()+1, _with_stack_limit,
 			env.get_version());
-	}
 	);
+	    return false;
+	}
 	
 	with_stack.push_back(entry);
+	_scopeStack.push_back(const_cast<as_object*>(entry.object()));
 	return true;
 }
 
@@ -339,7 +357,7 @@
 	    boost::to_lower(namei, vm.getLocale());
 	}
 	
-	return env.del_variable_raw(namei, with_stack);
+	return env.del_variable_raw(namei, getScopeStack());
 }
 
 bool
@@ -366,7 +384,7 @@
 	    boost::to_lower(namei, vm.getLocale());
 	}
 	
-	return env.set_variable(namei, val, getWithStack());
+	return env.set_variable(namei, val, getScopeStack());
 }
 
 as_value
@@ -379,7 +397,7 @@
 	    boost::to_lower(namei, vm.getLocale());
 	}
 	
-	return env.get_variable(namei, getWithStack());
+	return env.get_variable(namei, getScopeStack());
 }
 
 as_value
@@ -392,7 +410,7 @@
 	    boost::to_lower(namei, vm.getLocale());
 	}
 	
-	return env.get_variable(namei, getWithStack(), target);
+	return env.get_variable(namei, getScopeStack(), target);
 }
 
 void

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/vm/ActionExec.h	26 Apr 2007 17:06:10 -0000	1.16
+++ server/vm/ActionExec.h	27 Apr 2007 16:09:01 -0000	1.17
@@ -43,6 +43,18 @@
 
 private: 
 
+	/// Returns 'with' stack associated with this execution thread
+	// 
+	/// If you need to modify it, use the pushWithEntry() function.
+	///
+	/// TODO: deprecate this
+	///
+	const std::vector<with_stack_entry>& getWithStack() const
+	{
+		return with_stack;
+	}
+
+
 	/// Run after a complete run, or after an run interrupted by 
 	/// a bail-out exception (ActionLimitException, for example)
 	void cleanupAfterRun();
@@ -50,6 +62,11 @@
 	/// the 'with' stack associated with this execution thread
 	std::vector<with_stack_entry> with_stack;
 
+	typedef as_environment::ScopeStack ScopeStack;
+
+	/// the scope stack associated with this execution thread
+	ScopeStack _scopeStack;
+
 	/// Limit of with stack
 	//
 	/// This is 7 for SWF up to 5 and 15 for SWF 6 and up
@@ -178,13 +195,13 @@
 	/// Get the current 'this' pointer, for use in function calls
 	as_object* getThisPointer() { return _function_var ? _this_ptr.get() : getTarget(); }
 
-	/// Returns 'with' stack associated with this execution thread
+	/// Returns the scope stack associated with this execution thread
 	// 
-	/// If you need to modify it, use the pushWithEntry() function.
+	/// TODO: return by const ref instead
 	///
-	const std::vector<with_stack_entry>& getWithStack() const
+	const ScopeStack& getScopeStack() const
 	{
-		return with_stack;
+		return _scopeStack;
 	}
 
 	/// Return the maximum allowed 'with' stack limit.

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- testsuite/actionscript.all/Function.as	26 Apr 2007 20:47:33 -0000	1.46
+++ testsuite/actionscript.all/Function.as	27 Apr 2007 16:09:01 -0000	1.47
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.46 2007/04/26 20:47:33 strk Exp $";
+rcsid="$Id: Function.as,v 1.47 2007/04/27 16:09:01 strk Exp $";
 
 #include "check.as"
 
@@ -309,7 +309,7 @@
   check_equals ( result1, "hello" );
 
   // Gnash fails here, we want this fixed!
-  xcheck_equals ( result2, "hello" );
+  check_equals ( result2, "hello" );
 
 #else // SWF5 or lower seems unable to work with nested functions
 

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- testsuite/swfdec/PASSING	27 Apr 2007 09:43:43 -0000	1.20
+++ testsuite/swfdec/PASSING	27 Apr 2007 16:09:01 -0000	1.21
@@ -44,6 +44,8 @@
 name2.swf
 registerclass-properties.swf
 function-scope-5.swf
+function-scope-6.swf
+function-scope-7.swf
 setinterval-clear.swf
 onload-childparent.swf
 registerclass-previous.swf



From MAILER-DAEMON Fri Apr 27 12:49:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhTdI-0002ei-0T
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 12:49:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhTdF-0002eQ-G8
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:49:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhTdE-0002eE-N2
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:49:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhTdE-0002eB-Ho
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:49:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhTXM-0005Vz-C2
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:43:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhTXK-0002qi-Dv
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 16:43:10 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhTXK-0002qe-5s
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 16:43:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhTXK-0002qe-5s@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 16:43:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Glob...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 16:49:18 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 16:43:10

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: Global.as 

Log message:
	        * testsuite/actionscript.all/Global.as: check that _global._global
	          is undefined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3022&r2=1.3023
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Global.as?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3022
retrieving revision 1.3023
diff -u -b -r1.3022 -r1.3023
--- ChangeLog	27 Apr 2007 16:09:00 -0000	1.3022
+++ ChangeLog	27 Apr 2007 16:43:09 -0000	1.3023
@@ -1,5 +1,10 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/Global.as: check that _global._global
+	  is undefined.
+
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
 	* server/as_environment.{cpp,h}: changed the ScopeChain
 	  typedef to be just a vector of as_objects.
 	* server/swf_function.{cpp,h}: take a vector of as_objects

Index: testsuite/actionscript.all/Global.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Global.as,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/actionscript.all/Global.as	19 Apr 2007 10:27:09 -0000	1.23
+++ testsuite/actionscript.all/Global.as	27 Apr 2007 16:43:09 -0000	1.24
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Global.as,v 1.23 2007/04/19 10:27:09 strk Exp $";
+rcsid="$Id: Global.as,v 1.24 2007/04/27 16:43:09 strk Exp $";
 
 #include "check.as"
 
@@ -35,6 +35,7 @@
 
 // odd stuff.. not every value of type 'object' is an instance of Object :!!
 check_equals(typeof(_global), 'object');
+check_equals(typeof(_global._global), 'undefined');
 xcheck( ! _global instanceof Object );
 xcheck_equals( typeof(_global.__proto__), 'undefined' );
 xcheck_equals(typeof(_global.toString), 'undefined');



From MAILER-DAEMON Fri Apr 27 12:53:20 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhThA-00035f-7d
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 12:53:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhTh8-00035Z-Us
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:53:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhTh6-00035N-QA
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:53:17 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhTh6-00035K-Mr
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:53:16 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhTbE-0005sf-I4
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 12:47:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhTbD-0002vk-3K
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 16:47:11 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhTbC-0002vh-Rm
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 16:47:11 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhTbC-0002vh-Rm@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 16:47:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash testsuite/actionscript.all/Function.as Ch...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 16:53:19 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 16:47:10

Modified files:
	testsuite/actionscript.all: Function.as 
	.              : ChangeLog 

Log message:
	        * testsuite/actionscript.all/Function.as: add another test for
	          nested functions and scope chain.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3023&r2=1.3024

Patches:
Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- testsuite/actionscript.all/Function.as	27 Apr 2007 16:09:01 -0000	1.47
+++ testsuite/actionscript.all/Function.as	27 Apr 2007 16:47:10 -0000	1.48
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.47 2007/04/27 16:09:01 strk Exp $";
+rcsid="$Id: Function.as,v 1.48 2007/04/27 16:47:10 strk Exp $";
 
 #include "check.as"
 
@@ -321,6 +321,24 @@
 
 #endif
 
+function bla (num)
+{
+	bla = function ()
+	{
+		return num;
+	};
+	return num;
+}
+
+check_equals(typeof(bla), 'function');
+check_equals(bla(42), 42);
+check_equals(typeof(bla), 'function');
+#if OUTPUT_VERSION < 6
+check_equals(typeof(bla(43)), 'undefined');
+#else
+check_equals(bla(43), 42);
+#endif
+
 //----------------------------------------------------------
 //
 //  Test case for "this"  in Object's context

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3023
retrieving revision 1.3024
diff -u -b -r1.3023 -r1.3024
--- ChangeLog	27 Apr 2007 16:43:09 -0000	1.3023
+++ ChangeLog	27 Apr 2007 16:47:10 -0000	1.3024
@@ -2,6 +2,8 @@
 
 	* testsuite/actionscript.all/Global.as: check that _global._global
 	  is undefined.
+	* testsuite/actionscript.all/Function.as: add another test for
+	  nested functions and scope chain.
 
 2007-04-27 Sandro Santilli <strk@keybit.net>
 



From MAILER-DAEMON Fri Apr 27 13:38:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhUOR-0005qK-Uy
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 13:38:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhUOQ-0005qF-TW
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:38:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhUOQ-0005q3-1m
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:38:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhUOP-0005q0-Uz
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:38:02 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhUIX-0001AO-J2
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:31:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhUIW-00048s-Ql
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:31:56 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhUIW-00048i-E4
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:31:56 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhUIW-00048i-E4@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 17:31:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-mtasc.all/README
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 17:38:03 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 17:31:56

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-mtasc.all: README 

Log message:
	        * testsuite/misc-mtasc.all/README: some info about the MTASC
	          testing framework.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3024&r2=1.3025
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/README?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3024
retrieving revision 1.3025
diff -u -b -r1.3024 -r1.3025
--- ChangeLog	27 Apr 2007 16:47:10 -0000	1.3024
+++ ChangeLog	27 Apr 2007 17:31:56 -0000	1.3025
@@ -1,5 +1,7 @@
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-mtasc.all/README: some info about the MTASC
+	  testing framework.
 	* testsuite/actionscript.all/Global.as: check that _global._global
 	  is undefined.
 	* testsuite/actionscript.all/Function.as: add another test for

Index: testsuite/misc-mtasc.all/README
===================================================================
RCS file: testsuite/misc-mtasc.all/README
diff -N testsuite/misc-mtasc.all/README
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-mtasc.all/README	27 Apr 2007 17:31:56 -0000	1.1
@@ -0,0 +1,43 @@
+This directory contains the testing framework for MTASC output.
+The framework is composed by a set of Makefile rules easying the addition
+of new tests.
+
+Requirements
+------------
+
+In order to use the Dejagnu.swf facilities, which have been developed to
+get the same results with both the proprietary player and Gnash (one
+of the problems being embedding fonts) Ming's makeswf utility is used
+to embed the Dejagnu.swf file into the MTASC output.
+All of this is transparent to the user, except that the final SWF version
+might be different then the expected one (until we fix this).
+
+You'll need Ming version 0.4.0.beta3 or higher in order for this to work.
+
+How to add a new test
+---------------------
+
+To add a new test just write it using MTASC conventions, then add the main 
+filename to the ASTEST variable in the Makefile.am file. Also, remember
+to add any accessory file (additional classes) to the EXTRA_DIST variable,
+so they are properly distributed.
+
+Once you've done so, 'make <yourtestname>.swf' should produce the swf for you,
+with the Dejagnu.swf file already embedded. You can play this movie with any
+player (including the proprietary one) to confirm it passes all checks contained
+in it.
+
+Running 'make check' should run all tests, including your new one.
+
+How to write checks
+---------------------
+
+Take a look at the existing .as files to see how you can use the Dejagnu.swf facilities.
+Basically, you'd be calling the functions:
+
+	_root.check( expression );
+	_root.check_equals( expression, expected ); // uses equality operator ==
+
+Or the corresponding versions expecting failures (xcheck, xcheck_equals).
+For more info see the gnash manual in the Testing/Dejagnu.swf section.
+You can build the gnash manual by runnign 'make gnash.html' under the doc/C dir.



From MAILER-DAEMON Fri Apr 27 13:42:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhUSY-0006T1-As
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 13:42:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhUSW-0006Sg-8B
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:42:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhUSV-0006SO-6N
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:42:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhUSV-0006SJ-1G
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:42:15 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhUMc-0001Zh-L0
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 13:36:10 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhUMc-00055T-12
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:36:10 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhUMb-00055Q-Rc
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:36:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhUMb-00055Q-Rc@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 17:36:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-mtasc.all Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 17:42:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 17:36:09

Modified files:
	testsuite/misc-mtasc.all: Makefile.am 

Log message:
	added note about Ming version requirement

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Makefile.am	29 Mar 2007 14:29:15 -0000	1.7
+++ Makefile.am	27 Apr 2007 17:36:09 -0000	1.8
@@ -19,6 +19,8 @@
 AUTOMAKE_OPTIONS = dejagnu
 
 if ENABLE_MTASC
+
+# NOTE: 0.4.0.beta3 is required for prebuilt-clip to work !!
 if ENABLE_MING
 
 DEJAGNU_SO_PATH = ../Dejagnu.swf



From MAILER-DAEMON Fri Apr 27 14:23:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhV6N-0000Qu-1n
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 14:23:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhV6L-0000Qo-Na
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 14:23:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhV6J-0000Pj-6Y
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 14:23:24 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhV6J-0000Pg-11
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 14:23:23 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HhV0Q-00066Z-Bp
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 14:17:18 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhV0O-0005i4-L6
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 18:17:16 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HhV0O-0005i1-9J
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 18:17:16 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhV0O-0005i1-9J@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Fri, 27 Apr 2007 18:17:16 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash configure.ac ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 18:23:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/27 18:17:16

Modified files:
	.              : configure.ac ChangeLog 

Log message:
	configure.ac: Add verbose text for missing gstreamer-dev help

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.294&r2=1.295
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3025&r2=1.3026

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -b -r1.294 -r1.295
--- configure.ac	27 Apr 2007 01:07:57 -0000	1.294
+++ configure.ac	27 Apr 2007 18:17:16 -0000	1.295
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.294 2007/04/27 01:07:57 rsavoye Exp $
+dnl $Id: configure.ac,v 1.295 2007/04/27 18:17:16 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -1360,6 +1360,10 @@
       echo "        Gstreamer libs are: $GSTREAMER_LIBS"
   else
     echo "        ERROR: gstreamer media handling requested, but no gstreamer 0.10+ found"
+    echo "               You need to have the gstreamer development package installed"
+    echo "               to compile this project. You can either reconfigure using"
+    echo "               --media-handler=ffmpeg or install libgstreamer0.10-dev"
+    echo "               (using apt-get) or <something similar> (using yum)."
     nogo=true
   fi
 fi

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3025
retrieving revision 1.3026
diff -u -b -r1.3025 -r1.3026
--- ChangeLog	27 Apr 2007 17:31:56 -0000	1.3025
+++ ChangeLog	27 Apr 2007 18:17:16 -0000	1.3026
@@ -1,3 +1,7 @@
+2007-04-27 Martin Guy <martinwguy@yahoo.it>
+
+	* configure.ac: Add verbose text for missing gstreamer-dev help
+
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-mtasc.all/README: some info about the MTASC



From MAILER-DAEMON Fri Apr 27 17:37:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhY7i-0003ar-Oq
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 17:37:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhY7g-0003XO-Bs
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:37:00 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhY7f-0003WL-Jq
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:37:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhY7f-0003Vs-BZ
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:36:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhY1l-0008VP-Pe
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:30:53 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhY1h-00055n-6O
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 21:30:49 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhY1g-00055i-Tf
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 21:30:49 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhY1g-00055i-Tf@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 21:30:48 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/gui gtk.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 21:37:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 21:30:48

Modified files:
	gui            : gtk.cpp 

Log message:
	comment out function tracing for key and mouse event handlers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.87&r2=1.88

Patches:
Index: gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- gtk.cpp	13 Apr 2007 09:15:54 -0000	1.87
+++ gtk.cpp	27 Apr 2007 21:30:48 -0000	1.88
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: gtk.cpp,v 1.87 2007/04/13 09:15:54 bjacques Exp $ */
+/* $Id: gtk.cpp,v 1.88 2007/04/27 21:30:48 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1177,7 +1177,7 @@
                 GdkEventKey *const event,
                 const gpointer data)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     Gui* gui = static_cast<Gui*>(data);
 
@@ -1198,7 +1198,7 @@
                 GdkEventKey *const event,
                 const gpointer data)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     Gui* gui = static_cast<Gui*>(data);
 
@@ -1219,7 +1219,7 @@
                            GdkEventButton *const event,
                            const gpointer data)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     Gui *obj = static_cast<Gui *>(data);
 
     int	mask = 1 << (event->button - 1);
@@ -1232,7 +1232,7 @@
                              GdkEventButton * const event,
                              const gpointer data)
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     Gui *obj = static_cast<Gui *>(data);
 
     int	mask = 1 << (event->button - 1);



From MAILER-DAEMON Fri Apr 27 17:49:51 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhYK7-00075f-Hj
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 17:49:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhYK6-00075a-QM
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:49:50 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhYK5-00075N-5g
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:49:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhYK5-00075K-0y
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:49:49 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhYEB-0001GF-El
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 17:43:43 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhYEA-0006Y3-5x
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 21:43:42 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhYE9-0006Y0-Nc
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 21:43:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhYE9-0006Y0-Nc@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Fri, 27 Apr 2007 21:43:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/swf/PlaceObject2Tag.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Apr 2007 21:49:50 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/27 21:43:41

Modified files:
	.              : ChangeLog 
	server/swf     : PlaceObject2Tag.cpp 

Log message:
	        * server/swf/PlaceObject2Tag.cpp (readPlaceActions): fix check for
	          all reserved bits being zero (removed an annoying false malformed
	          swf error).
	        * gui/gtk.cpp: comment out function tracing for key and mouse events.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3026&r2=1.3027
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3026
retrieving revision 1.3027
diff -u -b -r1.3026 -r1.3027
--- ChangeLog	27 Apr 2007 18:17:16 -0000	1.3026
+++ ChangeLog	27 Apr 2007 21:43:41 -0000	1.3027
@@ -1,3 +1,10 @@
+2007-04-27 Sandro Santilli <strk@keybit.net>
+
+	* server/swf/PlaceObject2Tag.cpp (readPlaceActions): fix check for
+	  all reserved bits being zero (removed an annoying false malformed
+	  swf error).
+	* gui/gtk.cpp: comment out function tracing for key and mouse events.
+
 2007-04-27 Martin Guy <martinwguy@yahoo.it>
 
 	* configure.ac: Add verbose text for missing gstreamer-dev help

Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/swf/PlaceObject2Tag.cpp	24 Apr 2007 06:54:06 -0000	1.5
+++ server/swf/PlaceObject2Tag.cpp	27 Apr 2007 21:43:41 -0000	1.6
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.5 2007/04/24 06:54:06 zoulunkai Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.6 2007/04/27 21:43:41 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -170,7 +170,8 @@
 		// Let's see if the event flag we received is for an event that we know of
 
 		//check if all unused bits are zero!
-		if( !(flags & (1 << total_known_events)) )
+		//if( !(flags & (1 << total_known_events)) )
+		if( flags >> total_known_events ) 
 		{
 			IF_VERBOSE_MALFORMED_SWF(
 			log_swferror(_("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"), flags);



From MAILER-DAEMON Fri Apr 27 20:10:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhaWL-0002qo-3o
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 20:10:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhaWJ-0002nR-OP
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 20:10:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhaWI-0002ll-SZ
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 20:10:35 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhaWI-0002lS-Nj
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 20:10:34 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1HhaQO-0004Lo-8f
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 20:04:28 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhaQN-00055U-LZ
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 00:04:27 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1HhaQN-00055R-CM
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 00:04:27 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhaQN-00055R-CM@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Sat, 28 Apr 2007 00:04:27 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash gui/fltk.cpp ChangeLog macros/agg.m4 macr...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 00:10:36 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/28 00:04:26

Modified files:
	gui            : fltk.cpp 
	.              : ChangeLog 
	macros         : agg.m4 incllist libslist mysql.m4 pthreads.m4 
	                 x11.m4 
	server         : BitmapMovieInstance.cpp Makefile.am 
	server/asobj   : Makefile.am 
	server/parser  : Makefile.am bitmap_character_def.cpp 
	                 sprite_definition.cpp 
	server/vm      : Makefile.am VM.cpp 

Log message:
		* gui/fltk.cpp: Cast the key::code so it compiles on Darwin.
		* macros/agg.m4: Don't inherit the -rpath setting fropm
		pkg-config, it screws up the linux on Darwin.
		* macros/incllist, libslist: Look in $with_top_level for support
		packages no in the $prefix path.
		* macros/pthreads.m4: Add -mthreads for mingw32.
		* macros/x11.m4: If X11 is found, also add libSM and libICE if
		they are found to resolve dependencies on Darwin.
		* server/Makefile.am: Remove -no-undefined as it cause dependency
		problems on Darwin.
		* server/vm/Makefile.am: Remove -no-undefined as it causes
		inter-library dependency problems on Darwin.
		* server/parser/Makefile.am: Remove -no-undefined as it causes
		inter-library dependency problems on Darwin.
		* server/asobjsMakefile.am: Remove -no-undefined as it causes
		inter-library dependency problems on Darwin. Add libgeo to the
		link line.
		* server/vm/VM.cpp: Don't use the gnash:: namespace with setting
		the global singleton, it won't compile on Darwin.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/fltk.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3027&r2=1.3028
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/incllist?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libslist?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/mysql.m4?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/BitmapMovieInstance.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/VM.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: gui/fltk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/fltk.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gui/fltk.cpp	11 Apr 2007 17:03:16 -0000	1.9
+++ gui/fltk.cpp	28 Apr 2007 00:04:25 -0000	1.10
@@ -173,7 +173,7 @@
 
     for (int i = 0; table[i].fltkKey; i++) {
         if (key == table[i].fltkKey) {
-            notify_key_event(table[i].gnashKey, true);
+            notify_key_event((gnash::key::code)table[i].gnashKey, true);
             break;
         }
     }

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3027
retrieving revision 1.3028
diff -u -b -r1.3027 -r1.3028
--- ChangeLog	27 Apr 2007 21:43:41 -0000	1.3027
+++ ChangeLog	28 Apr 2007 00:04:25 -0000	1.3028
@@ -1,3 +1,25 @@
+2007-04-26  Rob Savoye  <rob@pawnee.welcomehome.org>
+
+	* gui/fltk.cpp: Cast the key::code so it compiles on Darwin.
+	* macros/agg.m4: Don't inherit the -rpath setting fropm
+	pkg-config, it screws up the linux on Darwin.
+	* macros/incllist, libslist: Look in $with_top_level for support
+	packages no in the $prefix path.
+	* macros/pthreads.m4: Add -mthreads for mingw32.
+	* macros/x11.m4: If X11 is found, also add libSM and libICE if
+	they are found to resolve dependencies on Darwin.
+	* server/Makefile.am: Remove -no-undefined as it cause dependency
+	problems on Darwin.
+	* server/vm/Makefile.am: Remove -no-undefined as it causes
+	inter-library dependency problems on Darwin.
+	* server/parser/Makefile.am: Remove -no-undefined as it causes
+	inter-library dependency problems on Darwin.
+	* server/asobjsMakefile.am: Remove -no-undefined as it causes
+	inter-library dependency problems on Darwin. Add libgeo to the
+	link line.
+	* server/vm/VM.cpp: Don't use the gnash:: namespace with setting
+	the global singleton, it won't compile on Darwin.
+
 2007-04-27 Sandro Santilli <strk@keybit.net>
 
 	* server/swf/PlaceObject2Tag.cpp (readPlaceActions): fix check for

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/agg.m4	8 Apr 2007 23:06:17 -0000	1.26
+++ macros/agg.m4	28 Apr 2007 00:04:26 -0000	1.27
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: agg.m4,v 1.26 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: agg.m4,v 1.27 2007/04/28 00:04:26 rsavoye Exp $
 
 dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
 dnl but not in AGG 2.3. As we need AGG 2.4, we use this as 
@@ -86,7 +86,8 @@
   pkg=no
   if test x$cross_compiling = xno; then
     if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_agg_lib}" = x; then
-      $PKG_CONFIG --exists libagg && ac_cv_path_agg_lib=`$PKG_CONFIG --libs libagg`
+      $PKG_CONFIG --exists libagg && ac_cv_path_agg_lib=`$PKG_CONFIG --libs-only-L libagg`
+      $PKG_CONFIG --exists libagg && ac_cv_path_agg_lib="${ac_cv_path_agg_lib}`$PKG_CONFIG --libs-only-l libagg`"
       $PKG_CONFIG --exists libagg && pkg=yes
     fi
   fi

Index: macros/incllist
===================================================================
RCS file: /sources/gnash/gnash/macros/incllist,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/incllist	10 Apr 2007 18:18:46 -0000	1.5
+++ macros/incllist	28 Apr 2007 00:04:26 -0000	1.6
@@ -1 +1 @@
-${prefix}/${host_alias}/include ${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include /usr/local/include /home/latest/include /opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include /usr/local/olpc/include .. ../..
+${with_top_level}/include ${prefix}/${host_alias}/include ${prefix}/include /sw/include /usr/nekoware/include /usr/freeware/include /pkg/include /opt/local/include /usr/local/include /home/latest/include /opt/include /opt/mesa/include /opt/include /usr/X11R6/include /usr/X11/include /usr/include /usr/pkg/include /usr/local/olpc/include .. ../..

Index: macros/libslist
===================================================================
RCS file: /sources/gnash/gnash/macros/libslist,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- macros/libslist	10 Apr 2007 18:18:46 -0000	1.7
+++ macros/libslist	28 Apr 2007 00:04:26 -0000	1.8
@@ -1 +1 @@
-${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..
+${with_top_level}/lib ${prefix}/${host_alias}/lib ${prefix}/lib64 ${prefix}/lib32 ${prefix}/lib /usr/local/lib /lib /usr/lib64 /usr/lib32 /usr/nekoware/lib /usr/freeware/lib /usr/lib /sw/lib /home/latest/lib /opt/lib /pkg/lib /opt/local/lib /usr/pkg/lib /usr/X11R6/lib /usr/X11/lib /usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib /opt/mesa/lib64 .. ../..

Index: macros/mysql.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/mysql.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- macros/mysql.m4	8 Apr 2007 23:06:17 -0000	1.4
+++ macros/mysql.m4	28 Apr 2007 00:04:26 -0000	1.5
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: mysql.m4,v 1.4 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: mysql.m4,v 1.5 2007/04/28 00:04:26 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_MYSQL],
 [

Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- macros/pthreads.m4	8 Apr 2007 23:06:17 -0000	1.28
+++ macros/pthreads.m4	28 Apr 2007 00:04:26 -0000	1.29
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 dnl Copyright (C) 2006 Steven G. Johnson <stevenj@alum.mit.edu>.
-dnl $Id: pthreads.m4,v 1.28 2007/04/08 23:06:17 rsavoye Exp $
+dnl $Id: pthreads.m4,v 1.29 2007/04/28 00:04:26 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_PTHREADS],
 [
@@ -88,6 +88,9 @@
   *darwin*)
     pthread_flags="none"
     ;;
+  *mingw*)
+    pthread_flags="-mthreads"
+    ;;
   *solaris*)
 
   dnl On Solaris (at least, for some versions), libc contains stubbed

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- macros/x11.m4	10 Apr 2007 18:18:46 -0000	1.5
+++ macros/x11.m4	28 Apr 2007 00:04:26 -0000	1.6
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.5 2007/04/10 18:18:46 rsavoye Exp $
+dnl $Id: x11.m4,v 1.6 2007/04/28 00:04:26 rsavoye Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
@@ -95,6 +95,12 @@
           if test -f $i/libXext.a -o -f $i/libXext.${shlibext}; then
             ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXext"
           fi
+          if test -f $i/libSM.a -o -f $i/libSM.${shlibext}; then
+            ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lSM"
+          fi
+          if test -f $i/libICE.a -o -f $i/libICE.${shlibext}; then
+            ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lICE"
+          fi
           AC_MSG_RESULT(yes)
           break
         fi

Index: server/BitmapMovieInstance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/BitmapMovieInstance.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/BitmapMovieInstance.cpp	18 Apr 2007 19:13:55 -0000	1.6
+++ server/BitmapMovieInstance.cpp	28 Apr 2007 00:04:26 -0000	1.7
@@ -14,9 +14,6 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-// 
-//
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/Makefile.am	27 Apr 2007 01:08:51 -0000	1.110
+++ server/Makefile.am	28 Apr 2007 00:04:26 -0000	1.111
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.110 2007/04/27 01:08:51 rsavoye Exp $
+# $Id: Makefile.am,v 1.111 2007/04/28 00:04:26 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -175,7 +175,7 @@
 endif
 
 #libserver_la_LIBDADD =  #@DL_LIB@  # $(LIBLTDL)
-libgnashserver_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashserver_la_LDFLAGS = -release $(VERSION) -export-dynamic #-no-undefined 
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/asobj/Makefile.am	27 Apr 2007 01:08:50 -0000	1.35
+++ server/asobj/Makefile.am	28 Apr 2007 00:04:26 -0000	1.36
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.35 2007/04/27 01:08:50 rsavoye Exp $
+# $Id: Makefile.am,v 1.36 2007/04/28 00:04:26 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -117,7 +117,9 @@
 
 libgnashasobjs_la_LIBADD = \
 	$(top_builddir)/libamf/libgnashamf.la \
-	$(top_builddir)/libbase/libgnashbase.la
+	$(top_builddir)/libgeometry/libgnashgeo.la \
+	$(top_builddir)/libbase/libgnashbase.la \
+	$(LIBXML_LIBS)
 
 if USE_FFMPEG_ENGINE
 libgnashasobjs_la_SOURCES += NetStreamFfmpeg.cpp SoundFfmpeg.cpp
@@ -137,7 +139,7 @@
 libgnashasobjs_la_LIBADD += $(MAD_LIBS)
 endif
 
-libgnashasobjs_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashasobjs_la_LDFLAGS = -release $(VERSION) #-no-undefined -export-dynamic
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/parser/Makefile.am	27 Apr 2007 01:08:51 -0000	1.29
+++ server/parser/Makefile.am	28 Apr 2007 00:04:26 -0000	1.30
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.29 2007/04/27 01:08:51 rsavoye Exp $
+# $Id: Makefile.am,v 1.30 2007/04/28 00:04:26 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -76,9 +76,11 @@
 	video_stream_def.h
 
 libgnashparser_la_LIBADD = \
+	$(top_builddir)/libamf/libgnashamf.la \
+	$(top_builddir)/libgeometry/libgnashgeo.la \
 	$(top_builddir)/libbase/libgnashbase.la 
 
-libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -release $(VERSION) -no-undefined -export-dynamic
+libgnashparser_la_LDFLAGS = $(BOOST_LIBS) -release $(VERSION) -export-dynamic #-no-undefined 
 
 if USE_SOUND_GST
 AM_CPPFLAGS += $(GSTREAMER_CFLAGS)

Index: server/parser/bitmap_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/bitmap_character_def.cpp	13 Apr 2007 07:35:56 -0000	1.5
+++ server/parser/bitmap_character_def.cpp	28 Apr 2007 00:04:26 -0000	1.6
@@ -22,7 +22,6 @@
 #endif
 
 #include "bitmap_character_def.h"
-//#include "bitmap_character_instance.h"
 #include "gnash.h" // for bitmap_info
 #include "render.h"
 

Index: server/parser/sprite_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/sprite_definition.cpp	18 Apr 2007 14:07:32 -0000	1.13
+++ server/parser/sprite_definition.cpp	28 Apr 2007 00:04:26 -0000	1.14
@@ -15,7 +15,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-//
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/vm/Makefile.am	27 Apr 2007 01:08:51 -0000	1.10
+++ server/vm/Makefile.am	28 Apr 2007 00:04:26 -0000	1.11
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.10 2007/04/27 01:08:51 rsavoye Exp $
+# $Id: Makefile.am,v 1.11 2007/04/28 00:04:26 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -60,7 +60,7 @@
 libgnashvm_la_LIBADD = \
 	$(top_builddir)/libbase/libgnashbase.la 
 
-libgnashvm_la_LDFLAGS = -release $(VERSION) -no-undefined -export-dynamic
+libgnashvm_la_LDFLAGS = -release $(VERSION) -export-dynamic # -no-undefined 
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:

Index: server/vm/VM.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/VM.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/vm/VM.cpp	15 Mar 2007 22:39:54 -0000	1.5
+++ server/vm/VM.cpp	28 Apr 2007 00:04:26 -0000	1.6
@@ -1,5 +1,5 @@
 // 
-//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+//   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -14,9 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-//
-
-/* $Id: VM.cpp,v 1.5 2007/03/15 22:39:54 strk Exp $ */
+/* $Id: VM.cpp,v 1.6 2007/04/28 00:04:26 rsavoye Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -50,7 +48,7 @@
 	assert(inst.get()); // or an invalid movie_definition was given
 	_singleton->setRoot(inst.release()); // transfer ownership
 
-	_singleton->setGlobal(new gnash::Global(*_singleton));
+	_singleton->setGlobal(new Global(*_singleton));
 	assert(_singleton->getGlobal());
 
 	return *_singleton;



From MAILER-DAEMON Fri Apr 27 22:11:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhcP8-0005dV-27
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 22:11:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhcP6-0005d8-JN
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:11:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhcP4-0005cu-VH
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:11:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhcP4-0005cr-Pz
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:11:14 -0400
Received: from nz-out-0506.google.com ([64.233.162.231])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HhcJ9-00055d-Jr
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:05:08 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1296833nzp
	for <gnash-commit@gnu.org>; Fri, 27 Apr 2007 19:05:06 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=h+bivjVGhpZ9WCJC1Yj7ZLUnebC+ebPG2YgzPUCdQqVfMXivT+Zsfu4MgITvz7qR+8pQS74QS3baz7dsCQi2O60xuL13EHPOLksk6DiKsSsqibrubvcLjAsVi7VUAHRq0jG9MnOHqihUmwLo1sn7I/nRAyx8jYIxP4ee1sNOOZY=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=YgFwismU/6mHHXsR8nmhPOPugG6hnlRoEkGm1IHe0fFA555KF6ORKK1HK4w6hOfsfqGNf8iL2I9njManAeOpFwVtnPfg+GzLO5Ra6/H4kvVzn9dzkEV0TM41GWlC4SSk0wzeyKtQATXYdSDyjp+H2EZeAIIthMhXvLFZQI2ToUA=
Received: by 10.114.159.1 with SMTP id h1mr1207299wae.1177725905688;
	Fri, 27 Apr 2007 19:05:05 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Fri, 27 Apr 2007 19:05:05 -0700 (PDT)
Message-ID: <ca4b43ff0704271905k4a4ec543tb431eaba580eca8e@mail.gmail.com>
Date: Sat, 28 Apr 2007 10:05:05 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
In-Reply-To: <E1HhT0H-0000oz-HL@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HhT0H-0000oz-HL@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 02:11:16 -0000

happy to see we have a "ScopeChain" now. I believe that will make
things easier...

On 4/28/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/04/27 16:09:01
>
> Modified files:
>        .              : ChangeLog
>        server         : as_environment.cpp as_environment.h
>                         swf_function.cpp swf_function.h
>        server/vm      : ASHandlers.cpp ActionExec.cpp ActionExec.h
>        testsuite/actionscript.all: Function.as
>        testsuite/swfdec: PASSING
>
> Log message:
>                * server/as_environment.{cpp,h}: changed the ScopeChain
>                  typedef to be just a vector of as_objects.
>                * server/swf_function.{cpp,h}: take a vector of as_objects
>                  as ScopeChain, rather then with_entry vector...
>                * server/vm/ActionExec.{cpp,h}: only expose the ScopeChain,
>                  not the 'with' stack. When constructed for a function, push
>                  the function's activation object to the ScopeChain.
>                * server/vm/ASHandlers.cpp: update calls to ActionExec and
>                  swf_function when it comes to setting the ScopeChain.
>                * testsuite/actionscript.all/Function.as: the scope chain test kai
>                  added now succeeds.
>                * testsuite/swfdec/PASSING: function-scope-6.swf and function-scope-7.swf
>                  now succeed.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3021&r2=1.3022
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.74&r2=1.75
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.48&r2=1.49
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.28&r2=1.29
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.12&r2=1.13
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.101&r2=1.102
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.31&r2=1.32
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.16&r2=1.17
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.46&r2=1.47
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.20&r2=1.21
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3021
> retrieving revision 1.3022
> diff -u -b -r1.3021 -r1.3022
> --- ChangeLog   27 Apr 2007 13:01:10 -0000      1.3021
> +++ ChangeLog   27 Apr 2007 16:09:00 -0000      1.3022
> @@ -1,5 +1,21 @@
>  2007-04-27 Sandro Santilli <strk@keybit.net>
>
> +       * server/as_environment.{cpp,h}: changed the ScopeChain
> +         typedef to be just a vector of as_objects.
> +       * server/swf_function.{cpp,h}: take a vector of as_objects
> +         as ScopeChain, rather then with_entry vector...
> +       * server/vm/ActionExec.{cpp,h}: only expose the ScopeChain,
> +         not the 'with' stack. When constructed for a function, push
> +         the function's activation object to the ScopeChain.
> +       * server/vm/ASHandlers.cpp: update calls to ActionExec and
> +         swf_function when it comes to setting the ScopeChain.
> +       * testsuite/actionscript.all/Function.as: the scope chain test kai
> +         added now succeeds.
> +       * testsuite/swfdec/PASSING: function-scope-6.swf and function-scope-7.swf
> +         now succeed.
> +
> +2007-04-27 Sandro Santilli <strk@keybit.net>
> +
>        * libgeometry/snappingrange.h: add contains(SnappingRange2d) method;
>          fixed contains(Range2d) to take a const ref rather then a value.
>        * testsuite/libgeometry/snappingrangetest.cpp: add tests for
>
> Index: server/as_environment.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
> retrieving revision 1.74
> retrieving revision 1.75
> diff -u -b -r1.74 -r1.75
> --- server/as_environment.cpp   26 Apr 2007 17:06:10 -0000      1.74
> +++ server/as_environment.cpp   27 Apr 2007 16:09:00 -0000      1.75
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: as_environment.cpp,v 1.74 2007/04/26 17:06:10 strk Exp $ */
> +/* $Id: as_environment.cpp,v 1.75 2007/04/27 16:09:00 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -45,7 +45,7 @@
>  // Return the value of the given var, if it's defined.
>  as_value
>  as_environment::get_variable(const std::string& varname,
> -               const ScopeStack& with_stack, as_object** retTarget) const
> +               const ScopeStack& scopeStack, as_object** retTarget) const
>  {
>     // Path lookup rigamarole.
>     std::string        path;
> @@ -53,11 +53,11 @@
>     //log_msg(_("get_variable(%s)"), varname.c_str());
>     bool is_slash_based;
>     if (parse_path(varname, path, var, &is_slash_based)) {
> -       //as_value target_val = get_variable_raw(path, with_stack);
> +       //as_value target_val = get_variable_raw(path, scopeStack);
>         //as_object* target = target_val.to_object();
>        // TODO: let find_target return generic as_objects, or use 'with' stack,
>        //       see player2.swf or bug #18758 (strip.swf)
> -       // @@ TODO: should we use with_stack here too ?
> +       // @@ TODO: should we use scopeStack here too ?
>         as_object* target = is_slash_based ? find_object_slashsyntax(path) : find_object_dotsyntax(path);
>
>        if (target) {
> @@ -76,31 +76,31 @@
>                            );
>            );
>
> -           as_value tmp = get_variable_raw(path, with_stack, retTarget);
> +           as_value tmp = get_variable_raw(path, scopeStack, retTarget);
>            if ( ! tmp.is_undefined() )
>            {
>            IF_VERBOSE_ASCODING_ERRORS(
> -                   log_aserror(_("...but get_variable_raw(%s, <with_stack>) succeeded!"), path.c_str());
> +                   log_aserror(_("...but get_variable_raw(%s, <scopeStack>) succeeded!"), path.c_str());
>            )
>            }
>            return as_value();
>        }
>     } else {
> -       return get_variable_raw(varname, with_stack, retTarget);
> +       return get_variable_raw(varname, scopeStack, retTarget);
>     }
>  }
>
>  as_value
>  as_environment::get_variable(const std::string& varname) const
>  {
> -       static ScopeStack empty_with_stack;
> -       return get_variable(varname, empty_with_stack);
> +       static ScopeStack empty_scopeStack;
> +       return get_variable(varname, empty_scopeStack);
>  }
>
>  as_value
>  as_environment::get_variable_raw(
>     const std::string& varname,
> -    const ScopeStack& with_stack, as_object** retTarget) const
> +    const ScopeStack& scopeStack, as_object** retTarget) const
>     // varname must be a plain variable name; no path parsing.
>  {
>     assert(strchr(varname.c_str(), ':') == NULL);
> @@ -108,9 +108,9 @@
>     as_value   val;
>
>     // Check the with-stack.
> -    for (size_t i = with_stack.size(); i > 0; --i) {
> +    for (size_t i = scopeStack.size(); i > 0; --i) {
>         // const_cast needed due to non-const as_object::get_member
> -       as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
> +       as_object* obj = const_cast<as_object*>(scopeStack[i-1].get());
>        if (obj && obj->get_member(varname.c_str(), &val)) {
>            // Found the var in this context.
>            if ( retTarget ) *retTarget = obj;
> @@ -174,7 +174,7 @@
>  bool
>  as_environment::del_variable_raw(
>     const std::string& varname,
> -    const ScopeStack& with_stack)
> +    const ScopeStack& scopeStack)
>     // varname must be a plain variable name; no path parsing.
>  {
>        assert(strchr(varname.c_str(), ':') == NULL);
> @@ -184,10 +184,10 @@
>        as_value        val;
>
>        // Check the with-stack.
> -       for (size_t i = with_stack.size(); i > 0; --i)
> +       for (size_t i = scopeStack.size(); i > 0; --i)
>        {
>                // const_cast needed due to non-const as_object::get_member
> -               as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
> +               as_object* obj = const_cast<as_object*>(scopeStack[i-1].get());
>                if (obj)
>                {
>                        std::pair<bool,bool> ret = obj->delProperty(varname);
> @@ -221,8 +221,8 @@
>  as_value
>  as_environment::get_variable_raw(const std::string& varname) const
>  {
> -       static ScopeStack empty_with_stack;
> -       return get_variable_raw(varname, empty_with_stack);
> +       static ScopeStack empty_scopeStack;
> +       return get_variable_raw(varname, empty_scopeStack);
>  }
>
>  // Given a path to variable, set its value.
> @@ -230,7 +230,7 @@
>  as_environment::set_variable(
>     const std::string& varname,
>     const as_value& val,
> -    const ScopeStack& with_stack)
> +    const ScopeStack& scopeStack)
>  {
>        IF_VERBOSE_ACTION (
>     log_action("-------------- %s = %s",
> @@ -259,7 +259,7 @@
>                );
>        }
>     } else {
> -       set_variable_raw(varname, val, with_stack);
> +       set_variable_raw(varname, val, scopeStack);
>     }
>  }
>
> @@ -268,8 +268,8 @@
>                const std::string& varname,
>                const as_value& val)
>  {
> -       static ScopeStack empty_with_stack;
> -       set_variable(varname, val, empty_with_stack);
> +       static ScopeStack empty_scopeStack;
> +       set_variable(varname, val, empty_scopeStack);
>  }
>
>  // No path rigamarole.
> @@ -277,7 +277,7 @@
>  as_environment::set_variable_raw(
>     const std::string& varname,
>     const as_value& val,
> -    const ScopeStack& with_stack)
> +    const ScopeStack& scopeStack)
>  {
>
>        // Check locals for setting them
> @@ -287,10 +287,10 @@
>        }
>
>        // Check the with-stack.
> -       for (size_t i = with_stack.size(); i > 0; --i)
> +       for (size_t i = scopeStack.size(); i > 0; --i)
>        {
>                // const_cast needed due to non-const as_object::get_member
> -               as_object* obj = const_cast<as_object*>(with_stack[i-1].object());
> +               as_object* obj = const_cast<as_object*>(scopeStack[i-1].get());
>                as_value        dummy;
>                if (obj && obj->get_member(varname.c_str(), &dummy)) {
>                    // This object has the member; so set it here.
> @@ -308,8 +308,8 @@
>                const std::string& varname,
>                const as_value& val)
>  {
> -       static ScopeStack empty_with_stack;
> -       set_variable_raw(varname, val, empty_with_stack);
> +       static ScopeStack empty_scopeStack;
> +       set_variable_raw(varname, val, empty_scopeStack);
>  }
>
>  // Set/initialize the value of the local variable.
>
> Index: server/as_environment.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_environment.h,v
> retrieving revision 1.48
> retrieving revision 1.49
> diff -u -b -r1.48 -r1.49
> --- server/as_environment.h     26 Apr 2007 17:06:10 -0000      1.48
> +++ server/as_environment.h     27 Apr 2007 16:09:01 -0000      1.49
> @@ -34,7 +34,7 @@
>
>  // Forward declarations
>  class character;
> -class with_stack_entry;
> +//class with_stack_entry;
>
>  /// ActionScript execution environment.
>  class as_environment
> @@ -42,32 +42,12 @@
>  public:
>
>        /// A stack of objects used for variables/members lookup
> -       typedef std::vector<with_stack_entry> ScopeStack;
> +       //typedef std::vector<with_stack_entry> ScopeStack;
> +       typedef std::vector< boost::intrusive_ptr<as_object> > ScopeStack;
>
>        /// Stack of as_values in this environment
>        std::vector<as_value>   m_stack;
>
> -#if 0
> -       /// For local vars.  Use empty names to separate frames.
> -       class frame_slot
> -       {
> -       public:
> -               std::string     m_name;
> -               as_value        m_value;
> -
> -               frame_slot()
> -               {
> -               }
> -
> -               frame_slot(const std::string& name, const as_value& val)
> -                       :
> -                       m_name(name),
> -                       m_value(val)
> -               {
> -               }
> -       };
> -#endif
> -
>        as_environment()
>                :
>                m_target(0)
> @@ -160,11 +140,11 @@
>        ///     Variable name. Can not contain path elements.
>        ///     TODO: should be case-insensitive up to SWF6.
>        ///
> -       /// @param with_stack
> +       /// @param scopeStack
>        ///     The Scope stack to use for lookups.
>        ///
>        bool del_variable_raw(const std::string& varname,
> -                       const ScopeStack& with_stack);
> +                       const ScopeStack& scopeStack);
>
>        /// Return the (possibly UNDEFINED) value of the named var.
>        //
> @@ -172,7 +152,7 @@
>        ///     Variable name. Can contain path elements.
>        ///     TODO: should be case-insensitive up to SWF6.
>        ///
> -       /// @param with_stack
> +       /// @param scopeStack
>        ///     The Scope stack to use for lookups.
>        ///
>        /// @param retTarget
> @@ -180,7 +160,7 @@
>        ///     found variable (if found).
>        ///
>        as_value get_variable(const std::string& varname,
> -               const ScopeStack& with_stack, as_object** retTarget=NULL) const;
> +               const ScopeStack& scopeStack, as_object** retTarget=NULL) const;
>
>        /// \brief
>        /// Given a path to variable, set its value.
> @@ -227,11 +207,11 @@
>        /// @param val
>        ///     The value to assign to the variable.
>        ///
> -       /// @param with_stack
> +       /// @param scopeStack
>        ///     The Scope stack to use for lookups.
>        ///
>        void set_variable(const std::string& path, const as_value& val,
> -               const ScopeStack& with_stack);
> +               const ScopeStack& scopeStack);
>
>        /// Set/initialize the value of the local variable.
>        //
> @@ -474,6 +454,14 @@
>                _localFrames.pop_back();
>        }
>
> +       /// Get top element of the call stack
> +       //
> +       CallFrame& topCallFrame()
> +       {
> +               assert(_localFrames.size());
> +               return _localFrames.back();
> +       }
> +
>        /// Return the depth of call stack
>        size_t callStackDepth()
>        {
> @@ -513,7 +501,7 @@
>
>        /// Given a variable name, set its value (no support for path)
>        void set_variable_raw(const std::string& path, const as_value& val,
> -               const ScopeStack& with_stack);
> +               const ScopeStack& scopeStack);
>
>        /// Same of the above, but no support for path.
>        ///
> @@ -522,7 +510,7 @@
>        ///     found variable (if found).
>        ///
>        as_value get_variable_raw(const std::string& varname,
> -               const ScopeStack& with_stack, as_object** retTarget=NULL) const;
> +               const ScopeStack& scopeStack, as_object** retTarget=NULL) const;
>
>
>        /// \brief
>
> Index: server/swf_function.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
> retrieving revision 1.28
> retrieving revision 1.29
> diff -u -b -r1.28 -r1.29
> --- server/swf_function.cpp     22 Mar 2007 22:37:45 -0000      1.28
> +++ server/swf_function.cpp     27 Apr 2007 16:09:01 -0000      1.29
> @@ -45,13 +45,13 @@
>
>  swf_function::swf_function(const action_buffer* ab,
>                        as_environment* env,
> -                       size_t start, const std::vector<with_stack_entry>& with_stack)
> +                       size_t start, const ScopeStack& scopeStack)
>        :
>        as_function(NULL),
>        //ctor(0),
>        m_action_buffer(ab),
>        m_env(env),
> -       m_with_stack(with_stack),
> +       _scopeStack(scopeStack),
>        m_start_pc(start),
>        m_length(0),
>        m_is_function2(false),
> @@ -169,6 +169,7 @@
>  {
>
>        as_environment* our_env = m_env;
> +       assert(our_env);
>        if (our_env == NULL)
>        {
>                our_env = &fn.env();
>
> Index: server/swf_function.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf_function.h,v
> retrieving revision 1.12
> retrieving revision 1.13
> diff -u -b -r1.12 -r1.13
> --- server/swf_function.h       11 Apr 2007 17:54:21 -0000      1.12
> +++ server/swf_function.h       27 Apr 2007 16:09:01 -0000      1.13
> @@ -23,7 +23,8 @@
>
>  #include "impl.h"
>  #include "as_function.h" // for inheritance
> -#include "with_stack_entry.h" // for composition (vector element)
> +#include "as_object.h" // for composition (vector element)
> +//#include "with_stack_entry.h" // for composition (vector element)
>
>  #include <cassert>
>  #include <string>
> @@ -49,8 +50,10 @@
>        /// @@ might need some kind of ref count here, but beware cycles
>        as_environment* m_env;
>
> -       /// initial with-stack on function entry.
> -       std::vector<with_stack_entry>   m_with_stack;
> +       typedef std::vector< boost::intrusive_ptr<as_object> > ScopeStack;
> +
> +       /// Scope stack on function definition.
> +       ScopeStack _scopeStack;
>
>        /// \brief
>        /// Offset within the action_buffer where
> @@ -175,11 +178,11 @@
>        swf_function(const action_buffer* ab,
>                as_environment* env,
>                size_t start,
> -               const std::vector<with_stack_entry>& with_stack);
> +               const ScopeStack& with_stack);
>
> -       const std::vector<with_stack_entry>& getWithStack() const
> +       const ScopeStack& getScopeStack() const
>        {
> -               return m_with_stack;
> +               return _scopeStack;
>        }
>
>        const action_buffer& getActionBuffer() const
>
> Index: server/vm/ASHandlers.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
> retrieving revision 1.101
> retrieving revision 1.102
> diff -u -b -r1.101 -r1.102
> --- server/vm/ASHandlers.cpp    26 Apr 2007 17:06:10 -0000      1.101
> +++ server/vm/ASHandlers.cpp    27 Apr 2007 16:09:01 -0000      1.102
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: ASHandlers.cpp,v 1.101 2007/04/26 17:06:10 strk Exp $ */
> +/* $Id: ASHandlers.cpp,v 1.102 2007/04/27 16:09:01 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -3263,7 +3263,7 @@
>        // contains name and args, while next tag is first tag
>        // of the function body.
>        swf_function* func = new swf_function(
> -               &code, &env, thread.next_pc, thread.getWithStack());
> +               &code, &env, thread.next_pc, thread.getScopeStack());
>
>        func->set_is_function2();
>
> @@ -3384,12 +3384,6 @@
>        thread.ensureStack(1);  // the object
>        boost::intrusive_ptr<as_object> with_obj = env.pop().to_object();
>
> -       const vector<with_stack_entry>& with_stack = thread.getWithStack();
> -       IF_VERBOSE_ACTION (
> -       log_action(_("-------------- with block start: stack size is " SIZET_FMT),
> -                  with_stack.size());
> -       );
> -
>        ++pc; // skip tag code
>
>        int tag_length = code.read_int16(pc); // read tag len (should be 2)
> @@ -3421,11 +3415,6 @@
>        if ( ! thread.pushWithEntry(with_stack_entry(with_obj, block_end)) )
>        {
>                // skip the full block
> -               // FIXME, is this a log_aserror?
> -               log_error(_("With-block skipped"
> -                       " (with stack size exceeds limit of "
> -                       SIZET_FMT " elements)"),
> -                       thread.getWithStackLimit());
>                thread.next_pc += block_length;
>        }
>
> @@ -3449,7 +3438,7 @@
>        // contains name and args, while next tag is first tag
>        // of the function body.
>        swf_function* func = new swf_function(
> -               &code, &env, thread.next_pc, thread.getWithStack());
> +               &code, &env, thread.next_pc, thread.getScopeStack());
>
>        size_t i = thread.pc + 3;
>
>
> Index: server/vm/ActionExec.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
> retrieving revision 1.31
> retrieving revision 1.32
> diff -u -b -r1.31 -r1.32
> --- server/vm/ActionExec.cpp    26 Apr 2007 17:06:10 -0000      1.31
> +++ server/vm/ActionExec.cpp    27 Apr 2007 16:09:01 -0000      1.32
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: ActionExec.cpp,v 1.31 2007/04/26 17:06:10 strk Exp $ */
> +/* $Id: ActionExec.cpp,v 1.32 2007/04/27 16:09:01 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -73,7 +73,8 @@
>
>  ActionExec::ActionExec(const swf_function& func, as_environment& newEnv, as_value* nRetVal, as_object* this_ptr)
>        :
> -       with_stack(func.getWithStack()),
> +       with_stack(),
> +       _scopeStack(func.getScopeStack()),
>        // See comment in header
>        _with_stack_limit(7),
>        _function_var(func.isFunction2() ? 2 : 1),
> @@ -92,11 +93,23 @@
>        if ( env.get_version() > 5 ) {
>            _with_stack_limit = 15;
>        }
> +
> +       // SWF version 6 and higher pushes the activation object to the scope stack
> +       if ( env.get_version() > 5 )
> +       {
> +               // We assume that the swf_function () operator already initialized its environment
> +               // so that it's activation object is now in the top element of the CallFrame stack
> +               //
> +               as_environment::CallFrame& topFrame = newEnv.topCallFrame();
> +               assert(topFrame.func == &func);
> +               _scopeStack.push_back(topFrame.locals);
> +       }
>  }
>
>  ActionExec::ActionExec(const action_buffer& abuf, as_environment& newEnv)
>        :
>        with_stack(),
> +       _scopeStack(), // TODO: initialize the scope stack somehow
>        _with_stack_limit(7),
>        _function_var(0),
>        _func(NULL),
> @@ -152,7 +165,9 @@
>            // Cleanup any expired "with" blocks.
>            while ( ! with_stack.empty() && pc >= with_stack.back().end_pc() ) {
>                // Drop last stack element
> +               assert(with_stack.back().object() == _scopeStack.back().get());
>                with_stack.pop_back();
> +               _scopeStack.pop_back(); // hopefully nothing gets after the 'with' stack.
>            }
>
>        // Get the opcode.
> @@ -315,18 +330,21 @@
>  ActionExec::pushWithEntry(const with_stack_entry& entry)
>  {
>        // See comment in header about _with_stack_limit
> +       if (with_stack.size() >= _with_stack_limit)
> +       {
>        IF_VERBOSE_ASCODING_ERRORS (
> -       if (with_stack.size() >= _with_stack_limit) {
>            log_aserror(_("'With' stack depth (" SIZET_FMT ") "
>                        "exceeds the allowed limit for current SWF "
>                        "target version (" SIZET_FMT " for version %d)."
>                        " Don't expect this movie to work with all players."),
>                        with_stack.size()+1, _with_stack_limit,
>                        env.get_version());
> -       }
>        );
> +           return false;
> +       }
>
>        with_stack.push_back(entry);
> +       _scopeStack.push_back(const_cast<as_object*>(entry.object()));
>        return true;
>  }
>
> @@ -339,7 +357,7 @@
>            boost::to_lower(namei, vm.getLocale());
>        }
>
> -       return env.del_variable_raw(namei, with_stack);
> +       return env.del_variable_raw(namei, getScopeStack());
>  }
>
>  bool
> @@ -366,7 +384,7 @@
>            boost::to_lower(namei, vm.getLocale());
>        }
>
> -       return env.set_variable(namei, val, getWithStack());
> +       return env.set_variable(namei, val, getScopeStack());
>  }
>
>  as_value
> @@ -379,7 +397,7 @@
>            boost::to_lower(namei, vm.getLocale());
>        }
>
> -       return env.get_variable(namei, getWithStack());
> +       return env.get_variable(namei, getScopeStack());
>  }
>
>  as_value
> @@ -392,7 +410,7 @@
>            boost::to_lower(namei, vm.getLocale());
>        }
>
> -       return env.get_variable(namei, getWithStack(), target);
> +       return env.get_variable(namei, getScopeStack(), target);
>  }
>
>  void
>
> Index: server/vm/ActionExec.h
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
> retrieving revision 1.16
> retrieving revision 1.17
> diff -u -b -r1.16 -r1.17
> --- server/vm/ActionExec.h      26 Apr 2007 17:06:10 -0000      1.16
> +++ server/vm/ActionExec.h      27 Apr 2007 16:09:01 -0000      1.17
> @@ -43,6 +43,18 @@
>
>  private:
>
> +       /// Returns 'with' stack associated with this execution thread
> +       //
> +       /// If you need to modify it, use the pushWithEntry() function.
> +       ///
> +       /// TODO: deprecate this
> +       ///
> +       const std::vector<with_stack_entry>& getWithStack() const
> +       {
> +               return with_stack;
> +       }
> +
> +
>        /// Run after a complete run, or after an run interrupted by
>        /// a bail-out exception (ActionLimitException, for example)
>        void cleanupAfterRun();
> @@ -50,6 +62,11 @@
>        /// the 'with' stack associated with this execution thread
>        std::vector<with_stack_entry> with_stack;
>
> +       typedef as_environment::ScopeStack ScopeStack;
> +
> +       /// the scope stack associated with this execution thread
> +       ScopeStack _scopeStack;
> +
>        /// Limit of with stack
>        //
>        /// This is 7 for SWF up to 5 and 15 for SWF 6 and up
> @@ -178,13 +195,13 @@
>        /// Get the current 'this' pointer, for use in function calls
>        as_object* getThisPointer() { return _function_var ? _this_ptr.get() : getTarget(); }
>
> -       /// Returns 'with' stack associated with this execution thread
> +       /// Returns the scope stack associated with this execution thread
>        //
> -       /// If you need to modify it, use the pushWithEntry() function.
> +       /// TODO: return by const ref instead
>        ///
> -       const std::vector<with_stack_entry>& getWithStack() const
> +       const ScopeStack& getScopeStack() const
>        {
> -               return with_stack;
> +               return _scopeStack;
>        }
>
>        /// Return the maximum allowed 'with' stack limit.
>
> Index: testsuite/actionscript.all/Function.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
> retrieving revision 1.46
> retrieving revision 1.47
> diff -u -b -r1.46 -r1.47
> --- testsuite/actionscript.all/Function.as      26 Apr 2007 20:47:33 -0000      1.46
> +++ testsuite/actionscript.all/Function.as      27 Apr 2007 16:09:01 -0000      1.47
> @@ -20,7 +20,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: Function.as,v 1.46 2007/04/26 20:47:33 strk Exp $";
> +rcsid="$Id: Function.as,v 1.47 2007/04/27 16:09:01 strk Exp $";
>
>  #include "check.as"
>
> @@ -309,7 +309,7 @@
>   check_equals ( result1, "hello" );
>
>   // Gnash fails here, we want this fixed!
> -  xcheck_equals ( result2, "hello" );
> +  check_equals ( result2, "hello" );
>
>  #else // SWF5 or lower seems unable to work with nested functions
>
>
> Index: testsuite/swfdec/PASSING
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
> retrieving revision 1.20
> retrieving revision 1.21
> diff -u -b -r1.20 -r1.21
> --- testsuite/swfdec/PASSING    27 Apr 2007 09:43:43 -0000      1.20
> +++ testsuite/swfdec/PASSING    27 Apr 2007 16:09:01 -0000      1.21
> @@ -44,6 +44,8 @@
>  name2.swf
>  registerclass-properties.swf
>  function-scope-5.swf
> +function-scope-6.swf
> +function-scope-7.swf
>  setinterval-clear.swf
>  onload-childparent.swf
>  registerclass-previous.swf
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Fri Apr 27 22:30:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhchT-0006T1-0i
	for mharc-gnash-commit@gnu.org; Fri, 27 Apr 2007 22:30:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhchR-0006Sm-3t
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:30:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhchN-0006SM-JA
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:30:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhchN-0006SJ-Fi
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:30:09 -0400
Received: from wr-out-0506.google.com ([64.233.184.229])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HhcbS-0006WP-Ee
	for gnash-commit@gnu.org; Fri, 27 Apr 2007 22:24:02 -0400
Received: by wr-out-0506.google.com with SMTP id i23so1138671wra
	for <gnash-commit@gnu.org>; Fri, 27 Apr 2007 19:24:01 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=oH2Uc0xubub8/kB2dMfhDcAeIZRjY4ehtH35MCAgo6AF4jihU3/ZzTHJVxciMLJduR4u8bGey0WXskW3dMRshkXpJRmHwqsfxRx8+3G4D/3WhTW6pWsxQo4RgkMLcOLWnn1uzBrayfN0HngS/mvEt6cErd3aWTHM9b4lv6VRCs4=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=f88cadvMQkHeFaTJ9f+KxHxFe0OL5aNQPREW1L8MGRLeHjfP75wk6BwkwHTqjtIfU8nDIRFYTuHwQhfr3zZbvmtMrFtEMojwVy8a7nJAzKRnoc2EDFXFT1Dl3FACdjhSQzBpDJdUaPwF32trZ/tf2hiTDKE/zfGGtuiVfQ5Dqxs=
Received: by 10.114.175.16 with SMTP id x16mr6909wae.1177727041324;
	Fri, 27 Apr 2007 19:24:01 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Fri, 27 Apr 2007 19:24:01 -0700 (PDT)
Message-ID: <ca4b43ff0704271924y6cfe3442t7fa56424761354bb@mail.gmail.com>
Date: Sat, 28 Apr 2007 10:24:01 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash ChangeLog server/swf/PlaceObject2Tag.cpp
In-Reply-To: <E1HhYE9-0006Y0-Nc@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HhYE9-0006Y0-Nc@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 02:30:13 -0000

-    if( !(flags & (1 << total_known_events)) )    <--------  [1]
+   //if( !(flags & (1 << total_known_events)) )   <---------[2]
+   if( flags >> total_known_events )     <----------------   [3]

[1] was my mistake.
[3] is faster and cleaner.
[2] should be removed:)



On 4/28/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/04/27 21:43:41
>
> Modified files:
>        .              : ChangeLog
>        server/swf     : PlaceObject2Tag.cpp
>
> Log message:
>                * server/swf/PlaceObject2Tag.cpp (readPlaceActions): fix check for
>                  all reserved bits being zero (removed an annoying false malformed
>                  swf error).
>                * gui/gtk.cpp: comment out function tracing for key and mouse events.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3026&r2=1.3027
> http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.5&r2=1.6
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3026
> retrieving revision 1.3027
> diff -u -b -r1.3026 -r1.3027
> --- ChangeLog   27 Apr 2007 18:17:16 -0000      1.3026
> +++ ChangeLog   27 Apr 2007 21:43:41 -0000      1.3027
> @@ -1,3 +1,10 @@
> +2007-04-27 Sandro Santilli <strk@keybit.net>
> +
> +       * server/swf/PlaceObject2Tag.cpp (readPlaceActions): fix check for
> +         all reserved bits being zero (removed an annoying false malformed
> +         swf error).
> +       * gui/gtk.cpp: comment out function tracing for key and mouse events.
> +
>  2007-04-27 Martin Guy <martinwguy@yahoo.it>
>
>        * configure.ac: Add verbose text for missing gstreamer-dev help
>
> Index: server/swf/PlaceObject2Tag.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
> retrieving revision 1.5
> retrieving revision 1.6
> diff -u -b -r1.5 -r1.6
> --- server/swf/PlaceObject2Tag.cpp      24 Apr 2007 06:54:06 -0000      1.5
> +++ server/swf/PlaceObject2Tag.cpp      27 Apr 2007 21:43:41 -0000      1.6
> @@ -17,7 +17,7 @@
>  // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>  //
>
> -/* $Id: PlaceObject2Tag.cpp,v 1.5 2007/04/24 06:54:06 zoulunkai Exp $ */
> +/* $Id: PlaceObject2Tag.cpp,v 1.6 2007/04/27 21:43:41 strk Exp $ */
>
>  #ifdef HAVE_CONFIG_H
>  #include "config.h"
> @@ -170,7 +170,8 @@
>                // Let's see if the event flag we received is for an event that we know of
>
>                //check if all unused bits are zero!
> -               if( !(flags & (1 << total_known_events)) )
> +               //if( !(flags & (1 << total_known_events)) )
> +               if( flags >> total_known_events )
>                {
>                        IF_VERBOSE_MALFORMED_SWF(
>                        log_swferror(_("swf_event::read() -- unknown / unhandled event type received, flags = 0x%x"), flags);
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sat Apr 28 01:00:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hhf3I-00018r-7k
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 01:00:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hhf3G-00018Z-Dz
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:00:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhf3F-00017Z-5y
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:00:53 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhf3E-00017S-Se
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:00:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhexJ-00039j-7g
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 00:54:45 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhexH-0006qa-AA
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:54:43 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhexH-0006qX-2T
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:54:43 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhexH-0006qX-2T@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 28 Apr 2007 04:54:43 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/server/swf PlaceObject2Tag.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 05:00:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/28 04:54:42

Modified files:
	server/swf     : PlaceObject2Tag.cpp 

Log message:
	Cleanup last events flag checker after confirmation from kai

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PlaceObject2Tag.cpp	27 Apr 2007 21:43:41 -0000	1.6
+++ PlaceObject2Tag.cpp	28 Apr 2007 04:54:42 -0000	1.7
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: PlaceObject2Tag.cpp,v 1.6 2007/04/27 21:43:41 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.7 2007/04/28 04:54:42 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -169,8 +169,7 @@
 
 		// Let's see if the event flag we received is for an event that we know of
 
-		//check if all unused bits are zero!
-		//if( !(flags & (1 << total_known_events)) )
+		// Integrity check: all reserved bits should be zero
 		if( flags >> total_known_events ) 
 		{
 			IF_VERBOSE_MALFORMED_SWF(



From MAILER-DAEMON Sat Apr 28 01:20:37 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhfML-0002iO-5G
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 01:20:37 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhfMI-0002hN-BI
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:20:34 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhfMG-0002h8-Ln
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:20:33 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhfMG-0002h5-GJ
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:20:32 -0400
Received: from nz-out-0506.google.com ([64.233.162.234])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HhfGK-0004R3-Lg
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 01:14:24 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1328565nzp
	for <gnash-commit@gnu.org>; Fri, 27 Apr 2007 22:14:24 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=jYsWQEVli7Qi6E4xrLUA883PRkQrgbMvgk7JP0XqIM6uP7k0BPDP3E9Y156e5hfFqWS0GRz+9L42j8gaJgQXyENmCxi0+JlH21r3dEHtb19Eu4ANSPYZpiyoPuqP5glQ7Mv4tdMGCpQXs315lkPBoDdPgx1+Vi4frxz8XnwlNxE=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=VH+9HsDG28rndki6FM74Cb6tgr3ZvJ9fSFfEckD8mxssxLxtx/gAcABWsaChhLrZp+BDL8QeCSpS9Ztz1FW6v6MCqZY6p294drj+1Eii63wYs77r1vLojffZ6p/Jo1CpYp9tvHJpgZEVY/PfeXZW3M/ynsLcVTO4Ro+9QL42aYs=
Received: by 10.115.49.16 with SMTP id b16mr1258818wak.1177737263627;
	Fri, 27 Apr 2007 22:14:23 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Fri, 27 Apr 2007 22:14:23 -0700 (PDT)
Message-ID: <ca4b43ff0704272214x349279eel833a6383c3edac08@mail.gmail.com>
Date: Sat, 28 Apr 2007 13:14:23 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "Sandro Santilli" <strk@keybit.net>
Subject: Re: [Gnash-commit] gnash testsuite/actionscript.all/Function.as Ch...
In-Reply-To: <E1HhTbC-0002vh-Rm@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1HhTbC-0002vh-Rm@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 05:20:35 -0000

continues with the nested function.

I extract the tests from Function.as, around line 280.

Suppose that OUTPUT_VERSION  is  5

var result1 = "initial_result1_value";
var result2 = "initial_result2_value";

check_equals(eval("result1"), "initial_result1_value");
outer_func = function()
{
	var a = "hello";

	inner_func = function(var_ref)
	{
		return(eval(var_ref));
	};

	result1 = inner_func("a");   <---------------------------- [1]
};

//call outer_func to set result1
check_equals(typeof(outer_func), 'function');
outer_func();

// call inner_func to set result2
check_equals(typeof(inner_func), 'function');
result2 = inner_func("a");

xcheck_equals ( result1, undefined ); <--------------------- [2]
check_equals ( result2, undefined );

[2] while fails here?
inner_func() is a main timeline function. It's expected that inner_func()
can not find the variable "a" defined in another main timeline function
outer_func().



On 4/28/07, Sandro Santilli <strk@keybit.net> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Sandro Santilli <strk>  07/04/27 16:47:10
>
> Modified files:
>        testsuite/actionscript.all: Function.as
>        .              : ChangeLog
>
> Log message:
>                * testsuite/actionscript.all/Function.as: add another test for
>                  nested functions and scope chain.
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.47&r2=1.48
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3023&r2=1.3024
>
> Patches:
> Index: testsuite/actionscript.all/Function.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
> retrieving revision 1.47
> retrieving revision 1.48
> diff -u -b -r1.47 -r1.48
> --- testsuite/actionscript.all/Function.as      27 Apr 2007 16:09:01 -0000      1.47
> +++ testsuite/actionscript.all/Function.as      27 Apr 2007 16:47:10 -0000      1.48
> @@ -20,7 +20,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: Function.as,v 1.47 2007/04/27 16:09:01 strk Exp $";
> +rcsid="$Id: Function.as,v 1.48 2007/04/27 16:47:10 strk Exp $";
>
>  #include "check.as"
>
> @@ -321,6 +321,24 @@
>
>  #endif
>
> +function bla (num)
> +{
> +       bla = function ()
> +       {
> +               return num;
> +       };
> +       return num;
> +}
> +
> +check_equals(typeof(bla), 'function');
> +check_equals(bla(42), 42);
> +check_equals(typeof(bla), 'function');
> +#if OUTPUT_VERSION < 6
> +check_equals(typeof(bla(43)), 'undefined');
> +#else
> +check_equals(bla(43), 42);
> +#endif
> +
>  //----------------------------------------------------------
>  //
>  //  Test case for "this"  in Object's context
>
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3023
> retrieving revision 1.3024
> diff -u -b -r1.3023 -r1.3024
> --- ChangeLog   27 Apr 2007 16:43:09 -0000      1.3023
> +++ ChangeLog   27 Apr 2007 16:47:10 -0000      1.3024
> @@ -2,6 +2,8 @@
>
>        * testsuite/actionscript.all/Global.as: check that _global._global
>          is undefined.
> +       * testsuite/actionscript.all/Function.as: add another test for
> +         nested functions and scope chain.
>
>  2007-04-27 Sandro Santilli <strk@keybit.net>
>
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sat Apr 28 03:29:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhhMa-0005EV-Uo
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 03:29:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhhMZ-0005Cm-KS
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 03:28:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhhMX-0005C1-NI
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 03:28:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhhMX-0005Bm-HL
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 03:28:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhhGb-0005tv-17
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 03:22:49 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhhGW-0007KP-BQ
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:22:44 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhhGW-0007KM-59
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:22:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhhGW-0007KM-59@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 28 Apr 2007 07:22:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 07:28:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/28 07:22:44

Modified files:
	.              : ChangeLog 
	server         : as_environment.cpp as_environment.h 
	testsuite/actionscript.all: Function.as 

Log message:
	        * server/as_environment.{cpp,h}: stop descending
	          the CallStack looking into the callers locals!
	        * testsuite/actionscript.all/Function.as: success
	          with SWF5 and (missing) scope chain.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3028&r2=1.3029
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.75&r2=1.76
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Function.as?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3028
retrieving revision 1.3029
diff -u -b -r1.3028 -r1.3029
--- ChangeLog	28 Apr 2007 00:04:25 -0000	1.3028
+++ ChangeLog	28 Apr 2007 07:22:43 -0000	1.3029
@@ -1,4 +1,11 @@
-2007-04-26  Rob Savoye  <rob@pawnee.welcomehome.org>
+2007-04-28 Sandro Santilli <strk@keybit.net>
+
+	* server/as_environment.{cpp,h}: stop descending
+	  the CallStack looking into the callers locals!
+	* testsuite/actionscript.all/Function.as: success
+	  with SWF5 and (missing) scope chain.
+
+2007-04-27  Rob Savoye  <rob@pawnee.welcomehome.org>
 
 	* gui/fltk.cpp: Cast the key::code so it compiles on Darwin.
 	* macros/agg.m4: Don't inherit the -rpath setting fropm

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -b -r1.75 -r1.76
--- server/as_environment.cpp	27 Apr 2007 16:09:00 -0000	1.75
+++ server/as_environment.cpp	28 Apr 2007 07:22:43 -0000	1.76
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: as_environment.cpp,v 1.75 2007/04/27 16:09:00 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.76 2007/04/28 07:22:43 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -120,7 +120,7 @@
 
     // Check locals for getting them
     //as_environment::frame_slot slot;
-    if ( findLocal(varname, val, true, retTarget) ) // do we really want to descend here ??
+    if ( findLocal(varname, val, retTarget) ) 
     {
 	return val;
     }
@@ -281,7 +281,8 @@
 {
 
 	// Check locals for setting them
-	if ( setLocal(varname, val, true) )
+	// TODO: check if local variable takes precedence over 'with' scope when setting
+	if ( setLocal(varname, val) )
 	{
 		return;
 	}
@@ -321,10 +322,7 @@
 	assert(_localFrames.size());
 
 	// Is it in the current frame already?
-	// TODO: should we descend to upper frames ?
-	//       (probably not as we want to update it)
-	//as_environment::frame_slot slot;
-	if ( setLocal(varname, val, false) )
+	if ( setLocal(varname, val) )
 	{
 		return;
 	}
@@ -343,12 +341,8 @@
 void
 as_environment::declare_local(const std::string& varname)
 {
-	// TODO: should we descend to upper frames ?
-	//       (probably not as we want to declare it)
-	//as_environment::frame_slot slot;
-
 	as_value tmp;
-	if ( ! findLocal(varname, tmp, false) )
+	if ( ! findLocal(varname, tmp) )
 	{
 		// Not in frame; create a new local var.
 		assert(_localFrames.size());
@@ -929,32 +923,15 @@
 
 /*private*/
 bool
-as_environment::findLocal(const std::string& varname, as_value& ret, bool descend, as_object** retTarget)
+as_environment::findLocal(const std::string& varname, as_value& ret, as_object** retTarget)
 {
 	if ( _localFrames.empty() ) return false;
-	if ( ! descend )
-	{
 		if ( findLocal(_localFrames.back().locals, varname, ret) )
 		{
 			if ( retTarget ) *retTarget = _localFrames.back().locals.get();
 			return true;
 		}
 		return false;
-	}
-
-	for (CallStack::reverse_iterator it=_localFrames.rbegin(),
-			itEnd=_localFrames.rend();
-			it != itEnd;
-			++it)
-	{
-		LocalVars& locals = it->locals;
-		if ( findLocal(locals, varname, ret) )
-		{
-			if ( retTarget ) *retTarget = locals.get();
-			return true;
-		}
-	}
-	return false;
 }
 
 /* static private */
@@ -962,18 +939,6 @@
 as_environment::findLocal(LocalVars& locals, const std::string& name, as_value& ret)
 {
 	return locals->get_member(name, &ret);
-#if 0
-	for (size_t i=0; i<locals.size(); ++i)
-	{
-		const as_environment::frame_slot& slot = locals[i];
-		if (slot.m_name == name)
-		{
-			ret = slot;
-			return true;
-		}
-	}
-	return false;
-#endif
 }
 
 /* static private */
@@ -981,60 +946,22 @@
 as_environment::delLocal(LocalVars& locals, const std::string& varname)
 {
 	return locals->delProperty(varname).second;
-#if 0
-	for (size_t i=0; i<locals.size(); ++i)
-	{
-		const as_environment::frame_slot& slot = locals[i];
-		if (slot.m_name == varname)
-		{
-			locals.erase(locals.begin()+i);
-			return true;
-		}
-	}
-	return false;
-#endif
 }
 
 /* private */
 bool
-as_environment::delLocal(const std::string& varname, bool descend)
+as_environment::delLocal(const std::string& varname)
 {
 	if ( _localFrames.empty() ) return false;
-	if ( ! descend ) return delLocal(_localFrames.back().locals, varname);
-
-	for (CallStack::reverse_iterator it=_localFrames.rbegin(),
-			itEnd=_localFrames.rend();
-			it != itEnd;
-			++it)
-	{
-		LocalVars& locals = it->locals;
-		if ( delLocal(locals, varname) )
-		{
-			return true;
-		}
-	}
-	return false;
+	return delLocal(_localFrames.back().locals, varname);
 }
 
 /* private */
 bool
-as_environment::setLocal(const std::string& varname, const as_value& val, bool descend)
+as_environment::setLocal(const std::string& varname, const as_value& val)
 {
 	if ( _localFrames.empty() ) return false;
-	if ( ! descend ) return setLocal(_localFrames.back().locals, varname, val);
-
-	for (CallStack::reverse_iterator it=_localFrames.rbegin(),
-			itEnd=_localFrames.rend();
-			it != itEnd;
-			++it)
-	{
-		LocalVars& locals = it->locals;
-		if ( setLocal(locals, varname, val) )
-		{
-			return true;
-		}
-	}
-	return false;
+	return setLocal(_localFrames.back().locals, varname, val);
 }
 
 /* static private */
@@ -1046,18 +973,6 @@
 	if ( ! prop ) return false;
 	prop->setValue(*locals, val);
 	return true;
-#if 0
-	for (size_t i=0; i<locals.size(); ++i)
-	{
-		as_environment::frame_slot& slot = locals[i];
-		if (slot.m_name == varname)
-		{
-			slot.m_value = val;
-			return true;
-		}
-	}
-	return false;
-#endif
 }
 
 

Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/as_environment.h	27 Apr 2007 16:09:01 -0000	1.49
+++ server/as_environment.h	28 Apr 2007 07:22:43 -0000	1.50
@@ -523,21 +523,17 @@
 	///	If a variable is found it's assigned to this parameter.
 	///	Untouched if the variable is not found.
 	///
-	/// @param descend
-	///	If true the seek don't stop at current call frame, but
-	///	descends in upper frames. By default it is false.
-	///
 	/// @param retTarget
 	///	If not NULL, the pointer will be set to the actual object containing the
 	///	found variable (if found).
 	///
 	/// @return true if the variable was found, false otherwise
 	///
-	bool findLocal(const std::string& varname, as_value& ret, bool descend, as_object** retTarget=NULL);
+	bool findLocal(const std::string& varname, as_value& ret, as_object** retTarget=NULL);
 
-	bool findLocal(const std::string& varname, as_value& ret, bool descend, as_object** retTarget=NULL) const
+	bool findLocal(const std::string& varname, as_value& ret, as_object** retTarget=NULL) const
 	{
-		return const_cast<as_environment*>(this)->findLocal(varname, ret, descend, retTarget);
+		return const_cast<as_environment*>(this)->findLocal(varname, ret, retTarget);
 	}
 
 	/// Find a variable in the given LocalVars
@@ -558,13 +554,9 @@
 	/// @param varname
 	///	Name of the local variable
 	///
-	/// @param descend
-	///	If true the seek don't stop at current call frame, but
-	///	descends in upper frames. By default it is false.
-	///
 	/// @return true if the variable was found and deleted, false otherwise
 	///
-	bool delLocal(const std::string& varname, bool descend=false);
+	bool delLocal(const std::string& varname);
 
 	/// Delete a variable from the given LocalVars
 	//
@@ -583,13 +575,9 @@
 	/// @param val
 	///	Value to assign to the variable
 	///
-	/// @param descend
-	///	If true the seek don't stop at current call frame, but
-	///	descends in upper frames. By default it is false.
-	///
 	/// @return true if the variable was found, false otherwise
 	///
-	bool setLocal(const std::string& varname, const as_value& val, bool descend=false);
+	bool setLocal(const std::string& varname, const as_value& val);
 
 	/// Set a variable from the given LocalVars, if it exists.
 	//

Index: testsuite/actionscript.all/Function.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Function.as,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- testsuite/actionscript.all/Function.as	27 Apr 2007 16:47:10 -0000	1.48
+++ testsuite/actionscript.all/Function.as	28 Apr 2007 07:22:43 -0000	1.49
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: Function.as,v 1.48 2007/04/27 16:47:10 strk Exp $";
+rcsid="$Id: Function.as,v 1.49 2007/04/28 07:22:43 strk Exp $";
 
 #include "check.as"
 
@@ -307,16 +307,11 @@
 #if OUTPUT_VERSION >= 6
 
   check_equals ( result1, "hello" );
-
-  // Gnash fails here, we want this fixed!
   check_equals ( result2, "hello" );
 
-#else // SWF5 or lower seems unable to work with nested functions
-
-  xcheck_equals ( result1, undefined );
+#else // SWF5 or lower doesn't use a scope chain
 
-  // Gnash succeeds here, but that's for the same reason why it
-  // fails in the SWF6+ section above...
+  check_equals ( result1, undefined );
   check_equals ( result2, undefined );
 
 #endif



From MAILER-DAEMON Sat Apr 28 04:09:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hhhze-00060i-Q7
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 04:09:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hhhzd-00060G-6W
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:09:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhhzc-0005zy-AH
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:09:20 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhhzc-0005zv-6Y
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:09:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1Hhhtf-0000mG-GO
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:03:11 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hhhtd-0002K2-GM
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 08:03:09 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1Hhhtd-0002Jy-1j
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 08:03:09 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hhhtd-0002Jy-1j@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Sat, 28 Apr 2007 08:03:09 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 08:09:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/28 08:03:08

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: with.as 

Log message:
	more tests about ActionWith

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3029&r2=1.3030
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/with.as?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3029
retrieving revision 1.3030
diff -u -b -r1.3029 -r1.3030
--- ChangeLog	28 Apr 2007 07:22:43 -0000	1.3029
+++ ChangeLog	28 Apr 2007 08:03:08 -0000	1.3030
@@ -1,3 +1,8 @@
+2007-04-28 Zou Lunkai <zoulunkai@gmail.com>
+
+	*	testsuite/actionscript.all/with.as:
+		add more tests
+
 2007-04-28 Sandro Santilli <strk@keybit.net>
 
 	* server/as_environment.{cpp,h}: stop descending

Index: testsuite/actionscript.all/with.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/with.as,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/actionscript.all/with.as	6 Mar 2007 10:16:04 -0000	1.9
+++ testsuite/actionscript.all/with.as	28 Apr 2007 08:03:08 -0000	1.10
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: with.as,v 1.9 2007/03/06 10:16:04 strk Exp $";
+rcsid="$Id: with.as,v 1.10 2007/04/28 08:03:08 zoulunkai Exp $";
 
 #include "check.as"
 
@@ -124,3 +124,82 @@
 
 with(_root) { ; }
 // not aborting is enough to pass this test
+
+
+
+//---------------------------------------------------------
+// tests how "with" affect the serch path(ScopeChain).
+//---------------------------------------------------------
+
+a = 100;
+b = 100;
+_root.createEmptyMovieClip("mc1", 3);
+mc1.a = 1;
+mc1.b = 1;
+mc1.x = 3;
+_root.createEmptyMovieClip("mc2", 4);
+mc2.a = 2;
+mc2.b = 2;
+mc2.y = 3;
+
+with(mc1)
+{
+	check_equals(a, 1);
+}
+with(mc2)
+{
+	check_equals(a, 2);
+}
+
+with(mc1)
+{
+	with(mc2)
+	{
+		check_equals(a, 2);
+		check_equals(b, 2);
+		check_equals(x, 3);
+		check_equals(y, 3);
+	}
+}
+
+with(mc2)
+{
+	with(mc1)
+	{
+		check_equals(a, 1);
+		check_equals(b, 1);
+		check_equals(x, 3);
+		check_equals(y, 3);
+	}
+}
+
+function f_a()
+{
+	return a;
+}
+
+function f_b()
+{
+	return b;
+}
+
+function f_x()
+{
+	return x;
+}
+
+function f_y()
+{
+	return y;
+}
+
+with(mc1)
+{
+	with(mc2)
+	{
+		check_equals(f_a(), 100); 
+		check_equals(f_b(), 100); 
+		check_equals(typeof(f_x()), 'undefined'); 
+		check_equals(typeof(f_y()), 'undefined'); 
+	}
+}



From MAILER-DAEMON Sat Apr 28 04:12:45 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hhi2v-0001h1-Cs
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 04:12:45 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hhi2u-0001dq-7Q
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:12:44 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhi2r-0001ZC-88
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:12:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhi2r-0001YQ-5O
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:12:41 -0400
Received: from nz-out-0506.google.com ([64.233.162.235])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hhhwu-000174-3b
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:06:32 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1357244nzp
	for <gnash-commit@gnu.org>; Sat, 28 Apr 2007 01:06:31 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=W/8jTbFxGROokHrzHTluyhs2jZ+0memtOl7a+2RNJd+Lx5Tv5a1B6jDQKR/4OkEVQRbQzStQYdjqPpTtjq4KCXbuIhKnt0YOlf604dGCZ0zUtcFdzhZ+aHUk+cXLc8zDSR6I6K321i2EbP5BnbFlVvhtB3YW/UcoH0AmQdn69sc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=TwWj7h3K6oAmWdmkxSyDV2fMpE9g8wHx8yn4MndYp7JemWdYZhgQO2l91X6oxwOiX18xKw8ECUWuQizua0ekC/RSXhUzGkYY8T22KlYsZpLKK9CGH25Sflhex9KWwEEkbvx6LdCH2ETZ+xFXwwdjaF50Pzaci46KaU2QP2QoLjQ=
Received: by 10.114.133.1 with SMTP id g1mr1323881wad.1177747590974;
	Sat, 28 Apr 2007 01:06:30 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sat, 28 Apr 2007 01:06:30 -0700 (PDT)
Message-ID: <ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
Date: Sat, 28 Apr 2007 16:06:30 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
In-Reply-To: <E1Hhhtd-0002Jy-1j@cvs>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hhhtd-0002Jy-1j@cvs>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 08:12:44 -0000

I'm not sure whether all these check could be passed, as I assume strk
is working on this.

On 4/28/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> CVSROOT:        /sources/gnash
> Module name:    gnash
> Changes by:     Zou Lunkai <zoulunkai>  07/04/28 08:03:08
>
> Modified files:
>        .              : ChangeLog
>        testsuite/actionscript.all: with.as
>
> Log message:
>        more tests about ActionWith
>
> CVSWeb URLs:
> http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3029&r2=1.3030
> http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/with.as?cvsroot=gnash&r1=1.9&r2=1.10
>
> Patches:
> Index: ChangeLog
> ===================================================================
> RCS file: /sources/gnash/gnash/ChangeLog,v
> retrieving revision 1.3029
> retrieving revision 1.3030
> diff -u -b -r1.3029 -r1.3030
> --- ChangeLog   28 Apr 2007 07:22:43 -0000      1.3029
> +++ ChangeLog   28 Apr 2007 08:03:08 -0000      1.3030
> @@ -1,3 +1,8 @@
> +2007-04-28 Zou Lunkai <zoulunkai@gmail.com>
> +
> +       *       testsuite/actionscript.all/with.as:
> +               add more tests
> +
>  2007-04-28 Sandro Santilli <strk@keybit.net>
>
>        * server/as_environment.{cpp,h}: stop descending
>
> Index: testsuite/actionscript.all/with.as
> ===================================================================
> RCS file: /sources/gnash/gnash/testsuite/actionscript.all/with.as,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -b -r1.9 -r1.10
> --- testsuite/actionscript.all/with.as  6 Mar 2007 10:16:04 -0000       1.9
> +++ testsuite/actionscript.all/with.as  28 Apr 2007 08:03:08 -0000      1.10
> @@ -22,7 +22,7 @@
>  // compile this test case with Ming makeswf, and then
>  // execute it like this gnash -1 -r 0 -v out.swf
>
> -rcsid="$Id: with.as,v 1.9 2007/03/06 10:16:04 strk Exp $";
> +rcsid="$Id: with.as,v 1.10 2007/04/28 08:03:08 zoulunkai Exp $";
>
>  #include "check.as"
>
> @@ -124,3 +124,82 @@
>
>  with(_root) { ; }
>  // not aborting is enough to pass this test
> +
> +
> +
> +//---------------------------------------------------------
> +// tests how "with" affect the serch path(ScopeChain).
> +//---------------------------------------------------------
> +
> +a = 100;
> +b = 100;
> +_root.createEmptyMovieClip("mc1", 3);
> +mc1.a = 1;
> +mc1.b = 1;
> +mc1.x = 3;
> +_root.createEmptyMovieClip("mc2", 4);
> +mc2.a = 2;
> +mc2.b = 2;
> +mc2.y = 3;
> +
> +with(mc1)
> +{
> +       check_equals(a, 1);
> +}
> +with(mc2)
> +{
> +       check_equals(a, 2);
> +}
> +
> +with(mc1)
> +{
> +       with(mc2)
> +       {
> +               check_equals(a, 2);
> +               check_equals(b, 2);
> +               check_equals(x, 3);
> +               check_equals(y, 3);
> +       }
> +}
> +
> +with(mc2)
> +{
> +       with(mc1)
> +       {
> +               check_equals(a, 1);
> +               check_equals(b, 1);
> +               check_equals(x, 3);
> +               check_equals(y, 3);
> +       }
> +}
> +
> +function f_a()
> +{
> +       return a;
> +}
> +
> +function f_b()
> +{
> +       return b;
> +}
> +
> +function f_x()
> +{
> +       return x;
> +}
> +
> +function f_y()
> +{
> +       return y;
> +}
> +
> +with(mc1)
> +{
> +       with(mc2)
> +       {
> +               check_equals(f_a(), 100);
> +               check_equals(f_b(), 100);
> +               check_equals(typeof(f_x()), 'undefined');
> +               check_equals(typeof(f_y()), 'undefined');
> +       }
> +}
>
>
> _______________________________________________
> Gnash-commit mailing list
> Gnash-commit@gnu.org
> http://lists.gnu.org/mailman/listinfo/gnash-commit
>



From MAILER-DAEMON Sat Apr 28 04:21:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhiBA-00061u-3S
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 04:21:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhiB8-0005zz-JC
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:21:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhiB7-0005xR-Hl
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:21:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhiB7-0005x7-Bu
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:21:13 -0400
Received: from nz-out-0506.google.com ([64.233.162.239])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hhi5A-0001fV-KA
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 04:15:04 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1359080nzp
	for <gnash-commit@gnu.org>; Sat, 28 Apr 2007 01:15:04 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=MDFeBY/XK9JfE7i1WHY+ccF8p/9Jf/lp73QmgmHJA6BEkbVOjCWsbdL8lFpHVvATCIhX+1JcIWa8nHEVqdnbvvWLp8LcFU2uHBmJ1zQocyzwmOhZoLJNPW5znZQRjgPfZBk9YiHQdJVd1ZYZhWybW+92P32Vwr4u0qW42pssEys=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=DP8WO5vJa0SaYfeyMk44eTNf3jXcwpW5oIlNqhOwm0SBXxfT2pCWSbkADFxbA6RszlWui/ZCM9Vlw69BShhx954dOKAyfAxhyf2uFvRZMBXVcweEtDJ43O9p/Yt0Ty9s2jO+N2aOoGyWSozSXNx/p2FVmjLaS0TpN4Wl8wk1AFA=
Received: by 10.114.113.1 with SMTP id l1mr1298427wac.1177748103489;
	Sat, 28 Apr 2007 01:15:03 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sat, 28 Apr 2007 01:15:03 -0700 (PDT)
Message-ID: <ca4b43ff0704280115m3f9ca1aeg9f82ede2f34f1984@mail.gmail.com>
Date: Sat, 28 Apr 2007 16:15:03 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
In-Reply-To: <ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 08:21:14 -0000

+with(mc1)
+{
+       with(mc2)
+       {
+               check_equals(f_a(), 100);   <---------------------------- [1]
+               check_equals(f_b(), 100);
+               check_equals(typeof(f_x()), 'undefined');
+               check_equals(typeof(f_y()), 'undefined');
+       }
+}

search mc2,  no "f_a" defined;
search mc1,  no "f_a" defined;
searce _root,  find "f_a", executing f_a(), get _root.a == 100,  succeed!
that's how [1] works in my brain.



On 4/28/07, zou lunkai <zoulunkai@gmail.com> wrote:
> I'm not sure whether all these check could be passed, as I assume strk
> is working on this.
>
> On 4/28/07, Zou Lunkai <zoulunkai@gmail.com> wrote:
> > CVSROOT:        /sources/gnash
> > Module name:    gnash
> > Changes by:     Zou Lunkai <zoulunkai>  07/04/28 08:03:08
> >
> > Modified files:
> >        .              : ChangeLog
> >        testsuite/actionscript.all: with.as
> >
> > Log message:
> >        more tests about ActionWith
> >
> > CVSWeb URLs:
> > http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3029&r2=1.3030
> > http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/with.as?cvsroot=gnash&r1=1.9&r2=1.10
> >
> > Patches:
> > Index: ChangeLog
> > ===================================================================
> > RCS file: /sources/gnash/gnash/ChangeLog,v
> > retrieving revision 1.3029
> > retrieving revision 1.3030
> > diff -u -b -r1.3029 -r1.3030
> > --- ChangeLog   28 Apr 2007 07:22:43 -0000      1.3029
> > +++ ChangeLog   28 Apr 2007 08:03:08 -0000      1.3030
> > @@ -1,3 +1,8 @@
> > +2007-04-28 Zou Lunkai <zoulunkai@gmail.com>
> > +
> > +       *       testsuite/actionscript.all/with.as:
> > +               add more tests
> > +
> >  2007-04-28 Sandro Santilli <strk@keybit.net>
> >
> >        * server/as_environment.{cpp,h}: stop descending
> >
> > Index: testsuite/actionscript.all/with.as
> > ===================================================================
> > RCS file: /sources/gnash/gnash/testsuite/actionscript.all/with.as,v
> > retrieving revision 1.9
> > retrieving revision 1.10
> > diff -u -b -r1.9 -r1.10
> > --- testsuite/actionscript.all/with.as  6 Mar 2007 10:16:04 -0000       1.9
> > +++ testsuite/actionscript.all/with.as  28 Apr 2007 08:03:08 -0000      1.10
> > @@ -22,7 +22,7 @@
> >  // compile this test case with Ming makeswf, and then
> >  // execute it like this gnash -1 -r 0 -v out.swf
> >
> > -rcsid="$Id: with.as,v 1.9 2007/03/06 10:16:04 strk Exp $";
> > +rcsid="$Id: with.as,v 1.10 2007/04/28 08:03:08 zoulunkai Exp $";
> >
> >  #include "check.as"
> >
> > @@ -124,3 +124,82 @@
> >
> >  with(_root) { ; }
> >  // not aborting is enough to pass this test
> > +
> > +
> > +
> > +//---------------------------------------------------------
> > +// tests how "with" affect the serch path(ScopeChain).
> > +//---------------------------------------------------------
> > +
> > +a = 100;
> > +b = 100;
> > +_root.createEmptyMovieClip("mc1", 3);
> > +mc1.a = 1;
> > +mc1.b = 1;
> > +mc1.x = 3;
> > +_root.createEmptyMovieClip("mc2", 4);
> > +mc2.a = 2;
> > +mc2.b = 2;
> > +mc2.y = 3;
> > +
> > +with(mc1)
> > +{
> > +       check_equals(a, 1);
> > +}
> > +with(mc2)
> > +{
> > +       check_equals(a, 2);
> > +}
> > +
> > +with(mc1)
> > +{
> > +       with(mc2)
> > +       {
> > +               check_equals(a, 2);
> > +               check_equals(b, 2);
> > +               check_equals(x, 3);
> > +               check_equals(y, 3);
> > +       }
> > +}
> > +
> > +with(mc2)
> > +{
> > +       with(mc1)
> > +       {
> > +               check_equals(a, 1);
> > +               check_equals(b, 1);
> > +               check_equals(x, 3);
> > +               check_equals(y, 3);
> > +       }
> > +}
> > +
> > +function f_a()
> > +{
> > +       return a;
> > +}
> > +
> > +function f_b()
> > +{
> > +       return b;
> > +}
> > +
> > +function f_x()
> > +{
> > +       return x;
> > +}
> > +
> > +function f_y()
> > +{
> > +       return y;
> > +}
> > +
> > +with(mc1)
> > +{
> > +       with(mc2)
> > +       {
> > +               check_equals(f_a(), 100);
> > +               check_equals(f_b(), 100);
> > +               check_equals(typeof(f_x()), 'undefined');
> > +               check_equals(typeof(f_y()), 'undefined');
> > +       }
> > +}
> >
> >
> > _______________________________________________
> > Gnash-commit mailing list
> > Gnash-commit@gnu.org
> > http://lists.gnu.org/mailman/listinfo/gnash-commit
> >
>



From MAILER-DAEMON Sat Apr 28 07:23:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hhl1z-0000AD-2m
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 07:23:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hhl1x-00009o-Hr
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:23:57 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhl1v-00009c-Qr
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:23:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhl1v-00009Z-L4
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:23:55 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hhkvx-0000J1-No
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:17:46 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3SBHXW87173;
	Sat, 28 Apr 2007 13:17:33 +0200 (CEST)
	(envelope-from strk@keybit.net)
From: strk <strk@keybit.net>
Date: Sat, 28 Apr 2007 13:17:33 +0200
To: zou lunkai <zoulunkai@gmail.com>
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
Message-ID: <20070428111733.GB80667@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: gnash-commit@gnu.org
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 11:23:57 -0000

On Sat, Apr 28, 2007 at 04:06:30PM +0800, zou lunkai wrote:
> I'm not sure whether all these check could be passed, as I assume strk
> is working on this.

SWF5 has no createEmptyMovieClip, and is the only version that fails in Gnash.
Interestingly, the total number of tests run differ between Gnash and the reference
player. Check it out.

--strk;



From MAILER-DAEMON Sat Apr 28 07:27:24 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hhl5I-0001ab-8v
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 07:27:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hhl5G-0001Zl-KE
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:27:22 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhl5G-0001ZZ-4f
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:27:22 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhl5F-0001ZW-Vt
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:27:22 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HhkzH-0000Yr-VG
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 07:21:12 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3SBL7u87243;
	Sat, 28 Apr 2007 13:21:07 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Sat, 28 Apr 2007 13:21:07 +0200
From: strk <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
Message-ID: <20070428112107.GC80667@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
	<20070428111733.GB80667@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070428111733.GB80667@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 11:27:23 -0000

On Sat, Apr 28, 2007 at 01:17:33PM +0200, strk wrote:
> On Sat, Apr 28, 2007 at 04:06:30PM +0800, zou lunkai wrote:
> > I'm not sure whether all these check could be passed, as I assume strk
> > is working on this.
> 
> SWF5 has no createEmptyMovieClip, and is the only version that fails in Gnash.
> Interestingly, the total number of tests run differ between Gnash and the reference
> player. Check it out.

All the additional tests run by gnash come after this:

ACTIONSCRIPT ERROR: Empty with() block...

Maybe that error triggers an abort of current action execution, so further
tests are never executed (and would fail with the reference player as well).

--strk;



From MAILER-DAEMON Sat Apr 28 08:31:56 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hhm5k-00027O-AQ
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 08:31:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hhm5j-00027D-AL
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 08:31:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhm5i-00026z-Bg
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 08:31:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhm5i-00026w-9Y
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 08:31:54 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1Hhlzj-00068g-Um
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 08:25:44 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3SCPdD88024;
	Sat, 28 Apr 2007 14:25:39 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Sat, 28 Apr 2007 14:25:39 +0200
From: strk <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
Message-ID: <20070428122539.GE80667@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
	<20070428111733.GB80667@keybit.net>
	<20070428112107.GC80667@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070428112107.GC80667@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 12:31:55 -0000

On Sat, Apr 28, 2007 at 01:21:07PM +0200, strk wrote:
> On Sat, Apr 28, 2007 at 01:17:33PM +0200, strk wrote:
> > On Sat, Apr 28, 2007 at 04:06:30PM +0800, zou lunkai wrote:
> > > I'm not sure whether all these check could be passed, as I assume strk
> > > is working on this.
> > 
> > SWF5 has no createEmptyMovieClip, and is the only version that fails in Gnash.
> > Interestingly, the total number of tests run differ between Gnash and the reference
> > player. Check it out.
> 
> All the additional tests run by gnash come after this:
> 
> ACTIONSCRIPT ERROR: Empty with() block...
> 
> Maybe that error triggers an abort of current action execution, so further
> tests are never executed (and would fail with the reference player as well).

I noticed that all the tests that are run in gnash but not in th erefenrece
player are inside with(undefined) blocks, so the solution seems easy....

--strk;



From MAILER-DAEMON Sat Apr 28 13:03:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhqKH-0007xz-Q7
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 13:03:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhqKF-0007xt-Ot
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:03:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhqKD-0007xh-94
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:03:10 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhqKD-0007xe-5W
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:03:09 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhqED-0004ou-Uk
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 12:56:58 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhqEB-0002u0-64
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 16:56:55 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhqEA-0002tx-OU
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 16:56:55 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhqEA-0002tx-OU@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 28 Apr 2007 16:56:54 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 17:03:12 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/28 16:56:54

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: with.as 

Log message:
	        * testsuite/actionscript.all/with.as:
	          Add tests explaining why the tests in previous
	          commit are failing in SWF5 version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3030&r2=1.3031
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/with.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3030
retrieving revision 1.3031
diff -u -b -r1.3030 -r1.3031
--- ChangeLog	28 Apr 2007 08:03:08 -0000	1.3030
+++ ChangeLog	28 Apr 2007 16:56:54 -0000	1.3031
@@ -1,3 +1,9 @@
+2007-04-28 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/actionscript.all/with.as: 
+	  Add tests explaining why the tests in previous
+	  commit are failing in SWF5 version.
+
 2007-04-28 Zou Lunkai <zoulunkai@gmail.com>
 
 	*	testsuite/actionscript.all/with.as:

Index: testsuite/actionscript.all/with.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/with.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/actionscript.all/with.as	28 Apr 2007 08:03:08 -0000	1.10
+++ testsuite/actionscript.all/with.as	28 Apr 2007 16:56:54 -0000	1.11
@@ -22,7 +22,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: with.as,v 1.10 2007/04/28 08:03:08 zoulunkai Exp $";
+rcsid="$Id: with.as,v 1.11 2007/04/28 16:56:54 strk Exp $";
 
 #include "check.as"
 
@@ -125,6 +125,25 @@
 with(_root) { ; }
 // not aborting is enough to pass this test
 
+//---------------------------------------------------------
+// Test with(undefined) with(null) with(3) with("string")
+//---------------------------------------------------------
+
+checkpoint = 1;
+
+with(null) { _root.checkpoint = 2; }
+check_equals(checkpoint, 1);
+
+with(undefined) { _root.checkpoint = 3; }
+check_equals(checkpoint, 1);
+
+with(4) { _root.checkpoint = 3; __proto__.checkpoint = 'three'; }
+check_equals(checkpoint, 3);
+check_equals(Number.prototype.checkpoint, 'three');
+
+with('string') { _root.checkpoint = 4; __proto__.checkpoint = 'four'; }
+check_equals(checkpoint, 4);
+check_equals(String.prototype.checkpoint, 'four');
 
 
 //---------------------------------------------------------



From MAILER-DAEMON Sat Apr 28 13:12:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhqSw-0003fs-Ud
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhqSu-0003dC-K8
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhqSs-0003b7-VO
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:07 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhqSs-0003aw-SK
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:06 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HhqMt-0005Zs-Jw
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:05:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HhqMr-0003Hx-Rs
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 17:05:53 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HhqMr-0003Hu-GR
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 17:05:53 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HhqMr-0003Hu-GR@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sat, 28 Apr 2007 17:05:53 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 17:12:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/28 17:05:53

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

Log message:
	        * server/vm/ASHandlers.cpp (ActionWith): skip with() blocks
	          given a parameter not casting to an object.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3031&r2=1.3032
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3031
retrieving revision 1.3032
diff -u -b -r1.3031 -r1.3032
--- ChangeLog	28 Apr 2007 16:56:54 -0000	1.3031
+++ ChangeLog	28 Apr 2007 17:05:53 -0000	1.3032
@@ -1,5 +1,7 @@
 2007-04-28 Sandro Santilli <strk@keybit.net>
 
+	* server/vm/ASHandlers.cpp (ActionWith): skip with() blocks
+	  given a parameter not casting to an object.
 	* testsuite/actionscript.all/with.as: 
 	  Add tests explaining why the tests in previous
 	  commit are failing in SWF5 version.

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/vm/ASHandlers.cpp	27 Apr 2007 16:09:01 -0000	1.102
+++ server/vm/ASHandlers.cpp	28 Apr 2007 17:05:53 -0000	1.103
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.102 2007/04/27 16:09:01 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.103 2007/04/28 17:05:53 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -3382,7 +3382,8 @@
 	assert( code[pc] == SWF::ACTION_WITH );
 
 	thread.ensureStack(1);  // the object
-	boost::intrusive_ptr<as_object> with_obj = env.pop().to_object();
+	as_value with_obj_val = env.pop().to_object();
+	boost::intrusive_ptr<as_object> with_obj = with_obj_val.to_object();
 
 	++pc; // skip tag code
 
@@ -3409,6 +3410,17 @@
 	// now we should be on the first action of the 'with' body
 	assert(thread.next_pc == pc);
 
+	if ( ! with_obj )
+	{
+		IF_VERBOSE_ASCODING_ERRORS(
+		log_aserror(_("with(%s) : first argument doesn't cast to an object!"),
+			with_obj_val.to_debug_string().c_str());
+		);
+		// skip the full block
+		thread.next_pc += block_length;
+		return;
+	}
+
 	// where does the 'with' block ends ?
 	unsigned block_end = thread.next_pc + block_length;
 



From MAILER-DAEMON Sat Apr 28 13:13:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhqTl-0003sc-Ae
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 13:13:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhqTj-0003sJ-C2
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhqTg-0003rz-TD
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhqTg-0003rw-OG
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:12:56 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HhqNg-0005eE-A3
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:06:45 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3SH6Uv92032;
	Sat, 28 Apr 2007 19:06:30 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Sat, 28 Apr 2007 19:06:30 +0200
From: strk <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
Message-ID: <20070428170630.GA91664@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
	<20070428111733.GB80667@keybit.net>
	<20070428112107.GC80667@keybit.net>
	<20070428122539.GE80667@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070428122539.GE80667@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 17:13:00 -0000

Fixed...

with(undefined) {
	... <-- completely skipped
}

--strk;

On Sat, Apr 28, 2007 at 02:25:39PM +0200, strk wrote:
> On Sat, Apr 28, 2007 at 01:21:07PM +0200, strk wrote:
> > On Sat, Apr 28, 2007 at 01:17:33PM +0200, strk wrote:
> > > On Sat, Apr 28, 2007 at 04:06:30PM +0800, zou lunkai wrote:
> > > > I'm not sure whether all these check could be passed, as I assume strk
> > > > is working on this.
> > > 
> > > SWF5 has no createEmptyMovieClip, and is the only version that fails in Gnash.
> > > Interestingly, the total number of tests run differ between Gnash and the reference
> > > player. Check it out.
> > 
> > All the additional tests run by gnash come after this:
> > 
> > ACTIONSCRIPT ERROR: Empty with() block...
> > 
> > Maybe that error triggers an abort of current action execution, so further
> > tests are never executed (and would fail with the reference player as well).
> 
> I noticed that all the tests that are run in gnash but not in th erefenrece
> player are inside with(undefined) blocks, so the solution seems easy....
> 
> --strk;

-- 

 ()   ASCII Ribbon Campaign
 /\   Keep it simple! 




From MAILER-DAEMON Sat Apr 28 13:15:04 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhqVk-0004iM-N6
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 13:15:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhqVi-0004i5-ME
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:15:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhqVh-0004hr-ND
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:15:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhqVh-0004ho-IC
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:15:01 -0400
Received: from host147-8-static.59-217-b.business.telecomitalia.it
	([217.59.8.147] helo=freek.keybit.net)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <strk@keybit.net>) id 1HhqPh-0005ng-6I
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 13:08:50 -0400
Received: (from strk@localhost)
	by freek.keybit.net (8.11.1/8.11.1) id l3SH8bD92068;
	Sat, 28 Apr 2007 19:08:37 +0200 (CEST)
	(envelope-from strk@keybit.net)
Date: Sat, 28 Apr 2007 19:08:37 +0200
From: strk <strk@keybit.net>
To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
Message-ID: <20070428170837.GB91664@keybit.net>
Mail-Followup-To: zou lunkai <zoulunkai@gmail.com>, gnash-commit@gnu.org
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
	<20070428111733.GB80667@keybit.net>
	<20070428112107.GC80667@keybit.net>
	<20070428122539.GE80667@keybit.net>
	<20070428170630.GA91664@keybit.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070428170630.GA91664@keybit.net>
X-detected-kernel: FreeBSD 2.0-4.2
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Apr 2007 17:15:03 -0000

On Sat, Apr 28, 2007 at 07:06:30PM +0200, strk wrote:
> Fixed...
> 
> with(undefined) {
> 	... <-- completely skipped
> }

BTW, this fix makes kai tests useles to detect differences between SWF5 and
higher. Zou, you should use normal objects as 'with' arguments, to avoid
the call to createEmptyMovieClip (unsupported in SWF5)

--strk;



From MAILER-DAEMON Sat Apr 28 21:05:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhxrD-0002Eu-IH
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 21:05:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhxrB-0002E9-V3
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:05:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hhxr9-0002C5-W7
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:05:40 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hhxr9-0002Bx-P2
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:05:39 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <rob@welcomehome.org>) id 1Hhxl5-00011u-K9
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 20:59:24 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hhxl1-00087y-8x
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 00:59:19 +0000
Received: from rsavoye by cvs with local (Exim 4.50) id 1Hhxl1-00087v-2f
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 00:59:19 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hhxl1-00087v-2f@cvs>
From: Rob Savoye <rob@welcomehome.org>
Date: Sun, 29 Apr 2007 00:59:19 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/po Makefile.in.in
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 01:05:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Rob Savoye <rsavoye>	07/04/29 00:59:19

Removed files:
	po             : Makefile.in.in 

Log message:
	Should be gone already, now it is...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Makefile.in.in?cvsroot=gnash&r1=1.1&r2=0

Patches:
Index: Makefile.in.in
===================================================================
RCS file: Makefile.in.in
diff -N Makefile.in.in
--- Makefile.in.in	6 Apr 2007 07:49:55 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,384 +0,0 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
-#
-# Origin: gettext-0.14.4
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin \
-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-	@lang=`echo $* | sed -e 's,.*/,,'`; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-	sed -e '/^#/d' $< > t-$@
-	mv t-$@ $@
-
-
-all: all-@USE_NLS@
-
-all-yes: stamp-po
-all-no:
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
-# we don't want to bother translators with empty POT files). We assume that
-# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
-	test ! -f $(srcdir)/$(DOMAIN).pot || \
-	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
-	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
-	  echo "touch stamp-po" && \
-	  echo timestamp > stamp-poT && \
-	  mv stamp-poT stamp-po; \
-	}
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-	if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
-	  msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-	else \
-	  msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-	fi; \
-	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-	  --files-from=$(srcdir)/POTFILES.in \
-	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
-	  --msgid-bugs-address="$$msgid_bugs_address"
-	test ! -f $(DOMAIN).po || { \
-	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-	    else \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	    fi; \
-	  else \
-	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	  fi; \
-	}
-
-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-# every "make" invocation, only create it when it is missing.
-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/$(DOMAIN).pot:
-	$(MAKE) $(DOMAIN).pot-update
-
-# This target rebuilds a PO file if $(DOMAIN).pot has changed.
-# Note that a PO file is not touched if it doesn't need to be changed.
-$(POFILES): $(srcdir)/$(DOMAIN).pot
-	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-	  cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-	else \
-	  $(MAKE) $${lang}.po-create; \
-	fi
-
-
-install: install-exec install-data
-install-exec:
-install-data: install-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    $(INSTALL_DATA) $(srcdir)/$$file \
-			    $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	  for file in Makevars; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-install-data-no: all
-install-data-yes: all
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-	  if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
-	  $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-	  echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	      rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-	      cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	      echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-	    fi; \
-	  done; \
-	done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: installdirs-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-	else \
-	  : ; \
-	fi
-installdirs-data-no:
-installdirs-data-yes:
-	$(mkinstalldirs) $(DESTDIR)$(datadir)
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  dir=$(localedir)/$$lang/LC_MESSAGES; \
-	  $(mkinstalldirs) $(DESTDIR)$$dir; \
-	  for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-	    if test -n "$$lc"; then \
-	      if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
-	        link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
-	        mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	        mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-	         for file in *; do \
-	           if test -f $$file; then \
-	             ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-	           fi; \
-	         done); \
-	        rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-	      else \
-	        if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-	          :; \
-	        else \
-	          rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	          mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-	        fi; \
-	      fi; \
-	    fi; \
-	  done; \
-	done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: uninstall-data-@USE_NLS@
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  for file in $(DISTFILES.common) Makevars.template; do \
-	    rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-	  done; \
-	else \
-	  : ; \
-	fi
-uninstall-data-no:
-uninstall-data-yes:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-	  for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-	    rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-	  done; \
-	done
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-	rm -f remove-potcdate.sed
-	rm -f stamp-poT
-	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f stamp-po $(GMOFILES)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-	$(MAKE) update-po
-	@$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	if test "$(PACKAGE)" = "gettext-tools"; then \
-	  dists="$$dists Makevars.template"; \
-	fi; \
-	if test -f $(srcdir)/$(DOMAIN).pot; then \
-	  dists="$$dists $(DOMAIN).pot stamp-po"; \
-	fi; \
-	if test -f $(srcdir)/ChangeLog; then \
-	  dists="$$dists ChangeLog"; \
-	fi; \
-	for i in 0 1 2 3 4 5 6 7 8 9; do \
-	  if test -f $(srcdir)/ChangeLog.$$i; then \
-	    dists="$$dists ChangeLog.$$i"; \
-	  fi; \
-	done; \
-	if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-	for file in $$dists; do \
-	  if test -f $$file; then \
-	    cp -p $$file $(distdir) || exit 1; \
-	  else \
-	    cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-	  fi; \
-	done
-
-update-po: Makefile
-	$(MAKE) $(DOMAIN).pot-update
-	test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-	$(MAKE) update-gmo
-
-# General rule for creating PO files.
-
-.nop.po-create:
-	@lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-	echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
-	exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-	@lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-	if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; fi; \
-	tmpdir=`pwd`; \
-	echo "$$lang:"; \
-	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-	cd $(srcdir); \
-	if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-	    rm -f $$tmpdir/$$lang.new.po; \
-	  else \
-	    if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-	      :; \
-	    else \
-	      echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-	      exit 1; \
-	    fi; \
-	  fi; \
-	else \
-	  echo "msgmerge for $$lang.po failed!" 1>&2; \
-	  rm -f $$tmpdir/$$lang.new.po; \
-	fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-	@:
-
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
-	       $(SHELL) ./config.status
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:



From MAILER-DAEMON Sat Apr 28 21:30:16 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhyEy-0007Qv-1f
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 21:30:16 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhyEw-0007Qf-B2
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:30:14 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhyEv-0007QT-Nt
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:30:14 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhyEv-0007QJ-LJ
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:30:13 -0400
Received: from nz-out-0506.google.com ([64.233.162.226])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1Hhy8t-0002YA-Sd
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:24:00 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1562959nzp
	for <gnash-commit@gnu.org>; Sat, 28 Apr 2007 18:23:59 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=Jw6hxhF1JniyoMPI/cpkbgd2rkDHjQBwKotvc8iHEecfxaEkjGQtCf2mmNrrge8bBFV6ZkyRLMrlkpQ+eVwi5LKFpQLJK7pnxQoDWiHoFfQcLS9V4wPn82vph9f+tfOTuBBvBNWx/sX7IzR7v2J/rQ3UMR6dI2P6/0vlQCwjzEc=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=YqANKNAwQgIFcZ8aVzdOI1kqbP89MWeiq+KHfSiTgpIdzwxq9mV6fylof+YhetYfC99J3c6kTqD+hlQMKmcbLquL4aYa9siqKO7zVxKQdhYq8RtJLq3Q5o2EdQ3QM9O/IhNO/O0RJOYw/1IcOvub2tuypAd4TLqwxOLUQr/dR/s=
Received: by 10.115.93.16 with SMTP id v16mr1518451wal.1177809839184;
	Sat, 28 Apr 2007 18:23:59 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sat, 28 Apr 2007 18:23:59 -0700 (PDT)
Message-ID: <ca4b43ff0704281823j1704a909w9bd7bd18c02dece5@mail.gmail.com>
Date: Sun, 29 Apr 2007 09:23:59 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "zou lunkai" <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
In-Reply-To: <20070428170837.GB91664@keybit.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
	<20070428111733.GB80667@keybit.net>
	<20070428112107.GC80667@keybit.net>
	<20070428122539.GE80667@keybit.net>
	<20070428170630.GA91664@keybit.net>
	<20070428170837.GB91664@keybit.net>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 01:30:14 -0000

On 4/29/07, strk <strk@keybit.net> wrote:
> On Sat, Apr 28, 2007 at 07:06:30PM +0200, strk wrote:
> > Fixed...
> >
> > with(undefined) {
> >       ... <-- completely skipped
> > }
>
confirmed, this is the expected behaviour.


> BTW, this fix makes kai tests useles to detect differences between SWF5 and
> higher.
Great.

> Zou, you should use normal objects as 'with' arguments, to avoid
> the call to createEmptyMovieClip (unsupported in SWF5)
>
I use MovieClips because I want to add tests for SetTarget there. eg.
mix "with" and "SetTarget ".    "SetTarget " don't works with normal
object, IIRC.  And if all my tests are the expected ones,  we will get
less chance to detect those interesting things:)



From MAILER-DAEMON Sat Apr 28 21:36:59 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HhyLT-0008Ii-PG
	for mharc-gnash-commit@gnu.org; Sat, 28 Apr 2007 21:36:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HhyLS-0008Em-9S
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:36:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HhyLR-0008D0-Ey
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:36:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HhyLR-0008CV-8k
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:36:57 -0400
Received: from nz-out-0506.google.com ([64.233.162.234])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <zoulunkai@gmail.com>) id 1HhyFP-0002zd-IW
	for gnash-commit@gnu.org; Sat, 28 Apr 2007 21:30:43 -0400
Received: by nz-out-0506.google.com with SMTP id 12so1563722nzp
	for <gnash-commit@gnu.org>; Sat, 28 Apr 2007 18:30:43 -0700 (PDT)
DKIM-Signature: a=rsa-sha1; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=KVod/zr0K3M2b5ABdImZwMZ6GCzMzAoZw7n2ZxbnPPOoIzjhaX8K1gpnYj9QNGdxTyfpSlhRcsyJbRCI+LF54izY4/b2z8qmar9QI2NYgJ5r5DBdGBbGMB4ztmBW1X8wanjlg7F9ytNCLl4FlC415DTzJfNQRGpFsZ3jOHEwtMo=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=EVTkVdI1LlqxhPxu6R7Kr29ja603fnOLGggFiOxvEzt2kJ9y3Yb4bQeK1N5nJf3B/aveZnw8T4DbMWbfe/lCo32B5O78tWJVx3wH8Ve9OUIJ4T3UkqrgCLCflW9vVsYMg+o3qPrTPG+LcleVngFGXQIz6dXsQ02UPay6gZVF7f0=
Received: by 10.114.254.1 with SMTP id b1mr1559121wai.1177810242740;
	Sat, 28 Apr 2007 18:30:42 -0700 (PDT)
Received: by 10.114.109.18 with HTTP; Sat, 28 Apr 2007 18:30:42 -0700 (PDT)
Message-ID: <ca4b43ff0704281830w5343fde4t21d82fdc5883bca8@mail.gmail.com>
Date: Sun, 29 Apr 2007 09:30:42 +0800
From: "zou lunkai" <zoulunkai@gmail.com>
To: "zou lunkai" <zoulunkai@gmail.com>, gnash-commit@gnu.org
Subject: Re: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/with.as
In-Reply-To: <ca4b43ff0704281823j1704a909w9bd7bd18c02dece5@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <E1Hhhtd-0002Jy-1j@cvs>
	<ca4b43ff0704280106v6a26153cybb659ed6fed662cc@mail.gmail.com>
	<20070428111733.GB80667@keybit.net>
	<20070428112107.GC80667@keybit.net>
	<20070428122539.GE80667@keybit.net>
	<20070428170630.GA91664@keybit.net>
	<20070428170837.GB91664@keybit.net>
	<ca4b43ff0704281823j1704a909w9bd7bd18c02dece5@mail.gmail.com>
X-detected-kernel: Linux 2.4-2.6 (Google crawlbot)
Cc: 
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 01:36:58 -0000

>
> > Zou, you should use normal objects as 'with' arguments, to avoid
> > the call to createEmptyMovieClip (unsupported in SWF5)
> >
> I use MovieClips because I want to add tests for SetTarget there. eg.
> mix "with" and "SetTarget ".    "SetTarget " don't works with normal
> object, IIRC.  And if all my tests are the expected ones,  we will get
> less chance to detect those interesting things:)
>
BTW,  createEmptyMovieClip  is just not a supported built-in method in
SWF5, but it is a *supported* expression in SWF5,  That's why it
compiles in SWF5 and higher. I admit I didn't notice that before you
point out:)



From MAILER-DAEMON Sun Apr 29 10:15:18 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiABK-0002Ym-Dq
	for mharc-gnash-commit@gnu.org; Sun, 29 Apr 2007 10:15:18 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiABI-0002WT-L7
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 10:15:16 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiABG-0002UX-Ck
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 10:15:15 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiABG-0002UU-7H
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 10:15:14 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiA5A-0008IZ-Rt
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 10:08:56 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiA4y-0003n7-Ri
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 14:08:44 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiA4y-0003n2-Fr
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 14:08:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiA4y-0003n2-Fr@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 29 Apr 2007 14:08:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/button_character_instanc...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 14:15:16 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/29 14:08:44

Modified files:
	.              : ChangeLog 
	server         : button_character_instance.cpp 
	                 button_character_instance.h 

Log message:
	        * server/button_character_instance.{cpp,h}: implement pointInShape().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3032&r2=1.3033
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3032
retrieving revision 1.3033
diff -u -b -r1.3032 -r1.3033
--- ChangeLog	28 Apr 2007 17:05:53 -0000	1.3032
+++ ChangeLog	29 Apr 2007 14:08:44 -0000	1.3033
@@ -1,3 +1,7 @@
+2007-04-29 Sandro Santilli <strk@keybit.net>
+
+	* server/button_character_instance.{cpp,h}: implement pointInShape().
+
 2007-04-28 Sandro Santilli <strk@keybit.net>
 
 	* server/vm/ASHandlers.cpp (ActionWith): skip with() blocks

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/button_character_instance.cpp	26 Apr 2007 10:56:50 -0000	1.45
+++ server/button_character_instance.cpp	29 Apr 2007 14:08:44 -0000	1.46
@@ -804,12 +804,36 @@
 		    || (m_mouse_state == DOWN && rec.m_down)
 		    || (m_mouse_state == OVER && rec.m_over))
 		{
+			// TODO: should we consider having multiple characters
+			//       for a single state ?
 			return m_record_character[i]->getBounds();
 		}
 	}
 	return geometry::Range2d<float>(geometry::nullRange);
 }
 
+bool
+button_character_instance::pointInShape(float x, float y) const
+{
+	for (unsigned int i = 0; i < m_def->m_button_records.size(); i++)
+	{
+		button_record&	rec = m_def->m_button_records[i];
+		if (m_record_character[i] == NULL)
+		{
+			continue;
+		}
+		if ((m_mouse_state == UP && rec.m_up)
+		    || (m_mouse_state == DOWN && rec.m_down)
+		    || (m_mouse_state == OVER && rec.m_over))
+		{
+			// TODO: should we consider having multiple characters
+			//       for a single state ?
+			return m_record_character[i]->pointInShape(x, y);
+		}
+	}
+	return false; // no shape
+}
+
 character*
 button_character_instance::get_relative_target(const std::string& name)
 {

Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- server/button_character_instance.h	12 Apr 2007 11:35:30 -0000	1.19
+++ server/button_character_instance.h	29 Apr 2007 14:08:44 -0000	1.20
@@ -20,7 +20,7 @@
 
 // SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
-/* $Id: button_character_instance.h,v 1.19 2007/04/12 11:35:30 strk Exp $ */
+/* $Id: button_character_instance.h,v 1.20 2007/04/29 14:08:44 strk Exp $ */
 
 #ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
 #define GNASH_BUTTON_CHARACTER_INSTANCE_H
@@ -136,6 +136,9 @@
 	
 	geometry::Range2d<float> getBounds() const;
 	
+	// See dox in character.h
+	bool pointInShape(float x, float y) const;
+
 	static as_value enabled_getset(const fn_call& fn);
 	
 	bool get_enabled();



From MAILER-DAEMON Sun Apr 29 12:37:06 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiCOY-0007Rd-NO
	for mharc-gnash-commit@gnu.org; Sun, 29 Apr 2007 12:37:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiCOX-0007PA-Da
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:37:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiCOW-0007N1-6U
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:37:04 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiCOW-0007Mo-3X
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:37:04 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiCIQ-000741-4b
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:30:46 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiCIO-0006lF-JL
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 16:30:44 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiCIO-0006lC-97
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 16:30:44 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiCIO-0006lC-97@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 29 Apr 2007 16:30:44 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 16:37:05 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/29 16:30:43

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am DrawingApiTest.as 

Log message:
	        * testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as: add
	          tests for hitTest (not automatically run, but works fine so far).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3033&r2=1.3034
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.10&r2=1.11

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3033
retrieving revision 1.3034
diff -u -b -r1.3033 -r1.3034
--- ChangeLog	29 Apr 2007 14:08:44 -0000	1.3033
+++ ChangeLog	29 Apr 2007 16:30:43 -0000	1.3034
@@ -1,5 +1,7 @@
 2007-04-29 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as: add
+	  tests for hitTest (not automatically run, but works fine so far).
 	* server/button_character_instance.{cpp,h}: implement pointInShape().
 
 2007-04-28 Sandro Santilli <strk@keybit.net>

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- testsuite/misc-ming.all/Makefile.am	24 Apr 2007 21:02:20 -0000	1.99
+++ testsuite/misc-ming.all/Makefile.am	29 Apr 2007 16:30:43 -0000	1.100
@@ -966,7 +966,7 @@
 
 
 DrawingApiTest.swf: $(srcdir)/DrawingApiTest.as 
-	$(MAKESWF) -r2 -o $@ $(srcdir)/DrawingApiTest.as
+	$(MAKESWF) -r12 -o $@ $(srcdir)/DrawingApiTest.as
 
 DrawingApiTestRunner_SOURCES = \
 	DrawingApiTestRunner.cpp \

Index: testsuite/misc-ming.all/DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- testsuite/misc-ming.all/DrawingApiTest.as	24 Apr 2007 21:02:20 -0000	1.10
+++ testsuite/misc-ming.all/DrawingApiTest.as	29 Apr 2007 16:30:43 -0000	1.11
@@ -157,3 +157,38 @@
 	}
 };
 
+createEmptyMovieClip("cursor", 3);
+with(cursor)
+{
+	lineStyle(2, 0xFF0000);
+	beginFill(0xFF0000, 100);
+	drawCircle(_root.cursor, 0, 0, 10);
+	onMouseMove = function()
+	{
+		_x = _root._xmouse;
+		_y = _root._ymouse;
+
+		// Bounding box check
+		if ( hitTest(_root.a) ) {
+			_alpha=50;
+		} else {
+			_alpha=100;
+		}
+
+		// Bounding box check with circle center
+		if ( _root.a.hitTest(_x, _y) ) {
+			_root.a._alpha=50;
+		} else {
+			_root.a._alpha=100;
+		}
+
+		// Shape check with circle center
+		if ( _root.a.hitTest(_x, _y, true) ) {
+			_xscale=50;
+			_yscale=50;
+		} else {
+			_xscale=100;
+			_yscale=100;
+		}
+	};
+}



From MAILER-DAEMON Sun Apr 29 12:40:03 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiCRP-00059o-58
	for mharc-gnash-commit@gnu.org; Sun, 29 Apr 2007 12:40:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiCRN-00054S-5E
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:40:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiCRL-000521-Ig
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:39:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiCRL-00051Y-CF
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:39:59 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiCLF-0007NY-B8
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 12:33:41 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiCLD-0007P4-BQ
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 16:33:39 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiCLC-0007Ox-TU
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 16:33:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiCLC-0007Ox-TU@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Sun, 29 Apr 2007 16:33:38 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash/testsuite/misc-ming.all DrawingApiTest.as
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Apr 2007 16:40:01 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/29 16:33:38

Modified files:
	testsuite/misc-ming.all: DrawingApiTest.as 

Log message:
	Temporarely disabled custom cursor to avoid failures in the current automated test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/DrawingApiTest.as?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: DrawingApiTest.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/DrawingApiTest.as,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- DrawingApiTest.as	29 Apr 2007 16:30:43 -0000	1.11
+++ DrawingApiTest.as	29 Apr 2007 16:33:38 -0000	1.12
@@ -157,6 +157,7 @@
 	}
 };
 
+#if 0
 createEmptyMovieClip("cursor", 3);
 with(cursor)
 {
@@ -192,3 +193,4 @@
 		}
 	};
 }
+#endif



From MAILER-DAEMON Sun Apr 29 22:23:15 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiLXn-0001AH-5Q
	for mharc-gnash-commit@gnu.org; Sun, 29 Apr 2007 22:23:15 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiLXl-00019h-DI
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 22:23:13 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiLXk-00019O-QF
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 22:23:13 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiLXk-00019F-M0
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 22:23:12 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HiLRb-0002VE-PR
	for gnash-commit@gnu.org; Sun, 29 Apr 2007 22:16:51 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiLRa-0006TA-QQ
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 02:16:50 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HiLRa-0006T7-Bx
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 02:16:50 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiLRa-0006T7-Bx@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 30 Apr 2007 02:16:50 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/action_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 02:23:13 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/30 02:16:50

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-ming.all: action_execution_order_test7.c 

Log message:
	another testcase about the action execution order, this one is not insane

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3034&r2=1.3035
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test7.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3034
retrieving revision 1.3035
diff -u -b -r1.3034 -r1.3035
--- ChangeLog	29 Apr 2007 16:30:43 -0000	1.3034
+++ ChangeLog	30 Apr 2007 02:16:49 -0000	1.3035
@@ -1,3 +1,8 @@
+2007-04-30 Zou Lunkai <zoulunkai@gmail.com>
+
+	* testsuite/misc-ming.all/action_execution_order_test7.c:
+	  a simple and normal one that we should pass.
+	  
 2007-04-29 Sandro Santilli <strk@keybit.net>
 
 	* testsuite/misc-ming.all/: Makefile.am, DrawingApiTest.as: add

Index: testsuite/misc-ming.all/action_execution_order_test7.c
===================================================================
RCS file: testsuite/misc-ming.all/action_execution_order_test7.c
diff -N testsuite/misc-ming.all/action_execution_order_test7.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/action_execution_order_test7.c	30 Apr 2007 02:16:50 -0000	1.1
@@ -0,0 +1,89 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "action_execution_order_test7.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc, dejagnuclip;
+
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  SWFMovie_nextFrame(mo); /* 1st frame */
+
+  mc = newSWFMovieClip();
+  add_clip_actions(mc, "_root.x = 1;"
+                       "_root.check_equals(_root.x, 1);");
+  SWFMovieClip_nextFrame(mc);
+ 
+ 
+  add_actions(mo, " gotoAndPlay(4); ");
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+  
+  SWFMovie_nextFrame(mo); /* 3rd frame */
+  
+   
+  /* add mc to _root and name it as "mc" */
+  SWFDisplayItem it;
+  it = SWFMovie_add(mo, (SWFBlock)mc);  
+  SWFDisplayItem_setDepth(it, 3); 
+  SWFDisplayItem_setName(it, "mc"); 
+  add_actions(mo, " _root.x = 2; "
+                  " _root.check_equals(_root.x, 2); ");
+  SWFMovie_nextFrame(mo); /* 4th frame */
+
+	SWFDisplayItem_remove(it);
+  xcheck_equals(mo, "_root.x", "1");
+  check_equals(mo, "typeof(mc)", "'undefined'");
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 5th frame */
+
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+



From MAILER-DAEMON Mon Apr 30 01:47:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiOjr-0001Yw-LJ
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 01:47:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiOjp-0001Yr-L2
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 01:47:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiOjo-0001Yf-5L
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 01:47:52 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiOjn-0001Yc-Vu
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 01:47:52 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <zoulunkai@gmail.com>) id 1HiOde-0002xK-4r
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 01:41:30 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiOdd-0000DV-J7
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 05:41:29 +0000
Received: from zoulunkai by cvs with local (Exim 4.50) id 1HiOdd-0000DS-7D
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 05:41:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiOdd-0000DS-7D@cvs>
From: Zou Lunkai <zoulunkai@gmail.com>
Date: Mon, 30 Apr 2007 05:41:29 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/action_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 05:47:54 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Zou Lunkai <zoulunkai>	07/04/30 05:41:29

Modified files:
	.              : ChangeLog 
Added files:
	testsuite/misc-ming.all: action_execution_order_test8.c 

Log message:
	another testcase about execution order

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3035&r2=1.3036
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test8.c?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3035
retrieving revision 1.3036
diff -u -b -r1.3035 -r1.3036
--- ChangeLog	30 Apr 2007 02:16:49 -0000	1.3035
+++ ChangeLog	30 Apr 2007 05:41:28 -0000	1.3036
@@ -2,6 +2,8 @@
 
 	* testsuite/misc-ming.all/action_execution_order_test7.c:
 	  a simple and normal one that we should pass.
+	* testsuite/misc-ming.all/action_execution_order_test8.c:
+		another one for execution order.
 	  
 2007-04-29 Sandro Santilli <strk@keybit.net>
 

Index: testsuite/misc-ming.all/action_execution_order_test8.c
===================================================================
RCS file: testsuite/misc-ming.all/action_execution_order_test8.c
diff -N testsuite/misc-ming.all/action_execution_order_test8.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/misc-ming.all/action_execution_order_test8.c	30 Apr 2007 05:41:29 -0000	1.1
@@ -0,0 +1,105 @@
+/*
+ *   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */ 
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <ming.h>
+
+#include "ming_utils.h"
+
+#define OUTPUT_VERSION 6
+#define OUTPUT_FILENAME "action_execution_order_test8.swf"
+
+
+int
+main(int argc, char** argv)
+{
+  SWFMovie mo;
+  SWFMovieClip  mc1, mc2, dejagnuclip;
+  SWFDisplayItem it1, it2;
+  
+  const char *srcdir=".";
+  if ( argc>1 ) 
+    srcdir=argv[1];
+  else
+  {
+      fprintf(stderr, "Usage: %s <mediadir>\n", argv[0]);
+      return 1;
+  }
+
+  Ming_init();
+  mo = newSWFMovieWithVersion(OUTPUT_VERSION);
+  SWFMovie_setDimension(mo, 800, 600);
+  SWFMovie_setRate (mo, 12.0);
+
+  dejagnuclip = get_dejagnu_clip((SWFBlock)get_default_font(srcdir), 10, 0, 0, 800, 600);
+  SWFMovie_add(mo, (SWFBlock)dejagnuclip);
+  SWFMovie_nextFrame(mo); /* 1st frame */
+
+  add_actions(mo, " if(check == 1) gotoAndPlay(4); ");
+  SWFMovie_nextFrame(mo); /* 2nd frame */
+  
+  add_actions(mo, " check = 1; gotoAndPlay(2); ");
+  SWFMovie_nextFrame(mo); /* 3rd frame */
+  
+  
+  mc1 = newSWFMovieClip();
+  add_clip_actions(mc1, " _root.gotoAndStop(6);"
+                        " _root.x = 100; " );
+  SWFMovieClip_nextFrame(mc1);
+  
+  /* add mc1 to _root and name it as "mc1" */
+  it1 = SWFMovie_add(mo, (SWFBlock)mc1);  
+  SWFDisplayItem_setDepth(it1, 3); 
+  SWFDisplayItem_setName(it1, "mc1"); 
+  check_equals(mo, "typeof(_root.x)", "'undefined'");
+  add_actions(mo, " _root.x = 200; ");
+  SWFMovie_nextFrame(mo); /* 4th frame */
+
+
+  SWFDisplayItem_remove(it1);
+  
+  mc2 = newSWFMovieClip();
+  // these actions are expected to be skipped with SWF version higher then 4
+  add_clip_actions(mc2, " _root.note(' your player version is lower than  5');"
+                        " _root.note(' Or your player is bogus'); "
+                        " fail = 0; "
+                        //this should not be executed with SWF6
+                        " _root.xcheck_equals(fail, 1); " ); 
+  it2 = SWFMovie_add(mo, (SWFBlock)mc2);  
+  SWFDisplayItem_setDepth(it2, 3); 
+  SWFDisplayItem_setName(it2, "mc2"); 
+  SWFMovieClip_nextFrame(mc2);
+  add_actions(mo, " stop(); ");  
+   
+  SWFMovie_nextFrame(mo); /* 5th frame */
+
+  SWFDisplayItem_remove(it2);
+  check_equals(mo, "_root.x", "200");
+  add_actions(mo, " _root.totals(); stop(); ");
+  SWFMovie_nextFrame(mo); /* 6th frame */
+  //Output movie
+  puts("Saving " OUTPUT_FILENAME );
+  SWFMovie_save(mo, OUTPUT_FILENAME);
+
+  return 0;
+}
+
+
+



From MAILER-DAEMON Mon Apr 30 05:45:13 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiSRV-0002we-GP
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 05:45:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiSRT-0002uW-Ka
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 05:45:11 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiSRT-0002uK-4L
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 05:45:11 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiSRS-0002uH-S2
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 05:45:10 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiSLH-0005XY-SJ
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 05:38:47 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiSLF-0000ti-W8
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 09:38:46 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiSLF-0000tf-Kv
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 09:38:45 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiSLF-0000tf-Kv@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 09:38:45 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/Makefil...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 09:45:12 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 09:38:45

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/misc-ming.all/Makefile.am:
	          Activated action_execution_order_test{7,8}.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3036&r2=1.3037
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.100&r2=1.101

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3036
retrieving revision 1.3037
diff -u -b -r1.3036 -r1.3037
--- ChangeLog	30 Apr 2007 05:41:28 -0000	1.3036
+++ ChangeLog	30 Apr 2007 09:38:45 -0000	1.3037
@@ -1,3 +1,8 @@
+2007-04-30 Sandro Santilli <strk@keybit.net>
+
+	* testsuite/misc-ming.all/Makefile.am: 
+	  Activated action_execution_order_test{7,8}.
+
 2007-04-30 Zou Lunkai <zoulunkai@gmail.com>
 
 	* testsuite/misc-ming.all/action_execution_order_test7.c:

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -b -r1.100 -r1.101
--- testsuite/misc-ming.all/Makefile.am	29 Apr 2007 16:30:43 -0000	1.100
+++ testsuite/misc-ming.all/Makefile.am	30 Apr 2007 09:38:45 -0000	1.101
@@ -98,6 +98,8 @@
 	action_execution_order_test4 \
 	action_execution_order_test5 \
 	action_execution_order_test6 \
+	action_execution_order_test7 \
+	action_execution_order_test8 \
 	reverse_execute_PlaceObject2_test1 \
 	reverse_execute_PlaceObject2_test2 \
 	loadMovieTest \
@@ -144,6 +146,8 @@
 	action_execution_order_test4runner \
 	action_execution_order_test5runner \
 	action_execution_order_test6runner \
+	action_execution_order_test7runner \
+	action_execution_order_test8runner \
 	reverse_execute_PlaceObject2_test1runner \
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \
@@ -736,6 +740,34 @@
 	sh $< $(top_builddir) action_execution_order_test6.swf > $@
 	chmod 755 $@
 
+action_execution_order_test7_SOURCES =	\
+	action_execution_order_test7.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+action_execution_order_test7_LDADD = $(MING_LIBS)
+
+action_execution_order_test7.swf: action_execution_order_test7
+	./action_execution_order_test7 $(top_srcdir)/testsuite/media
+
+action_execution_order_test7runner: $(srcdir)/../generic-testrunner.sh action_execution_order_test7.swf
+	sh $< $(top_builddir) action_execution_order_test7.swf > $@
+	chmod 755 $@
+
+action_execution_order_test8_SOURCES =	\
+	action_execution_order_test8.c	\
+	ming_utils.h		\
+	ming_utils.c		\
+	$(NULL)
+action_execution_order_test8_LDADD = $(MING_LIBS)
+
+action_execution_order_test8.swf: action_execution_order_test8
+	./action_execution_order_test8 $(top_srcdir)/testsuite/media
+
+action_execution_order_test8runner: $(srcdir)/../generic-testrunner.sh action_execution_order_test8.swf
+	sh $< -f8 $(top_builddir) action_execution_order_test8.swf > $@
+	chmod 755 $@
+
 reverse_execute_PlaceObject2_test1_SOURCES =	\
 	reverse_execute_PlaceObject2_test1.c	\
 	ming_utils.h		\
@@ -1026,6 +1058,8 @@
 	action_execution_order_test4runner \
 	action_execution_order_test5runner \
 	action_execution_order_test6runner \
+	action_execution_order_test7runner \
+	action_execution_order_test8runner \
 	reverse_execute_PlaceObject2_test1runner \
 	reverse_execute_PlaceObject2_test2runner \
 	displaylist_depths_testrunner \



From MAILER-DAEMON Mon Apr 30 07:17:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiTsT-0004Sl-CP
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 07:17:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiTsR-0004NZ-8m
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 07:17:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiTsP-0004Jq-Fu
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 07:17:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiTsP-0004Jl-Cs
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 07:17:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HiTmD-0000aA-NV
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 07:10:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiTm8-0007Fm-P1
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 11:10:36 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HiTm8-0007Fj-IH
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 11:10:36 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiTm8-0007Fj-IH@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Mon, 30 Apr 2007 11:10:36 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 11:17:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/30 11:10:36

Modified files:
	.              : ChangeLog 

Log message:
	Remove spurious >>>>>>

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3037&r2=1.3038

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3037
retrieving revision 1.3038
diff -u -b -r1.3037 -r1.3038
--- ChangeLog	30 Apr 2007 09:38:45 -0000	1.3037
+++ ChangeLog	30 Apr 2007 11:10:36 -0000	1.3038
@@ -346,7 +346,6 @@
 	* extensions/fileio/fileio.cpp: Use intrusive pointers instead of
 	explicit pointers.
 
->>>>>>> 1.2990
 2007-04-24 Udo Giacomozzi <udo.gnu@nova-sys.net>
 
 	* libgeometry/Range2d.h: added expandToCircle()



From MAILER-DAEMON Mon Apr 30 09:10:01 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiVdh-0003ND-6X
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 09:10:01 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiVde-0003IU-Gw
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 09:09:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiVdc-0003FA-V4
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 09:09:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiVdc-0003Ea-O6
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 09:09:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiVXQ-0007RS-Me
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 09:03:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiVXP-0000HP-Qc
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:03:31 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiVXP-0000HL-Dm
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:03:31 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiVXP-0000HL-Dm@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 13:03:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/parser/shape_character_d...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 13:09:58 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 13:03:31

Modified files:
	.              : ChangeLog 
	server/parser  : shape_character_def.cpp 

Log message:
	        * server/parser/shape_character_def.cpp (compute_bounds): harline
	          strokes don't add anything to the bounds (no need to expand to
	          circle, same as for hidden strokes). -- this is just an optimization 
		  as expandToCirle(x,y,0) is equivalent to expandToPoint(x,y).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3038&r2=1.3039
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/shape_character_def.cpp?cvsroot=gnash&r1=1.20&r2=1.21

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3038
retrieving revision 1.3039
diff -u -b -r1.3038 -r1.3039
--- ChangeLog	30 Apr 2007 11:10:36 -0000	1.3038
+++ ChangeLog	30 Apr 2007 13:03:30 -0000	1.3039
@@ -1,5 +1,8 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* server/parser/shape_character_def.cpp (compute_bounds): harline
+	  strokes don't add anything to the bounds (no need to expand to
+	  circle, same as for hidden strokes).
 	* testsuite/misc-ming.all/Makefile.am: 
 	  Activated action_execution_order_test{7,8}.
 

Index: server/parser/shape_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/shape_character_def.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/parser/shape_character_def.cpp	24 Apr 2007 12:01:55 -0000	1.20
+++ server/parser/shape_character_def.cpp	30 Apr 2007 13:03:31 -0000	1.21
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: shape_character_def.cpp,v 1.20 2007/04/24 12:01:55 udog Exp $ */
+/* $Id: shape_character_def.cpp,v 1.21 2007/04/30 13:03:31 strk Exp $ */
 
 // Based on the public domain shape.cpp of Thatcher Ulrich <tu@tulrich.com> 2003
 
@@ -674,21 +674,15 @@
         size_t nedges = p.m_edges.size();
         if ( ! nedges ) continue;
         
-        if (p.m_line==0) {
-
-            r->expand_to_point(p.m_ax, p.m_ay);
-            for (unsigned int j = 0; j<nedges; j++)
+        if (p.m_line)
             {
-                r->expand_to_point(p.m_edges[j].m_ax, p.m_edges[j].m_ay);
-                r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
-            }
-            
-        } else {        
-            
-            // NOTE: Half of get_width() would be enough (and correct) for
+		unsigned thickness=m_line_styles[p.m_line-1].get_width();
+		if ( thickness ) // hairlines don't add any bound
+		{
+			// NOTE: Half of thickness would be enough (and correct) for
             // radius, but that would not match how Flash calculates the
             // bounds using the drawing API.                        
-            float radius = m_line_styles[p.m_line-1].get_width();
+			float radius = thickness;
             
             r->expand_to_circle(p.m_ax, p.m_ay, radius);
             for (unsigned int j = 0; j<nedges; j++)
@@ -696,6 +690,18 @@
                 r->expand_to_circle(p.m_edges[j].m_ax, p.m_edges[j].m_ay, radius);
                 r->expand_to_circle(p.m_edges[j].m_cx, p.m_edges[j].m_cy, radius);
             }
+
+			continue;
+		}
+	}
+
+	assert(p.m_line==0 || m_line_styles[p.m_line-1].get_width()==0);
+
+	r->expand_to_point(p.m_ax, p.m_ay);
+	for (unsigned int j = 0; j<nedges; j++)
+	{
+		r->expand_to_point(p.m_edges[j].m_ax, p.m_edges[j].m_ay);
+                r->expand_to_point(p.m_edges[j].m_cx, p.m_edges[j].m_cy);
         }
     }
 }



From MAILER-DAEMON Mon Apr 30 12:14:23 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiYW7-0003DT-63
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 12:14:23 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiYW5-0003CZ-N5
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:14:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiYW4-0003BQ-FP
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:14:21 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiYW4-0003BA-9n
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:14:20 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiYPr-0006dQ-26
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:07:55 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiYPe-0006NS-0u
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 16:07:42 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiYPd-0006NP-L6
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 16:07:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiYPd-0006NP-L6@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 16:07:41 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/misc-ming.all/action_...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 16:14:21 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 16:07:41

Modified files:
	.              : ChangeLog 
	testsuite/misc-ming.all: action_execution_order_test8.c 

Log message:
	        * testsuite/misc-ming.all/action_execution_order_test8.c: add
	          more output trying to understand the problem better.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3039&r2=1.3040
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/action_execution_order_test8.c?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3039
retrieving revision 1.3040
diff -u -b -r1.3039 -r1.3040
--- ChangeLog	30 Apr 2007 13:03:30 -0000	1.3039
+++ ChangeLog	30 Apr 2007 16:07:40 -0000	1.3040
@@ -1,5 +1,7 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/misc-ming.all/action_execution_order_test8.c: add
+	  more output trying to understand the problem better.
 	* server/parser/shape_character_def.cpp (compute_bounds): harline
 	  strokes don't add anything to the bounds (no need to expand to
 	  circle, same as for hidden strokes).

Index: testsuite/misc-ming.all/action_execution_order_test8.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/action_execution_order_test8.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- testsuite/misc-ming.all/action_execution_order_test8.c	30 Apr 2007 05:41:29 -0000	1.1
+++ testsuite/misc-ming.all/action_execution_order_test8.c	30 Apr 2007 16:07:41 -0000	1.2
@@ -52,15 +52,20 @@
   SWFMovie_add(mo, (SWFBlock)dejagnuclip);
   SWFMovie_nextFrame(mo); /* 1st frame */
 
+  add_actions(mo, " _root.note('root frame '+_root._currentframe);");
   add_actions(mo, " if(check == 1) gotoAndPlay(4); ");
   SWFMovie_nextFrame(mo); /* 2nd frame */
   
+  add_actions(mo, " _root.note('root frame '+_root._currentframe);");
   add_actions(mo, " check = 1; gotoAndPlay(2); ");
   SWFMovie_nextFrame(mo); /* 3rd frame */
   
   
-  mc1 = newSWFMovieClip();
-  add_clip_actions(mc1, " _root.gotoAndStop(6);"
+  mc1 = newSWFMovieClip(); // will only exist in frame4
+  add_clip_actions(mc2, " _root.note('mc1 frame '+this._currentframe);");
+  add_clip_actions(mc1, " _root.note('about to invoke _root.gotoAndStop(6)');"
+  			" _root.gotoAndStop(6);"
+		        " _root.note('mc1 actions still running after _root.gotoAndStop(6), _root is '+_root);"
                         " _root.x = 100; " );
   SWFMovieClip_nextFrame(mc1);
   
@@ -68,6 +73,7 @@
   it1 = SWFMovie_add(mo, (SWFBlock)mc1);  
   SWFDisplayItem_setDepth(it1, 3); 
   SWFDisplayItem_setName(it1, "mc1"); 
+  add_actions(mo, " _root.note('root frame '+_root._currentframe);");
   check_equals(mo, "typeof(_root.x)", "'undefined'");
   add_actions(mo, " _root.x = 200; ");
   SWFMovie_nextFrame(mo); /* 4th frame */
@@ -77,6 +83,7 @@
   
   mc2 = newSWFMovieClip();
   // these actions are expected to be skipped with SWF version higher then 4
+  add_clip_actions(mc2, " _root.note('mc2 frame '+this._currentframe);");
   add_clip_actions(mc2, " _root.note(' your player version is lower than  5');"
                         " _root.note(' Or your player is bogus'); "
                         " fail = 0; "
@@ -86,13 +93,16 @@
   SWFDisplayItem_setDepth(it2, 3); 
   SWFDisplayItem_setName(it2, "mc2"); 
   SWFMovieClip_nextFrame(mc2);
+  add_actions(mo, " _root.note('root frame '+_root._currentframe);");
   add_actions(mo, " stop(); ");  
    
   SWFMovie_nextFrame(mo); /* 5th frame */
 
   SWFDisplayItem_remove(it2);
   check_equals(mo, "_root.x", "200");
+  add_actions(mo, " _root.note('root frame '+_root._currentframe);");
   add_actions(mo, " _root.totals(); stop(); ");
+
   SWFMovie_nextFrame(mo); /* 6th frame */
   //Output movie
   puts("Saving " OUTPUT_FILENAME );



From MAILER-DAEMON Mon Apr 30 12:49:25 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiZ41-0001iw-1I
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 12:49:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiZ3z-0001ig-Kd
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:49:23 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiZ3y-0001iT-Vm
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:49:23 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiZ3y-0001i5-Qx
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:49:22 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiYxl-0003Rv-QQ
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:42:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiYxl-0000oJ-4A
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 16:42:57 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiYxk-0000oG-OK
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 16:42:57 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiYxk-0000oG-OK@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 16:42:56 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog configure.ac
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 16:49:23 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 16:42:56

Modified files:
	.              : ChangeLog configure.ac 

Log message:
	        * configure.ac: if ffmpeg version doesn't match the required one
	          set media handling to none.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3040&r2=1.3041
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.295&r2=1.296

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3040
retrieving revision 1.3041
diff -u -b -r1.3040 -r1.3041
--- ChangeLog	30 Apr 2007 16:07:40 -0000	1.3040
+++ ChangeLog	30 Apr 2007 16:42:56 -0000	1.3041
@@ -1,5 +1,7 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* configure.ac: if ffmpeg version doesn't match the required one
+	  set media handling to none.
 	* testsuite/misc-ming.all/action_execution_order_test8.c: add
 	  more output trying to understand the problem better.
 	* server/parser/shape_character_def.cpp (compute_bounds): harline

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -b -r1.295 -r1.296
--- configure.ac	27 Apr 2007 18:17:16 -0000	1.295
+++ configure.ac	30 Apr 2007 16:42:56 -0000	1.296
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.295 2007/04/27 18:17:16 martinwguy Exp $
+dnl $Id: configure.ac,v 1.296 2007/04/30 16:42:56 strk Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -795,8 +795,8 @@
 
 if test x"$media_handler" = x"ffmpeg"; then
   GNASH_PATH_FFMPEG
-  if test x"${ac_cv_path_ffmpeg_lib}" = x ; then
-    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present, disabling media handling])
+  if test x"${ac_cv_path_ffmpeg_lib}" = x -o x${ffmpeg_version} != xok; then
+    AC_MSG_WARN([ffmpeg specified as decoder, but it's not present or it's version is too old, disabling media handling])
     media_handler=none
   fi
 fi



From MAILER-DAEMON Mon Apr 30 13:04:11 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiZII-00042D-Q7
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 13:04:10 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiZIG-00041y-Ob
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:04:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiZIF-00041f-FR
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:04:08 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiZIF-00041c-AF
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:04:07 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiZC2-0005Si-8m
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 12:57:42 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiZC1-0001dM-9d
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 16:57:41 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiZC0-0001dF-Vc
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 16:57:41 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiZC0-0001dF-Vc@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 16:57:40 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/actionscript.all/arra...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 17:04:09 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 16:57:40

Modified files:
	.              : ChangeLog 
	testsuite/actionscript.all: array.as 

Log message:
	        * testsuite/actionscript.all/array.as: add test for deleting an
	          array element, and for array indexes being proper properties
	          (fails in gnash).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3041&r2=1.3042
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.17&r2=1.18

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3041
retrieving revision 1.3042
diff -u -b -r1.3041 -r1.3042
--- ChangeLog	30 Apr 2007 16:42:56 -0000	1.3041
+++ ChangeLog	30 Apr 2007 16:57:40 -0000	1.3042
@@ -1,5 +1,8 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/actionscript.all/array.as: add test for deleting an
+	  array element, and for array indexes being proper properties
+	  (fails in gnash).
 	* configure.ac: if ffmpeg version doesn't match the required one
 	  set media handling to none.
 	* testsuite/misc-ming.all/action_execution_order_test8.c: add

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- testsuite/actionscript.all/array.as	4 Apr 2007 09:49:43 -0000	1.17
+++ testsuite/actionscript.all/array.as	30 Apr 2007 16:57:40 -0000	1.18
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.17 2007/04/04 09:49:43 strk Exp $";
+rcsid="$Id: array.as,v 1.18 2007/04/30 16:57:40 strk Exp $";
 
 #include "check.as"
 
@@ -289,53 +289,28 @@
 check_equals(c.length, 2);
 check_equals(c[8], undefined);
 
-// $Log: array.as,v $
-// Revision 1.17  2007/04/04 09:49:43  strk
-//
-//         * server/array.cpp: use a getter/setter for the 'length' property.
-//         * testsuite/actionscript.all/array.as: another success.
-//
-// Revision 1.16  2007/04/04 09:22:30  strk
-// * testsuite/actionscript.all/array.as: more tests added.
-//
-// Revision 1.15  2007/03/28 14:58:30  strk
-//         * server/array.{cpp,h}: implement Array.splice(),
-//           improve toString to actually call the user-provided
-//           toString on all elements.
-//         * testsuite/actionscript.all/array.as: added testcases
-//           for Array.splice().
-//
-// Revision 1.14  2007/02/28 23:58:26  strk
-//         * testsuite/actionscript.all/: array.as, Function.as
-//           Don't expect failures when checking for missing
-//           apply/call in SWF5.
-//         * server/as_function.cpp (getFunctionPrototype):
-//           Don't register 'apply' and 'call' members if
-//           SWF < 6; use builtin_function when registering them.
-//         * testsuite/actionscript.all/String.as:
-//           Add test for 'substring' with base == length;
-//           Fix test for SWF5 (no Function.call or Function.apply
-//           there)
-//         * server/vm/ASHandlers.cpp (ActionSubString):
-// 	  fix case in which base is == length.
-//
-// Revision 1.13  2007/02/28 13:00:05  strk
-//         * server/array.cpp: use builtin_method for builtin
-//           methods :) ensure the 'this' pointer passed
-//           to builtin methods is valid.
-//         * testsuite/actionscript.all/array.as:
-//           Add test for calling Array builtin functions
-//           using FUnction.call.
-//
-// Revision 1.12  2007/02/28 07:41:27  strk
-//         * server/array.{cpp,h}: allow resize trough
-//           setting the 'length' property.
-//         * testsuite/actionscript.all/array.as: test
-//           that arrays 'length' is settable.
-//
-// Revision 1.11  2006/11/21 10:53:08  strk
-//         * server/array.h: documented ::slice function
-//         * server/array.cpp: more fixes.
-//         * testsuite/actionscript.all/array.as: added some tests for
-//           invalid calls to Array.slice()
-//
+//-------------------------------
+// Test deleting an array element
+//-------------------------------
+
+var c = new Array(10,20,30);
+check_equals ( c.length, 3 );
+check_equals(c[0], 10);
+check_equals(c[1], 20);
+check_equals(c[2], 30);
+#if OUTPUT_VERSION > 5
+xcheck(c.hasOwnProperty('0'));
+xcheck(c.hasOwnProperty('1'));
+xcheck(c.hasOwnProperty('2'));
+#endif
+xcheck(delete c[1]);
+check_equals ( c.length, 3 );
+check_equals(c[0], 10);
+xcheck_equals(typeof(c[1]), 'undefined');
+check_equals(c[2], 30);
+#if OUTPUT_VERSION > 5
+xcheck(c.hasOwnProperty('0'));
+check(!c.hasOwnProperty('1'));
+xcheck(c.hasOwnProperty('2'));
+#endif
+



From MAILER-DAEMON Mon Apr 30 13:09:27 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiZNP-0007Y0-F4
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 13:09:27 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiZNN-0007XX-9G
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:09:25 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiZNM-0007XG-Tx
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:09:25 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiZNM-0007XD-O0
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:09:24 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiZH9-0006P9-Ho
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:02:59 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiZH9-0001ug-9Q
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:02:59 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiZH8-0001ud-UA
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:02:59 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiZH8-0001ud-UA@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 17:02:58 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/samples/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 17:09:25 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 17:02:58

Modified files:
	.              : ChangeLog 
	testsuite/samples: Makefile.am 

Log message:
	* testsuite/samples/Makefile.am: distribute gotoFrameOnKeyEvent.swf.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3042&r2=1.3043
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3042
retrieving revision 1.3043
diff -u -b -r1.3042 -r1.3043
--- ChangeLog	30 Apr 2007 16:57:40 -0000	1.3042
+++ ChangeLog	30 Apr 2007 17:02:58 -0000	1.3043
@@ -1,5 +1,6 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/samples/Makefile.am: distribute gotoFrameOnKeyEvent.swf.
 	* testsuite/actionscript.all/array.as: add test for deleting an
 	  array element, and for array indexes being proper properties
 	  (fails in gnash).

Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/samples/Makefile.am	8 Apr 2007 23:06:17 -0000	1.15
+++ testsuite/samples/Makefile.am	30 Apr 2007 17:02:58 -0000	1.16
@@ -81,6 +81,7 @@
 EXTRA_DIST = \
 	clip_as_button2.swf \
 	GotoAndPlayTest.swf \
+	gotoFrameOnKeyEvent.swf \
 	README \
 	$(NULL)
 



From MAILER-DAEMON Mon Apr 30 13:19:31 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiZX9-00087O-5B
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 13:19:31 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiZX6-000865-IB
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:19:28 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiZX5-00084x-4l
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:19:27 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiZX5-00084n-1L
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:19:27 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiZQr-0007fb-RZ
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:13:01 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiZQq-0002ZK-T1
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:13:00 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiZQq-0002ZH-LV
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:13:00 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiZQq-0002ZH-LV@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 17:13:00 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog autogen.sh
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 17:19:29 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 17:13:00

Modified files:
	.              : ChangeLog autogen.sh 

Log message:
	        * autogen.sh: only process configure.ac in root dir and under libltdl,
	          running a find annoingly descends in just generated dist dirs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3043&r2=1.3044
http://cvs.savannah.gnu.org/viewcvs/gnash/autogen.sh?cvsroot=gnash&r1=1.23&r2=1.24

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3043
retrieving revision 1.3044
diff -u -b -r1.3043 -r1.3044
--- ChangeLog	30 Apr 2007 17:02:58 -0000	1.3043
+++ ChangeLog	30 Apr 2007 17:13:00 -0000	1.3044
@@ -1,5 +1,7 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* autogen.sh: only process configure.ac in root dir and under libltdl,
+	  running a find annoingly descends in just generated dist dirs.
 	* testsuite/samples/Makefile.am: distribute gotoFrameOnKeyEvent.swf.
 	* testsuite/actionscript.all/array.as: add test for deleting an
 	  array element, and for array indexes being proper properties

Index: autogen.sh
===================================================================
RCS file: /sources/gnash/gnash/autogen.sh,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- autogen.sh	28 Mar 2007 23:42:19 -0000	1.23
+++ autogen.sh	30 Apr 2007 17:13:00 -0000	1.24
@@ -119,7 +119,8 @@
 	fi
 fi
 
-for coin in `find $srcdir -name CVS -prune -o -name configure.ac -print`
+#for coin in `find $srcdir -name CVS -prune -o -name configure.ac -print`
+for coin in configure.ac libltdl/configure.ac
 do 
   dr=`dirname $coin`
   if test -f $dr/NO-AUTO-GEN; then



From MAILER-DAEMON Mon Apr 30 13:30:44 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiZi0-0000UU-U0
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 13:30:44 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiZhz-0000UP-Hc
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:30:43 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiZhy-0000SW-26
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:30:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiZhx-0000Rx-Qq
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:30:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HiZbk-0000xZ-I7
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:24:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiZbj-0003Az-EJ
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:24:15 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HiZbj-0003Aw-2k
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:24:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiZbj-0003Aw-2k@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Mon, 30 Apr 2007 17:24:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash libamf/amf.h libamf/amf.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 17:30:43 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/30 17:24:14

Modified files:
	libamf         : amf.h amf.cpp 
	.              : ChangeLog 

Log message:
	        * libamf/amf.{h,cpp}: swapBytes is now file-local and uses libboost

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.h?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/amf.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3044&r2=1.3045

Patches:
Index: libamf/amf.h
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libamf/amf.h	3 Apr 2007 16:13:07 -0000	1.17
+++ libamf/amf.h	30 Apr 2007 17:24:14 -0000	1.18
@@ -175,8 +175,6 @@
     AMF(int size);
     ~AMF();
     size_t size() { return _total_size; };
-    // Swap the bytes for Little Endian machines
-    void *swapBytes(void *word, int size);
 
     // encode an element
     void *encodeElement(astype_e type, const void *in, int nbytes);

Index: libamf/amf.cpp
===================================================================
RCS file: /sources/gnash/gnash/libamf/amf.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- libamf/amf.cpp	25 Apr 2007 12:26:07 -0000	1.33
+++ libamf/amf.cpp	30 Apr 2007 17:24:14 -0000	1.34
@@ -16,7 +16,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: amf.cpp,v 1.33 2007/04/25 12:26:07 martinwguy Exp $ */
+/* $Id: amf.cpp,v 1.34 2007/04/30 17:24:14 martinwguy Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -33,11 +33,11 @@
 #endif
 
 #include "log.h"
-#include "tu_swap.h"
-
 #include "amf.h"
 #include "amfutf8.h"
 
+#include <boost/detail/endian.hpp>
+
 using namespace std;
 using namespace gnash;
 
@@ -119,23 +119,13 @@
 /// anything if we happen to be on a big-endian machine.
 ///
 /// Returns its first parameter, pointing to the (maybe-byte-swapped) data.
-void *
-AMF::swapBytes(void *word, int size)
+static void *
+swapBytes(void *word, int size)
 {
-    union {
-	uint16_t s;
-	struct {
-	    uint8_t c0;
-	    uint8_t c1;
-	} c;
-    } u;
-	   
-    u.s = 1;
-    if (u.c.c0 == 0) {
+#ifdef BOOST_BIG_ENDIAN
 	// Big-endian machine: do nothing
-        return word;
-    }
-
+#else
+# ifdef BOOST_LITTLE_ENDIAN
     // Little-endian machine: byte-swap the word
 
     // A conveniently-typed pointer to the source data
@@ -165,6 +155,10 @@
 	break;
       }
     }
+# else
+#  error "Unsupported host endianness"
+# endif
+#endif
 
     return word;
 }

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3044
retrieving revision 1.3045
diff -u -b -r1.3044 -r1.3045
--- ChangeLog	30 Apr 2007 17:13:00 -0000	1.3044
+++ ChangeLog	30 Apr 2007 17:24:14 -0000	1.3045
@@ -1,3 +1,10 @@
+2007-04-27 Martin Guy <martinwguy@yahoo.it>
+
+	* libbase/tu_types.{h,cpp}, server/swf/tag_loaders.cpp:
+	  Eliminate remnants of _TU_LITTLE_ENDIAN_
+	* configure.ac: Drop now-redundant endian header detection
+	* libamf/amf.{h,cpp}: swapBytes is now file-local and uses libboost
+
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
 	* autogen.sh: only process configure.ac in root dir and under libltdl,



From MAILER-DAEMON Mon Apr 30 13:34:09 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiZlJ-0001Y5-Qn
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 13:34:09 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiZlH-0001XU-83
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:34:07 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiZlF-0001XI-OZ
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:34:06 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiZlF-0001XF-J9
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:34:05 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HiZf2-0001I4-83
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 13:27:40 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiZf1-0003Lo-JW
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:27:39 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HiZf1-0003Ll-CV
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:27:39 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiZf1-0003Ll-CV@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Mon, 30 Apr 2007 17:27:39 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash libbase/tu_types.h libbase/tu_types.cpp c...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 17:34:07 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/30 17:27:39

Modified files:
	libbase        : tu_types.h tu_types.cpp 
	.              : configure.ac 

Log message:
	        * libbase/tu_types.{h,cpp}, server/swf/tag_loaders.cpp:
	          Eliminate remnants of _TU_LITTLE_ENDIAN_
	        * configure.ac: Drop now-redundant endian header detection

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.h?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_types.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.296&r2=1.297

Patches:
Index: libbase/tu_types.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- libbase/tu_types.h	19 Apr 2007 05:23:30 -0000	1.34
+++ libbase/tu_types.h	30 Apr 2007 17:27:39 -0000	1.35
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: tu_types.h,v 1.34 2007/04/19 05:23:30 zoulunkai Exp $ */
+/* $Id: tu_types.h,v 1.35 2007/04/30 17:27:39 martinwguy Exp $ */
 
 #ifndef TU_TYPES_H
 #define TU_TYPES_H
@@ -40,7 +40,6 @@
 typedef unsigned __int64 uint64_t;
 typedef __int64 int64_t;
 # define __PRETTY_FUNCTION__ __FUNCDNAME__
-# define BYTE_ORDER SDL_BYTEORDER
 #else
 # include <inttypes.h>
 
@@ -60,25 +59,6 @@
 
 #endif
 
-#ifndef BYTE_ORDER
-#ifdef HAVE_ENDIAN_H
-	#include <endian.h>
-#elif HAVE_SYS_ENDIAN_H
-	#include <sys/endian.h>
-#elif HAVE_MACHINE_ENDIAN_H
-	#include <machine/endian.h>
-#endif
-#  ifndef BYTE_ORDER
-#    error BYTE_ORDER not defined by endian.h. :(
-#  endif // BYTE_ORDER
-#endif // BYTE_ORDER
-
-#if ((BYTE_ORDER == LITTLE_ENDIAN) || (BYTE_ORDER == __LITTLE_ENDIAN) || (BYTE_ORDER == _LITTLE_ENDIAN))
-#	define _TU_LITTLE_ENDIAN_ 1
-#else
-#	undef _TU_LITTLE_ENDIAN_
-#endif //BYTE_ORDER == SDL_LIL_ENDIAN
-
 // A function to run some validation checks.
 DSOEXPORT bool	tu_types_validate();
 

Index: libbase/tu_types.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_types.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/tu_types.cpp	11 Apr 2007 17:54:21 -0000	1.5
+++ libbase/tu_types.cpp	30 Apr 2007 17:27:39 -0000	1.6
@@ -28,25 +28,6 @@
 		return false;
 	}
 
-	// Endian checks.
-	char* buf = "1234";
-
-#ifdef _TU_LITTLE_ENDIAN_
-	if (*(uint32_t*) buf != 0x34333231)
-	{
-		// No good.
-		assert(0);
-		return false;
-	}
-#else	// not _TU_LITTLE_ENDIAN_
-	if (*(uint32_t*) buf != 0x31323334)
-	{
-		// No good.
-		assert(0);
-		return false;
-	}
-#endif	// not _TU_LITTLE_ENDIAN_
-
 	// Checks passed.
 	return true;
 }

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -b -r1.296 -r1.297
--- configure.ac	30 Apr 2007 16:42:56 -0000	1.296
+++ configure.ac	30 Apr 2007 17:27:39 -0000	1.297
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.296 2007/04/30 16:42:56 strk Exp $
+dnl $Id: configure.ac,v 1.297 2007/04/30 17:27:39 martinwguy Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -606,9 +606,6 @@
 dnl Look for Win32 networking stuff
 AC_CHECK_HEADERS(winsock.h)
 AC_CHECK_HEADERS(winsock2.h)
-AC_CHECK_HEADERS(sys/endian.h)
-AC_CHECK_HEADERS(machine/endian.h)
-AC_CHECK_HEADERS(endian.h)
 AC_CHECK_FUNCS(socket)
 AC_CHECK_FUNCS(CreateFileMappingA)
 



From MAILER-DAEMON Mon Apr 30 14:29:00 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HiacO-0000hv-44
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 14:29:00 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HiacM-0000hq-OW
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:28:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HiacK-0000he-U1
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:28:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HiacK-0000hb-Mi
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:28:56 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HiaW7-00088p-8J
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:22:31 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HiaW6-0007If-0t
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 18:22:30 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HiaW5-0007Ib-Jx
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 18:22:29 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HiaW5-0007Ib-Jx@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 18:22:29 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog po/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 18:28:59 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 18:22:29

Modified files:
	.              : ChangeLog 
	po             : Makefile.am 

Log message:
	        * po/Makefile.am: don't update the .po files on every .gmo
	          production. Produce the .gmo in the build tree, not in the
	          source tree.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3045&r2=1.3046
http://cvs.savannah.gnu.org/viewcvs/gnash/po/Makefile.am?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3045
retrieving revision 1.3046
diff -u -b -r1.3045 -r1.3046
--- ChangeLog	30 Apr 2007 17:24:14 -0000	1.3045
+++ ChangeLog	30 Apr 2007 18:22:29 -0000	1.3046
@@ -1,5 +1,8 @@
 2007-04-27 Martin Guy <martinwguy@yahoo.it>
 
+	* po/Makefile.am: don't update the .po files on every .gmo
+	  production. Produce the .gmo in the build tree, not in the
+	  source tree.
 	* libbase/tu_types.{h,cpp}, server/swf/tag_loaders.cpp:
 	  Eliminate remnants of _TU_LITTLE_ENDIAN_
 	* configure.ac: Drop now-redundant endian header detection

Index: po/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/po/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- po/Makefile.am	27 Apr 2007 01:08:51 -0000	1.1
+++ po/Makefile.am	30 Apr 2007 18:22:29 -0000	1.2
@@ -48,11 +48,11 @@
 	done
 	touch update-po
 
-$(gmofiles): update-po
+$(gmofiles): #update-po
 
 SUFFIXES = .po .gmo
 .po.gmo:
-	msgfmt --statistics --directory=$(srcdir) -o $*.gmo $*.po
+	msgfmt --statistics --directory=$(srcdir) -o $*.gmo $(@:%.gmo=$(srcdir)/%.po) 
 else
 $(gmofiles): force
 	@for i in $(gmofiles); do \



From MAILER-DAEMON Mon Apr 30 14:39:55 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hiamw-0007mT-QO
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 14:39:54 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hiamu-0007lb-Ce
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:39:52 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hiamt-0007kw-8s
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:39:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hiams-0007kr-TO
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:39:50 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hiagf-0001aJ-Dy
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:33:25 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hiage-0000Az-E9
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 18:33:24 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hiage-0000Ao-5M
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 18:33:24 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hiage-0000Ao-5M@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 18:33:24 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog server/StringPredicates.h
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 18:39:52 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 18:33:24

Modified files:
	.              : ChangeLog 
	server         : StringPredicates.h 

Log message:
	        * server/StringPredicates.h: include cctype.
	          See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417210.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3046&r2=1.3047
http://cvs.savannah.gnu.org/viewcvs/gnash/server/StringPredicates.h?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3046
retrieving revision 1.3047
diff -u -b -r1.3046 -r1.3047
--- ChangeLog	30 Apr 2007 18:22:29 -0000	1.3046
+++ ChangeLog	30 Apr 2007 18:33:23 -0000	1.3047
@@ -1,8 +1,13 @@
-2007-04-27 Martin Guy <martinwguy@yahoo.it>
+2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* server/StringPredicates.h: include cctype.
+	  See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417210.
 	* po/Makefile.am: don't update the .po files on every .gmo
 	  production. Produce the .gmo in the build tree, not in the
 	  source tree.
+
+2007-04-30 Martin Guy <martinwguy@yahoo.it>
+
 	* libbase/tu_types.{h,cpp}, server/swf/tag_loaders.cpp:
 	  Eliminate remnants of _TU_LITTLE_ENDIAN_
 	* configure.ac: Drop now-redundant endian header detection

Index: server/StringPredicates.h
===================================================================
RCS file: /sources/gnash/gnash/server/StringPredicates.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/StringPredicates.h	10 Apr 2007 18:18:45 -0000	1.5
+++ server/StringPredicates.h	30 Apr 2007 18:33:23 -0000	1.6
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: StringPredicates.h,v 1.5 2007/04/10 18:18:45 rsavoye Exp $ */
+/* $Id: StringPredicates.h,v 1.6 2007/04/30 18:33:23 strk Exp $ */
 
 #ifndef GNASH_STRINGPREDICATES_H
 #define GNASH_STRINGPREDICATES_H
@@ -25,6 +25,7 @@
 #endif
 
 #include <string> 
+#include <cctype> // for toupper,tolower
 
 #include <cassert> // for inlines
 



From MAILER-DAEMON Mon Apr 30 14:59:58 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hib6L-0000mm-Rr
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 14:59:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hib6J-0000mX-Fz
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:59:55 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hib6H-0000mL-6r
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:59:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hib6H-0000mI-2W
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:59:53 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hib03-0004U2-GC
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 14:53:27 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hib02-0001gl-Bn
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 18:53:26 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hib01-0001gi-V6
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 18:53:26 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hib01-0001gi-V6@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 18:53:25 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 18:59:56 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 18:53:25

Modified files:
	.              : ChangeLog Makefile.am 

Log message:
	        * Makefile.am: don't put 'po' in EXTRA_DIST, as it's already
	          in SUBDIRS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3047&r2=1.3048
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.69&r2=1.70

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3047
retrieving revision 1.3048
diff -u -b -r1.3047 -r1.3048
--- ChangeLog	30 Apr 2007 18:33:23 -0000	1.3047
+++ ChangeLog	30 Apr 2007 18:53:25 -0000	1.3048
@@ -1,5 +1,7 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* Makefile.am: don't put 'po' in EXTRA_DIST, as it's already
+	  in SUBDIRS.
 	* server/StringPredicates.h: include cctype.
 	  See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=417210.
 	* po/Makefile.am: don't update the .po files on every .gmo

Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- Makefile.am	27 Apr 2007 01:06:57 -0000	1.69
+++ Makefile.am	30 Apr 2007 18:53:25 -0000	1.70
@@ -15,7 +15,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # 
 
-# $Id: Makefile.am,v 1.69 2007/04/27 01:06:57 rsavoye Exp $
+# $Id: Makefile.am,v 1.70 2007/04/30 18:53:25 strk Exp $
 
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = 1.6.0
@@ -61,7 +61,7 @@
 
 DIST_SUBDIRS = $(STD_DIRS) doc plugin cygnal extensions
 
-EXTRA_DIST= config.rpath $(man_MANS) macros/incllist macros/libslist po
+EXTRA_DIST = config.rpath $(man_MANS) macros/incllist macros/libslist 
 
 noinst_HEADERS = compatibility_include.h
 



From MAILER-DAEMON Mon Apr 30 15:19:34 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HibPK-0005Bv-G6
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 15:19:34 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HibPI-0005Bq-D3
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:19:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HibPH-0005Be-6d
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:19:31 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HibPG-0005Bb-UB
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:19:30 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <martinwguy@yahoo.it>) id 1HibJ3-0007IH-4G
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:13:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HibJ2-0002aR-Hb
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 19:13:04 +0000
Received: from martinwguy by cvs with local (Exim 4.50) id 1HibJ2-0002aL-4T
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 19:13:04 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HibJ2-0002aL-4T@cvs>
From: Martin Guy <martinwguy@yahoo.it>
Date: Mon, 30 Apr 2007 19:13:04 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash backend/sound_handler_sdl.cpp ChangeLog
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 19:19:32 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Martin Guy <martinwguy>	07/04/30 19:13:03

Modified files:
	backend        : sound_handler_sdl.cpp 
	.              : ChangeLog 

Log message:
	        * backend/sound_handler_sdl.cpp: Fix volume scaling in 8->16 bit
	          raw data conversion (closes bug #19747)
	          and convert cascaded ifs to a case.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/sound_handler_sdl.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3048&r2=1.3049

Patches:
Index: backend/sound_handler_sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/backend/sound_handler_sdl.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- backend/sound_handler_sdl.cpp	18 Apr 2007 20:56:39 -0000	1.52
+++ backend/sound_handler_sdl.cpp	30 Apr 2007 19:13:03 -0000	1.53
@@ -18,7 +18,7 @@
 // Based on sound_handler_sdl.cpp by Thatcher Ulrich http://tulrich.com 2003
 // which has been donated to the Public Domain.
 
-// $Id: sound_handler_sdl.cpp,v 1.52 2007/04/18 20:56:39 martinwguy Exp $
+// $Id: sound_handler_sdl.cpp,v 1.53 2007/04/30 19:13:03 martinwguy Exp $
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -160,7 +160,8 @@
 	sound_data* sounddata = m_sound_data[handle_id];
 
 	// Handling of the sound data
-	if (sounddata->format == FORMAT_NATIVE16)
+	switch (sounddata->format) {
+	case FORMAT_NATIVE16:
 	{
 		int16_t*	adjusted_data = 0;
 		int	adjusted_size = 0;
@@ -191,8 +192,11 @@
 			sound->position = sounddata->data_size;
 			sound->set_raw_data(sounddata->data);
 		}
-	} else if (sounddata->format == FORMAT_MP3) {
+	    }
+	    break;
 
+	case FORMAT_MP3:
+	    {
 		// Reallocate the required memory.
 		Uint8* tmp_data = new Uint8[data_bytes + sounddata->data_size];
 		memcpy(tmp_data, sounddata->data, sounddata->data_size);
@@ -211,7 +215,10 @@
 			sound->data_size = sounddata->data_size;
 		}
 
-	} else {
+	    }
+	    break;
+
+	default:
 		gnash::log_error(_("Behavior for this audio codec %d is unknown.  Please send this SWF to the developers"), (int)(sounddata->format));
 	}
 
@@ -556,14 +563,14 @@
 
 	if (sample_size == 1)
 	{
-		// Expand from 8 bit to 16 bit.
+		// Expand from 8 bit unsigned to 16 bit signed.
 		uint8_t*	in = (uint8_t*) data;
 		for (int i = 0; i < output_sample_count; i += dup)
 		{
 			uint8_t	val = *in;
 			for (int j = 0; j < dup; j++)
 			{
-				*out_data++ = (int(val) - 128);
+				*out_data++ = (int(val) - 128) * 256 ;
 			}
 			in += inc;
 		}

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3048
retrieving revision 1.3049
diff -u -b -r1.3048 -r1.3049
--- ChangeLog	30 Apr 2007 18:53:25 -0000	1.3048
+++ ChangeLog	30 Apr 2007 19:13:03 -0000	1.3049
@@ -1,3 +1,9 @@
+2007-04-30 Martin Guy <martinwguy@yahoo.it>
+
+	* backend/sound_handler_sdl.cpp: Fix volume scaling in 8->16 bit
+	  raw data conversion (closes bug #19747)
+	  and convert cascaded ifs to a case.
+
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
 	* Makefile.am: don't put 'po' in EXTRA_DIST, as it's already



From MAILER-DAEMON Mon Apr 30 15:27:43 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HibXD-000352-Nx
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 15:27:43 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HibXC-00034s-Hm
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:27:42 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HibXC-00034g-1x
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:27:42 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HibXB-00034d-TV
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:27:41 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HibQy-0008JI-2x
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:21:16 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HibQx-00033E-J8
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 19:21:15 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HibQx-00033A-6U
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 19:21:15 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HibQx-00033A-6U@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 19:21:15 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog doc/C/Makefile.am
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 19:27:42 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 19:21:15

Modified files:
	.              : ChangeLog 
	doc/C          : Makefile.am 

Log message:
	        * doc/C/Makefile.am: distribute actionscript.xml and related
	          files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3049&r2=1.3050
http://cvs.savannah.gnu.org/viewcvs/gnash/doc/C/Makefile.am?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3049
retrieving revision 1.3050
diff -u -b -r1.3049 -r1.3050
--- ChangeLog	30 Apr 2007 19:13:03 -0000	1.3049
+++ ChangeLog	30 Apr 2007 19:21:14 -0000	1.3050
@@ -1,3 +1,8 @@
+2007-04-30 Sandro Santilli <strk@keybit.net>
+
+	* doc/C/Makefile.am: distribute actionscript.xml and related
+	  files.
+
 2007-04-30 Martin Guy <martinwguy@yahoo.it>
 
 	* backend/sound_handler_sdl.cpp: Fix volume scaling in 8->16 bit

Index: doc/C/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/doc/C/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- doc/C/Makefile.am	29 Mar 2007 22:09:44 -0000	1.36
+++ doc/C/Makefile.am	30 Apr 2007 19:21:14 -0000	1.37
@@ -39,9 +39,12 @@
 	object.xml \
 	opcodes.xml \
 	plugin.xml \
-	rtmp.xml
+	rtmp.xml \
+	actionscript/main.xml \
+	actionscript/as_value.xml \
+	actionscript/new_as_class.xml
 
-xml_files = $(entities) $(docname).xml
+xml_files = $(entities) $(docname).xml actionscript.xml
 
 #noinst_SCRIPT = gen-doc.sh
 dist_man_MANS = gnash.1



From MAILER-DAEMON Mon Apr 30 16:00:02 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Hic2U-0002xN-Ez
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 16:00:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Hic2R-0002x3-NL
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:59:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Hic2Q-0002wp-SY
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:59:59 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Hic2Q-0002wl-Qa
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:59:58 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1HibwC-00047V-S7
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 15:53:32 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1HibwC-0001EK-9D
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 19:53:32 +0000
Received: from strk by cvs with local (Exim 4.50) id 1HibwB-0001EH-SR
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 19:53:32 +0000
To: gnash-commit@gnu.org
Message-Id: <E1HibwB-0001EH-SR@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 19:53:31 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/libamf.all/Makefile.a...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 20:00:00 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 19:53:31

Modified files:
	.              : ChangeLog 
	testsuite/libamf.all: Makefile.am 
	testsuite/misc-ming.all: Makefile.am 

Log message:
	        * testsuite/libamf.all/Makefile.am: proper clean rule.
	        * testsuite/misc-ming.all/Makefile.am: proper clean rule.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3050&r2=1.3051
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libamf.all/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.101&r2=1.102

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3050
retrieving revision 1.3051
diff -u -b -r1.3050 -r1.3051
--- ChangeLog	30 Apr 2007 19:21:14 -0000	1.3050
+++ ChangeLog	30 Apr 2007 19:53:31 -0000	1.3051
@@ -1,5 +1,7 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/libamf.all/Makefile.am: proper clean rule.
+	* testsuite/misc-ming.all/Makefile.am: proper clean rule.
 	* doc/C/Makefile.am: distribute actionscript.xml and related
 	  files.
 

Index: testsuite/libamf.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libamf.all/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/libamf.all/Makefile.am	16 Mar 2007 19:35:12 -0000	1.2
+++ testsuite/libamf.all/Makefile.am	30 Apr 2007 19:53:31 -0000	1.3
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.2 2007/03/16 19:35:12 rsavoye Exp $
+# $Id: Makefile.am,v 1.3 2007/04/30 19:53:31 strk Exp $
 
 AUTOMAKE_OPTIONS = dejagnu
 
@@ -61,8 +61,8 @@
 	@echo "Rebuilding with GCC Mudflap support"
 	$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
 
-clean-hook:
-	-rm -f core.*
+clean-local:
+	-rm -f core.* site.exp.bak testrun.sum testrun.log
 
 TEST_DRIVERS = ../simple.exp
 

Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- testsuite/misc-ming.all/Makefile.am	30 Apr 2007 09:38:45 -0000	1.101
+++ testsuite/misc-ming.all/Makefile.am	30 Apr 2007 19:53:31 -0000	1.102
@@ -1026,7 +1026,7 @@
 	./Dejagnu $(top_srcdir)/testsuite/media
 
 clean-local: 
-	-rm *.swf media
+	-rm *.swf media *.pp *unner
 
 TEST_DRIVERS = ../simple.exp
 TEST_CASES = \



From MAILER-DAEMON Mon Apr 30 17:17:41 2007
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1HidFd-0007x9-KB
	for mharc-gnash-commit@gnu.org; Mon, 30 Apr 2007 17:17:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1HidFb-0007wN-Fv
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:17:39 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1HidFa-0007vw-P2
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:17:39 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1HidFa-0007vs-Fp
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:17:38 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <strk@keybit.net>) id 1Hid9M-0004XZ-3e
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 17:11:12 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69] helo=cvs)
	by sv.gnu.org with esmtp (Exim 4.50) id 1Hid9L-0002KW-05
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 21:11:11 +0000
Received: from strk by cvs with local (Exim 4.50) id 1Hid9K-0002KT-Ir
	for gnash-commit@gnu.org; Mon, 30 Apr 2007 21:11:10 +0000
To: gnash-commit@gnu.org
Message-Id: <E1Hid9K-0002KT-Ir@cvs>
From: Sandro Santilli <strk@keybit.net>
Date: Mon, 30 Apr 2007 21:11:10 +0000
X-detected-kernel: Linux 2.6 (newer, 1)
Subject: [Gnash-commit] gnash ChangeLog testsuite/swfdec/PASSING testsu...
X-BeenThere: gnash-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Gnash CVS commit messages <gnash-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/gnash-commit>
List-Post: <mailto:gnash-commit@gnu.org>
List-Help: <mailto:gnash-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/gnash-commit>,
	<mailto:gnash-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Apr 2007 21:17:39 -0000

CVSROOT:	/sources/gnash
Module name:	gnash
Changes by:	Sandro Santilli <strk>	07/04/30 21:11:10

Modified files:
	.              : ChangeLog 
	testsuite/swfdec: PASSING swfdec_gnash_tester 

Log message:
	        * testsuite/swfdec/swfdec_gnash_tester: allow 11 loop-backs.
	        * testsuite/swfdec/PASSING: function1.swf now succeeds.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3051&r2=1.3052
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/swfdec_gnash_tester?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3051
retrieving revision 1.3052
diff -u -b -r1.3051 -r1.3052
--- ChangeLog	30 Apr 2007 19:53:31 -0000	1.3051
+++ ChangeLog	30 Apr 2007 21:11:10 -0000	1.3052
@@ -1,5 +1,10 @@
 2007-04-30 Sandro Santilli <strk@keybit.net>
 
+	* testsuite/swfdec/swfdec_gnash_tester: allow 11 loop-backs.
+	* testsuite/swfdec/PASSING: function1.swf now succeeds.
+
+2007-04-30 Sandro Santilli <strk@keybit.net>
+		
 	* testsuite/libamf.all/Makefile.am: proper clean rule.
 	* testsuite/misc-ming.all/Makefile.am: proper clean rule.
 	* doc/C/Makefile.am: distribute actionscript.xml and related

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- testsuite/swfdec/PASSING	27 Apr 2007 16:09:01 -0000	1.21
+++ testsuite/swfdec/PASSING	30 Apr 2007 21:11:10 -0000	1.22
@@ -58,3 +58,4 @@
 divide-7.swf
 object-math-7.swf
 event-order.swf
+function1.swf

Index: testsuite/swfdec/swfdec_gnash_tester
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/swfdec_gnash_tester,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- testsuite/swfdec/swfdec_gnash_tester	27 Apr 2007 09:43:43 -0000	1.7
+++ testsuite/swfdec/swfdec_gnash_tester	30 Apr 2007 21:11:10 -0000	1.8
@@ -19,7 +19,7 @@
 	use_orig=1
 fi
 
-${GPROCESSOR} -r10 -f11 -v "$in"  | grep TRACE | sed 's/.*TRACE: //' | fromdos > $out
+${GPROCESSOR} -r11 -f11 -v "$in"  | grep TRACE | sed 's/.*TRACE: //' | fromdos > $out
 if test "$?" != 0; then
 	echo "gprocessor returned an error"
 	exit 1



