[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10228: Tweak TextField implementati
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10228: Tweak TextField implementation, stub unimplemented methods. |
|
Date: |
Wed, 05 Nov 2008 13:23:13 +0100 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10228
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2008-11-05 13:23:13 +0100
message:
Tweak TextField implementation, stub unimplemented methods.
renamed:
libcore/edit_text_character.cpp => libcore/TextField.cpp
libcore/edit_text_character.h => libcore/TextField.h
modified:
libcore/Makefile.am
libcore/MovieClip.cpp
libcore/MovieClip.h
libcore/asobj/ClassHierarchy.cpp
libcore/asobj/Global.cpp
libcore/parser/edit_text_character_def.cpp
libcore/parser/edit_text_character_def.h
macros/ffmpeg.m4
testsuite/actionscript.all/TextField.as
testsuite/actionscript.all/toString_valueOf.as
libcore/TextField.cpp
libcore/TextField.h
------------------------------------------------------------
revno: 10227.1.1
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Wed 2008-11-05 11:02:06 +0100
message:
Rename edit_text_character to TextField.
Add password, multiline and maxChars to TextField (not implemented).
Change prototype of first instantiation of TextField, behaviour different
for SWF5 and SWF6+.
renamed:
libcore/edit_text_character.cpp => libcore/TextField.cpp
libcore/edit_text_character.h => libcore/TextField.h
modified:
libcore/Makefile.am
libcore/MovieClip.cpp
libcore/MovieClip.h
libcore/asobj/ClassHierarchy.cpp
libcore/asobj/Global.cpp
libcore/parser/edit_text_character_def.cpp
libcore/parser/edit_text_character_def.h
libcore/TextField.cpp
libcore/TextField.h
------------------------------------------------------------
revno: 10227.1.2
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Wed 2008-11-05 11:23:05 +0100
message:
Indentation and cleanups in TextField.
Add new passes in TextField and toString_valueOf (TextField SWF5
prototype).
There are new failures because some properties of TextField should not be
defined before instantiation. They were undefined before because they were
not implemented at all, so this seems acceptable.
The problem now appears to be that the Dejagnu.swf clip trace field
shouldn't
be regarded as a TextField instantiation, but it is by Gnash, so the
prototype
is changed before it should be.
modified:
libcore/TextField.cpp
testsuite/actionscript.all/TextField.as
testsuite/actionscript.all/toString_valueOf.as
------------------------------------------------------------
revno: 10227.1.3
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Wed 2008-11-05 11:34:07 +0100
message:
Correct totals.
modified:
testsuite/actionscript.all/TextField.as
------------------------------------------------------------
revno: 10227.1.4
committer: Benjamin Wolsey <address@hidden>
branch nick: work
timestamp: Wed 2008-11-05 11:57:01 +0100
message:
Expect failures.
modified:
testsuite/actionscript.all/TextField.as
=== modified file 'libcore/Makefile.am'
--- a/libcore/Makefile.am 2008-10-30 16:46:00 +0000
+++ b/libcore/Makefile.am 2008-11-05 10:02:06 +0000
@@ -64,7 +64,7 @@
CharacterProxy.cpp \
cxform.cpp \
DynamicShape.cpp \
- edit_text_character.cpp \
+ TextField.cpp \
BlurFilter.cpp \
GlowFilter.cpp \
DropShadowFilter.cpp \
@@ -139,7 +139,7 @@
DynamicShape.h \
DisplayList.h \
drag_state.h \
- edit_text_character.h \
+ TextField.h \
event_id.h \
fill_style.h \
BitmapFilter.h \
=== modified file 'libcore/MovieClip.cpp'
--- a/libcore/MovieClip.cpp 2008-10-30 21:35:10 +0000
+++ b/libcore/MovieClip.cpp 2008-11-05 10:02:06 +0000
@@ -27,7 +27,7 @@
#include "movie_definition.h"
#include "as_value.h"
#include "as_function.h"
-#include "edit_text_character.h" // for registered variables
+#include "TextField.h" // for registered variables
#include "edit_text_character_def.h" // @@ temp hack for createTextField exp.
#include "ControlTag.h"
#include "fn_call.h"
@@ -3013,7 +3013,9 @@
MovieClip::add_textfield(const std::string& name, int depth, int x, int y,
float width, float height)
{
// Create a definition (TODO: cleanup this thing, definitions should be
immutable!)
- boost::intrusive_ptr<edit_text_character_def> txt = new
edit_text_character_def();
+
+ boost::intrusive_ptr<edit_text_character_def> txt =
+ new edit_text_character_def();
// Set textfield bounds
txt->set_bounds(rect(0, 0, PIXELS_TO_TWIPS(width),
PIXELS_TO_TWIPS(height)));
@@ -4469,7 +4471,7 @@
_vm.getRoot().set_background_color(color);
}
-static bool isTextFieldUnloaded(boost::intrusive_ptr< edit_text_character >& p)
+static bool isTextFieldUnloaded(boost::intrusive_ptr<TextField>& p)
{
return p->isUnloaded();
}
@@ -4500,8 +4502,7 @@
/* public */
void
-MovieClip::set_textfield_variable(const std::string& name,
- edit_text_character* ch)
+MovieClip::set_textfield_variable(const std::string& name, TextField* ch)
{
assert(ch);
@@ -5150,8 +5151,8 @@
// although we're a 'const' method...
// Yet another approach would be for TextField::unload
// to unregister self from our map, but TextField
- // (edit_text_character) doesn't really store a pointer
- // to the movieclip it's registered against.
+ // doesn't really store a pointer to the movieclip
+ // it's registered against.
//
//log_debug("Unloaded TextField in registered textfield "
//"variables container on ::markReachableResources");
=== modified file 'libcore/MovieClip.h'
--- a/libcore/MovieClip.h 2008-10-30 21:35:10 +0000
+++ b/libcore/MovieClip.h 2008-11-05 10:02:06 +0000
@@ -49,7 +49,7 @@
class drag_state;
class LoadVariablesThread;
class gradient_record;
- class edit_text_character;
+ class TextField;
namespace SWF {
class PlaceObject2Tag;
}
@@ -609,8 +609,7 @@
/// A TextField variable is a variable that acts
/// as a setter/getter for a TextField 'text' member.
///
- void set_textfield_variable(const std::string& name,
- edit_text_character* ch);
+ void set_textfield_variable(const std::string& name, TextField* ch);
void add_invalidated_bounds(InvalidatedRanges& ranges, bool force);
@@ -919,8 +918,8 @@
/// Increment m_current_frame, and take care of looping.
void increment_frame_and_check_for_loop();
- typedef boost::intrusive_ptr< edit_text_character > TextFieldPtr;
- typedef std::vector< TextFieldPtr > TextFieldPtrVect;
+ typedef boost::intrusive_ptr<TextField> TextFieldPtr;
+ typedef std::vector<TextFieldPtr> TextFieldPtrVect;
/// A container for textfields, indexed by their variable name
typedef std::map< std::string, TextFieldPtrVect > TextFieldMap;
=== renamed file 'libcore/edit_text_character.cpp' => 'libcore/TextField.cpp'
--- a/libcore/edit_text_character.cpp 2008-10-25 10:38:32 +0000
+++ b/libcore/TextField.cpp 2008-11-05 12:23:13 +0000
@@ -1,4 +1,4 @@
-// edit_text_character.cpp: User-editable text regions, for Gnash.
+// TextField.cpp: User-editable text regions, for Gnash.
//
// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
//
@@ -26,9 +26,9 @@
#include "render.h" // for display()
#include "movie_definition.h" // to extract version info
#include "MovieClip.h"
-#include "edit_text_character.h"
+#include "TextField.h"
#include "Key_as.h" // for keyboard events
-#include "movie_root.h" // for killing focus
+#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"
@@ -84,7 +84,8 @@
static as_value textfield_removeTextField(const fn_call& fn);
static as_value textfield_replaceSel(const fn_call& fn);
static as_value textfield_replaceText(const fn_call& fn);
-static as_object* getTextFieldInterface();
+
+static as_object* getTextFieldInterface(VM& vm);
static as_value textfield_background_getset(const fn_call& fn);
static as_value textfield_border_getset(const fn_call& fn);
@@ -109,221 +110,370 @@
static as_value
textfield_get_variable(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
- return as_value(text->get_variable_name());
+ return as_value(text->get_variable_name());
}
static as_value
textfield_set_variable(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
-
- assert ( fn.nargs > 0 );
- const std::string& newname = fn.arg(0).to_string();
-
- text->set_variable_name(newname);
-
- return as_value();
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ assert ( fn.nargs > 0 );
+ const std::string& newname = fn.arg(0).to_string();
+
+ text->set_variable_name(newname);
+
+ return as_value();
}
static as_value
textfield_getDepth(const fn_call& fn)
{
- // TODO: make this a character::getDepth_method function...
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
-
- int n = text->get_depth();
-
- return as_value(n);
+ // TODO: make this a character::getDepth_method function...
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ int n = text->get_depth();
+
+ return as_value(n);
}
static as_value
textfield_getFontList(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
- UNUSED(text);
-
- LOG_ONCE(log_unimpl("TextField.getFontList()"));
-
- return as_value();
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE(log_unimpl("TextField.getFontList()"));
+
+ return as_value();
}
static as_value
textfield_getNewTextFormat(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
- UNUSED(text);
-
- LOG_ONCE(log_unimpl("TextField.getNewTextFormat()"));
-
- return as_value();
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE(log_unimpl("TextField.getNewTextFormat()"));
+
+ return as_value();
}
static as_value
textfield_getTextFormat(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
-
- boost::intrusive_ptr<TextFormat> tf = new TextFormat();
- tf->alignSet(text->getTextAlignment());
- tf->sizeSet(text->getFontHeight());
- tf->indentSet(text->getIndent());
- tf->blockIndentSet(text->getBlockIndent());
- tf->leadingSet(text->getLeading());
- tf->leftMarginSet(text->getLeftMargin());
- tf->rightMarginSet(text->getRightMargin());
- tf->colorSet(text->getTextColor());
- tf->underlinedSet(text->getUnderlined());
-
- const font* font = text->getFont();
- if (font)
- {
- tf->fontSet(font->get_name());
- tf->italicedSet(font->isItalic());
- tf->boldSet(font->isBold());
- }
-
- // TODO: add font color and some more
-
- LOG_ONCE( log_unimpl("TextField.getTextFormat() discards url, target,
tabStops, bullet and display") );
-
- return as_value(tf.get());
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ boost::intrusive_ptr<TextFormat> tf = new TextFormat();
+ tf->alignSet(text->getTextAlignment());
+ tf->sizeSet(text->getFontHeight());
+ tf->indentSet(text->getIndent());
+ tf->blockIndentSet(text->getBlockIndent());
+ tf->leadingSet(text->getLeading());
+ tf->leftMarginSet(text->getLeftMargin());
+ tf->rightMarginSet(text->getRightMargin());
+ tf->colorSet(text->getTextColor());
+ tf->underlinedSet(text->getUnderlined());
+
+ const font* font = text->getFont();
+ if (font)
+ {
+ tf->fontSet(font->get_name());
+ tf->italicedSet(font->isItalic());
+ tf->boldSet(font->isBold());
+ }
+
+ // TODO: add font color and some more
+
+ LOG_ONCE(
+ log_unimpl("TextField.getTextFormat() discards url, target, "
+ "tabStops, bullet and display")
+ );
+
+ return as_value(tf.get());
}
static as_value
textfield_setTextFormat(const fn_call& fn)
{
- //GNASH_REPORT_FUNCTION;
-
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( ! fn.nargs )
- {
- IF_VERBOSE_ASCODING_ERRORS(
- std::stringstream ss; fn.dump_args(ss);
- log_aserror("TextField.setTextFormat(%s) : %s", ss.str(),
_("missing arg"))
- );
- return as_value();
- }
- else if ( fn.nargs > 2 )
- {
- std::stringstream ss; fn.dump_args(ss);
- log_debug("TextField.setTextFormat(%s) : args past the first
are unhandled by Gnash", ss.str());
- }
-
- as_object* obj = fn.arg(0).to_object().get();
- if ( ! obj )
- {
- IF_VERBOSE_ASCODING_ERRORS(
- std::stringstream ss; fn.dump_args(ss);
- log_aserror("TextField.setTextFormat(%s) : %s", ss.str(),
_("first argument is not an object"))
- );
- return as_value();
- }
-
- TextFormat* tf = dynamic_cast<TextFormat*>(obj);
- if ( ! tf )
- {
- IF_VERBOSE_ASCODING_ERRORS(
- std::stringstream ss; fn.dump_args(ss);
- log_aserror("TextField.setTextFormat(%s) : %s", ss.str(),
_("first argument is not a TextFormat"))
- );
- return as_value();
- }
-
- if ( tf->alignDefined() ) text->setAlignment(tf->align());
- if ( tf->sizeDefined() ) text->setFontHeight(tf->size()); // keep twips
- if ( tf->indentDefined() ) text->setIndent(tf->indent());
- if ( tf->blockIndentDefined() ) text->setBlockIndent(tf->blockIndent());
- if ( tf->leadingDefined() ) text->setLeading(tf->leading());
- if ( tf->leftMarginDefined() ) text->setLeftMargin(tf->leftMargin());
- if ( tf->rightMarginDefined() ) text->setRightMargin(tf->rightMargin());
- if ( tf->colorDefined() ) text->setTextColor(tf->color());
- if ( tf->underlinedDefined() ) text->setUnderlined(tf->underlined());
-
- if ( tf->fontDefined() )
- {
- const std::string& fontName = tf->font();
- if ( ! fontName.empty() )
- {
- bool bold = tf->bold();
- bool italic = tf->italiced();
-
- // NOTE: should query movie-private font lib, not
global-shared one
- movie_instance* mi = text->get_root();
- assert(mi);
- movie_definition* md = mi->get_movie_definition();
- assert(md);
- font* f = md->get_font(fontName, bold, italic);
- if ( ! f ) f = fontlib::get_font(fontName, bold,
italic);
- text->setFont( f );
- }
- }
-
- // TODO: add font color and some more
-
- LOG_ONCE( log_unimpl("TextField.setTextFormat() discards url, target,
tabStops, bullet and display") );
-
- return as_value();
+ //GNASH_REPORT_FUNCTION;
+
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ if ( ! fn.nargs )
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ std::stringstream ss; fn.dump_args(ss);
+ log_aserror("TextField.setTextFormat(%s) : %s", ss.str(),
+ _("missing arg"))
+ );
+ return as_value();
+ }
+ else if ( fn.nargs > 2 )
+ {
+ std::stringstream ss; fn.dump_args(ss);
+ log_debug("TextField.setTextFormat(%s) : args past the first are "
+ "unhandled by Gnash", ss.str());
+ }
+
+ as_object* obj = fn.arg(0).to_object().get();
+ if ( ! obj )
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ std::stringstream ss; fn.dump_args(ss);
+ log_aserror("TextField.setTextFormat(%s) : %s", ss.str(), _("first
argument is not an object"))
+ );
+ return as_value();
+ }
+
+ TextFormat* tf = dynamic_cast<TextFormat*>(obj);
+ if ( ! tf )
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ std::stringstream ss; fn.dump_args(ss);
+ log_aserror("TextField.setTextFormat(%s) : %s", ss.str(),
+ _("first argument is not a TextFormat"))
+ );
+ return as_value();
+ }
+
+ if ( tf->alignDefined() ) text->setAlignment(tf->align());
+ if ( tf->sizeDefined() ) text->setFontHeight(tf->size()); // keep twips
+ if ( tf->indentDefined() ) text->setIndent(tf->indent());
+ if ( tf->blockIndentDefined() ) text->setBlockIndent(tf->blockIndent());
+ if ( tf->leadingDefined() ) text->setLeading(tf->leading());
+ if ( tf->leftMarginDefined() ) text->setLeftMargin(tf->leftMargin());
+ if ( tf->rightMarginDefined() ) text->setRightMargin(tf->rightMargin());
+ if ( tf->colorDefined() ) text->setTextColor(tf->color());
+ if ( tf->underlinedDefined() ) text->setUnderlined(tf->underlined());
+
+ if ( tf->fontDefined() )
+ {
+ const std::string& fontName = tf->font();
+ if ( ! fontName.empty() )
+ {
+ bool bold = tf->bold();
+ bool italic = tf->italiced();
+
+ // NOTE: should query movie-private font lib, not global-shared one
+ movie_instance* mi = text->get_root();
+ assert(mi);
+ movie_definition* md = mi->get_movie_definition();
+ assert(md);
+ font* f = md->get_font(fontName, bold, italic);
+ if ( ! f ) f = fontlib::get_font(fontName, bold, italic);
+ text->setFont( f );
+ }
+ }
+
+ // TODO: add font color and some more
+
+ LOG_ONCE( log_unimpl("TextField.setTextFormat() discards url, target,
tabStops, bullet and display") );
+
+ return as_value();
}
static as_value
textfield_setNewTextFormat(const fn_call& fn)
{
- //boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
- //UNUSED(text);
-
- LOG_ONCE( log_unimpl("TextField.setNewTextFormat(), we'll delegate to
setTextFormat") );
- return textfield_setTextFormat(fn);
-
- //return as_value();
-}
+ //boost::intrusive_ptr<TextField> text =
ensureType<TextField>(fn.this_ptr);
+ //UNUSED(text);
+
+ LOG_ONCE( log_unimpl("TextField.setNewTextFormat(), we'll delegate to
setTextFormat") );
+ return textfield_setTextFormat(fn);
+
+ //return as_value();
+}
+
+static as_value
+textfield_password(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ LOG_ONCE(log_unimpl("TextField.password"));
+
+ if (!fn.nargs)
+ {
+ // Getter
+ return as_value(text->password());
+ }
+ // Setter
+ text->password(fn.arg(0).to_bool());
+ return as_value();
+}
+
+static as_value
+textfield_multiline(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ LOG_ONCE(log_unimpl("TextField.multiline"));
+
+ if (!fn.nargs) {
+ // Getter
+ return as_value(text->multiline());
+ }
+ // Setter
+ text->multiline(fn.arg(0).to_bool());
+ return as_value();
+}
+
+static as_value
+textfield_restrict(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.restrict"));
+
+ return as_value();
+}
+
+static as_value
+textfield_bottomScroll(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.bottomScroll"));
+
+ return as_value();
+}
+
+static as_value
+textfield_maxhscroll(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.maxhscroll"));
+
+ return as_value();
+}
+
+/// Returns null when the value is 0.
+static as_value
+textfield_maxChars(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ LOG_ONCE(log_unimpl("TextField.maxChars"));
+
+ if (!fn.nargs)
+ {
+ boost::int32_t maxChars = text->maxChars();
+ if (maxChars == 0)
+ {
+ as_value null;
+ null.set_null();
+ return null;
+ }
+ return as_value(maxChars);
+ }
+ // Setter
+ text->maxChars(fn.arg(0).to_int());
+ return as_value();
+}
+
+static as_value
+textfield_htmlText(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.htmlText"));
+
+ return as_value();
+}
+
static as_value
textfield_replaceSel(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
- UNUSED(text);
-
- LOG_ONCE (log_unimpl("TextField.replaceSel()"));
-
- return as_value();
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.replaceSel()"));
+
+ return as_value();
+}
+
+static as_value
+textfield_scroll(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.scroll()"));
+
+ return as_value();
+}
+
+static as_value
+textfield_hscroll(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.hscroll()"));
+
+ return as_value();
+}
+
+static as_value
+textfield_maxscroll(const fn_call& fn)
+{
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE (log_unimpl("TextField.maxscroll"));
+
+ return as_value();
}
static as_value
textfield_replaceText(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
- UNUSED(text);
-
- LOG_ONCE(log_unimpl("TextField.replaceText()"));
-
- return as_value();
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+ UNUSED(text);
+
+ LOG_ONCE(log_unimpl("TextField.replaceText()"));
+
+ return as_value();
}
static as_value
textfield_removeTextField(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> text =
ensureType<edit_text_character>(fn.this_ptr);
-
- text->removeTextField();
-
- LOG_ONCE(log_debug("TextField.removeTextField() TESTING"));
-
- return as_value();
+ boost::intrusive_ptr<TextField> text = ensureType<TextField>(fn.this_ptr);
+
+ text->removeTextField();
+
+ LOG_ONCE(log_debug("TextField.removeTextField() TESTING"));
+
+ return as_value();
}
+/// This is called for 'new TextField()' only
static as_value
textfield_ctor(const fn_call& /* fn */)
{
- as_object* proto = getTextFieldInterface();
- if ( ! proto ) proto = getObjectInterface(); // for SWF5 and below I
guess...
- boost::intrusive_ptr<as_object> obj = new as_object(proto);
- return as_value(obj);
+ as_object* proto = getTextFieldInterface(VM::get());
+
+ // We should attach more properties to the prototype on first
+ // instantiation.
+ // TODO: this also attaches properties to the SWF5 prototype but makes
+ // them invisible with prop flags. Is this correct?
+ TextField::attachTextFieldInstanceProperties(*proto);
+
+ boost::intrusive_ptr<as_object> obj = new as_object(proto);
+
+ return as_value(obj);
}
//
@@ -333,1438 +483,1490 @@
static void
attachTextFieldInterface(as_object& o)
{
- boost::intrusive_ptr<builtin_function> getset;
-
- int target_version = o.getVM().getSWFVersion();
-
- // TextField is an AsBroadcaster
- AsBroadcaster::initialize(o);
-
- int propFlags = as_prop_flags::dontDelete
- |as_prop_flags::dontEnum
- |as_prop_flags::readOnly
- |as_prop_flags::isProtected;
-
- // Parent seems to not be a normal property
- getset = new builtin_function(&character::parent_getset, NULL);
- o.init_property(NSV::PROP_uPARENT, *getset, *getset);
-
- // Target seems to not be a normal property
- getset = new builtin_function(&character::target_getset, NULL);
- o.init_property(NSV::PROP_uTARGET, *getset, *getset);
-
- // _name should be a property of the instance, not the prototype
- getset = new builtin_function(&character::name_getset, NULL);
- o.init_property(NSV::PROP_uNAME, *getset, *getset);
-
- o.init_property(NSV::PROP_uXMOUSE, character::xmouse_get,
character::xmouse_get, propFlags);
- o.init_property(NSV::PROP_uYMOUSE, character::ymouse_get,
character::ymouse_get, propFlags);
- o.init_property(NSV::PROP_uXSCALE, character::xscale_getset,
character::xscale_getset);
- o.init_property(NSV::PROP_uYSCALE, character::yscale_getset,
character::yscale_getset);
- o.init_property(NSV::PROP_TEXT_WIDTH, textfield_textWidth_getset,
textfield_textWidth_getset);
- o.init_property(NSV::PROP_TEXT_HEIGHT, textfield_textHeight_getset,
textfield_textHeight_getset);
-
-
- // SWF5 or higher (TODO: check textfields in SWF5 !!! we miss tests
here !)
- if ( target_version < 6 ) return;
-
- // SWF6 or higher
-
- boost::intrusive_ptr<builtin_function> variable_getter(new
builtin_function(&textfield_get_variable, NULL));
- boost::intrusive_ptr<builtin_function> variable_setter(new
builtin_function(&textfield_set_variable, NULL));
- o.init_property("variable", *variable_getter, *variable_setter);
- o.init_member("setTextFormat", new
builtin_function(textfield_setTextFormat));
- o.init_member("getTextFormat", new
builtin_function(textfield_getTextFormat));
-
- o.init_member("setNewTextFormat", new
builtin_function(textfield_setNewTextFormat));
- o.init_member("getNewTextFormat", new
builtin_function(textfield_getNewTextFormat));
- o.init_member("getNewTextFormat", new
builtin_function(textfield_getNewTextFormat));
- o.init_member("getDepth", new builtin_function(textfield_getDepth));
- o.init_member("removeTextField", new
builtin_function(textfield_removeTextField));
- o.init_member("replaceSel", new builtin_function(textfield_replaceSel));
-
- // The following properties should only be attached to the prototype
- // on first textfield creation. We won't get to that detail of
compatibility,
- // seeming not important
- getset = new builtin_function(textfield_background_getset);
- o.init_property("background", *getset, *getset);
- getset = new builtin_function(textfield_backgroundColor_getset);
- o.init_property("backgroundColor", *getset, *getset);
- getset = new builtin_function(textfield_border_getset);
- o.init_property("border", *getset, *getset);
- getset = new builtin_function(textfield_borderColor_getset);
- o.init_property("borderColor", *getset, *getset);
- getset = new builtin_function(textfield_textColor_getset);
- o.init_property("textColor", *getset, *getset);
- getset = new builtin_function(textfield_embedFonts_getset);
- o.init_property("embedFonts", *getset, *getset);
- getset = new builtin_function(textfield_autoSize_getset);
- o.init_property("autoSize", *getset, *getset);
- getset = new builtin_function(textfield_type_getset);
- o.init_property("type", *getset, *getset);
- getset = new builtin_function(textfield_wordWrap_getset);
- o.init_property("wordWrap", *getset, *getset);
- getset = new builtin_function(textfield_html_getset);
- o.init_property("html", *getset, *getset);
- getset = new builtin_function(textfield_selectable_getset);
- o.init_property("selectable", *getset, *getset);
- getset = new builtin_function(textfield_length_getset);
- o.init_property("length", *getset, *getset);
-
-
- if ( target_version < 7 ) return;
-
- // SWF7 or higher
- o.init_member("replaceText", new
builtin_function(textfield_replaceText));
- if ( target_version < 8 ) return;
-
-}
+ boost::intrusive_ptr<builtin_function> getset;
+
+ // TextField is an AsBroadcaster
+ AsBroadcaster::initialize(o);
+
+ int propFlags = as_prop_flags::dontDelete
+ |as_prop_flags::dontEnum
+ |as_prop_flags::readOnly
+ |as_prop_flags::isProtected;
+
+ // Parent seems to not be a normal property
+ getset = new builtin_function(&character::parent_getset, NULL);
+ o.init_property(NSV::PROP_uPARENT, *getset, *getset);
+
+ // Target seems to not be a normal property
+ getset = new builtin_function(&character::target_getset, NULL);
+ o.init_property(NSV::PROP_uTARGET, *getset, *getset);
+
+ // _name should be a property of the instance, not the prototype
+ getset = new builtin_function(&character::name_getset, NULL);
+ o.init_property(NSV::PROP_uNAME, *getset, *getset);
+
+ o.init_property(NSV::PROP_uXMOUSE,
+ character::xmouse_get, character::xmouse_get, propFlags);
+ o.init_property(NSV::PROP_uYMOUSE,
+ character::ymouse_get, character::ymouse_get, propFlags);
+ o.init_property(NSV::PROP_uXSCALE,
+ character::xscale_getset, character::xscale_getset);
+ o.init_property(NSV::PROP_uYSCALE,
+ character::yscale_getset, character::yscale_getset);
+ // Standard flags.
+ const int flags = as_prop_flags::dontDelete
+ |as_prop_flags::dontEnum;
+
+ // SWF6 or higher
+ const int swf6Flags = flags | as_prop_flags::onlySWF6Up;
+
+ o.init_member("setTextFormat",
+ new builtin_function(textfield_setTextFormat), swf6Flags);
+ o.init_member("getTextFormat",
+ new builtin_function(textfield_getTextFormat), swf6Flags);
+ o.init_member("setNewTextFormat",
+ new builtin_function(textfield_setNewTextFormat), swf6Flags);
+ o.init_member("getNewTextFormat",
+ new builtin_function(textfield_getNewTextFormat), swf6Flags);
+ o.init_member("getNewTextFormat",
+ new builtin_function(textfield_getNewTextFormat), swf6Flags);
+ o.init_member("getDepth",
+ new builtin_function(textfield_getDepth), swf6Flags);
+ o.init_member("removeTextField",
+ new builtin_function(textfield_removeTextField), swf6Flags);
+ o.init_member("replaceSel",
+ new builtin_function(textfield_replaceSel), swf6Flags);
+
+ // SWF7 or higher
+ const int swf7Flags = flags | as_prop_flags::onlySWF7Up;
+
+ o.init_member("replaceText",
+ new builtin_function(textfield_replaceText), swf7Flags);
+
+}
+
+void
+TextField::attachTextFieldInstanceProperties(as_object& o)
+{
+ // Standard flags.
+ const int flags = as_prop_flags::dontDelete
+ |as_prop_flags::dontEnum;
+
+ // SWF6 or higher
+ const int swf6Flags = flags | as_prop_flags::onlySWF6Up;
+
+ boost::intrusive_ptr<builtin_function> getset;
+
+ // The following properties should only be attached to the prototype
+ // on first textfield creation.
+ o.init_property(NSV::PROP_TEXT_WIDTH,
+ textfield_textWidth_getset, textfield_textWidth_getset);
+ o.init_property(NSV::PROP_TEXT_HEIGHT,
+ textfield_textHeight_getset, textfield_textHeight_getset);
+
+ boost::intrusive_ptr<builtin_function> variable_getter(
+ new builtin_function(&textfield_get_variable, NULL));
+ boost::intrusive_ptr<builtin_function> variable_setter(
+ new builtin_function(&textfield_set_variable, NULL));
+ o.init_property("variable", *variable_getter, *variable_setter, swf6Flags);
+ getset = new builtin_function(textfield_background_getset);
+ o.init_property("background", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_backgroundColor_getset);
+ o.init_property("backgroundColor", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_border_getset);
+ o.init_property("border", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_borderColor_getset);
+ o.init_property("borderColor", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_textColor_getset);
+ o.init_property("textColor", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_embedFonts_getset);
+ o.init_property("embedFonts", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_autoSize_getset);
+ o.init_property("autoSize", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_type_getset);
+ o.init_property("type", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_wordWrap_getset);
+ o.init_property("wordWrap", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_html_getset);
+ o.init_property("html", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_selectable_getset);
+ o.init_property("selectable", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_length_getset);
+ o.init_property("length", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_maxscroll);
+ o.init_property("maxscroll", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_maxhscroll);
+ o.init_property("maxhscroll", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_maxChars);
+ o.init_property("maxChars", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_bottomScroll);
+ o.init_property("bottomScroll", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_scroll);
+ o.init_property("scroll", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_hscroll);
+ o.init_property("hscroll", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_restrict);
+ o.init_property("restrict", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_multiline);
+ o.init_property("multiline", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_password);
+ o.init_property("password", *getset, *getset, swf6Flags);
+ getset = new builtin_function(textfield_htmlText);
+ o.init_property("htmlText", *getset, *getset, swf6Flags);
+}
+
static void
attachTextFieldStaticMembers(as_object& o)
{
- int target_version = o.getVM().getSWFVersion();
-
- // SWF5 or higher
- if ( target_version < 6 ) return;
-
- // SWF6 or higher
- o.init_member("getFontList", new
builtin_function(textfield_getFontList));
- if ( target_version < 7 ) return;
-
- // SWF7 or higher
- if ( target_version < 8 ) return;
+ // Standard flags.
+ const int flags = as_prop_flags::dontDelete
+ |as_prop_flags::dontEnum;
+
+ // SWF6 or higher
+ const int swf6Flags = flags | as_prop_flags::onlySWF6Up;
+
+ o.init_member("getFontList",
+ new builtin_function(textfield_getFontList), swf6Flags);
}
+/// This is called when a prototype should be added
+//
+/// @note This is called at different times, depending on the version.
+/// For SWF5 it is called only on first instantiation. For SWF6 it
+/// is called at the registration of _global.TextField.
static as_object*
-getTextFieldInterface()
-{
- static boost::intrusive_ptr<as_object> proto;
-
- if ( VM::get().getSWFVersion() < 6 ) return NULL;
-
- if ( proto == NULL )
- {
- proto = new as_object(getObjectInterface());
- VM::get().addStatic(proto.get());
-
- attachTextFieldInterface(*proto);
- //proto->init_member("constructor", new
builtin_function(textfield_ctor));
- }
- return proto.get();
-}
-
-//
-// edit_text_character class
-//
-
-edit_text_character::edit_text_character(character* parent,
- edit_text_character_def* def, int id)
- :
- character(parent, id),
- _text(L""),
- _textDefined(def->has_text()),
- m_def(def),
- _underlined(false),
- _leading(m_def->get_leading()),
- _alignment(def->get_alignment()),
- _indent(def->get_indent()),
- _blockIndent(0),
- _leftMargin(def->get_left_margin()),
- _rightMargin(def->get_right_margin()),
- _fontHeight(def->get_font_height()),
- _font(0),
- m_has_focus(false),
- m_cursor(0u),
- m_xcursor(0.0f),
- m_ycursor(0.0f),
- _text_variable_registered(false),
- _variable_name(m_def->get_variable_name()),
- _drawBackground(m_def->has_border()),
- _backgroundColor(255,255,255,255),
- _drawBorder(m_def->has_border()),
- _borderColor(0,0,0,255),
- _textColor(m_def->get_text_color()),
- _embedFonts(m_def->getUseEmbeddedGlyphs()),
- _wordWrap(m_def->do_word_wrap()),
- _html(m_def->htmlAllowed()),
- _selectable(!m_def->get_no_select()),
- _autoSize(autoSizeNone),
- _type(m_def->get_readonly() ? typeDynamic : typeInput),
- _bounds(m_def->get_bounds())
-{
- assert(parent);
- assert(m_def);
-
- set_prototype(getTextFieldInterface());
-
- Array_as* ar = new Array_as();
- ar->push(this);
- set_member(NSV::PROP_uLISTENERS, ar);
-
- // WARNING! remember to set the font *before* setting text value!
- setFont( m_def->get_font() );
-
- // set default text *before* calling registerTextVariable
- // (if the textvariable already exist and has a value
- // the text will be replaced with it)
-
- int version = parent->getVM().getSWFVersion();
-
- if ( _textDefined )
- {
-
setTextValue(utf8::decodeCanonicalString(m_def->get_default_text(), version));
- }
-
- registerTextVariable();
-
- m_dummy_style.push_back(fill_style());
-
- reset_bounding_box(0, 0);
-
-}
-
-edit_text_character::~edit_text_character()
+getTextFieldInterface(VM& vm)
+{
+ static boost::intrusive_ptr<as_object> proto;
+
+ if ( proto == NULL )
+ {
+ if (vm.getSWFVersion() < 6) {
+ /// The prototype for SWF5 is a simple as_object without
+ /// toString() or valueOf().
+ proto = new as_object();
+ }
+ else {
+ proto = new as_object(getObjectInterface());
+ vm.addStatic(proto.get());
+ attachTextFieldInterface(*proto);
+ }
+
+ }
+ return proto.get();
+}
+
+//
+// TextField class
+//
+
+TextField::TextField(character* parent,
+ edit_text_character_def* def, int id)
+ :
+ character(parent, id),
+ _text(L""),
+ _textDefined(def->has_text()),
+ m_def(def),
+ _underlined(false),
+ _leading(m_def->get_leading()),
+ _alignment(def->get_alignment()),
+ _indent(def->get_indent()),
+ _blockIndent(0),
+ _leftMargin(def->get_left_margin()),
+ _rightMargin(def->get_right_margin()),
+ _fontHeight(def->get_font_height()),
+ _font(0),
+ m_has_focus(false),
+ m_cursor(0u),
+ m_xcursor(0.0f),
+ m_ycursor(0.0f),
+ _multiline(def->multiline()),
+ _password(def->password()),
+ _maxChars(def->maxChars()),
+ _text_variable_registered(false),
+ _variable_name(m_def->get_variable_name()),
+ _drawBackground(m_def->has_border()),
+ _backgroundColor(255,255,255,255),
+ _drawBorder(m_def->has_border()),
+ _borderColor(0,0,0,255),
+ _textColor(m_def->get_text_color()),
+ _embedFonts(m_def->getUseEmbeddedGlyphs()),
+ _wordWrap(m_def->do_word_wrap()),
+ _html(m_def->htmlAllowed()),
+ _selectable(!m_def->get_no_select()),
+ _autoSize(autoSizeNone),
+ _type(m_def->get_readonly() ? typeDynamic : typeInput),
+ _bounds(m_def->get_bounds())
+{
+ assert(parent);
+ assert(m_def);
+
+ as_object* proto = getTextFieldInterface(_vm);
+
+ // This is an instantiation, so attach properties to the
+ // prototype.
+ // TODO: is it correct to do it here, or can some TextFields
+ // be constructed without attaching these?
+ attachTextFieldInstanceProperties(*proto);
+
+ set_prototype(proto);
+
+ Array_as* ar = new Array_as();
+ ar->push(this);
+ set_member(NSV::PROP_uLISTENERS, ar);
+
+ // WARNING! remember to set the font *before* setting text value!
+ setFont( m_def->get_font() );
+
+ // set default text *before* calling registerTextVariable
+ // (if the textvariable already exist and has a value
+ // the text will be replaced with it)
+
+ int version = parent->getVM().getSWFVersion();
+
+ if (_textDefined)
+ {
+ setTextValue(utf8::decodeCanonicalString(
+ m_def->get_default_text(), version));
+ }
+
+ registerTextVariable();
+
+ m_dummy_style.push_back(fill_style());
+
+ reset_bounding_box(0, 0);
+
+}
+
+TextField::~TextField()
{
}
bool
-edit_text_character::unload()
-{
- // TODO: unregisterTextVariable() ?
- on_event(event_id::KILLFOCUS);
-
- return character::unload();
-}
-
-void
-edit_text_character::removeTextField()
-{
- int depth = get_depth();
- if ( depth < 0 || depth > 1048575 )
- {
- //IF_VERBOSE_ASCODING_ERRORS(
- log_debug(_("CHECKME: removeTextField(%s): TextField depth (%d)
out of the "
- "'dynamic' zone [0..1048575], won't remove"),
- getTarget(), depth);
- //);
- return;
- }
-
- character* parent = get_parent();
- assert(parent); // every TextField must have a parent, right ?
-
- MovieClip* parentSprite = parent->to_movie();
-
- if ( ! parentSprite )
- {
- log_error("FIXME: attempt to remove a TextField being a child
of a %s", typeName(*parent));
- return;
- }
-
- // second argument is arbitrary, see comments above
- // the function declaration in MovieClip.h
- parentSprite->remove_display_object(depth, 0);
-}
-
-void
-edit_text_character::show_cursor(const SWFMatrix& mat)
-{
- boost::uint16_t x = static_cast<boost::uint16_t>(m_xcursor);
- boost::uint16_t y = static_cast<boost::uint16_t>(m_ycursor);
- boost::uint16_t h = getFontHeight();
-
- boost::int16_t box[4];
- box[0] = x;
- box[1] = y;
- box[2] = x;
- box[3] = y + h;
-
- render::draw_line_strip(box, 2, rgba(0,0,0,255), mat); // draw line
-}
-
-void
-edit_text_character::display()
-{
- //GNASH_REPORT_FUNCTION;
-
- registerTextVariable();
-
- bool drawBorder = getDrawBorder();
- bool drawBackground = getDrawBackground();
-
- SWFMatrix wmat = getWorldMatrix();
-
- if ( (drawBorder || drawBackground) && !_bounds.is_null() )
- {
-
- point coords[4];
-
- boost::int32_t xmin = _bounds.get_x_min();
- boost::int32_t xmax = _bounds.get_x_max();
- boost::int32_t ymin = _bounds.get_y_min();
- boost::int32_t ymax = _bounds.get_y_max();
-
- coords[0].setTo(xmin, ymin);
- coords[1].setTo(xmax, ymin);
- coords[2].setTo(xmax, ymax);
- coords[3].setTo(xmin, ymax);
-
- rgba borderColor = drawBorder ? getBorderColor() :
rgba(0,0,0,0);
- rgba backgroundColor = drawBackground ? getBackgroundColor() :
rgba(0,0,0,0);
-
- cxform cx = get_world_cxform();
-
- if (drawBorder)
- borderColor = cx.transform(borderColor);
-
- if (drawBackground)
- backgroundColor = cx.transform(backgroundColor);
-
+TextField::unload()
+{
+ // TODO: unregisterTextVariable() ?
+ on_event(event_id::KILLFOCUS);
+
+ return character::unload();
+}
+
+void
+TextField::removeTextField()
+{
+ int depth = get_depth();
+ if ( depth < 0 || depth > 1048575 )
+ {
+ //IF_VERBOSE_ASCODING_ERRORS(
+ log_debug(_("CHECKME: removeTextField(%s): TextField depth (%d) "
+ "out of the 'dynamic' zone [0..1048575], won't remove"),
+ getTarget(), depth);
+ //);
+ return;
+ }
+
+ character* parent = get_parent();
+ assert(parent); // every TextField must have a parent, right ?
+
+ MovieClip* parentSprite = parent->to_movie();
+
+ if (!parentSprite)
+ {
+ log_error("FIXME: attempt to remove a TextField being a child of a %s",
+ typeName(*parent));
+ return;
+ }
+
+ // second argument is arbitrary, see comments above
+ // the function declaration in MovieClip.h
+ parentSprite->remove_display_object(depth, 0);
+}
+
+void
+TextField::show_cursor(const SWFMatrix& mat)
+{
+ boost::uint16_t x = static_cast<boost::uint16_t>(m_xcursor);
+ boost::uint16_t y = static_cast<boost::uint16_t>(m_ycursor);
+ boost::uint16_t h = getFontHeight();
+
+ boost::int16_t box[4];
+ box[0] = x;
+ box[1] = y;
+ box[2] = x;
+ box[3] = y + h;
+
+ render::draw_line_strip(box, 2, rgba(0,0,0,255), mat); // draw line
+}
+
+void
+TextField::display()
+{
+
+ registerTextVariable();
+
+ bool drawBorder = getDrawBorder();
+ bool drawBackground = getDrawBackground();
+
+ SWFMatrix wmat = getWorldMatrix();
+
+ if ((drawBorder || drawBackground) && !_bounds.is_null())
+ {
+
+ point coords[4];
+
+ boost::int32_t xmin = _bounds.get_x_min();
+ boost::int32_t xmax = _bounds.get_x_max();
+ boost::int32_t ymin = _bounds.get_y_min();
+ boost::int32_t ymax = _bounds.get_y_max();
+
+ coords[0].setTo(xmin, ymin);
+ coords[1].setTo(xmax, ymin);
+ coords[2].setTo(xmax, ymax);
+ coords[3].setTo(xmin, ymax);
+
+ rgba borderColor = drawBorder ? getBorderColor() : rgba(0,0,0,0);
+ rgba backgroundColor = drawBackground ? getBackgroundColor() :
+ rgba(0,0,0,0);
+
+ cxform cx = get_world_cxform();
+
+ if (drawBorder) borderColor = cx.transform(borderColor);
+
+ if (drawBackground) backgroundColor = cx.transform(backgroundColor);
+
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("rendering a Pol composed by corners %s", _bounds);
+ log_debug("rendering a Pol composed by corners %s", _bounds);
#endif
- render::draw_poly( &coords[0], 4, backgroundColor, borderColor,
wmat, true);
-
- }
-
- // Draw our actual text.
- // Using a SWFMatrix to translate to def bounds seems an hack to me.
- // A cleaner implementation is likely correctly setting the
- // m_x_offset and m_y_offset memebers in glyph records.
- // Anyway, see bug #17954 for a testcase.
- SWFMatrix m;
-
- if ( !_bounds.is_null() ) // ! def_bounds.is_null() && !
def_bounds.is_world()
- {
- m.concatenate_translation(_bounds.get_x_min(),
_bounds.get_y_min());
- }
-
-
- //log_debug("Displaying glyph records for textfield %s", getTarget());
- display_glyph_records(m, this, m_text_glyph_records, _embedFonts);
-
- if (m_has_focus)
- {
- show_cursor(wmat);
- }
-
- clear_invalidated();
+ render::draw_poly( &coords[0], 4, backgroundColor,
+ borderColor, wmat, true);
+
+ }
+
+ // Draw our actual text.
+ // Using a SWFMatrix to translate to def bounds seems an hack to me.
+ // A cleaner implementation is likely correctly setting the
+ // m_x_offset and m_y_offset memebers in glyph records.
+ // Anyway, see bug #17954 for a testcase.
+ SWFMatrix m;
+
+ if (!_bounds.is_null())
+ {
+ m.concatenate_translation(_bounds.get_x_min(), _bounds.get_y_min());
+ }
+
+ display_glyph_records(m, this, m_text_glyph_records, _embedFonts);
+
+ if (m_has_focus) show_cursor(wmat);
+
+ clear_invalidated();
}
void
-edit_text_character::add_invalidated_bounds(InvalidatedRanges& ranges,
- bool force)
+TextField::add_invalidated_bounds(InvalidatedRanges& ranges,
+ bool force)
{
- if (!force && !m_invalidated) return; // no need to redraw
+ if (!force && !m_invalidated) return; // no need to redraw
- ranges.add(m_old_invalidated_ranges);
-
- SWFMatrix wm = getWorldMatrix();
-
- rect bounds = getBounds();
- bounds.expand_to_rect(m_text_bounding_box);
- wm.transform(bounds);
- ranges.add( bounds.getRange() );
+ ranges.add(m_old_invalidated_ranges);
+
+ SWFMatrix wm = getWorldMatrix();
+
+ rect bounds = getBounds();
+ bounds.expand_to_rect(m_text_bounding_box);
+ wm.transform(bounds);
+ ranges.add( bounds.getRange() );
}
bool
-edit_text_character::on_event(const event_id& id)
+TextField::on_event(const event_id& id)
{
- if ( isReadOnly() )
- {
- return false;
- }
-
- switch (id.m_id)
- {
- case event_id::SETFOCUS:
- {
- setFocus();
- break;
- }
-
- case event_id::KILLFOCUS:
- {
- killFocus();
- break;
- }
-
- case event_id::KEY_PRESS:
- {
- if ( getType() != typeInput ) break; // not an input
field
- std::wstring s = _text;
-
- // id.keyCode is the unique gnash::key::code for a
character/key.
- // The maximum value is about 265, including function
keys.
- // It seems that typing in characters outside the
Latin-1 set
- // (256 character codes, identical to the first 256 of
UTF-8)
- // is not supported, though a much greater number UTF-8
codes can be
- // stored and displayed. See utf.h for more information.
- // This is a limit on the number of key codes, not on
the
- // capacity of strings.
- gnash::key::code c = id.keyCode;
-
- // maybe _text is changed in ActionScript
- m_cursor = std::min<size_t>(m_cursor, _text.size());
-
- switch (c)
- {
- case key::BACKSPACE:
- if (m_cursor > 0)
- {
- s.erase(m_cursor - 1, 1);
- m_cursor--;
- setTextValue(s);
- }
- break;
-
- case key::DELETEKEY:
- if (s.size() > m_cursor)
- {
- s.erase(m_cursor, 1);
- setTextValue(s);
- }
- break;
-
- case key::INSERT: // TODO
- break;
-
- case key::HOME:
- case key::PGUP:
- case key::UP:
- m_cursor = 0;
- format_text();
- break;
-
- case key::END:
- case key::PGDN:
- case key::DOWN:
- m_cursor = _text.size();
- format_text();
- break;
-
- case key::LEFT:
- m_cursor = m_cursor > 0 ? m_cursor - 1
: 0;
- format_text();
- break;
-
- case key::RIGHT:
- m_cursor = m_cursor < _text.size() ?
m_cursor + 1 : _text.size();
- format_text();
- break;
-
- default:
- wchar_t t =
static_cast<wchar_t>(gnash::key::codeMap[c][key::ASCII]);
- if (t != 0)
- {
- // Insert one copy of the
character
- // at the cursor position.
- s.insert(m_cursor, 1, t);
- m_cursor++;
- }
- setTextValue(s);
- break;
- }
- onChanged();
- }
-
- default:
- return false;
- }
- return true;
+ if (isReadOnly()) return false;
+
+ switch (id.m_id)
+ {
+ case event_id::SETFOCUS:
+ setFocus();
+ break;
+
+ case event_id::KILLFOCUS:
+ killFocus();
+ break;
+
+ case event_id::KEY_PRESS:
+ {
+ if ( getType() != typeInput ) break; // not an input field
+ std::wstring s = _text;
+
+ // id.keyCode is the unique gnash::key::code for a character/key.
+ // The maximum value is about 265, including function keys.
+ // It seems that typing in characters outside the Latin-1 set
+ // (256 character codes, identical to the first 256 of UTF-8)
+ // is not supported, though a much greater number UTF-8 codes can
be
+ // stored and displayed. See utf.h for more information.
+ // This is a limit on the number of key codes, not on the
+ // capacity of strings.
+ gnash::key::code c = id.keyCode;
+
+ // maybe _text is changed in ActionScript
+ m_cursor = std::min<size_t>(m_cursor, _text.size());
+
+ switch (c)
+ {
+ case key::BACKSPACE:
+ if (m_cursor > 0)
+ {
+ s.erase(m_cursor - 1, 1);
+ m_cursor--;
+ setTextValue(s);
+ }
+ break;
+
+ case key::DELETEKEY:
+ if (s.size() > m_cursor)
+ {
+ s.erase(m_cursor, 1);
+ setTextValue(s);
+ }
+ break;
+
+ case key::INSERT: // TODO
+ break;
+
+ case key::HOME:
+ case key::PGUP:
+ case key::UP:
+ m_cursor = 0;
+ format_text();
+ break;
+
+ case key::END:
+ case key::PGDN:
+ case key::DOWN:
+ m_cursor = _text.size();
+ format_text();
+ break;
+
+ case key::LEFT:
+ m_cursor = m_cursor > 0 ? m_cursor - 1 : 0;
+ format_text();
+ break;
+
+ case key::RIGHT:
+ m_cursor = m_cursor < _text.size() ? m_cursor + 1 :
+ _text.size();
+ format_text();
+ break;
+
+ default:
+ wchar_t t = static_cast<wchar_t>(
+ gnash::key::codeMap[c][key::ASCII]);
+ if (t != 0)
+ {
+ // Insert one copy of the character
+ // at the cursor position.
+ s.insert(m_cursor, 1, t);
+ m_cursor++;
+ }
+ setTextValue(s);
+ break;
+ }
+ onChanged();
+ }
+
+ default:
+ return false;
+ }
+ return true;
}
character*
-edit_text_character::get_topmost_mouse_entity(boost::int32_t x, boost::int32_t
y)
+TextField::get_topmost_mouse_entity(boost::int32_t x, boost::int32_t y)
{
- //log_debug("get_topmost_mouse_entity called on edit_text_character %p,
labeled '%s'", (void*)this, get_text_value());
-
- if (get_visible() == false)
- {
- return NULL;
- }
-
- // shouldn't this be !can_handle_mouse_event() instead ?
- if (!_selectable)
- {
- // not selectable, so don't catch mouse events!
- return NULL;
- }
-
- SWFMatrix m = getMatrix();
- point p(x, y);
+
+ if (!get_visible()) return NULL;
+
+ // shouldn't this be !can_handle_mouse_event() instead ?
+ // not selectable, so don't catch mouse events!
+ if (!_selectable) return NULL;
+
+ SWFMatrix m = getMatrix();
+ point p(x, y);
m.invert().transform(p);
- if ( _bounds.point_test(p.x, p.y) )
- {
- return this;
- }
- return NULL;
-}
-
-void
-edit_text_character::updateText(const std::string& str)
-{
- int version = _vm.getSWFVersion();
- const std::wstring& wstr = utf8::decodeCanonicalString(str, version);
- updateText(wstr);
-}
-
-void
-edit_text_character::updateText(const std::wstring& wstr)
-{
- _textDefined = true;
-
- unsigned int maxLen = m_def->get_max_length();
-
- std::wstring newText = wstr; // copy needed for eventual resize
- if (maxLen && newText.length() > maxLen )
- {
- newText.resize(maxLen);
- }
- if (_text == newText)
- {
- return;
- }
-
- set_invalidated();
-
- _text = newText;
- format_text();
-}
-
-void
-edit_text_character::setTextValue(const std::wstring& wstr)
-{
-
- updateText(wstr);
-
- if ( ! _variable_name.empty() && _text_variable_registered )
- {
- // TODO: notify MovieClip if we have a variable name !
- VariableRef ref = parseTextVariableRef(_variable_name);
- as_object* tgt = ref.first;
- if ( tgt )
- {
- int version = _vm.getSWFVersion();
- // we shouldn't truncate, right?
- tgt->set_member(ref.second,
utf8::encodeCanonicalString(wstr, version));
- }
- else
- {
- // nothing to do (too early ?)
- log_debug("setTextValue: variable name %s points to an
unexisting target, I guess we would not be registered in this was true, or the
sprite we've registered our variable name has been unloaded", _variable_name);
- }
- }
+ if ( _bounds.point_test(p.x, p.y) ) return this;
+
+ return NULL;
+}
+
+void
+TextField::updateText(const std::string& str)
+{
+ int version = _vm.getSWFVersion();
+ const std::wstring& wstr = utf8::decodeCanonicalString(str, version);
+ updateText(wstr);
+}
+
+void
+TextField::updateText(const std::wstring& wstr)
+{
+ _textDefined = true;
+
+ unsigned int maxLen = m_def->get_max_length();
+
+ std::wstring newText = wstr; // copy needed for eventual resize
+ if (maxLen && newText.length() > maxLen) newText.resize(maxLen);
+
+ if (_text == newText) return;
+
+ set_invalidated();
+
+ _text = newText;
+ format_text();
+}
+
+void
+TextField::setTextValue(const std::wstring& wstr)
+{
+
+ updateText(wstr);
+
+ if ( ! _variable_name.empty() && _text_variable_registered )
+ {
+ // TODO: notify MovieClip if we have a variable name !
+ VariableRef ref = parseTextVariableRef(_variable_name);
+ as_object* tgt = ref.first;
+ if ( tgt )
+ {
+ int version = _vm.getSWFVersion();
+ // we shouldn't truncate, right?
+ tgt->set_member(ref.second, utf8::encodeCanonicalString(wstr,
+ version));
+ }
+ else
+ {
+ // nothing to do (too early ?)
+ log_debug("setTextValue: variable name %s points to a non-existent"
+ " target, I guess we would not be registered if this was "
+ "true, or the sprite we've registered our variable name "
+ "has been unloaded", _variable_name);
+ }
+ }
}
std::string
-edit_text_character::get_text_value() const
+TextField::get_text_value() const
{
- // we need the const_cast here because registerTextVariable
- // *might* change our text value, calling the non-const
- // setTextValue().
- // This happens if the TextVariable has not been already registered
- // and during registration comes out to name an existing variable
- // with a pre-existing value.
- const_cast<edit_text_character*>(this)->registerTextVariable();
-
- int version = _vm.getSWFVersion();
-
- return utf8::encodeCanonicalString(_text, version);
+ // we need the const_cast here because registerTextVariable
+ // *might* change our text value, calling the non-const
+ // setTextValue().
+ // This happens if the TextVariable has not been already registered
+ // and during registration comes out to name an existing variable
+ // with a pre-existing value.
+ const_cast<TextField*>(this)->registerTextVariable();
+
+ int version = _vm.getSWFVersion();
+
+ return utf8::encodeCanonicalString(_text, version);
}
bool
-edit_text_character::set_member(string_table::key name,
- const as_value& val, string_table::key nsname, bool ifFound)
+TextField::set_member(string_table::key name,
+ const as_value& val, string_table::key nsname, bool ifFound)
{
- //log_debug("edit_text_character.set_member(%s, %s)", name,
val.to_string());
-
- // FIXME: Turn all standard members into getter/setter properties
- // of the TextField class. See attachTextFieldInterface()
- // @@ TODO need to inherit basic stuff like _x, _y, _xscale, _yscale
etc ?
-
- switch (name)
- {
- default:
- break;
- case NSV::PROP_TEXT:
- {
- int version =
get_parent()->get_movie_definition()->get_version();
-
setTextValue(utf8::decodeCanonicalString(val.to_string_versioned(version),
version));
- return true;
- }
- case NSV::PROP_HTML_TEXT:
- {
- int version =
get_parent()->get_movie_definition()->get_version();
-
setTextValue(utf8::decodeCanonicalString(val.to_string_versioned(version),
version));
- format_text();
- return true;
- }
- case NSV::PROP_uX:
- {
- SWFMatrix m = getMatrix();
+
+ // FIXME: Turn all standard members into getter/setter properties
+ // of the TextField class. See attachTextFieldInterface()
+ // @@ TODO need to inherit basic stuff like _x, _y, _xscale, _yscale etc ?
+
+ switch (name)
+ {
+ default:
+ break;
+ case NSV::PROP_TEXT:
+ {
+ int version = get_parent()->get_movie_definition()->get_version();
+ setTextValue(utf8::decodeCanonicalString(
+ val.to_string_versioned(version), version));
+ return true;
+ }
+ case NSV::PROP_HTML_TEXT:
+ {
+ int version = get_parent()->get_movie_definition()->get_version();
+ setTextValue(utf8::decodeCanonicalString(
+ val.to_string_versioned(version), version));
+ format_text();
+ return true;
+ }
+ case NSV::PROP_uX:
+ {
+ SWFMatrix m = getMatrix();
double x = utility::infinite_to_zero( val.to_number() );
- m.tx = PIXELS_TO_TWIPS(x);
- setMatrix(m); // no need to update caches when only changing
translation
+ m.tx = PIXELS_TO_TWIPS(x);
+ setMatrix(m); // no need to update caches when only changing
translation
- // m_accept_anim_moves = false;
- return true;
- }
- case NSV::PROP_uY:
- {
- SWFMatrix m = getMatrix();
+ // m_accept_anim_moves = false;
+ return true;
+ }
+ case NSV::PROP_uY:
+ {
+ SWFMatrix m = getMatrix();
double y = utility::infinite_to_zero( val.to_number() );
- m.ty = PIXELS_TO_TWIPS(y);
- setMatrix(m); // no need to update caches when only changing
translation
-
- // m_accept_anim_moves = false;
- return true;
- }
- case NSV::PROP_uWIDTH:
- {
- double nw = val.to_number();
- if ( ! utility::isFinite(nw) )
- {
- // might be our fault, see the TODO above (missing to
pass as_environment out..)
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set TextField._width to %g"),
nw);
- );
- return true;
- }
-
- if ( nw < 0 )
- {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set TextField._width to a
negative number: %g, toggling sign"), nw);
- );
- nw = -nw;
- }
-
- if ( _bounds.width() == PIXELS_TO_TWIPS(nw) )
- {
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("TextField width already == %g, nothing to do
to change it", nw);
-#endif
- return true; // nothing to do
- }
- if ( _bounds.is_null() )
- {
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("NULL TextField bounds : %s", _bounds);
-#endif
- return true;
- }
-
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("Chaging TextField width to %g", nw);
-#endif
-
- set_invalidated();
-
- // Modify TextField drawing rectangle
- // TODO: check which anchor point we should use !
- boost::int32_t xmin = _bounds.get_x_min();
- boost::int32_t ymin = _bounds.get_y_min();
- boost::int32_t ymax = _bounds.get_y_max();
- boost::int32_t xmax = xmin + PIXELS_TO_TWIPS(nw);
-
- assert(xmin <= xmax);
- _bounds.set_to_rect(xmin, ymin, xmax, ymax);
+ m.ty = PIXELS_TO_TWIPS(y);
+ setMatrix(m); // no need to update caches when only changing
translation
+
+ // m_accept_anim_moves = false;
+ return true;
+ }
+ case NSV::PROP_uWIDTH:
+ {
+ double nw = val.to_number();
+ if ( ! utility::isFinite(nw) )
+ {
+ // might be our fault, see the TODO above
+ // (missing to pass as_environment out..)
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set TextField._width to %g"), nw);
+ );
+ return true;
+ }
+
+ if ( nw < 0 )
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set TextField._width to a "
+ "negative number: %g, toggling sign"), nw);
+ );
+ nw = -nw;
+ }
+
+ if ( _bounds.width() == PIXELS_TO_TWIPS(nw) )
+ {
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("TextField width already == %g, nothing to do to "
+ "change it", nw);
+#endif
+ return true; // nothing to do
+ }
+ if ( _bounds.is_null() )
+ {
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("NULL TextField bounds : %s", _bounds);
+#endif
+ return true;
+ }
+
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("Chaging TextField width to %g", nw);
+#endif
+
+ set_invalidated();
+
+ // Modify TextField drawing rectangle
+ // TODO: check which anchor point we should use !
+ boost::int32_t xmin = _bounds.get_x_min();
+ boost::int32_t ymin = _bounds.get_y_min();
+ boost::int32_t ymax = _bounds.get_y_max();
+ boost::int32_t xmax = xmin + PIXELS_TO_TWIPS(nw);
+
+ assert(xmin <= xmax);
+ _bounds.set_to_rect(xmin, ymin, xmax, ymax);
assert( _bounds.width() == PIXELS_TO_TWIPS(nw) );
- // previously truncated text might get visible now
- // TODO: if nested masks were implemented we would
- // not need to reformat text here
- format_text();
-
- return true;
- }
- case NSV::PROP_uHEIGHT:
- {
- double nh = val.to_number();
- if ( ! utility::isFinite(nh) )
- {
- // might be our fault, see the TODO above (missing to
pass as_environment out..)
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set TextField._height to
%g"), nh);
- );
- return true;
- }
-
- if ( nh < 0.0f )
- {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set TextField._height to a
negative number: %g, toggling sign"), nh);
- );
- nh = -nh;
- }
-
- if ( _bounds.height() == PIXELS_TO_TWIPS(nh) )
- {
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("TextField height already == %g, nothing to
do to change it", nh);
-#endif // GNASH_DEBUG_TEXTFIELDS
- return true; // nothing to do
- }
- if ( _bounds.is_null() )
- {
- return true;
- }
-
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("Changing TextField height to %g", nh);
-#endif // GNASH_DEBUG_TEXTFIELDS
- set_invalidated();
-
- // Modify TextField drawing rectangle
- // TODO: check which anchor point we should use !
- boost::int32_t xmin = _bounds.get_x_min();
- boost::int32_t xmax = _bounds.get_x_max();
- boost::int32_t ymin = _bounds.get_y_min();
- _bounds.set_to_rect(xmin, ymin, xmax, ymin +
PIXELS_TO_TWIPS(nh) );
-
- assert(_bounds.height() == PIXELS_TO_TWIPS(nh));
-
- // previously truncated text might get visible now
- // TODO: if nested masks were implemented we would
- // not need to reformat text here
- format_text();
-
- return true;
- }
- case NSV::PROP_uVISIBLE:
- {
- set_visible(val.to_bool());
- return true;
- }
- case NSV::PROP_uALPHA:
- {
- // @@ TODO this should be generic to class character!
- // Arg is in percent.
- cxform cx = get_cxform();
- cx.aa = (boost::int16_t)(val.to_number() * 2.56);
- set_cxform(cx);
- return true;
- }
- // @@ TODO see TextField members in Flash MX docs
- } // end switch
-
-
- return as_object::set_member(name, val, nsname, ifFound);
+ // previously truncated text might get visible now
+ // TODO: if nested masks were implemented we would
+ // not need to reformat text here
+ format_text();
+
+ return true;
+ }
+ case NSV::PROP_uHEIGHT:
+ {
+ double nh = val.to_number();
+ if ( ! utility::isFinite(nh) )
+ {
+ // might be our fault, see the TODO above (missing to pass
+ // as_environment out..)
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set TextField._height to %g"), nh);
+ );
+ return true;
+ }
+
+ if ( nh < 0.0f )
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set TextField._height to a negative "
+ "number: %g, toggling sign"), nh);
+ );
+ nh = -nh;
+ }
+
+ if ( _bounds.height() == PIXELS_TO_TWIPS(nh) )
+ {
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("TextField height already == %g, nothing to do to "
+ "change it", nh);
+#endif // GNASH_DEBUG_TEXTFIELDS
+ return true; // nothing to do
+ }
+ if ( _bounds.is_null() )
+ {
+ return true;
+ }
+
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("Changing TextField height to %g", nh);
+#endif // GNASH_DEBUG_TEXTFIELDS
+ set_invalidated();
+
+ // Modify TextField drawing rectangle
+ // TODO: check which anchor point we should use !
+ boost::int32_t xmin = _bounds.get_x_min();
+ boost::int32_t xmax = _bounds.get_x_max();
+ boost::int32_t ymin = _bounds.get_y_min();
+ _bounds.set_to_rect(xmin, ymin, xmax, ymin + PIXELS_TO_TWIPS(nh) );
+
+ assert(_bounds.height() == PIXELS_TO_TWIPS(nh));
+
+ // previously truncated text might get visible now
+ // TODO: if nested masks were implemented we would
+ // not need to reformat text here
+ format_text();
+
+ return true;
+ }
+ case NSV::PROP_uVISIBLE:
+ {
+ set_visible(val.to_bool());
+ return true;
+ }
+ case NSV::PROP_uALPHA:
+ {
+ // @@ TODO this should be generic to class character!
+ // Arg is in percent.
+ cxform cx = get_cxform();
+ cx.aa = (boost::int16_t)(val.to_number() * 2.56);
+ set_cxform(cx);
+ return true;
+ }
+ // @@ TODO see TextField members in Flash MX docs
+ } // end switch
+
+
+ return as_object::set_member(name, val, nsname, ifFound);
}
bool
-edit_text_character::get_member(string_table::key name, as_value* val,
- string_table::key nsname)
+TextField::get_member(string_table::key name, as_value* val,
+ string_table::key nsname)
{
- //log_debug("edit_text_character.get_member(%s)", name);
-
- // FIXME: Turn all standard members into getter/setter properties
- // of the TextField class. See attachTextFieldInterface()
-
- switch (name)
- {
- default:
- break;
- case NSV::PROP_TEXT:
- {
- val->set_string(get_text_value());
- return true;
- }
- case NSV::PROP_HTML_TEXT:
- {
- val->set_string(get_text_value());
- return true;
- }
- case NSV::PROP_uVISIBLE:
- {
- val->set_bool(get_visible());
- return true;
- }
- case NSV::PROP_uALPHA:
- {
- // @@ TODO this should be generic to class character!
- const cxform& cx = get_cxform();
- val->set_double(cx.aa / 2.56);
- return true;
- }
- case NSV::PROP_uX:
- {
- SWFMatrix m = getMatrix();
- val->set_double(TWIPS_TO_PIXELS(m.tx));
- return true;
- }
- case NSV::PROP_uY:
- {
- SWFMatrix m = getMatrix();
- val->set_double(TWIPS_TO_PIXELS(m.ty));
- return true;
- }
- case NSV::PROP_uWIDTH:
- {
- val->set_double(TWIPS_TO_PIXELS(get_width()));
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("Got TextField width == %s", *val);
-#endif // GNASH_DEBUG_TEXTFIELDS
- return true;
- }
- case NSV::PROP_uHEIGHT:
- {
- val->set_double(TWIPS_TO_PIXELS(get_height()));
-#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("Got TextField height == %s", *val);
-#endif // GNASH_DEBUG_TEXTFIELDS
- return true;
- }
- } // end switch
-
- return as_object::get_member(name, val, nsname);
-
+ //log_debug("TextField.get_member(%s)", name);
+
+ // FIXME: Turn all standard members into getter/setter properties
+ // of the TextField class. See attachTextFieldInterface()
+
+ switch (name)
+ {
+ default:
+ break;
+ case NSV::PROP_TEXT:
+ {
+ val->set_string(get_text_value());
+ return true;
+ }
+ case NSV::PROP_HTML_TEXT:
+ {
+ val->set_string(get_text_value());
+ return true;
+ }
+ case NSV::PROP_uVISIBLE:
+ {
+ val->set_bool(get_visible());
+ return true;
+ }
+ case NSV::PROP_uALPHA:
+ {
+ // @@ TODO this should be generic to class character!
+ const cxform& cx = get_cxform();
+ val->set_double(cx.aa / 2.56);
+ return true;
+ }
+ case NSV::PROP_uX:
+ {
+ SWFMatrix m = getMatrix();
+ val->set_double(TWIPS_TO_PIXELS(m.tx));
+ return true;
+ }
+ case NSV::PROP_uY:
+ {
+ SWFMatrix m = getMatrix();
+ val->set_double(TWIPS_TO_PIXELS(m.ty));
+ return true;
+ }
+ case NSV::PROP_uWIDTH:
+ {
+ val->set_double(TWIPS_TO_PIXELS(get_width()));
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("Got TextField width == %s", *val);
+#endif // GNASH_DEBUG_TEXTFIELDS
+ return true;
+ }
+ case NSV::PROP_uHEIGHT:
+ {
+ val->set_double(TWIPS_TO_PIXELS(get_height()));
+#ifdef GNASH_DEBUG_TEXTFIELDS
+ log_debug("Got TextField height == %s", *val);
+#endif // GNASH_DEBUG_TEXTFIELDS
+ return true;
+ }
+ } // end switch
+
+ return as_object::get_member(name, val, nsname);
+
}
-
+
float
-edit_text_character::align_line(
- edit_text_character_def::alignment align,
- int last_line_start_record, float x)
+TextField::align_line(
+ edit_text_character_def::alignment align,
+ int last_line_start_record, float x)
{
- //GNASH_REPORT_FUNCTION;
- assert(m_def);
-
- float width = _bounds.width(); // m_def->width()
- float right_margin = getRightMargin();
-
- float extra_space = (width - right_margin) - x - PADDING_TWIPS;
-
- //assert(extra_space >= 0.0f);
- if (extra_space <= 0.0f)
- {
+ //GNASH_REPORT_FUNCTION;
+ assert(m_def);
+
+ float width = _bounds.width(); // m_def->width()
+ float right_margin = getRightMargin();
+
+ float extra_space = (width - right_margin) - x - PADDING_TWIPS;
+
+ //assert(extra_space >= 0.0f);
+ if (extra_space <= 0.0f)
+ {
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug(_("TextField text doesn't fit in its boundaries: "
- "width %g, margin %g - nothing to align"),
- width, right_margin);
+ log_debug(_("TextField text doesn't fit in its boundaries: "
+ "width %g, margin %g - nothing to align"),
+ width, right_margin);
#endif
- return 0.0f;
- }
-
- float shift_right = 0.0f;
-
- if (align == edit_text_character_def::ALIGN_LEFT)
- {
- // Nothing to do; already aligned left.
- return 0.0f;
- }
- else if (align == edit_text_character_def::ALIGN_CENTER)
- {
- // Distribute the space evenly on both sides.
- shift_right = extra_space / 2;
- }
- else if (align == edit_text_character_def::ALIGN_RIGHT)
- {
- // Shift all the way to the right.
- shift_right = extra_space;
- }
-
- // Shift the beginnings of the records on this line.
- for (unsigned int i = last_line_start_record; i <
m_text_glyph_records.size(); i++)
- {
- text_glyph_record& rec = m_text_glyph_records[i];
-
- if ( rec.m_style.hasXOffset() )
- {
- rec.m_style.shiftXOffset(shift_right);
- }
- }
- return shift_right;
+ return 0.0f;
+ }
+
+ float shift_right = 0.0f;
+
+ if (align == edit_text_character_def::ALIGN_LEFT)
+ {
+ // Nothing to do; already aligned left.
+ return 0.0f;
+ }
+ else if (align == edit_text_character_def::ALIGN_CENTER)
+ {
+ // Distribute the space evenly on both sides.
+ shift_right = extra_space / 2;
+ }
+ else if (align == edit_text_character_def::ALIGN_RIGHT)
+ {
+ // Shift all the way to the right.
+ shift_right = extra_space;
+ }
+
+ // Shift the beginnings of the records on this line.
+ for (unsigned int i = last_line_start_record; i <
m_text_glyph_records.size(); i++)
+ {
+ text_glyph_record& rec = m_text_glyph_records[i];
+
+ if ( rec.m_style.hasXOffset() )
+ {
+ rec.m_style.shiftXOffset(shift_right);
+ }
+ }
+ return shift_right;
}
boost::intrusive_ptr<const font>
-edit_text_character::setFont(boost::intrusive_ptr<const font> newfont)
+TextField::setFont(boost::intrusive_ptr<const font> newfont)
{
- if ( newfont == _font ) return _font;
+ if ( newfont == _font ) return _font;
- boost::intrusive_ptr<const font> oldfont = _font;
- set_invalidated();
- _font = newfont;
- format_text();
- return oldfont;
+ boost::intrusive_ptr<const font> oldfont = _font;
+ set_invalidated();
+ _font = newfont;
+ format_text();
+ return oldfont;
}
void
-edit_text_character::format_text()
+TextField::format_text()
{
- m_text_glyph_records.clear();
+ m_text_glyph_records.clear();
- // nothing more to do if text is empty
- if ( _text.empty() )
+ // nothing more to do if text is empty
+ if ( _text.empty() )
{
// TODO: should we still reset _bounds if autoSize != autoSizeNone ?
// not sure we should...
- reset_bounding_box(0, 0);
- return;
- }
-
- // See bug #24266
- const rect& defBounds = _bounds; // m_def->get_bounds();
-
- AutoSizeValue autoSize = getAutoSize();
- if ( autoSize != autoSizeNone )
- {
- // define GNASH_DEBUG_TEXT_FORMATTING on top to get useful info
- //LOG_ONCE( log_debug(_("TextField.autoSize != 'none'
TESTING")) );
-
- // When doing WordWrap we don't want to change
- // the boundaries. See bug #24348
- if (! doWordWrap() )
- {
- _bounds.set_to_rect(0, 0, 0, 0); // this is correct for
'true'
- }
- }
-
- // Should get info from autoSize too maybe ?
- edit_text_character_def::alignment textAlignment = getTextAlignment();
-
- // FIXME: I don't think we should query the definition
- // to find the appropriate font to use, as ActionScript
- // code should be able to change the font of a TextField
- //
- if (_font == NULL)
- {
- log_error(_("No font for edit_text_character! [%s:%d]"),
- __FILE__, __LINE__);
- return;
- }
-
- boost::uint16_t fontHeight = getFontHeight();
- float scale = fontHeight / (float)_font->unitsPerEM(_embedFonts);
- float fontDescent = _embedFonts ? (_font->get_descent()*scale) : 0; //
TODO: fetch descent from device fonts as well ?
- float fontLeading = _embedFonts ? (_font->get_leading()*scale) : 0; //
TODO: fetch leading from device fonts as well ?
- boost::uint16_t leftMargin = getLeftMargin();
- boost::uint16_t rightMargin = getRightMargin();
- boost::uint16_t indent = getIndent();
- boost::uint16_t blockIndent = getBlockIndent();
- bool underlined = getUnderlined();
-
- //log_debug("%s: fontDescent:%g, fontLeading:%g, fontHeight:%g,
scale:%g", getTarget(), fontDescent, fontLeading, fontHeight, scale);
-
- text_glyph_record rec; // one to work on
- rec.m_style.setFont(_font.get());
- rec.m_style.setUnderlined(underlined);
- rec.m_style.m_color = getTextColor();
- rec.m_style.setXOffset( PADDING_TWIPS + std::max(0, leftMargin + indent
+ blockIndent) );
- rec.m_style.setYOffset( PADDING_TWIPS + fontHeight + (fontLeading -
fontDescent) );
- rec.m_style.m_text_height = fontHeight;
-
- boost::int32_t x =
static_cast<boost::int32_t>(rec.m_style.getXOffset());
- boost::int32_t y =
static_cast<boost::int32_t>(rec.m_style.getYOffset());
-
- // Start the bbox at the upper-left corner of the first glyph.
- reset_bounding_box(x, y - fontDescent + fontHeight);
-
- float leading = getLeading();
- leading += fontLeading * scale; // not sure this is correct...
-
- int last_code = -1; // only used if _embedFonts
- int last_space_glyph = -1;
- int last_line_start_record = 0;
-
- unsigned int character_idx = 0;
- m_xcursor = x;
- m_ycursor = y;
-
- assert(! _text.empty() );
-
- boost::uint32_t code = 0;
-
- // String iterators are very sensitive to
- // potential changes to the string (to allow for copy-on-write).
- // So there must be no external changes to the string or
- // calls to most non-const member functions during this loop.
- // Especially not c_str() or data().
+ reset_bounding_box(0, 0);
+ return;
+ }
+
+ // See bug #24266
+ const rect& defBounds = _bounds; // m_def->get_bounds();
+
+ AutoSizeValue autoSize = getAutoSize();
+ if ( autoSize != autoSizeNone )
+ {
+ // define GNASH_DEBUG_TEXT_FORMATTING on top to get useful info
+ //LOG_ONCE( log_debug(_("TextField.autoSize != 'none' TESTING")) );
+
+ // When doing WordWrap we don't want to change
+ // the boundaries. See bug #24348
+ if (! doWordWrap() )
+ {
+ _bounds.set_to_rect(0, 0, 0, 0); // this is correct for 'true'
+ }
+ }
+
+ // Should get info from autoSize too maybe ?
+ edit_text_character_def::alignment textAlignment = getTextAlignment();
+
+ // FIXME: I don't think we should query the definition
+ // to find the appropriate font to use, as ActionScript
+ // code should be able to change the font of a TextField
+ //
+ if (_font == NULL)
+ {
+ log_error(_("No font for TextField! [%s:%d]"),
+ __FILE__, __LINE__);
+ return;
+ }
+
+ boost::uint16_t fontHeight = getFontHeight();
+ float scale = fontHeight / (float)_font->unitsPerEM(_embedFonts);
+ float fontDescent = _embedFonts ? (_font->get_descent()*scale) : 0; //
TODO: fetch descent from device fonts as well ?
+ float fontLeading = _embedFonts ? (_font->get_leading()*scale) : 0; //
TODO: fetch leading from device fonts as well ?
+ boost::uint16_t leftMargin = getLeftMargin();
+ boost::uint16_t rightMargin = getRightMargin();
+ boost::uint16_t indent = getIndent();
+ boost::uint16_t blockIndent = getBlockIndent();
+ bool underlined = getUnderlined();
+
+ //log_debug("%s: fontDescent:%g, fontLeading:%g, fontHeight:%g, scale:%g",
getTarget(), fontDescent, fontLeading, fontHeight, scale);
+
+ text_glyph_record rec; // one to work on
+ rec.m_style.setFont(_font.get());
+ rec.m_style.setUnderlined(underlined);
+ rec.m_style.m_color = getTextColor();
+ rec.m_style.setXOffset( PADDING_TWIPS + std::max(0, leftMargin + indent +
blockIndent) );
+ rec.m_style.setYOffset( PADDING_TWIPS + fontHeight + (fontLeading -
fontDescent) );
+ rec.m_style.m_text_height = fontHeight;
+
+ boost::int32_t x =
static_cast<boost::int32_t>(rec.m_style.getXOffset());
+ boost::int32_t y =
static_cast<boost::int32_t>(rec.m_style.getYOffset());
+
+ // Start the bbox at the upper-left corner of the first glyph.
+ reset_bounding_box(x, y - fontDescent + fontHeight);
+
+ float leading = getLeading();
+ leading += fontLeading * scale; // not sure this is correct...
+
+ int last_code = -1; // only used if _embedFonts
+ int last_space_glyph = -1;
+ int last_line_start_record = 0;
+
+ unsigned int character_idx = 0;
+ m_xcursor = x;
+ m_ycursor = y;
+
+ assert(! _text.empty() );
+
+ boost::uint32_t code = 0;
+
+ // String iterators are very sensitive to
+ // potential changes to the string (to allow for copy-on-write).
+ // So there must be no external changes to the string or
+ // calls to most non-const member functions during this loop.
+ // Especially not c_str() or data().
std::wstring::const_iterator it = _text.begin();
const std::wstring::const_iterator e = _text.end();
- while (it != e)
- {
- code = *it++;
- if (!code) break;
-
- if ( _embedFonts )
- {
- x += _font->get_kerning_adjustment(last_code, (int)
code) * scale;
- last_code = static_cast<int>(code);
- }
-
- // Expand the bounding-box to the lower-right corner of each
glyph as
- // we generate it.
- m_text_bounding_box.expand_to_point(x, y + fontDescent);
-
- if (code == 13 || code == 10)
- {
- // newline.
-
- // Frigging Flash seems to use '\r' (13) as its
- // default newline character. If we get DOS-style \r\n
- // sequences, it'll show up as double newlines, so
maybe we
- // need to detect \r\n and treat it as one newline.
-
- // Close out this stretch of glyphs.
- m_text_glyph_records.push_back(rec);
- align_line(textAlignment, last_line_start_record, x);
-
- // Expand bounding box to include last column of text
...
- if ( _autoSize != autoSizeNone )
_bounds.expand_to_point(x+PADDING_TWIPS, y+PADDING_TWIPS);
-
- // new paragraphs get the indent.
- x = std::max(0, leftMargin + indent) + PADDING_TWIPS;
- y += fontHeight + leading;
-
- // Start a new record on the next line.
- rec.m_glyphs.resize(0);
- rec.m_style.setFont(_font.get());
- rec.m_style.setUnderlined(underlined);
- rec.m_style.m_color = getTextColor();
- rec.m_style.setXOffset(x);
- rec.m_style.setYOffset(y);
- rec.m_style.m_text_height = fontHeight;
-
- last_space_glyph = -1;
- last_line_start_record = m_text_glyph_records.size();
-
- continue;
- }
-
- if (code == 8)
- {
- // backspace (ASCII BS).
-
- // This is a limited hack to enable overstrike effects.
- // It backs the cursor up by one character and then
continues
- // the layout. E.g. you can use this to display an
underline
- // cursor inside a simulated text-entry box.
- //
- // ActionScript understands the '\b' escape sequence
- // for inserting a BS character.
- //
- // ONLY WORKS FOR BACKSPACING OVER ONE CHARACTER, WON'T
BS
- // OVER NEWLINES, ETC.
-
- if (rec.m_glyphs.size() > 0)
- {
- // Peek at the previous glyph, and zero out its
advance
- // value, so the next char overwrites it.
- float advance =
rec.m_glyphs.back().m_glyph_advance;
- x -= advance; // maintain formatting
- rec.m_glyphs.back().m_glyph_advance = 0;
// do the BS effect
- }
- continue;
- }
-
- if (code == '<' && _html )
- {
- LOG_ONCE(log_debug(_("HTML in a text field is
unsupported, "
+ while (it != e)
+ {
+ code = *it++;
+ if (!code) break;
+
+ if ( _embedFonts )
+ {
+ x += _font->get_kerning_adjustment(last_code, (int) code) * scale;
+ last_code = static_cast<int>(code);
+ }
+
+ // Expand the bounding-box to the lower-right corner of each glyph as
+ // we generate it.
+ m_text_bounding_box.expand_to_point(x, y + fontDescent);
+
+ if (code == 13 || code == 10)
+ {
+ // newline.
+
+ // Frigging Flash seems to use '\r' (13) as its
+ // default newline character. If we get DOS-style \r\n
+ // sequences, it'll show up as double newlines, so maybe we
+ // need to detect \r\n and treat it as one newline.
+
+ // Close out this stretch of glyphs.
+ m_text_glyph_records.push_back(rec);
+ align_line(textAlignment, last_line_start_record, x);
+
+ // Expand bounding box to include last column of text ...
+ if ( _autoSize != autoSizeNone )
_bounds.expand_to_point(x+PADDING_TWIPS, y+PADDING_TWIPS);
+
+ // new paragraphs get the indent.
+ x = std::max(0, leftMargin + indent) + PADDING_TWIPS;
+ y += fontHeight + leading;
+
+ // Start a new record on the next line.
+ rec.m_glyphs.resize(0);
+ rec.m_style.setFont(_font.get());
+ rec.m_style.setUnderlined(underlined);
+ rec.m_style.m_color = getTextColor();
+ rec.m_style.setXOffset(x);
+ rec.m_style.setYOffset(y);
+ rec.m_style.m_text_height = fontHeight;
+
+ last_space_glyph = -1;
+ last_line_start_record = m_text_glyph_records.size();
+
+ continue;
+ }
+
+ if (code == 8)
+ {
+ // backspace (ASCII BS).
+
+ // This is a limited hack to enable overstrike effects.
+ // It backs the cursor up by one character and then continues
+ // the layout. E.g. you can use this to display an underline
+ // cursor inside a simulated text-entry box.
+ //
+ // ActionScript understands the '\b' escape sequence
+ // for inserting a BS character.
+ //
+ // ONLY WORKS FOR BACKSPACING OVER ONE CHARACTER, WON'T BS
+ // OVER NEWLINES, ETC.
+
+ if (rec.m_glyphs.size() > 0)
+ {
+ // Peek at the previous glyph, and zero out its advance
+ // value, so the next char overwrites it.
+ float advance = rec.m_glyphs.back().m_glyph_advance;
+ x -= advance; // maintain formatting
+ rec.m_glyphs.back().m_glyph_advance = 0; // do the BS effect
+ }
+ continue;
+ }
+
+ if (code == '<' && _html )
+ {
+ LOG_ONCE(log_debug(_("HTML in a text field is unsupported, "
"gnash will just forget the tags and print
their content")));
std::wstring discard;
- bool complete = parseHTML(discard, it, e);
-
- //log_debug("HTML tag: %s",
utf8::encodeCanonicalString(discard, 7));
-
- // Check incomplete tag (end of string or NULL character in
the text).
- // We should stop parsing and not increment the iterator in
this case.
- if (!complete) break;
-
- continue;
- }
-
- if (code == 9) // tab (ASCII HT)
- {
- int index = _font->get_glyph_index(32, _embedFonts); //
ascii SPACE
- if ( index == -1 )
- {
- IF_VERBOSE_MALFORMED_SWF (
- log_error(_("%s -- missing glyph for space
char (needed for TAB). "
- " Make sure character shapes for
font %s are being exported "
- "into your SWF file."),
- __PRETTY_FUNCTION__,
- _font->get_name());
- );
- }
- else
- {
- text_glyph_record::glyph_entry ge;
- ge.m_glyph_index = index;
- ge.m_glyph_advance = scale *
_font->get_advance(index, _embedFonts);
-
- const int tabstop=8;
- rec.m_glyphs.insert(rec.m_glyphs.end(),
tabstop, ge);
- x += ge.m_glyph_advance*tabstop;
- }
- goto after_x_advance;
- }
-
- // Remember where word breaks occur.
- if (code == 32)
- {
- last_space_glyph = rec.m_glyphs.size();
- }
-
- {
- // need a sub-scope to avoid the 'goto' in TAB handling to cross
- // initialization of the 'index' variable
-
- // The font table holds up to 65535 glyphs. Casting from
uint32_t
- // would, in the event that the code is higher than 65535,
result
- // in the wrong character being chosen. It isn't clear whether
this
- // would ever happen, but UTF-8 conversion code can deal with
codes
- // up to 2^32; if they are valid, the code table will have to be
- // enlarged.
- int index =
_font->get_glyph_index(static_cast<boost::uint16_t>(code), _embedFonts);
-
- IF_VERBOSE_MALFORMED_SWF (
- if (index == -1)
- {
- // error -- missing glyph!
-
- // Log an error, but don't log too many times.
- static int s_log_count = 0;
- if (s_log_count < 10)
- {
- s_log_count++;
-
- if ( _embedFonts )
- {
- log_swferror(_("%s -- missing embedded
glyph for char %d. "
- " Make sure character shapes
for font %s are being exported "
- "into your SWF file"),
- __PRETTY_FUNCTION__,
- code,
- _font->get_name());
- }
- else
- {
- log_swferror(_("%s -- missing device glyph
for char %d. "
- " Maybe you don't have font
'%s' installed in your system?"),
- __PRETTY_FUNCTION__,
- code,
- _font->get_name());
- }
- }
-
- // Drop through and use index == -1; this will
display
- // using the empty-box glyph
- }
- ); // IF_VERBOSE_MALFORMED_SWF
-
- text_glyph_record::glyph_entry ge;
- ge.m_glyph_index = index;
- ge.m_glyph_advance = scale * _font->get_advance(index,
_embedFonts);
-
- rec.m_glyphs.push_back(ge);
-
- x += ge.m_glyph_advance;
- }
-
+ bool complete = parseHTML(discard, it, e);
+
+ //log_debug("HTML tag: %s", utf8::encodeCanonicalString(discard,
7));
+
+ // Check incomplete tag (end of string or NULL character in the
text).
+ // We should stop parsing and not increment the iterator in this
case.
+ if (!complete) break;
+
+ continue;
+ }
+
+ if (code == 9) // tab (ASCII HT)
+ {
+ int index = _font->get_glyph_index(32, _embedFonts); // ascii SPACE
+ if ( index == -1 )
+ {
+ IF_VERBOSE_MALFORMED_SWF (
+ log_error(_("%s -- missing glyph for space char (needed for
TAB). "
+ " Make sure character shapes for font %s are being
exported "
+ "into your SWF file."),
+ __PRETTY_FUNCTION__,
+ _font->get_name());
+ );
+ }
+ else
+ {
+ text_glyph_record::glyph_entry ge;
+ ge.m_glyph_index = index;
+ ge.m_glyph_advance = scale * _font->get_advance(index,
_embedFonts);
+
+ const int tabstop=8;
+ rec.m_glyphs.insert(rec.m_glyphs.end(), tabstop, ge);
+ x += ge.m_glyph_advance*tabstop;
+ }
+ goto after_x_advance;
+ }
+
+ // Remember where word breaks occur.
+ if (code == 32)
+ {
+ last_space_glyph = rec.m_glyphs.size();
+ }
+
+ {
+ // need a sub-scope to avoid the 'goto' in TAB handling to cross
+ // initialization of the 'index' variable
+
+ // The font table holds up to 65535 glyphs. Casting from uint32_t
+ // would, in the event that the code is higher than 65535, result
+ // in the wrong character being chosen. It isn't clear whether this
+ // would ever happen, but UTF-8 conversion code can deal with codes
+ // up to 2^32; if they are valid, the code table will have to be
+ // enlarged.
+ int index = _font->get_glyph_index(static_cast<boost::uint16_t>(code),
_embedFonts);
+
+ IF_VERBOSE_MALFORMED_SWF (
+ if (index == -1)
+ {
+ // error -- missing glyph!
+
+ // Log an error, but don't log too many times.
+ static int s_log_count = 0;
+ if (s_log_count < 10)
+ {
+ s_log_count++;
+
+ if ( _embedFonts )
+ {
+ log_swferror(_("%s -- missing embedded glyph for char %d. "
+ " Make sure character shapes for font %s are being
exported "
+ "into your SWF file"),
+ __PRETTY_FUNCTION__,
+ code,
+ _font->get_name());
+ }
+ else
+ {
+ log_swferror(_("%s -- missing device glyph for char %d. "
+ " Maybe you don't have font '%s' installed in your
system?"),
+ __PRETTY_FUNCTION__,
+ code,
+ _font->get_name());
+ }
+ }
+
+ // Drop through and use index == -1; this will display
+ // using the empty-box glyph
+ }
+ ); // IF_VERBOSE_MALFORMED_SWF
+
+ text_glyph_record::glyph_entry ge;
+ ge.m_glyph_index = index;
+ ge.m_glyph_advance = scale * _font->get_advance(index, _embedFonts);
+
+ rec.m_glyphs.push_back(ge);
+
+ x += ge.m_glyph_advance;
+ }
+
after_x_advance:
- float width = defBounds.width();
- if (x >= width - rightMargin - PADDING_TWIPS)
- {
+ float width = defBounds.width();
+ if (x >= width - rightMargin - PADDING_TWIPS)
+ {
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug("Text in TextField %s exceeds width [ _bounds
%s ]", getTarget(), _bounds);
+ log_debug("Text in TextField %s exceeds width [ _bounds %s ]",
getTarget(), _bounds);
#endif
- // no wrap and no resize --> truncate
- if ( ! doWordWrap() && autoSize == autoSizeNone )
- {
+ // no wrap and no resize --> truncate
+ if ( ! doWordWrap() && autoSize == autoSizeNone )
+ {
#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(" wordWrap=false, autoSize=none");
+ log_debug(" wordWrap=false, autoSize=none");
#endif
- // truncate long line, but keep expanding text
box
- bool newlinefound = false;
- while ( it != e )
- {
- code = *it++;
- if ( _embedFonts )
- {
- x +=
_font->get_kerning_adjustment(last_code, (int) code) * scale;
- last_code =
static_cast<int>(code);
- }
- // Expand the bounding-box to the
lower-right corner of each glyph,
- // even if we don't display it
- m_text_bounding_box.expand_to_point(x,
y + fontDescent);
-#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug("Text bbox expanded to %s
(width: %f)", m_text_bounding_box, m_text_bounding_box.width());
-#endif
-
- if (code == 13 || code == 10)
- {
- newlinefound = true;
- break;
- }
-
- int index =
_font->get_glyph_index((boost::uint16_t) code, _embedFonts);
- x += scale * _font->get_advance(index,
_embedFonts);
-
- }
- if ( ! newlinefound ) break;
- }
- else if ( doWordWrap() )
- {
-#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(" wordWrap=true");
-#endif // DEBUG_MOUSE_ENTITY_FINDING
-
- // Insert newline if there's space or autosize
!= none
-
- // Close out this stretch of glyphs.
- m_text_glyph_records.push_back(rec);
-
- float previous_x = x;
- x = leftMargin + blockIndent + PADDING_TWIPS;
- y += fontHeight + leading;
-
- // Start a new record on the next line.
- rec.m_glyphs.resize(0);
- rec.m_style.setFont(_font.get());
- rec.m_style.setUnderlined(underlined);
- rec.m_style.m_color = getTextColor();
- rec.m_style.setXOffset(x);
- rec.m_style.setYOffset(y);
- rec.m_style.m_text_height = getFontHeight();
-
- // TODO : what if m_text_glyph_records is empty
? Is it possible ?
- assert(!m_text_glyph_records.empty());
- text_glyph_record& last_line =
m_text_glyph_records.back();
- if (last_space_glyph == -1)
- {
- // Pull the previous glyph down onto the
- // new line.
- if (last_line.m_glyphs.size() > 0)
- {
-
rec.m_glyphs.push_back(last_line.m_glyphs.back());
- x +=
last_line.m_glyphs.back().m_glyph_advance;
- previous_x -=
last_line.m_glyphs.back().m_glyph_advance;
-
last_line.m_glyphs.resize(last_line.m_glyphs.size() - 1);
- }
- }
- else
- {
- // Move the previous word down onto the
next line.
-
- previous_x -=
last_line.m_glyphs[last_space_glyph].m_glyph_advance;
-
- for (unsigned int i = last_space_glyph
+ 1; i < last_line.m_glyphs.size(); i++)
- {
-
rec.m_glyphs.push_back(last_line.m_glyphs[i]);
- x +=
last_line.m_glyphs[i].m_glyph_advance;
- previous_x -=
last_line.m_glyphs[i].m_glyph_advance;
- }
-
last_line.m_glyphs.resize(last_space_glyph);
- }
-
- align_line(textAlignment,
last_line_start_record, previous_x);
-
- last_space_glyph = -1;
- last_line_start_record =
m_text_glyph_records.size();
-
- }
- else
- {
-#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug(" wordWrap=%d, autoSize=%d",
_wordWrap, _autoSize);
-#endif // DEBUG_MOUSE_ENTITY_FINDING
- }
- }
-
-
- if ( (y) > (defBounds.height() - PADDING_TWIPS) && autoSize ==
autoSizeNone )
- {
-#ifdef GNASH_DEBUG_TEXT_FORMATTING
- log_debug("Text with wordWrap exceeds height of box");
-#endif
- rec.m_glyphs.clear();
- // TODO: should still compute m_text_bounds !
- LOG_ONCE(log_unimpl("Computing text bounds of a
TextField containing text that doesn't fit the box vertically"));
- break;
- }
-
-
- if (m_cursor > character_idx)
- {
- m_xcursor = x;
- m_ycursor = y;
- }
- character_idx++;
-
- // TODO: HTML markup
- }
-
- // Expand bounding box to include the whole text (if autoSize)
- if ( _autoSize != autoSizeNone )
- {
- _bounds.expand_to_point(x+PADDING_TWIPS, y+PADDING_TWIPS);
- }
-
- // Add this line to our output.
- if ( ! rec.m_glyphs.empty() ) m_text_glyph_records.push_back(rec);
-
- float extra_space = align_line(textAlignment, last_line_start_record,
x);
-
- m_xcursor += static_cast<int>(extra_space);
- m_ycursor -= fontHeight + (fontLeading - fontDescent);
+ // truncate long line, but keep expanding text box
+ bool newlinefound = false;
+ while ( it != e )
+ {
+ code = *it++;
+ if ( _embedFonts )
+ {
+ x += _font->get_kerning_adjustment(last_code, (int)
code) * scale;
+ last_code = static_cast<int>(code);
+ }
+ // Expand the bounding-box to the lower-right corner of
each glyph,
+ // even if we don't display it
+ m_text_bounding_box.expand_to_point(x, y + fontDescent);
+#ifdef GNASH_DEBUG_TEXT_FORMATTING
+ log_debug("Text bbox expanded to %s (width: %f)",
m_text_bounding_box, m_text_bounding_box.width());
+#endif
+
+ if (code == 13 || code == 10)
+ {
+ newlinefound = true;
+ break;
+ }
+
+ int index = _font->get_glyph_index((boost::uint16_t) code,
_embedFonts);
+ x += scale * _font->get_advance(index, _embedFonts);
+
+ }
+ if ( ! newlinefound ) break;
+ }
+ else if ( doWordWrap() )
+ {
+#ifdef GNASH_DEBUG_TEXT_FORMATTING
+ log_debug(" wordWrap=true");
+#endif // DEBUG_MOUSE_ENTITY_FINDING
+
+ // Insert newline if there's space or autosize != none
+
+ // Close out this stretch of glyphs.
+ m_text_glyph_records.push_back(rec);
+
+ float previous_x = x;
+ x = leftMargin + blockIndent + PADDING_TWIPS;
+ y += fontHeight + leading;
+
+ // Start a new record on the next line.
+ rec.m_glyphs.resize(0);
+ rec.m_style.setFont(_font.get());
+ rec.m_style.setUnderlined(underlined);
+ rec.m_style.m_color = getTextColor();
+ rec.m_style.setXOffset(x);
+ rec.m_style.setYOffset(y);
+ rec.m_style.m_text_height = getFontHeight();
+
+ // TODO : what if m_text_glyph_records is empty ? Is it
possible ?
+ assert(!m_text_glyph_records.empty());
+ text_glyph_record& last_line = m_text_glyph_records.back();
+ if (last_space_glyph == -1)
+ {
+ // Pull the previous glyph down onto the
+ // new line.
+ if (last_line.m_glyphs.size() > 0)
+ {
+ rec.m_glyphs.push_back(last_line.m_glyphs.back());
+ x += last_line.m_glyphs.back().m_glyph_advance;
+ previous_x -=
last_line.m_glyphs.back().m_glyph_advance;
+ last_line.m_glyphs.resize(last_line.m_glyphs.size() -
1);
+ }
+ }
+ else
+ {
+ // Move the previous word down onto the next line.
+
+ previous_x -=
last_line.m_glyphs[last_space_glyph].m_glyph_advance;
+
+ for (unsigned int i = last_space_glyph + 1; i <
last_line.m_glyphs.size(); i++)
+ {
+ rec.m_glyphs.push_back(last_line.m_glyphs[i]);
+ x += last_line.m_glyphs[i].m_glyph_advance;
+ previous_x -= last_line.m_glyphs[i].m_glyph_advance;
+ }
+ last_line.m_glyphs.resize(last_space_glyph);
+ }
+
+ align_line(textAlignment, last_line_start_record, previous_x);
+
+ last_space_glyph = -1;
+ last_line_start_record = m_text_glyph_records.size();
+
+ }
+ else
+ {
+#ifdef GNASH_DEBUG_TEXT_FORMATTING
+ log_debug(" wordWrap=%d, autoSize=%d", _wordWrap, _autoSize);
+#endif // DEBUG_MOUSE_ENTITY_FINDING
+ }
+ }
+
+
+ if ( (y) > (defBounds.height() - PADDING_TWIPS) && autoSize ==
autoSizeNone )
+ {
+#ifdef GNASH_DEBUG_TEXT_FORMATTING
+ log_debug("Text with wordWrap exceeds height of box");
+#endif
+ rec.m_glyphs.clear();
+ // TODO: should still compute m_text_bounds !
+ LOG_ONCE(log_unimpl("Computing text bounds of a TextField
containing text that doesn't fit the box vertically"));
+ break;
+ }
+
+
+ if (m_cursor > character_idx)
+ {
+ m_xcursor = x;
+ m_ycursor = y;
+ }
+ character_idx++;
+
+ // TODO: HTML markup
+ }
+
+ // Expand bounding box to include the whole text (if autoSize)
+ if ( _autoSize != autoSizeNone )
+ {
+ _bounds.expand_to_point(x+PADDING_TWIPS, y+PADDING_TWIPS);
+ }
+
+ // Add this line to our output.
+ if ( ! rec.m_glyphs.empty() ) m_text_glyph_records.push_back(rec);
+
+ float extra_space = align_line(textAlignment, last_line_start_record, x);
+
+ m_xcursor += static_cast<int>(extra_space);
+ m_ycursor -= fontHeight + (fontLeading - fontDescent);
}
-edit_text_character::VariableRef
-edit_text_character::parseTextVariableRef(const std::string& variableName)
const
+TextField::VariableRef
+TextField::parseTextVariableRef(const std::string& variableName) const
{
- VariableRef ret;
- ret.first = 0;
-
- std::string var_str = PROPNAME(variableName);
-
- const char* varname = var_str.c_str();
-
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("VariableName: %s"), var_str);
-#endif
-
- /// Why isn't get_environment const again ?
- as_environment& env =
const_cast<edit_text_character*>(this)->get_environment();
-
- as_object* target = env.get_target();
- if ( ! target )
- {
- IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("Current environment has no target, "
- "can't bind VariableName (%s) associated to "
- "text field. Gnash will try to register "
- "again on next access."), var_str);
- );
- return ret;
- }
-
- // If the variable string contains a path, we extract
- // the appropriate target from it and update the variable
- // name
- std::string path, var;
- if ( as_environment::parse_path(varname, path, var) )
- {
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("Variable text Path: %s, Var: %s"), path, var);
-#endif
- // find target for the path component
- // we use our parent's environment for this
- target = env.find_object(path);
-
- // update varname (with path component stripped)
- varname = var.c_str();
- }
-
- if ( ! target )
- {
- IF_VERBOSE_MALFORMED_SWF(
- log_swferror(_("VariableName associated to text field
refer to an unknown target (%s). It is possible that the character will be
instantiated later in the SWF stream. Gnash will try to register again on next
access."), path);
- );
- return ret;
- }
-
- ret.first = target;
- ret.second = _vm.getStringTable().find(varname);
-
- return ret;
+ VariableRef ret;
+ ret.first = 0;
+
+ std::string var_str = PROPNAME(variableName);
+
+ const char* varname = var_str.c_str();
+
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("VariableName: %s"), var_str);
+#endif
+
+ /// Why isn't get_environment const again ?
+ as_environment& env = const_cast<TextField*>(this)->get_environment();
+
+ as_object* target = env.get_target();
+ if ( ! target )
+ {
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror(_("Current environment has no target, "
+ "can't bind VariableName (%s) associated to "
+ "text field. Gnash will try to register "
+ "again on next access."), var_str);
+ );
+ return ret;
+ }
+
+ // If the variable string contains a path, we extract
+ // the appropriate target from it and update the variable
+ // name
+ std::string path, var;
+ if ( as_environment::parse_path(varname, path, var) )
+ {
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("Variable text Path: %s, Var: %s"), path, var);
+#endif
+ // find target for the path component
+ // we use our parent's environment for this
+ target = env.find_object(path);
+
+ // update varname (with path component stripped)
+ varname = var.c_str();
+ }
+
+ if ( ! target )
+ {
+ IF_VERBOSE_MALFORMED_SWF(
+ log_swferror(_("VariableName associated to text field refer to an
unknown target (%s). It is possible that the character will be instantiated
later in the SWF stream. Gnash will try to register again on next access."),
path);
+ );
+ return ret;
+ }
+
+ ret.first = target;
+ ret.second = _vm.getStringTable().find(varname);
+
+ return ret;
}
void
-edit_text_character::registerTextVariable()
+TextField::registerTextVariable()
{
//#define DEBUG_DYNTEXT_VARIABLES 1
#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("registerTextVariable() called"));
-#endif
-
- if ( _text_variable_registered )
- {
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("registerTextVariable() no-op call (already
registered)"));
-#endif
- return;
- }
-
- if ( _variable_name.empty() )
- {
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("string is empty, consider as registered"));
-#endif
- _text_variable_registered=true;
- return;
- }
-
- VariableRef varRef = parseTextVariableRef(_variable_name);
- as_object* target = varRef.first;
- if ( ! target )
- {
- log_debug(_("VariableName associated to text field (%s) refer
to an unknown target. "
- "It is possible that the character will be
instantiated later in the SWF stream. "
- "Gnash will try to register again on next
access."), _variable_name);
- return;
- }
-
- string_table::key key = varRef.second;
-
- // check if the VariableName already has a value,
- // in that case update text value
- as_value val;
-
- int version = _vm.getSWFVersion();
-
- if (target->get_member(key, &val) )
- {
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("target object (%s @ %p) does have a member named
%s"),
- typeName(*target), (void*)target,
_vm.getStringTable().value(key));
-#endif
- // TODO: pass environment to to_string ?
- // as_environment& env = get_environment();
- setTextValue(utf8::decodeCanonicalString(val.to_string(),
version));
- }
- else if ( _textDefined )
- {
- as_value newVal = as_value(utf8::encodeCanonicalString(_text,
version));
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("target sprite (%s @ %p) does NOT have a member
named %s (no problem, we'll add it with value %s)"),
- typeName(*target), (void*)target,
_vm.getStringTable().value(key),
- newVal);
-#endif
- target->set_member(key, newVal);
- }
- else
- {
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug(_("target sprite (%s @ %p) does NOT have a member
named %s, and we don't have text defined"),
- typeName(*target), (void*)target,
_vm.getStringTable().value(key));
-#endif
- }
-
- MovieClip* sprite = target->to_movie();
-
- if ( sprite )
- {
- // add the textfield variable to the target sprite
- // TODO: have set_textfield_variable take a string_table::key
instead ?
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug("Calling set_textfield_variable(%s) against sprite
%s", _vm.getStringTable().value(key), sprite->getTarget());
-#endif
- sprite->set_textfield_variable(_vm.getStringTable().value(key),
this);
-
- }
- _text_variable_registered=true;
+ log_debug(_("registerTextVariable() called"));
+#endif
+
+ if ( _text_variable_registered )
+ {
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("registerTextVariable() no-op call (already registered)"));
+#endif
+ return;
+ }
+
+ if ( _variable_name.empty() )
+ {
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("string is empty, consider as registered"));
+#endif
+ _text_variable_registered=true;
+ return;
+ }
+
+ VariableRef varRef = parseTextVariableRef(_variable_name);
+ as_object* target = varRef.first;
+ if ( ! target )
+ {
+ log_debug(_("VariableName associated to text field (%s) refer to an
unknown target. "
+ "It is possible that the character will be instantiated later
in the SWF stream. "
+ "Gnash will try to register again on next access."),
_variable_name);
+ return;
+ }
+
+ string_table::key key = varRef.second;
+
+ // check if the VariableName already has a value,
+ // in that case update text value
+ as_value val;
+
+ int version = _vm.getSWFVersion();
+
+ if (target->get_member(key, &val) )
+ {
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("target object (%s @ %p) does have a member named %s"),
+ typeName(*target), (void*)target, _vm.getStringTable().value(key));
+#endif
+ // TODO: pass environment to to_string ?
+ // as_environment& env = get_environment();
+ setTextValue(utf8::decodeCanonicalString(val.to_string(), version));
+ }
+ else if ( _textDefined )
+ {
+ as_value newVal = as_value(utf8::encodeCanonicalString(_text,
version));
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("target sprite (%s @ %p) does NOT have a member named %s
(no problem, we'll add it with value %s)"),
+ typeName(*target), (void*)target, _vm.getStringTable().value(key),
+ newVal);
+#endif
+ target->set_member(key, newVal);
+ }
+ else
+ {
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug(_("target sprite (%s @ %p) does NOT have a member named %s,
and we don't have text defined"),
+ typeName(*target), (void*)target, _vm.getStringTable().value(key));
+#endif
+ }
+
+ MovieClip* sprite = target->to_movie();
+
+ if ( sprite )
+ {
+ // add the textfield variable to the target sprite
+ // TODO: have set_textfield_variable take a string_table::key instead ?
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug("Calling set_textfield_variable(%s) against sprite %s",
_vm.getStringTable().value(key), sprite->getTarget());
+#endif
+ sprite->set_textfield_variable(_vm.getStringTable().value(key), this);
+
+ }
+ _text_variable_registered=true;
}
@@ -1773,8 +1975,8 @@
/// tag was incomplete. The iterator is moved to after
/// the closing tag or the end of the string.
bool
-edit_text_character::parseHTML(std::wstring& tag,
std::wstring::const_iterator& it,
- const std::wstring::const_iterator& e) const
+TextField::parseHTML(std::wstring& tag, std::wstring::const_iterator& it,
+ const std::wstring::const_iterator& e) const
{
bool complete = false;
@@ -1802,179 +2004,177 @@
}
void
-edit_text_character::set_variable_name(const std::string& newname)
+TextField::set_variable_name(const std::string& newname)
{
- if ( newname != _variable_name )
- {
- _variable_name = newname;
- _text_variable_registered = false;
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug("Calling updateText after change of variable name");
-#endif
- updateText(m_def->get_default_text());
-#ifdef DEBUG_DYNTEXT_VARIABLES
- log_debug("Calling registerTextVariable after change of
variable name and updateText call");
-#endif
- registerTextVariable();
- //reset_bounding_box(0, 0); // does this make sense ? it's
called in the constructor...
- }
+ if ( newname != _variable_name )
+ {
+ _variable_name = newname;
+ _text_variable_registered = false;
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug("Calling updateText after change of variable name");
+#endif
+ updateText(m_def->get_default_text());
+#ifdef DEBUG_DYNTEXT_VARIABLES
+ log_debug("Calling registerTextVariable after change of variable name
and updateText call");
+#endif
+ registerTextVariable();
+ //reset_bounding_box(0, 0); // does this make sense ? it's called in
the constructor...
+ }
}
+/// This provides the prototype and static methods for TextField.
+//
+/// For SWF5 there is initially no prototype, for SWF6+ there is a
+/// limited prototype. This is changed later on instantiation of a
+/// TextField.
void
textfield_class_init(as_object& global)
{
- // This is going to be the global TextField "class"/"function"
- static boost::intrusive_ptr<builtin_function> cl=NULL;
-
- if ( cl == NULL )
- {
- VM& vm = global.getVM();
-
- as_object* iface = getTextFieldInterface();
- cl=new builtin_function(&textfield_ctor, iface);
-#ifndef NDEBUG
- int swfVer = vm.getSWFVersion();
- if ( swfVer > 5 )
- {
- assert(iface);
- assert(cl->getOwnProperty(NSV::PROP_PROTOTYPE));
- }
- else
- {
- assert(!iface);
- assert(!cl->getOwnProperty(NSV::PROP_PROTOTYPE));
- }
-#endif
-
- vm.addStatic(cl.get());
-
- // replicate all interface to class, to be able to access
- // all methods as static functions
- attachTextFieldStaticMembers(*cl);
-
- }
-
- // Register _global.MovieClip
- global.init_member("TextField", cl.get());
+ static boost::intrusive_ptr<builtin_function> cl = NULL;
+
+ if (!cl)
+ {
+ VM& vm = global.getVM();
+
+ if (vm.getSWFVersion() < 6) {
+ /// Version 5 or less: no initial prototype
+ cl = new builtin_function(&textfield_ctor, 0);
+ }
+ else {
+ /// Version 6 upward: limited initial prototype
+ as_object* iface = getTextFieldInterface(vm);
+ cl = new builtin_function(&textfield_ctor, iface);
+ }
+
+ vm.addStatic(cl.get());
+
+ // replicate static members to class, to be able to access
+ // all methods as static functions
+ attachTextFieldStaticMembers(*cl);
+
+ }
+
+ // Register _global.TextField
+ global.init_member("TextField", cl.get());
}
bool
-edit_text_character::pointInShape(boost::int32_t x, boost::int32_t y) const
+TextField::pointInShape(boost::int32_t x, boost::int32_t y) const
{
- SWFMatrix wm = getWorldMatrix();
- point lp(x, y);
+ SWFMatrix wm = getWorldMatrix();
+ point lp(x, y);
wm.invert().transform(lp);
- return _bounds.point_test(lp.x, lp.y);
-}
-
-bool
-edit_text_character::getDrawBorder() const
-{
- return _drawBorder;
-}
-
-void
-edit_text_character::setDrawBorder(bool val)
-{
- if ( _drawBorder != val )
- {
- set_invalidated();
- _drawBorder = val;
- }
-}
-
-rgba
-edit_text_character::getBorderColor() const
-{
- return _borderColor;
-}
-
-void
-edit_text_character::setBorderColor(const rgba& col)
-{
- if ( _borderColor != col )
- {
- set_invalidated();
- _borderColor = col;
- }
-}
-
-bool
-edit_text_character::getDrawBackground() const
-{
- return _drawBackground;
-}
-
-void
-edit_text_character::setDrawBackground(bool val)
-{
- if ( _drawBackground != val )
- {
- set_invalidated();
- _drawBackground = val;
- }
-}
-
-rgba
-edit_text_character::getBackgroundColor() const
-{
- return _backgroundColor;
-}
-
-void
-edit_text_character::setBackgroundColor(const rgba& col)
-{
- if ( _backgroundColor != col )
- {
- set_invalidated();
- _backgroundColor = col;
- }
-}
-
-void
-edit_text_character::setTextColor(const rgba& col)
-{
- if ( _textColor != col )
- {
- set_invalidated();
-
- _textColor = col;
-
- // Change color of all current glyph records
- for (TextGlyphRecords::iterator i=m_text_glyph_records.begin(),
- e=m_text_glyph_records.end(); i!=e; ++i)
- {
- text_glyph_record& rec=*i;
- rec.m_style.m_color = _textColor;
- }
-
- }
-}
-
-void
-edit_text_character::setEmbedFonts(bool use)
-{
- if ( _embedFonts != use )
- {
- set_invalidated();
- _embedFonts=use;
- format_text();
- }
-}
-
-void
-edit_text_character::setWordWrap(bool on)
-{
- if ( _wordWrap != on )
- {
- set_invalidated();
- _wordWrap=on;
- format_text();
- }
-}
-
-cxform
-edit_text_character::get_world_cxform() const
+ return _bounds.point_test(lp.x, lp.y);
+}
+
+bool
+TextField::getDrawBorder() const
+{
+ return _drawBorder;
+}
+
+void
+TextField::setDrawBorder(bool val)
+{
+ if ( _drawBorder != val )
+ {
+ set_invalidated();
+ _drawBorder = val;
+ }
+}
+
+rgba
+TextField::getBorderColor() const
+{
+ return _borderColor;
+}
+
+void
+TextField::setBorderColor(const rgba& col)
+{
+ if ( _borderColor != col )
+ {
+ set_invalidated();
+ _borderColor = col;
+ }
+}
+
+bool
+TextField::getDrawBackground() const
+{
+ return _drawBackground;
+}
+
+void
+TextField::setDrawBackground(bool val)
+{
+ if ( _drawBackground != val )
+ {
+ set_invalidated();
+ _drawBackground = val;
+ }
+}
+
+rgba
+TextField::getBackgroundColor() const
+{
+ return _backgroundColor;
+}
+
+void
+TextField::setBackgroundColor(const rgba& col)
+{
+ if ( _backgroundColor != col )
+ {
+ set_invalidated();
+ _backgroundColor = col;
+ }
+}
+
+void
+TextField::setTextColor(const rgba& col)
+{
+ if ( _textColor != col )
+ {
+ set_invalidated();
+
+ _textColor = col;
+
+ // Change color of all current glyph records
+ for (TextGlyphRecords::iterator i=m_text_glyph_records.begin(),
+ e=m_text_glyph_records.end(); i!=e; ++i)
+ {
+ text_glyph_record& rec=*i;
+ rec.m_style.m_color = _textColor;
+ }
+
+ }
+}
+
+void
+TextField::setEmbedFonts(bool use)
+{
+ if ( _embedFonts != use )
+ {
+ set_invalidated();
+ _embedFonts=use;
+ format_text();
+ }
+}
+
+void
+TextField::setWordWrap(bool on)
+{
+ if ( _wordWrap != on )
+ {
+ set_invalidated();
+ _wordWrap=on;
+ format_text();
+ }
+}
+
+cxform
+TextField::get_world_cxform() const
{
cxform cf = character::get_world_cxform();
@@ -1995,552 +2195,553 @@
}
void
-edit_text_character::setLeading(boost::uint16_t h)
-{
- if ( _leading != h )
- {
- set_invalidated();
- _leading = h;
- format_text();
- }
-}
-
-void
-edit_text_character::setUnderlined(bool v)
-{
- if ( _underlined != v )
- {
- set_invalidated();
- _underlined = v;
- format_text();
- }
-}
-
-void
-edit_text_character::setAlignment(edit_text_character_def::alignment h)
-{
- if ( _alignment != h )
- {
- set_invalidated();
- _alignment = h;
- format_text();
- }
-}
-
-void
-edit_text_character::setIndent(boost::uint16_t h)
-{
- if ( _indent != h )
- {
- set_invalidated();
- _indent = h;
- format_text();
- }
-}
-
-void
-edit_text_character::setBlockIndent(boost::uint16_t h)
-{
- if ( _blockIndent != h )
- {
- set_invalidated();
- _blockIndent = h;
- format_text();
- }
-}
-
-void
-edit_text_character::setRightMargin(boost::uint16_t h)
-{
- if ( _rightMargin != h )
- {
- set_invalidated();
- _rightMargin = h;
- format_text();
- }
-}
-
-void
-edit_text_character::setLeftMargin(boost::uint16_t h)
-{
- if (_leftMargin != h)
- {
- set_invalidated();
- _leftMargin = h;
- format_text();
- }
-}
-
-void
-edit_text_character::setFontHeight(boost::uint16_t h)
-{
- if ( _fontHeight != h )
- {
- set_invalidated();
- _fontHeight = h;
- format_text();
- }
+TextField::setLeading(boost::uint16_t h)
+{
+ if ( _leading != h )
+ {
+ set_invalidated();
+ _leading = h;
+ format_text();
+ }
+}
+
+void
+TextField::setUnderlined(bool v)
+{
+ if ( _underlined != v )
+ {
+ set_invalidated();
+ _underlined = v;
+ format_text();
+ }
+}
+
+void
+TextField::setAlignment(edit_text_character_def::alignment h)
+{
+ if ( _alignment != h )
+ {
+ set_invalidated();
+ _alignment = h;
+ format_text();
+ }
+}
+
+void
+TextField::setIndent(boost::uint16_t h)
+{
+ if ( _indent != h )
+ {
+ set_invalidated();
+ _indent = h;
+ format_text();
+ }
+}
+
+void
+TextField::setBlockIndent(boost::uint16_t h)
+{
+ if ( _blockIndent != h )
+ {
+ set_invalidated();
+ _blockIndent = h;
+ format_text();
+ }
+}
+
+void
+TextField::setRightMargin(boost::uint16_t h)
+{
+ if ( _rightMargin != h )
+ {
+ set_invalidated();
+ _rightMargin = h;
+ format_text();
+ }
+}
+
+void
+TextField::setLeftMargin(boost::uint16_t h)
+{
+ if (_leftMargin != h)
+ {
+ set_invalidated();
+ _leftMargin = h;
+ format_text();
+ }
+}
+
+void
+TextField::setFontHeight(boost::uint16_t h)
+{
+ if ( _fontHeight != h )
+ {
+ set_invalidated();
+ _fontHeight = h;
+ format_text();
+ }
}
static as_value
textfield_background_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->getDrawBackground());
- }
- else // setter
- {
- ptr->setDrawBackground(fn.arg(0).to_bool());
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->getDrawBackground());
+ }
+ else // setter
+ {
+ ptr->setDrawBackground(fn.arg(0).to_bool());
+ }
+
+ return as_value();
}
static as_value
textfield_border_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->getDrawBorder());
- }
- else // setter
- {
- ptr->setDrawBorder(fn.arg(0).to_bool());
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->getDrawBorder());
+ }
+ else // setter
+ {
+ ptr->setDrawBorder(fn.arg(0).to_bool());
+ }
+
+ return as_value();
}
static as_value
textfield_backgroundColor_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->getBackgroundColor().toRGB());
- }
- else // setter
- {
- rgba newColor;
- newColor.parseRGB(
static_cast<boost::uint32_t>(fn.arg(0).to_number()) );
- ptr->setBackgroundColor(newColor);
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->getBackgroundColor().toRGB());
+ }
+ else // setter
+ {
+ rgba newColor;
+ newColor.parseRGB(static_cast<boost::uint32_t>(fn.arg(0).to_int()));
+ ptr->setBackgroundColor(newColor);
+ }
+
+ return as_value();
}
static as_value
textfield_borderColor_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->getBorderColor().toRGB());
- }
- else // setter
- {
- rgba newColor;
- newColor.parseRGB(
static_cast<boost::uint32_t>(fn.arg(0).to_number()) );
- ptr->setBorderColor(newColor);
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->getBorderColor().toRGB());
+ }
+ else // setter
+ {
+ rgba newColor;
+ newColor.parseRGB( static_cast<boost::uint32_t>(fn.arg(0).to_number())
);
+ ptr->setBorderColor(newColor);
+ }
+
+ return as_value();
}
static as_value
textfield_textColor_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->getTextColor().toRGB());
- }
- else // setter
- {
- rgba newColor;
- newColor.parseRGB(
static_cast<boost::uint32_t>(fn.arg(0).to_number()) );
- ptr->setTextColor(newColor);
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->getTextColor().toRGB());
+ }
+ else // setter
+ {
+ rgba newColor;
+ newColor.parseRGB( static_cast<boost::uint32_t>(fn.arg(0).to_number())
);
+ ptr->setTextColor(newColor);
+ }
+
+ return as_value();
}
static as_value
textfield_embedFonts_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->getEmbedFonts());
- }
- else // setter
- {
- ptr->setEmbedFonts( fn.arg(0).to_bool() );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->getEmbedFonts());
+ }
+ else // setter
+ {
+ ptr->setEmbedFonts( fn.arg(0).to_bool() );
+ }
+
+ return as_value();
}
static as_value
textfield_wordWrap_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->doWordWrap());
- }
- else // setter
- {
- ptr->setWordWrap( fn.arg(0).to_bool() );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->doWordWrap());
+ }
+ else // setter
+ {
+ ptr->setWordWrap( fn.arg(0).to_bool() );
+ }
+
+ return as_value();
}
static as_value
textfield_html_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->doHtml());
- }
- else // setter
- {
- ptr->setHtml( fn.arg(0).to_bool() );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->doHtml());
+ }
+ else // setter
+ {
+ ptr->setHtml( fn.arg(0).to_bool() );
+ }
+
+ return as_value();
}
static as_value
textfield_selectable_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return as_value(ptr->isSelectable());
- }
- else // setter
- {
- ptr->setSelectable( fn.arg(0).to_bool() );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return as_value(ptr->isSelectable());
+ }
+ else // setter
+ {
+ ptr->setSelectable( fn.arg(0).to_bool() );
+ }
+
+ return as_value();
}
static as_value
textfield_length_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- const std::string& s = ptr->get_text_value();
- return as_value(s.length()); // TOCHECK: utf-8 ?
- }
- else // setter
- {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set length property of TextField
%s"), ptr->getTarget());
- );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ const std::string& s = ptr->get_text_value();
+ return as_value(s.length()); // TOCHECK: utf-8 ?
+ }
+ else // setter
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set length property of TextField %s"),
+ ptr->getTarget());
+ );
+ }
+
+ return as_value();
}
static as_value
textfield_textHeight_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- // Return the height, in pixels, of the text as laid out.
- // (I.e. the actual text content, not our defined
- // bounding box.)
- //
- // In local coords. Verified against Macromedia Flash.
- return
as_value(TWIPS_TO_PIXELS(ptr->getTextBoundingBox().height()));
-
- }
- else // setter
- {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set read-only %s property of
TextField %s"), "textHeight", ptr->getTarget());
- );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ // Return the height, in pixels, of the text as laid out.
+ // (I.e. the actual text content, not our defined
+ // bounding box.)
+ //
+ // In local coords. Verified against Macromedia Flash.
+ return as_value(TWIPS_TO_PIXELS(ptr->getTextBoundingBox().height()));
+
+ }
+ else // setter
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set read-only %s property of TextField "
+ "%s"), "textHeight", ptr->getTarget());
+ );
+ }
+
+ return as_value();
}
static as_value
textfield_textWidth_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- // Return the width, in pixels, of the text as laid out.
- // (I.e. the actual text content, not our defined
- // bounding box.)
- //
- // In local coords. Verified against Macromedia Flash.
- return
as_value(TWIPS_TO_PIXELS(ptr->getTextBoundingBox().width()));
-
- }
- else // setter
- {
- IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Attempt to set read-only %s property of
TextField %s"), "textWidth", ptr->getTarget());
- );
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ // Return the width, in pixels, of the text as laid out.
+ // (I.e. the actual text content, not our defined
+ // bounding box.)
+ //
+ // In local coords. Verified against Macromedia Flash.
+ return as_value(TWIPS_TO_PIXELS(ptr->getTextBoundingBox().width()));
+
+ }
+ else // setter
+ {
+ IF_VERBOSE_ASCODING_ERRORS(
+ log_aserror(_("Attempt to set read-only %s property of TextField %s"),
+ "textWidth", ptr->getTarget());
+ );
+ }
+
+ return as_value();
}
static as_value
textfield_autoSize_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return ptr->autoSizeValueName(ptr->getAutoSize());
- }
- else // setter
- {
- const as_value& arg = fn.arg(0);
- if ( arg.is_bool() )
- {
- if ( arg.to_bool() ) // true == left
- {
- ptr->setAutoSize(
edit_text_character::autoSizeLeft );
- }
- else
- {
- ptr->setAutoSize(
edit_text_character::autoSizeNone );
- }
- }
- else
- {
- std::string strval = arg.to_string();
- edit_text_character::AutoSizeValue val =
ptr->parseAutoSizeValue(strval);
- //log_debug("%s => %d", strval, val);
- ptr->setAutoSize( val );
- }
- }
-
- return as_value();
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ return ptr->autoSizeValueName(ptr->getAutoSize());
+ }
+ else // setter
+ {
+ const as_value& arg = fn.arg(0);
+ if ( arg.is_bool() )
+ {
+ if ( arg.to_bool() ) // true == left
+ {
+ ptr->setAutoSize( TextField::autoSizeLeft );
+ }
+ else
+ {
+ ptr->setAutoSize( TextField::autoSizeNone );
+ }
+ }
+ else
+ {
+ std::string strval = arg.to_string();
+ TextField::AutoSizeValue val = ptr->parseAutoSizeValue(strval);
+ //log_debug("%s => %d", strval, val);
+ ptr->setAutoSize( val );
+ }
+ }
+
+ return as_value();
}
static as_value
textfield_type_getset(const fn_call& fn)
{
- boost::intrusive_ptr<edit_text_character> ptr =
ensureType<edit_text_character>(fn.this_ptr);
-
- if ( fn.nargs == 0 ) // getter
- {
- return ptr->typeValueName(ptr->getType());
- }
-
- // setter
- const as_value& arg = fn.arg(0);
- std::string strval = arg.to_string();
- edit_text_character::TypeValue val = ptr->parseTypeValue(strval);
- //log_debug("setting %s.type : %s (toString->%s) => %d",
ptr->getTarget(), arg, strval, val);
- IF_VERBOSE_ASCODING_ERRORS(
- if ( val == edit_text_character::typeInvalid )
- {
- log_aserror(_("Invalid value given to TextField.type: %s"),
strval);
- }
- );
- ptr->setType(val);
- return as_value();
-}
-
-/* public static */
-edit_text_character::AutoSizeValue
-edit_text_character::parseAutoSizeValue(const std::string& val)
-{
- StringNoCaseEqual cmp;
-
- if ( cmp(val, "left") )
- {
- return autoSizeLeft;
- }
- if ( cmp(val, "right") )
- {
- return autoSizeRight;
- }
- if ( cmp(val, "center") )
- {
- return autoSizeCenter;
- }
- return autoSizeNone;
-
-}
-
-/* public static */
-const char*
-edit_text_character::autoSizeValueName(AutoSizeValue val)
-{
- switch (val)
- {
- case autoSizeLeft:
- return "left";
- case autoSizeRight:
- return "right";
- case autoSizeCenter:
- return "center";
- case autoSizeNone:
- default:
- return "none";
- }
-
-}
-
-/* public static */
-edit_text_character::TypeValue
-edit_text_character::parseTypeValue(const std::string& val)
-{
- StringNoCaseLessThen cmp;
-
- if ( ! cmp(val, "input") )
- {
- //log_debug("parsing type value %s: typeInput", val);
- return typeInput;
- }
- if ( ! cmp(val, "dynamic") )
- {
- //log_debug("parsing type value %s: typeDynamic", val);
- return typeDynamic;
- }
- //log_debug("parsing type value %s: typeInvalid", val);
- return typeInvalid;
-
-}
-
-/* public static */
-const char*
-edit_text_character::typeValueName(TypeValue val)
-{
- switch (val)
- {
- case typeInput:
- //log_debug("typeInput returned as 'input'");
- return "input";
- case typeDynamic:
- //log_debug("typeDynamic returned as 'dynamic'");
- return "dynamic";
- default:
- //log_debug("invalid type %d returned as 'invalid'",
(int)val);
- return "invalid";
- }
+ boost::intrusive_ptr<TextField> ptr = ensureType<TextField>(fn.this_ptr);
+
+ if (!fn.nargs)
+ {
+ // getter
+ return ptr->typeValueName(ptr->getType());
+ }
+
+ // setter
+ const as_value& arg = fn.arg(0);
+ std::string strval = arg.to_string();
+ TextField::TypeValue val = ptr->parseTypeValue(strval);
+
+ IF_VERBOSE_ASCODING_ERRORS(
+ if ( val == TextField::typeInvalid )
+ {
+ log_aserror(_("Invalid value given to TextField.type: %s"),
strval);
+ }
+ );
+ ptr->setType(val);
+ return as_value();
+}
+
+/* public static */
+TextField::AutoSizeValue
+TextField::parseAutoSizeValue(const std::string& val)
+{
+ StringNoCaseEqual cmp;
+
+ if ( cmp(val, "left") )
+ {
+ return autoSizeLeft;
+ }
+ if ( cmp(val, "right") )
+ {
+ return autoSizeRight;
+ }
+ if ( cmp(val, "center") )
+ {
+ return autoSizeCenter;
+ }
+ return autoSizeNone;
+
+}
+
+/* public static */
+const char*
+TextField::autoSizeValueName(AutoSizeValue val)
+{
+ switch (val)
+ {
+ case autoSizeLeft:
+ return "left";
+ case autoSizeRight:
+ return "right";
+ case autoSizeCenter:
+ return "center";
+ case autoSizeNone:
+ default:
+ return "none";
+ }
+
+}
+
+/* public static */
+TextField::TypeValue
+TextField::parseTypeValue(const std::string& val)
+{
+ StringNoCaseLessThen cmp;
+
+ if ( ! cmp(val, "input") )
+ {
+ return typeInput;
+ }
+ if ( ! cmp(val, "dynamic") )
+ {
+ return typeDynamic;
+ }
+ return typeInvalid;
+
+}
+
+/* public static */
+const char*
+TextField::typeValueName(TypeValue val)
+{
+ switch (val)
+ {
+ case typeInput:
+ //log_debug("typeInput returned as 'input'");
+ return "input";
+ case typeDynamic:
+ //log_debug("typeDynamic returned as 'dynamic'");
+ return "dynamic";
+ default:
+ //log_debug("invalid type %d returned as 'invalid'", (int)val);
+ return "invalid";
+ }
}
void
-edit_text_character::setAutoSize(AutoSizeValue val)
+TextField::setAutoSize(AutoSizeValue val)
{
- if ( val == _autoSize ) return;
-
- set_invalidated();
-
- _autoSize = val;
- format_text();
+ if ( val == _autoSize ) return;
+
+ set_invalidated();
+
+ _autoSize = val;
+ format_text();
}
edit_text_character_def::alignment
-edit_text_character::getTextAlignment()
-{
- // TODO: use a _textAlignment private member to reduce lookups ?
- // The member would be initialized to m_def->get_alignment and then
update
- // when _autoSize is updated.
- edit_text_character_def::alignment textAlignment = getAlignment();
- if ( _autoSize == autoSizeCenter ) textAlignment =
edit_text_character_def::ALIGN_CENTER;
- else if ( _autoSize == autoSizeLeft ) textAlignment =
edit_text_character_def::ALIGN_LEFT;
- else if ( _autoSize == autoSizeRight ) textAlignment =
edit_text_character_def::ALIGN_RIGHT;
- return textAlignment;
-}
-
-void
-edit_text_character::onChanged()
-{
- as_value met(PROPNAME("onChanged"));
- as_value targetVal(this);
- callMethod(NSV::PROP_BROADCAST_MESSAGE, met, targetVal);
-}
-
-void
-edit_text_character::onSetFocus()
-{
- callMethod(NSV::PROP_ON_SET_FOCUS);
-}
-
-void
-edit_text_character::onKillFocus()
-{
- callMethod(NSV::PROP_ON_KILL_FOCUS);
-}
-
-void
-edit_text_character::setFocus()
-{
- if ( m_has_focus ) return; // nothing to do
-
- set_invalidated();
-
- m_has_focus = true;
-
- // why should we add to the key listener list every time
- // we call setFocus()???
- _vm.getRoot().add_key_listener(this);
-
- m_cursor = _text.size();
- format_text();
-
- onSetFocus();
-}
-
-void
-edit_text_character::killFocus()
-{
- if ( ! m_has_focus ) return; // nothing to do
-
- set_invalidated();
-
- m_has_focus = false;
-
- movie_root& root = _vm.getRoot();
- root.setFocus(NULL);
- root.remove_key_listener(this);
- format_text(); // is this needed ?
-
- onKillFocus();
-}
-
-void
-edit_text_character::markReachableResources() const
-{
- if ( m_def.get() ) m_def->setReachable();
-
- if ( _font ) _font->setReachable();
-
- // recurse to parent...
- markCharacterReachable();
+TextField::getTextAlignment()
+{
+ // TODO: use a _textAlignment private member to reduce lookups ?
+ // The member would be initialized to m_def->get_alignment and then update
+ // when _autoSize is updated.
+ edit_text_character_def::alignment textAlignment = getAlignment();
+ if ( _autoSize == autoSizeCenter ) textAlignment =
edit_text_character_def::ALIGN_CENTER;
+ else if ( _autoSize == autoSizeLeft ) textAlignment =
edit_text_character_def::ALIGN_LEFT;
+ else if ( _autoSize == autoSizeRight ) textAlignment =
edit_text_character_def::ALIGN_RIGHT;
+ return textAlignment;
+}
+
+void
+TextField::onChanged()
+{
+ as_value met(PROPNAME("onChanged"));
+ as_value targetVal(this);
+ callMethod(NSV::PROP_BROADCAST_MESSAGE, met, targetVal);
+}
+
+void
+TextField::onSetFocus()
+{
+ callMethod(NSV::PROP_ON_SET_FOCUS);
+}
+
+void
+TextField::onKillFocus()
+{
+ callMethod(NSV::PROP_ON_KILL_FOCUS);
+}
+
+void
+TextField::setFocus()
+{
+ if ( m_has_focus ) return; // nothing to do
+
+ set_invalidated();
+
+ m_has_focus = true;
+
+ // why should we add to the key listener list every time
+ // we call setFocus()???
+ _vm.getRoot().add_key_listener(this);
+
+ m_cursor = _text.size();
+ format_text();
+
+ onSetFocus();
+}
+
+void
+TextField::killFocus()
+{
+ if ( ! m_has_focus ) return; // nothing to do
+
+ set_invalidated();
+
+ m_has_focus = false;
+
+ movie_root& root = _vm.getRoot();
+ root.setFocus(NULL);
+ root.remove_key_listener(this);
+ format_text(); // is this needed ?
+
+ onKillFocus();
+}
+
+void
+TextField::markReachableResources() const
+{
+ if ( m_def.get() ) m_def->setReachable();
+
+ if ( _font ) _font->setReachable();
+
+ // recurse to parent...
+ markCharacterReachable();
}
} // namespace gnash
=== renamed file 'libcore/edit_text_character.h' => 'libcore/TextField.h'
--- a/libcore/edit_text_character.h 2008-10-25 10:38:32 +0000
+++ b/libcore/TextField.h 2008-11-05 10:02:06 +0000
@@ -15,8 +15,8 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-#ifndef GNASH_EDIT_TEXT_CHARACTER_H
-#define GNASH_EDIT_TEXT_CHARACTER_H
+#ifndef GNASH_TEXTFIELD_H
+#define GNASH_TEXTFIELD_H
#include "character.h" // for inheritance
#include "edit_text_character_def.h" // for inlines and typedefs
@@ -36,7 +36,7 @@
namespace gnash {
/// An instance of an edit_text_character_def
-class edit_text_character : public character
+class TextField : public character
{
public:
@@ -71,12 +71,12 @@
typeInput
};
- edit_text_character(
+ TextField(
character* parent,
edit_text_character_def* def,
int id);
- ~edit_text_character();
+ ~TextField();
// TODO: should this return isSelectable() ?
bool can_handle_mouse_event() const { return true; }
@@ -103,10 +103,12 @@
///
void set_variable_name(const std::string& newname);
- /// Set our text to the given string by effect of an update of a
registered variable name
+ /// \brief Set our text to the given string by effect of an update of a
+ /// registered variable name
//
- /// This cal only updates the text and is only meant to be called by
ourselves
- /// or by MovieClip when a registered TextVariable is updated.
+ /// This call only updates the text and is only meant to be called
+ /// by ourselves or by MovieClip when a registered TextVariable is
+ /// updated.
void updateText(const std::string& s);
/// Return value of our text.
@@ -137,7 +139,7 @@
/// See dox in character::unload (character.h)
//
- /// NOTE: edit_text_character (TextField) never has
+ /// NOTE: TextField (TextField) never has
/// an onUnload event, so we always return false
/// here. (TODO: verify this)
///
@@ -189,6 +191,35 @@
return _embedFonts;
}
+ /// Get the current maxChars setting of the TextField
+ boost::int32_t maxChars() const {
+ return _maxChars;
+ }
+
+ /// Set the current maxChars setting of the TextField
+ void maxChars(boost::int32_t max) {
+ _maxChars = max;
+ }
+
+ /// Get the current multiline setting of the TextField
+ bool multiline() const {
+ return _multiline;
+ }
+
+ /// Set the current multiline setting of the TextField
+ void multiline(bool b) {
+ _multiline = b;
+ }
+
+ /// Get the current password setting of the TextField
+ bool password() const {
+ return _password;
+ }
+
+ /// Set the current password setting of the TextField
+ void password(bool b) {
+ _password = b;
+ }
/// \brief
/// Set whether this TextField should use embedded font glyphs,
/// or use device font glyphs
@@ -231,6 +262,13 @@
///
static const char* autoSizeValueName(AutoSizeValue val);
+ /// Attaches more properties to the prototype on first instantiation.
+ //
+ /// @param proto The prototype of the TextField object.
+ //
+ /// This is used when constructing non-AS textfields.
+ static void attachTextFieldInstanceProperties(as_object& proto);
+
/// Set type (input or dynamic)
//
/// @param val
@@ -405,11 +443,12 @@
///
void setTextValue(const std::wstring& wstr);
- /// Set our text to the given string by effect of an update of a
registered variable name
+ /// \brief Set our text to the given string by effect of an update of a
+ /// registered variable name
//
- /// This cal only updates the text and is only meant to be called by
ourselves
- /// or by MovieClip when a registered TextVariable is updated.
- ///
+ /// This call only updates the text and is only meant to be called
+ /// by ourselves or by MovieClip when a registered TextVariable is
+ /// updated.
void updateText(const std::wstring& s);
/// Set focus
@@ -427,9 +466,12 @@
/// Call this function when willing to invoke the onKillFocus event
handler
void onKillFocus();
- /// The actual text. Because we have to deal with non-ascii characters
(129-255)
- /// this is a wide string; the cursor position and the position within
the string
- /// are then the same, which makes manipulating the string much easier.
+ /// The actual text.
+ //
+ /// Because we have to deal with non-ascii characters (129-255), this
+ /// is a wide string; the cursor position and the position within the
+ /// string are then the same, which makes manipulating the string much
+ /// easier.
std::wstring _text;
/// This flag will be true as soon as the TextField
@@ -447,7 +489,7 @@
rect m_text_bounding_box;
/// Reset our text bounding box to the given point.
- void reset_bounding_box(boost::int32_t x, boost::int32_t y)
+ void reset_bounding_box(boost::int32_t x, boost::int32_t y)
{
m_text_bounding_box.set_to_point(x, y);
}
@@ -462,7 +504,7 @@
/// Convert the characters in _text into a series of
/// text_glyph_records to be rendered.
- void format_text();
+ void format_text();
/// Extracts an HTML tag.
///
@@ -509,6 +551,15 @@
float m_xcursor;
float m_ycursor;
+ /// Corresponds to the multiline property.
+ bool _multiline;
+
+ /// Corresponds to the password property.
+ bool _password;
+
+ /// Corresponds to the maxChars property.
+ boost::int32_t _maxChars;
+
/// Associate a variable to the text of this character
//
/// Setting the associated variable actually changes the
=== modified file 'libcore/asobj/ClassHierarchy.cpp'
--- a/libcore/asobj/ClassHierarchy.cpp 2008-10-30 16:46:00 +0000
+++ b/libcore/asobj/ClassHierarchy.cpp 2008-11-05 10:02:06 +0000
@@ -58,7 +58,7 @@
#include "timers.h"
#include "URL.h" // for URL::encode and URL::decode (escape/unescape)
#include "builtin_function.h"
-#include "edit_text_character.h"
+#include "TextField.h"
#include "namedStrings.h"
#include "ClassHierarchy.h"
#include "builtin_function.h"
=== modified file 'libcore/asobj/Global.cpp'
--- a/libcore/asobj/Global.cpp 2008-10-30 16:46:00 +0000
+++ b/libcore/asobj/Global.cpp 2008-11-05 10:02:06 +0000
@@ -64,7 +64,7 @@
#include "timers.h"
#include "URL.h" // for URL::encode and URL::decode (escape/unescape)
#include "builtin_function.h"
-#include "edit_text_character.h"
+#include "TextField.h"
#include "rc.h"
#include "ClassHierarchy.h"
#include "namedStrings.h"
=== modified file 'libcore/parser/edit_text_character_def.cpp'
--- a/libcore/parser/edit_text_character_def.cpp 2008-10-30 13:15:12
+0000
+++ b/libcore/parser/edit_text_character_def.cpp 2008-11-05 10:02:06
+0000
@@ -25,7 +25,7 @@
#include "log.h"
#include "movie_definition.h" // for m_root_def use
#include "edit_text_character_def.h"
-#include "edit_text_character.h"
+#include "TextField.h"
#include "font.h" // for setReachable call, ctor and dtor
#include "fontlib.h"
@@ -130,10 +130,7 @@
" text = ``%s''\n"
" font_id: %d\n"
" text_height: %d",
- m_variable_name.c_str(),
- m_default_text.c_str(),
- m_font_id,
- m_text_height);
+ m_variable_name, m_default_text, m_font_id,
m_text_height);
);
}
@@ -153,7 +150,7 @@
{
// Resolve the font, if possible
get_font();
- edit_text_character* ch = new edit_text_character(parent, this, id);
+ TextField* ch = new TextField(parent, this, id);
// This gives an "instance name" to the TextField, but
// it is not really what we need.
=== modified file 'libcore/parser/edit_text_character_def.h'
--- a/libcore/parser/edit_text_character_def.h 2008-10-30 13:15:12 +0000
+++ b/libcore/parser/edit_text_character_def.h 2008-11-05 10:02:06 +0000
@@ -159,6 +159,18 @@
return m_leading;
}
+ bool multiline() const {
+ return m_multiline;
+ }
+
+ bool password() const {
+ return m_password;
+ }
+
+ boost::int32_t maxChars() const {
+ return m_max_length;
+ }
+
/// Get text alignment
alignment get_alignment() const {
return m_alignment;
=== modified file 'macros/ffmpeg.m4'
--- a/macros/ffmpeg.m4 2008-11-05 01:02:53 +0000
+++ b/macros/ffmpeg.m4 2008-11-05 12:23:13 +0000
@@ -42,6 +42,7 @@
-o -f${with_ffmpeg_incl}/ffmpeg/avcodec.h \
-o -f ${with_ffmpeg_incl}/libavcodec/avcodec.h; then
ac_cv_path_ffmpeg_incl="-I`(cd ${with_ffmpeg_incl}; pwd)`"
+ avcodec_h=${with_ffmpeg_incl}/avcodec.h
else
AC_MSG_ERROR([${with_ffmpeg_incl} directory does not contain the
avcodec.h header])
fi
=== modified file 'testsuite/actionscript.all/TextField.as'
--- a/testsuite/actionscript.all/TextField.as 2008-11-03 18:25:59 +0000
+++ b/testsuite/actionscript.all/TextField.as 2008-11-05 10:57:01 +0000
@@ -89,19 +89,19 @@
xcheck( !TextField.prototype.hasOwnProperty('autoSize') );
xcheck( !TextField.prototype.hasOwnProperty('border') );
xcheck( !TextField.prototype.hasOwnProperty('borderColor') );
-check( !TextField.prototype.hasOwnProperty('bottomScroll') );
+xcheck( !TextField.prototype.hasOwnProperty('bottomScroll') );
xcheck( !TextField.prototype.hasOwnProperty('embedFonts') );
-check( !TextField.prototype.hasOwnProperty('hscroll') );
+xcheck( !TextField.prototype.hasOwnProperty('hscroll') );
xcheck( !TextField.prototype.hasOwnProperty('html') );
-check( !TextField.prototype.hasOwnProperty('htmlText') );
+xcheck( !TextField.prototype.hasOwnProperty('htmlText') );
xcheck( !TextField.prototype.hasOwnProperty('length') );
-check( !TextField.prototype.hasOwnProperty('maxChars') );
-check( !TextField.prototype.hasOwnProperty('maxhscroll') );
-check( !TextField.prototype.hasOwnProperty('maxscroll') );
-check( !TextField.prototype.hasOwnProperty('multiline') );
-check( !TextField.prototype.hasOwnProperty('password') );
-check( !TextField.prototype.hasOwnProperty('restrict') );
-check( !TextField.prototype.hasOwnProperty('scroll') );
+xcheck( !TextField.prototype.hasOwnProperty('maxChars') );
+xcheck( !TextField.prototype.hasOwnProperty('maxhscroll') );
+xcheck( !TextField.prototype.hasOwnProperty('maxscroll') );
+xcheck( !TextField.prototype.hasOwnProperty('multiline') );
+xcheck( !TextField.prototype.hasOwnProperty('password') );
+xcheck( !TextField.prototype.hasOwnProperty('restrict') );
+xcheck( !TextField.prototype.hasOwnProperty('scroll') );
xcheck( !TextField.prototype.hasOwnProperty('selectable') );
check( !TextField.prototype.hasOwnProperty('text') );
xcheck( !TextField.prototype.hasOwnProperty('textColor') );
@@ -166,19 +166,19 @@
check( TextField.prototype.hasOwnProperty('autoSize') );
check( TextField.prototype.hasOwnProperty('border') );
check( TextField.prototype.hasOwnProperty('borderColor') );
-xcheck( TextField.prototype.hasOwnProperty('bottomScroll') );
+check( TextField.prototype.hasOwnProperty('bottomScroll') );
check( TextField.prototype.hasOwnProperty('embedFonts') );
-xcheck( TextField.prototype.hasOwnProperty('hscroll') );
+check( TextField.prototype.hasOwnProperty('hscroll') );
check( TextField.prototype.hasOwnProperty('html') );
-xcheck( TextField.prototype.hasOwnProperty('htmlText') );
+check( TextField.prototype.hasOwnProperty('htmlText') );
check( TextField.prototype.hasOwnProperty('length') );
-xcheck( TextField.prototype.hasOwnProperty('maxChars') );
-xcheck( TextField.prototype.hasOwnProperty('maxhscroll') );
-xcheck( TextField.prototype.hasOwnProperty('maxscroll') );
-xcheck( TextField.prototype.hasOwnProperty('multiline') );
-xcheck( TextField.prototype.hasOwnProperty('password') );
-cxheck( TextField.prototype.hasOwnProperty('restrict') );
-xcheck( TextField.prototype.hasOwnProperty('scroll') );
+check( TextField.prototype.hasOwnProperty('maxChars') );
+check( TextField.prototype.hasOwnProperty('maxhscroll') );
+check( TextField.prototype.hasOwnProperty('maxscroll') );
+check( TextField.prototype.hasOwnProperty('multiline') );
+check( TextField.prototype.hasOwnProperty('password') );
+check( TextField.prototype.hasOwnProperty('restrict') );
+check( TextField.prototype.hasOwnProperty('scroll') );
check( TextField.prototype.hasOwnProperty('selectable') );
xcheck( TextField.prototype.hasOwnProperty('text') );
check( TextField.prototype.hasOwnProperty('textColor') );
@@ -367,7 +367,7 @@
// Check TextField.maxChars
-xcheck_equals(typeof(tf.maxChars), 'null');
+check_equals(typeof(tf.maxChars), 'null');
check(!tf.hasOwnProperty('maxChars'));
tf.maxChars = 5;
check_equals(tf.maxChars, 5);
@@ -375,12 +375,12 @@
// no effect (maybe only limits user input)
check_equals(tf.text, "0123456789");
tf.maxChars = "string";
-xcheck_equals(typeof(tf.maxChars), "null");
+check_equals(typeof(tf.maxChars), "null");
tf.maxChars = -6;
check_equals(typeof(tf.maxChars), "number");
check_equals(tf.maxChars, -6);
tf.maxChars = 0;
-xcheck_equals(typeof(tf.maxChars), "null");
+check_equals(typeof(tf.maxChars), "null");
tf.maxChars = null;
@@ -402,10 +402,10 @@
// Check TextField.multiline
-xcheck_equals(typeof(tf.multiline), 'boolean');
-xcheck_equals(tf.multiline, false);
+check_equals(typeof(tf.multiline), 'boolean');
+check_equals(tf.multiline, false);
check(!tf.hasOwnProperty('multiline'));
-xcheck_equals(tf.multiline, false);
+check_equals(tf.multiline, false);
tf.multiline = true;
check_equals(tf.multiline, true);
tf.multiline = false;
@@ -456,30 +456,30 @@
// This verifies it really uses to_bool.
-xcheck_equals(typeof(tf.password), 'boolean');
-xcheck_equals(tf.password, false);
+check_equals(typeof(tf.password), 'boolean');
+check_equals(tf.password, false);
check(!tf.hasOwnProperty('password'));
-xcheck_equals(tf.password, false);
+check_equals(tf.password, false);
tf.password = true;
check_equals(tf.password, true);
tf.password = 7;
-xcheck_equals(tf.password, true);
+check_equals(tf.password, true);
tf.password = "string";
#if OUTPUT_VERSION > 6
-xcheck_equals(tf.password, true);
+check_equals(tf.password, true);
#else
-xcheck_equals(tf.password, false);
+check_equals(tf.password, false);
#endif
tf.password = 0;
check_equals(tf.password, false);
tf.password = "a string";
#if OUTPUT_VERSION > 6
-xcheck_equals(tf.password, true);
+check_equals(tf.password, true);
#else
-xcheck_equals(tf.password, false);
+check_equals(tf.password, false);
#endif
tf.password = undefined;
-xcheck_equals(tf.password, false);
+check_equals(tf.password, false);
// TODO: check effects of setting to 'password' (should hide characters)
tf.password = false;
@@ -1004,11 +1004,11 @@
//------------------------------------------------------------
#if OUTPUT_VERSION == 6
- check_totals(437);
+ check_totals(438);
#elif OUTPUT_VERSION == 7
- check_totals(440);
+ check_totals(441);
#elif OUTPUT_VERSION == 8
- check_totals(441);
+ check_totals(442);
#endif
#endif
=== modified file 'testsuite/actionscript.all/toString_valueOf.as'
--- a/testsuite/actionscript.all/toString_valueOf.as 2008-04-02 00:52:14
+0000
+++ b/testsuite/actionscript.all/toString_valueOf.as 2008-11-05 10:23:05
+0000
@@ -289,11 +289,11 @@
check_equals(typeof(text1.toString), "function");
check_equals(typeof(text1.__proto__.toString), "function");
#else
- xcheck_equals(typeof(text1.toString), "undefined");
- xcheck_equals(typeof(text1.valueOf), "undefined");
+ check_equals(typeof(text1.toString), "undefined");
+ check_equals(typeof(text1.valueOf), "undefined");
check_equals(typeof(text1.__proto__), 'object');
- xcheck_equals(typeof(text1.__proto__.toString), "undefined");
- xcheck_equals(typeof(text1.__proto__.valueOf), "undefined");
+ check_equals(typeof(text1.__proto__.toString), "undefined");
+ check_equals(typeof(text1.__proto__.valueOf), "undefined");
#endif
x = text1.toString();
@@ -305,11 +305,11 @@
check(y.toString() == "[object Object]");
check(typeof(y.valueOf()) == "object");
#else
- xcheck_equals(typeof(x), "undefined");
- xcheck_equals(typeof(y), "undefined");
- xcheck_equals(x, undefined);
- xcheck_equals(y.toString(), undefined);
- xcheck_equals(typeof(y.valueOf()), "undefined");
+ check_equals(typeof(x), "undefined");
+ check_equals(typeof(y), "undefined");
+ check_equals(x, undefined);
+ check_equals(y.toString(), undefined);
+ check_equals(typeof(y.valueOf()), "undefined");
#endif
check_equals(y, text1);
@@ -319,7 +319,7 @@
#if OUTPUT_VERSION > 5
check_equals(a, "prefix_A STRING");
#else
- xcheck_equals(a, "prefix_");
+ check_equals(a, "prefix_");
#endif
//
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10228: Tweak TextField implementation, stub unimplemented methods.,
Benjamin Wolsey <=