[Gnash-commit] gnash ChangeLog configure.ac gui/gtk.cpp gui/gt...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/04/11 15:33:46

Modified files:
        .              : ChangeLog configure.ac 
        gui            : gtk.cpp gtksup.h gui.cpp gui.h 
        server         : character.cpp character.h movie_root.cpp 
                         movie_root.h sprite_instance.cpp 
                         sprite_instance.h 

Log message:
                * configure.ac: allow disabling movie properties separately from
                  menus. It can't presently be viewed without the menus, but may
                  be useful for debugging (dumping movie information).
                * server/character.{h,cpp}, server/movie_root.{cpp,h},
                  server/sprite_instance.{cpp,h}, gui/gtk{.cpp,sup.h},
                  gui/gui.{cpp,h}: update ifdefs, make sure all tree-related
                  code is ifdeffed out.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6257&r2=1.6258
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.509&r2=1.510
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.168&r2=1.169
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtksup.h?cvsroot=gnash&r1=1.72&r2=1.73
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.cpp?cvsroot=gnash&r1=1.150&r2=1.151
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.136&r2=1.137
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.174&r2=1.175
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.116&r2=1.117
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.501&r2=1.502
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.177&r2=1.178

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6257
retrieving revision 1.6258
diff -u -b -r1.6257 -r1.6258
--- ChangeLog   11 Apr 2008 12:47:55 -0000      1.6257
+++ ChangeLog   11 Apr 2008 15:33:44 -0000      1.6258
@@ -1,5 +1,15 @@
 2008-04-11 Benjamin Wolsey <address@hidden>
 
+       * configure.ac: allow disabling movie properties separately from
+         menus. It can't presently be viewed without the menus, but may
+         be useful for debugging (dumping movie information).
+       * server/character.{h,cpp}, server/movie_root.{cpp,h},
+         server/sprite_instance.{cpp,h}, gui/gtk{.cpp,sup.h},
+         gui/gui.{cpp,h}: update ifdefs, make sure all tree-related
+         code is ifdeffed out.
+
+2008-04-11 Benjamin Wolsey <address@hidden>
+
        * server/character.h: tree is not defined if tree.hh is not
          included.
 

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.509
retrieving revision 1.510
diff -u -b -r1.509 -r1.510
--- configure.ac        8 Apr 2008 20:30:28 -0000       1.509
+++ configure.ac        11 Apr 2008 15:33:45 -0000      1.510
@@ -297,6 +297,22 @@
 fi
 AM_CONDITIONAL(MENUS, test x$menus = xyes)
 
+dnl Don't gather SWF information in tree form. This takes
+dnl resources and memory that can be saved if there's no
+dnl need to examine SWF internals.
+AC_ARG_ENABLE(swftree,
+  AC_HELP_STRING([--disable-swftree],[Disable showing SWF properties]),
+[case "${enableval}" in
+  yes) swftree=yes ;;
+  no)  swftree=no ;;
+  *)   AC_MSG_ERROR([bad value ${enableval} for --disable-swf-properties 
option]) ;;
+esac],swftree=yes)
+
+if test x"$swftree" = x"yes"; then
+  AC_DEFINE([USE_SWFTREE], [], [View SWF information])
+fi
+AM_CONDITIONAL(SWFTREE, test x$swftree = xyes)
+
 dnl Disable running any tests for "make check". This may sound stupid, but
 dnl this option is designed to soley be used by maintainers in the 
 dnl DISTCHECK_CONFIGURE_FLAGS when building packages. Gnash's testing 
infrastructure

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -b -r1.168 -r1.169
--- gui/gtk.cpp 11 Apr 2008 10:56:14 -0000      1.168
+++ gui/gtk.cpp 11 Apr 2008 15:33:45 -0000      1.169
@@ -669,6 +669,8 @@
     return pixbuf;
 }
 
+#ifdef USE_SWFTREE
+
 // This creates a GtkTree model for displaying movie info.
 GtkTreeModel*
 GtkGui::makeTreeModel (std::auto_ptr<InfoTree> treepointer)
@@ -735,6 +737,8 @@
 
 }
 
+#endif
+
 // Adds the Gnash icon to a window.
 void
 GtkGui::addGnashIcon(GtkWindow* window)
@@ -1307,6 +1311,8 @@
     gtk_container_add (GTK_CONTAINER (
                         GTK_DIALOG(propsDialog)->vbox), propsvbox);
 
