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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/12 19:48:05

Modified files:
        .              : ChangeLog 
        server         : button_character_instance.h character.h 
                         edit_text_character.h generic_character.h 
                         sprite_instance.cpp sprite_instance.h 
                         video_stream_instance.h 

Log message:
                * server/: button_character_instance.h, character.h,
                  edit_text_character.h, generic_character.h, 
sprite_instance.cpp,
                  sprite_instance.h, video_stream_instance.h:
                  const-corrected can_handle_mouse_event() and 
get_event_handler().

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1921&r2=1.1922
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/server/generic_character.h?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.103&r2=1.104
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.h?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1921
retrieving revision 1.1922
diff -u -b -r1.1921 -r1.1922
--- ChangeLog   12 Dec 2006 19:46:18 -0000      1.1921
+++ ChangeLog   12 Dec 2006 19:48:04 -0000      1.1922
@@ -1,5 +1,12 @@
 2006-12-12 Sandro Santilli <address@hidden>
 
+       * server/: button_character_instance.h, character.h,
+         edit_text_character.h, generic_character.h, sprite_instance.cpp,
+         sprite_instance.h, video_stream_instance.h:
+         const-corrected can_handle_mouse_event() and get_event_handler().
+
+2006-12-12 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/MovieClip.as: some more
          (verified) tests for MovieClip.useHandCursor.
 

Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/button_character_instance.h  9 Dec 2006 23:14:49 -0000       1.8
+++ server/button_character_instance.h  12 Dec 2006 19:48:04 -0000      1.9
@@ -5,7 +5,7 @@
 
 // SWF buttons.  Mouse-sensitive update/display, actions, etc.
 
-/* $Id: button_character_instance.h,v 1.8 2006/12/09 23:14:49 strk Exp $ */
+/* $Id: button_character_instance.h,v 1.9 2006/12/12 19:48:04 strk Exp $ */
 
 #ifndef GNASH_BUTTON_CHARACTER_INSTANCE_H
 #define GNASH_BUTTON_CHARACTER_INSTANCE_H
@@ -68,7 +68,7 @@
 
        ~button_character_instance();
 
-       bool can_handle_mouse_event() { return true; }
+       bool can_handle_mouse_event() const { return true; }
 
        // called from keypress listener only
        bool on_event(const event_id& id);

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- server/character.h  12 Dec 2006 16:58:31 -0000      1.35
+++ server/character.h  12 Dec 2006 19:48:04 -0000      1.36
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: character.h,v 1.35 2006/12/12 16:58:31 strk Exp $ */
+/* $Id: character.h,v 1.36 2006/12/12 19:48:04 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -193,7 +193,13 @@
 
     const std::string& get_name() const { return _name; }
 
-    virtual bool can_handle_mouse_event() = 0;
+    /// Return true if this character can handle mouse events.
+    //
+    /// The default implementation returns false.
+    ///
+    virtual bool can_handle_mouse_event() const {
+        return false;
+    }
 
     // For edit_text support (Flash 5).  More correct way
     // is to do "text_character.text = whatever", via
@@ -219,9 +225,9 @@
        virtual cxform  get_world_cxform() const;
 
     // Event handler accessors.
-       bool get_event_handler(const event_id& id, as_value* result)
+       bool get_event_handler(const event_id& id, as_value* result) const
        {
-               std::map<event_id, as_value>::iterator it = \
+               std::map<event_id, as_value>::const_iterator it = \
                        _event_handlers.find(id);
                if ( it == _event_handlers.end() ) return false;
                *result = it->second;

Index: server/edit_text_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/edit_text_character.h        30 Nov 2006 13:41:51 -0000      1.20
+++ server/edit_text_character.h        12 Dec 2006 19:48:04 -0000      1.21
@@ -50,7 +50,7 @@
 
        ~edit_text_character();
 
-       virtual bool can_handle_mouse_event()   {       return true; }
+       virtual bool can_handle_mouse_event() const { return true; }
        virtual character* get_topmost_mouse_entity(float x, float y);  
        virtual bool on_event(const event_id& id);      
 

Index: server/generic_character.h
===================================================================
RCS file: /sources/gnash/gnash/server/generic_character.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/generic_character.h  21 Nov 2006 00:25:46 -0000      1.16
+++ server/generic_character.h  12 Dec 2006 19:48:04 -0000      1.17
@@ -57,7 +57,7 @@
            assert(m_def);
        }
 
-       virtual bool can_handle_mouse_event()   {
+       virtual bool can_handle_mouse_event() const {
                assert(m_parent != NULL);
                return m_parent->can_handle_mouse_event();
        }

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/sprite_instance.cpp  12 Dec 2006 18:14:00 -0000      1.103
+++ server/sprite_instance.cpp  12 Dec 2006 19:48:04 -0000      1.104
@@ -2614,7 +2614,7 @@
 }
 
 bool
-sprite_instance::can_handle_mouse_event()
+sprite_instance::can_handle_mouse_event() const
 {
     // We should cache this!
     as_value dummy;
@@ -2631,7 +2631,10 @@
        "onRollover",
     };
     for (unsigned int i = 0; i < ARRAYSIZE(FN_NAMES); i++) {
-       if (get_member(FN_NAMES[i], &dummy)) {
+           // 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(FN_NAMES[i], 
&dummy)) {
            return true;
        }
     }
@@ -2954,8 +2957,6 @@
        if ( ! _target_dot.empty() ) return _target_dot.c_str();
 
        _target_dot = "_level0" + getTargetPath();
-
-       std::string::size_type current=0;
        for (std::string::size_type i=0; i<_target_dot.length(); ++i)
        {
                if ( _target_dot[i] == '/' ) _target_dot[i] = '.';

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/sprite_instance.h    12 Dec 2006 16:58:31 -0000      1.48
+++ server/sprite_instance.h    12 Dec 2006 19:48:04 -0000      1.49
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.48 2006/12/12 16:58:31 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.49 2006/12/12 19:48:04 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -208,7 +208,7 @@
 
 
        /// Return true if we have any mouse event handlers.
-       virtual bool can_handle_mouse_event();
+       virtual bool can_handle_mouse_event() const;
 
        /// \brief
        /// Return the topmost entity that the given point

Index: server/video_stream_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/video_stream_instance.h      20 Nov 2006 15:06:53 -0000      1.3
+++ server/video_stream_instance.h      12 Dec 2006 19:48:04 -0000      1.4
@@ -26,7 +26,6 @@
        virtual void    advance(float delta_time);
        void    display();
 
-       bool can_handle_mouse_event() { return false; }
        void get_invalidated_bounds(rect* bounds, bool force);
 
 //     void set_source(const as_object* source)