[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp edit_text_character.h 
                         sprite_instance.cpp textformat.cpp 
        server/parser  : edit_text_character_def.cpp 

Log message:
                * server/sprite_instance.cpp (add_textfield): use 
edit_text_character,
                  not simple text_character (the latter has all the ActionScript
                  methods attached to it).
                * server/edit_text_character.{cpp,h}: keep definition
                  by intrusive_ptr.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2704&r2=1.2705
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.206&r2=1.207
http://cvs.savannah.gnu.org/viewcvs/gnash/server/textformat.cpp?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/edit_text_character_def.cpp?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2704
retrieving revision 1.2705
diff -u -b -r1.2704 -r1.2705
--- ChangeLog   28 Mar 2007 20:01:03 -0000      1.2704
+++ ChangeLog   28 Mar 2007 20:38:35 -0000      1.2705
@@ -1,5 +1,10 @@
 2007-03-28 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (add_textfield): use edit_text_character,
+         not simple text_character (the latter has all the ActionScript
+         methods attached to it).
+       * server/edit_text_character.{cpp,h}: keep definition
+         by intrusive_ptr.
        * server/edit_text_character.{cpp,h}: add stubs
          for all known TextField methods.
        * server/asobj/Global.cpp: initialize the global

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/edit_text_character.cpp      28 Mar 2007 20:01:04 -0000      1.48
+++ server/edit_text_character.cpp      28 Mar 2007 20:38:35 -0000      1.49
@@ -15,7 +15,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.48 2007/03/28 20:01:04 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.49 2007/03/28 20:38:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -891,7 +891,7 @@
        //
        if (_font == NULL)
        {
-               log_error("No font for edit_text_character! [%s:%d]\n",
+               log_error("No font for edit_text_character! [%s:%d]",
                        __FILE__, __LINE__);
                return;
        }

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/edit_text_character.h        28 Mar 2007 20:01:04 -0000      1.25
+++ server/edit_text_character.h        28 Mar 2007 20:38:35 -0000      1.26
@@ -100,7 +100,7 @@
        /// immutable definition of this object, as read
        /// from the SWF stream. Assured to be not-NULL
        /// by constructor. This might change in the future
-       edit_text_character_def*        m_def;
+       boost::intrusive_ptr<edit_text_character_def>   m_def;
 
        /// bounds of dynamic text, as laid out
        rect    m_text_bounding_box;

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -b -r1.206 -r1.207
--- server/sprite_instance.cpp  28 Mar 2007 15:22:24 -0000      1.206
+++ server/sprite_instance.cpp  28 Mar 2007 20:38:35 -0000      1.207
@@ -32,7 +32,8 @@
 #include "MovieClipLoader.h" // @@ temp hack for loading tests
 #include "as_value.h"
 #include "as_function.h"
-#include "text_character_def.h" // @@ temp hack for createTextField exp.
+//#include "text_character_def.h" // @@ temp hack for createTextField exp.
+#include "edit_text_character_def.h" // @@ temp hack for createTextField exp.
 #include "execute_tag.h"
 #include "fn_call.h"
 #include "Key.h"
@@ -2064,7 +2065,7 @@
        matrix txt_matrix;
 
        // Do I need the smart_ptr.here ?
-       boost::intrusive_ptr<text_character_def> txt = new 
text_character_def(get_movie_definition());
+       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);
 
        txt_char->set_name(name.c_str());

Index: server/textformat.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/textformat.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/textformat.cpp       22 Mar 2007 22:37:45 -0000      1.20
+++ server/textformat.cpp       28 Mar 2007 20:38:35 -0000      1.21
@@ -118,8 +118,8 @@
 {
   //log_msg("%s: args=%d\n", __FUNCTION__, nargs);
 
-  textformat_as_object*        text_obj = new textformat_as_object;
-  log_msg("\tCreated New TextFormat object at %p. Not fully implemented 
yet!\n", (void*)text_obj);
+  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());
   
   // tulrich: this looks like it's inserting a method into our
   // caller's env.  setTextFormat is a method on TextField.  So here
@@ -127,9 +127,9 @@
   //
   // TODO we should handle setTextFormat as a method on TextField,
   // instead of doing this.
-  fn.env().set_variable("setTextFormat", new 
builtin_function(textformat_setformat));
+  //fn.env().set_variable("setTextFormat", new 
builtin_function(textformat_setformat));
   
-  return as_value(text_obj);
+  return as_value(text_obj.get());
 }
 
 

Index: server/parser/edit_text_character_def.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/edit_text_character_def.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/parser/edit_text_character_def.cpp   21 Sep 2006 10:18:37 -0000      
1.6
+++ server/parser/edit_text_character_def.cpp   28 Mar 2007 20:38:35 -0000      
1.7
@@ -102,7 +102,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\n", m_font_id);
+                       log_error("error: text style with undefined font; 
font_id = %d", m_font_id);
                }
        }