[Gnash-commit] gnash ChangeLog server/edit_text_character.cpp ...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/07 10:46:12

Modified files:
        .              : ChangeLog 
        server         : edit_text_character.cpp movie_root.cpp 
                         movie_root.h 

Log message:
                * server/: edit_text_character.cpp, movie_root.cpp,
                  movie_root.h: streamlined headers inclusions.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1872&r2=1.1873
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.30&r2=1.31

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1872
retrieving revision 1.1873
diff -u -b -r1.1872 -r1.1873
--- ChangeLog   6 Dec 2006 15:27:56 -0000       1.1872
+++ ChangeLog   7 Dec 2006 10:46:12 -0000       1.1873
@@ -1,3 +1,8 @@
+2006-12-07 Sandro Santilli <address@hidden>
+
+       * server/: edit_text_character.cpp, movie_root.cpp,
+         movie_root.h: streamlined headers inclusions.
+
 2006-12-06 Sandro Santilli <address@hidden>
 
        * testsuite/server/PropertyListTest.cpp: updated test

Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- server/edit_text_character.cpp      6 Dec 2006 10:21:32 -0000       1.39
+++ server/edit_text_character.cpp      7 Dec 2006 10:46:12 -0000       1.40
@@ -15,20 +15,25 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-/* $Id: edit_text_character.cpp,v 1.39 2006/12/06 10:21:32 strk Exp $ */
+/* $Id: edit_text_character.cpp,v 1.40 2006/12/07 10:46:12 strk Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "utf8.h"
 #include "log.h"
-#include "render.h"
+#include "render.h" // for display()
 #include "movie_definition.h" // to extract version info
 #include "sprite_instance.h"
 #include "edit_text_character.h"
-#include "Key.h"
-#include "movie_root.h"        
+#include "Key.h" // for keyboard events
+#include "movie_root.h"         // for killing focus
 #include "as_environment.h" // for parse_path
 #include "action.h" // for as_standard_member enum
 #include "VM.h"
 #include "builtin_function.h" // for getter/setter properties
+#include "font.h" // for using the _font member
 
 #include <algorithm>
 #include <string>

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/movie_root.cpp       6 Dec 2006 12:48:51 -0000       1.32
+++ server/movie_root.cpp       7 Dec 2006 10:46:12 -0000       1.33
@@ -13,9 +13,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
 // 
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef HAVE_PTHREADS
 #include <pthread.h>
 #endif

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- server/movie_root.h 6 Dec 2006 10:21:32 -0000       1.30
+++ server/movie_root.h 7 Dec 2006 10:46:12 -0000       1.31
@@ -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.30 2006/12/06 10:21:32 strk Exp $ */
+/* $Id: movie_root.h,v 1.31 2006/12/07 10:46:12 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -67,37 +67,29 @@
 #ifndef GNASH_MOVIE_ROOT_H
 #define GNASH_MOVIE_ROOT_H
 
-#include "container.h"
-#include "mouse_button_state.h" // for mouse_button_state
-#include "timers.h" // for Timer
-#include "fontlib.h"
-#include "font.h"
-#include "tu_file.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "tu_config.h"
+
+#include "mouse_button_state.h" // for composition
 #include "drag_state.h" // for composition
 #include "sprite_instance.h" // for inlines
 
 // Forward declarations
-namespace gnash {
-       class import_info;
-       class movie_def_impl;
-       class movie_root;
-       class import_visitor; // in gnash.h
-       class sprite_instance;
-}
+// none needed
 
 namespace gnash
 {
 
-
-
 /// The absolute top level movie
 //
 /// This is a wrapper around the top-level movie_instance that is being played.
 /// There is a *single* instance of this class for each run;
 /// loading external movies will *not* create a new instance of it.
 ///
-class movie_root // : public ref_counted
+class movie_root 
 {
 
 public:
@@ -182,8 +174,11 @@
        /// user's mouse pointer is.
        void notify_mouse_state(int x, int y, int buttons);
 
+       /// \brief
        /// Use this to retrieve the last state of the mouse, as set via
-       /// notify_mouse_state().  Coordinates are in PIXELS, NOT TWIPS.
+       /// notify_mouse_state(). 
+       //
+       /// Coordinates are in PIXELS, NOT TWIPS.
        ///
        void    get_mouse_state(int& x, int& y, int& buttons);
 
@@ -191,6 +186,7 @@
 
        void set_drag_state(const drag_state& st);
 
+       /// @return current top-level root sprite
        sprite_instance* get_root_movie() { return _movie.get(); }
 
        void stop_drag()
@@ -218,6 +214,7 @@
                return get_movie_definition()->get_frame_rate();
        }
 
+       /// \brief
        /// Return the size of a logical movie pixel as
        /// displayed on-screen, with the current device
        /// coordinates.
@@ -249,6 +246,7 @@
 
        float   get_timer() const { return m_timer; }
 
+       /// Delegate to current top-level root sprite
        void    restart() { _movie->restart(); }
 
        void    advance(float delta_time);
@@ -269,26 +267,31 @@
                return _movie->goto_labeled_frame(label);
        }
 
+       /// Delegate to wrapped movie_instance
        void set_play_state(sprite_instance::play_state s) {
                _movie->set_play_state(s);
        }
 
+       /// Delegate to wrapped movie_instance
        sprite_instance::play_state get_play_state() const {
                return _movie->get_play_state();
        }
 
+       /// Delegate to wrapped movie_instance
        void set_variable(const char* path_to_var,
                        const char* new_value)
        {
                _movie->set_variable(path_to_var, new_value);
        }
 
+       /// Delegate to wrapped movie_instance
        void set_variable(const char* path_to_var,
                        const wchar_t* new_value)
        {
                _movie->set_variable(path_to_var, new_value);
        }
 
+       /// Delegate to wrapped movie_instance
        const char* get_variable(const char* path_to_var) const
        {
                return _movie->get_variable(path_to_var);
@@ -300,9 +303,11 @@
        const char* call_method_args(const char* method_name,
                        const char* method_arg_fmt, va_list args);
 
+       /// Delegate to wrapped movie_instance
        void set_visible(bool visible) {
                _movie->set_visible(visible);
        }
+       /// Delegate to wrapped movie_instance
        bool get_visible() const {
                return _movie->get_visible();
        }
@@ -310,6 +315,7 @@
        void * get_userdata() { return m_userdata; }
        void set_userdata(void * ud ) { m_userdata = ud;  }
 
+       /// Delegate to wrapped movie_instance
        void attach_display_callback(
                        const char* path_to_object,
                        void (*callback)(void* user_ptr),
@@ -323,12 +329,22 @@
        void add_keypress_listener(as_object* listener);
        void remove_keypress_listener(as_object* listener);
 
+       /// Get the character having focus
+       //
+       /// @return the character having focus or NULL of none.
+       ///
        character* get_active_entity();
+
+       /// Set the character having focus
+       //
+       /// @param ch
+       ///     The character having focus. NULL to kill focus.
+       ///
        void set_active_entity(character* ch);
        
        void get_invalidated_bounds(rect* bounds, bool force);
 
-       // reimplemented from movie_interface, see dox there
+       /// Return true if the mouse pointer is over an active entity
        bool isMouseOverActiveEntity() const;
 
        bool testInvariant() const;