+#ifdef USE_SWFTREE
+
     std::auto_ptr<InfoTree> infoptr = getMovieInfo();
 
     GtkWidget *scrollwindow1 = gtk_scrolled_window_new (NULL, NULL);
@@ -1371,6 +1377,8 @@
     //Add tree to scrollwindow.
     gtk_container_add (GTK_CONTAINER (scrollwindow1), treeview);
 
+#endif
+
     gtk_widget_show_all (propsDialog);
 
 }

Index: gui/gtksup.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gtksup.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -b -r1.72 -r1.73
--- gui/gtksup.h        11 Apr 2008 10:05:07 -0000      1.72
+++ gui/gtksup.h        11 Apr 2008 15:33:45 -0000      1.73
@@ -224,8 +224,10 @@
     
     GdkPixbuf* createPixbuf(const gchar *filename);
     
+#ifdef USE_SWFTREE
     // Create a tree model for displaying movie info
     GtkTreeModel* makeTreeModel (std::auto_ptr<InfoTree> treepointer);
+#endif
 
     std::auto_ptr<GtkGlue>     _glue;
 

Index: gui/gui.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- gui/gui.cpp 11 Apr 2008 10:46:21 -0000      1.150
+++ gui/gui.cpp 11 Apr 2008 15:33:45 -0000      1.151
@@ -888,13 +888,13 @@
        setInvalidatedRegion(bounds);
 }
 
+#ifdef USE_SWFTREE
+
 std::auto_ptr<Gui::InfoTree>
 Gui::getMovieInfo() const
 {
     std::auto_ptr<InfoTree> tr;
 
-#ifdef USE_MENUS // This could be further expanded to avoid tree entirely.
-
     if ( ! VM::isInitialized() )
     {
         return tr;
@@ -977,11 +977,11 @@
 
     tr->sort(firstLevelIter.begin(), firstLevelIter.end());
 
-#endif
-
     return tr;
 }
 
+#endif
+
 #ifdef GNASH_FPS_DEBUG
 void 
 Gui::fpsCounterTick()

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- gui/gui.h   11 Apr 2008 10:46:21 -0000      1.85
+++ gui/gui.h   11 Apr 2008 15:33:45 -0000      1.86
@@ -25,9 +25,12 @@
 #include "rect.h"  // for composition
 #include "snappingrange.h"  // for InvalidatedRanges
 #include "gnash.h" // for gnash::key::code type
-#include "tree.hh" // for tree
 #include "smart_ptr.h"
 
+#ifdef USE_SWFTREE
+#include "tree.hh" // for tree
+#endif
+
 #include <string>
 #include <map>
 
@@ -328,6 +331,8 @@
     }
 #endif // def GNASH_FPS_DEBUG
 
+
+#ifdef USE_SWFTREE
     // TODO: use a tree-like structure (tree.hh?)
     typedef std::pair<std::string, std::string> StringPair;
     typedef tree<StringPair> InfoTree;
@@ -337,6 +342,7 @@
     /// currently being played (or NULL, if the VM isn't initialized yet)
     ///
     std::auto_ptr<InfoTree> getMovieInfo() const;
+#endif
 
     typedef std::map<std::string, std::string> VariableMap;
 

Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/character.cpp        8 Apr 2008 18:23:18 -0000       1.87
+++ server/character.cpp        11 Apr 2008 15:33:45 -0000      1.88
@@ -19,7 +19,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // USE_SWFTREE
 #endif
 
 #include "character.h"
@@ -32,6 +32,10 @@
 #include "ExecutableCode.h"
 #include "namedStrings.h"
 
+#ifdef USE_SWFTREE
+# include "tree.hh"
+#endif
+
 #include <boost/algorithm/string/case_conv.hpp>
 
 #undef set_invalidated
