CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/18 13:51:33
Modified files:
. : ChangeLog
server : edit_text_character.cpp movie_root.cpp
movie_root.h
Log message:
* server/: movie_root.{cpp,h}, edit_text_character.cpp:
Renamed movie_root::{get,set}_active_entity to
movie_root::{get,set}Focus for clarity, and documented it.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4631&r2=1.4632
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.126&r2=1.127
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.80&r2=1.81
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4631
retrieving revision 1.4632
diff -u -b -r1.4631 -r1.4632
--- ChangeLog 18 Oct 2007 13:45:20 -0000 1.4631
+++ ChangeLog 18 Oct 2007 13:51:32 -0000 1.4632
@@ -1,5 +1,8 @@
2007-10-18 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/: movie_root.{cpp,h}, edit_text_character.cpp:
+ Renamed movie_root::{get,set}_active_entity to
+ movie_root::{get,set}Focus for clarity, and documented it.
* testsuite/swfdec/PASSING: we now pass
addProperty-get-prototypes-{6,7,8}.swf
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server/edit_text_character.cpp 18 Oct 2007 11:47:54 -0000 1.126
+++ server/edit_text_character.cpp 18 Oct 2007 13:51:33 -0000 1.127
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: edit_text_character.cpp,v 1.126 2007/10/18 11:47:54 cmusick Exp $ */
+/* $Id: edit_text_character.cpp,v 1.127 2007/10/18 13:51:33 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -594,7 +594,7 @@
if (m_has_focus == true)
{
movie_root& root = _vm.getRoot();
- root.set_active_entity(NULL);
+ root.setFocus(NULL);
root.remove_key_listener(this);
m_has_focus = false;
format_text();
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/movie_root.cpp 18 Oct 2007 11:47:54 -0000 1.110
+++ server/movie_root.cpp 18 Oct 2007 13:51:33 -0000 1.111
@@ -560,7 +560,7 @@
// set/kill focus for current root
movie_root& mroot = VM::get().getRoot();
- character* current_active_entity =
mroot.get_active_entity();
+ character* current_active_entity = mroot.getFocus();
// It's another entity ?
if (current_active_entity != active_entity.get())
@@ -573,7 +573,7 @@
// wheter the action must trigger
// a redraw.
need_redisplay=true;
- mroot.set_active_entity(NULL);
+ mroot.setFocus(NULL);
}
// Then to set focus
@@ -581,7 +581,7 @@
{
if
(active_entity->on_event(event_id::SETFOCUS))
{
-
mroot.set_active_entity(active_entity.get());
+
mroot.setFocus(active_entity.get());
}
}
}
@@ -1068,14 +1068,14 @@
}
character*
-movie_root::get_active_entity()
+movie_root::getFocus()
{
assert(testInvariant());
return m_active_input_text;
}
void
-movie_root::set_active_entity(character* ch)
+movie_root::setFocus(character* ch)
{
m_active_input_text = ch;
assert(testInvariant());
Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/movie_root.h 2 Oct 2007 15:44:51 -0000 1.80
+++ server/movie_root.h 18 Oct 2007 13:51:33 -0000 1.81
@@ -15,7 +15,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.80 2007/10/02 15:44:51 strk Exp $ */
+/* $Id: movie_root.h,v 1.81 2007/10/18 13:51:33 strk Exp $ */
/// \page events_handling Handling of user events
///
@@ -504,16 +504,19 @@
/// Get the character having focus
//
+ /// The character having focus will receive mouse button
+ /// and key presses/releases.
+ ///
/// @return the character having focus or NULL of none.
///
- character* get_active_entity();
+ character* getFocus();
/// Set the character having focus
//
/// @param ch
/// The character having focus. NULL to kill focus.
///
- void set_active_entity(character* ch);
+ void setFocus(character* ch);
DSOEXPORT void add_invalidated_bounds(InvalidatedRanges& ranges, bool
force);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
