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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/16 21:12:51

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

Log message:
        implement movie info tree filler so to print state and childs.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6305&r2=1.6306
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.cpp?cvsroot=gnash&r1=1.90&r2=1.91
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button_character_instance.h?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6305
retrieving revision 1.6306
diff -u -b -r1.6305 -r1.6306
--- ChangeLog   16 Apr 2008 21:05:25 -0000      1.6305
+++ ChangeLog   16 Apr 2008 21:12:50 -0000      1.6306
@@ -1,3 +1,8 @@
+2008-04-16 Sandro Santilli <address@hidden>
+
+       * server/button_character_instance.{cpp,h}: implement movie info
+         tree filler so to print state and childs.
+
 2008-04-16 Benjamin Wolsey <address@hidden>
 
        * server/types.h: drop some dead code. (PIXELS_TO_TWIPS) don't

Index: server/button_character_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -b -r1.90 -r1.91
--- server/button_character_instance.cpp        15 Apr 2008 11:00:48 -0000      
1.90
+++ server/button_character_instance.cpp        16 Apr 2008 21:12:51 -0000      
1.91
@@ -1031,6 +1031,39 @@
   global.init_member("Button", cl.get());
 }
 
+#ifdef USE_SWFTREE
+character::InfoTree::iterator 
+button_character_instance::getMovieInfo(InfoTree& tr, InfoTree::iterator it)
+{
+       InfoTree::iterator selfIt = character::getMovieInfo(tr, it);
+       std::ostringstream os;
+
+       std::vector<character*> actChars;
+       get_active_characters(actChars);
+       std::sort(actChars.begin(), actChars.end(), charDepthLessThen);
+
+       os << actChars.size() << " active characters for state " << 
mouseStateName(m_mouse_state);
+       InfoTree::iterator localIter = tr.append_child(selfIt, 
StringPair(_("Button state"), os.str()));            
+       std::for_each(actChars.begin(), actChars.end(), 
boost::bind(&character::getMovieInfo, _1, tr, localIter)); 
+
+       return selfIt;
+
+}
+#endif
+
+const char*
+button_character_instance::mouseStateName(e_mouse_state s)
+{
+       switch (s)
+       {
+               case UP: return "UP";
+               case DOWN: return "DOWN";
+               case OVER: return "OVER";
+               case HIT: return "HIT";
+               default: return "UNKNOWN (error?)";
+       }
+}
+
 } // end of namespace gnash
 
 

Index: server/button_character_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/button_character_instance.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- server/button_character_instance.h  31 Mar 2008 23:48:32 -0000      1.36
+++ server/button_character_instance.h  16 Apr 2008 21:12:51 -0000      1.37
@@ -59,6 +59,7 @@
                OUT_DOWN = FLAG_DOWN
        };
        int     m_last_mouse_flags, m_mouse_flags;
+
        enum e_mouse_state
        {
                UP = 0,
@@ -66,6 +67,9 @@
                OVER,
                HIT
        };
+
+       static const char* mouseStateName(e_mouse_state s);
+
        e_mouse_state m_mouse_state;
 
        button_character_instance(button_character_definition* def,
@@ -164,6 +168,11 @@
        /// Properly unload contained characters
        bool unload();
 
+#ifdef USE_SWFTREE
+       // Override to append button characters info, see dox in character.h
+       virtual InfoTree::iterator getMovieInfo(InfoTree& tr, 
InfoTree::iterator it);
+#endif
+
 protected:
 
 #ifdef GNASH_USE_GC