@@ -1005,7 +1009,7 @@
   return gnash::render::bounds_in_clipping_area(mybounds);  
 }
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
 character::InfoTree::iterator
 character::getMovieInfo(InfoTree& tr, InfoTree::iterator it)
 {

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -b -r1.136 -r1.137
--- server/character.h  11 Apr 2008 12:47:57 -0000      1.136
+++ server/character.h  11 Apr 2008 15:33:45 -0000      1.137
@@ -20,7 +20,7 @@
 #define GNASH_CHARACTER_H
 
 #ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
+#include "gnashconfig.h" // USE_SWFTREE
 #endif
 
 #include "gnash.h"
@@ -34,7 +34,7 @@
 #include "log.h"
 #include "snappingrange.h"
 #include "Range2d.h"
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
 # include "tree.hh"
 #endif
 
@@ -69,8 +69,9 @@
   // action_buffer is externally owned
   typedef std::vector<const action_buffer*> BufferList;
   typedef std::map<event_id, BufferList> Events;
+
+#ifdef USE_SWFTREE
   typedef std::pair<std::string, std::string> StringPair; // ifdef USE_MENU...
-#ifdef USE_MENUS
   typedef tree<StringPair> InfoTree; // ifdef USE_MENU
 #endif
 
@@ -1169,7 +1170,7 @@
   ///
   virtual bool isSelectableTextField() const { return false; }
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
   /// Append character info in the tree
   //
   /// @param tr

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -b -r1.174 -r1.175
--- server/movie_root.cpp       9 Apr 2008 16:53:10 -0000       1.174
+++ server/movie_root.cpp       11 Apr 2008 15:33:45 -0000      1.175
@@ -44,7 +44,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/bind.hpp>
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
 # include "tree.hh"
 #endif
 
@@ -1917,7 +1917,7 @@
 
 }
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
 void
 movie_root::getMovieInfo(tree<StringPair>& tr, tree<StringPair>::iterator it)
 {

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- server/movie_root.h 3 Apr 2008 14:24:01 -0000       1.116
+++ server/movie_root.h 11 Apr 2008 15:33:46 -0000      1.117
@@ -66,7 +66,7 @@
 #define GNASH_MOVIE_ROOT_H
 
 #ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // GNASH_USE_GC, USE_MENUS
+#include "gnashconfig.h" // GNASH_USE_GC, USE_SWFTREE
 #endif
 
 #include "dsodefs.h" // DSOEXPORT
@@ -79,7 +79,7 @@
 #include "smart_ptr.h" // for memory management
 #include "URL.h" // for loadMovie
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
 # include "tree.hh"
 #endif
 
@@ -671,7 +671,7 @@
                interfaceHandle = handler;
        }
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
     typedef std::pair<std::string, std::string> StringPair;
     void getMovieInfo(tree<StringPair>& tr, tree<StringPair>::iterator it);
 #endif

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -b -r1.501 -r1.502
--- server/sprite_instance.cpp  11 Apr 2008 12:06:56 -0000      1.501
+++ server/sprite_instance.cpp  11 Apr 2008 15:33:46 -0000      1.502
@@ -55,6 +55,10 @@
 #include "namedStrings.h"
 #include "fill_style.h" // for beginGradientFill
 
+#ifdef USE_SWFTREE
+# include "tree.hh"
+#endif
+
 #include <vector>
 #include <string>
 #include <cmath>
@@ -4600,7 +4604,7 @@
        m_play_state = s;
 }
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
 
 class MovieInfoVisitor {
 
@@ -4638,6 +4642,6 @@
 
 }
 
-#endif // USE_MENUS
+#endif // USE_SWFTREE
 
 } // namespace gnash

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -b -r1.177 -r1.178
--- server/sprite_instance.h    4 Apr 2008 10:51:54 -0000       1.177
+++ server/sprite_instance.h    11 Apr 2008 15:33:46 -0000      1.178
@@ -22,7 +22,7 @@
 #define GNASH_SPRITE_INSTANCE_H
 
 #ifdef HAVE_CONFIG_H
-#include "gnashconfig.h" // GNASH_USE_GC
+#include "gnashconfig.h" // GNASH_USE_GC, USE_SWFTREE
 #endif
 
 //#include "edit_text_character.h" // temp hack
@@ -35,6 +35,10 @@
 #include "Range2d.h"
 #include "dsodefs.h" // for DSOEXPORT
 
+#ifdef USE_SWFTREE
+# include "tree.hh"
+#endif
+
 #include <vector>
 #include <list>
 #include <map>
@@ -879,7 +883,7 @@
        /// Getter-setter for MovieClip._lockroot
        static as_value lockroot_getset(const fn_call& fn);
 
-#ifdef USE_MENUS
+#ifdef USE_SWFTREE
        // Override to append display list info, see dox in character.h
        virtual InfoTree::iterator getMovieInfo(InfoTree& tr, 
InfoTree::iterator it);
 #endif