[Gnash-commit] gnash ChangeLog configure.ac server/button_char...

[Sandro Santilli]

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 <address@hidden>
+
+       * 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 <address@hidden>
 
        * 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);