[Gnash-commit] gnash ChangeLog server/button_character_instanc...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/19 21:46:30

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.cpp 

Log message:
        (on_button_event): Push all events to the global queue.
        Tested this locally, no automated test.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6332&r2=1.6333
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.97&r2=1.98

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6332
retrieving revision 1.6333
diff -u -b -r1.6332 -r1.6333
--- ChangeLog   19 Apr 2008 19:23:51 -0000      1.6332
+++ ChangeLog   19 Apr 2008 21:46:28 -0000      1.6333
@@ -1,3 +1,9 @@
+2008-04-19 Sandro Santilli <address@hidden>
+
+       * server/button_character_instance.cpp (on_button_event):
+         Push all events to the global queue. Tested this locally, no
+         automated test.
+
 2008-04-19 Benjamin Wolsey <address@hidden>
 
        * server/asobj/LocalConnection.cpp: log unimplemented for LC send.

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/button_character_instance.cpp        19 Apr 2008 07:37:12 -0000      
1.97
+++ server/button_character_instance.cpp        19 Apr 2008 21:46:29 -0000      
1.98
@@ -547,27 +547,30 @@
        // the action queue on mouse event.
        //
 
-       ButtonActionPusher xec(getVM().getRoot(), this); 
+       movie_root& mr = getVM().getRoot();
+
+       ButtonActionPusher xec(mr, this); 
        m_def->forEachTrigger(event, xec);
 
        // check for built-in event handler.
        std::auto_ptr<ExecutableCode> code ( get_event_handler(event) );
        if ( code.get() )
        {
-               code->execute();
+               //log_debug(_("Got statically-defined handler for event: %s"), 
event.get_function_name().c_str());
+               mr.pushAction(code, movie_root::apDOACTION);
+               //code->execute();
        }
-       else
-       {
-               //log_debug(_("No handler for event: %s"), 
event.get_function_name().c_str());
-       }
-
+       //else log_debug(_("No statically-defined handler for event: %s"), 
event.get_function_name().c_str());
 
        // Call conventional attached method.
        boost::intrusive_ptr<as_function> method = 
getUserDefinedEventHandler(event.get_function_key());
        if ( method )
        {
-               call_method0(as_value(method.get()), &(get_environment()), 
this);
+               //log_debug(_("Got user-defined handler for event: %s"), 
event.get_function_name().c_str());
+               mr.pushAction(method, this, movie_root::apDOACTION);
+               //call_method0(as_value(method.get()), &(get_environment()), 
this);
        }
+       //else log_debug(_("No statically-defined handler for event: %s"), 
event.get_function_name().c_str());
 }
 
 void