[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r11318: Implemented TextField passwo
|
From: |
Sharad Desai |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r11318: Implemented TextField password, bullet, display properties |
|
Date: |
Mon, 27 Jul 2009 14:16:06 -0600 |
|
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 11318
committer: Sharad Desai <address@hidden>
branch nick: trunk
timestamp: Mon 2009-07-27 14:16:06 -0600
message:
Implemented TextField password, bullet, display properties
modified:
libcore/TextField.cpp
libcore/TextField.h
libcore/asobj/TextFormat_as.cpp
libcore/asobj/TextFormat_as.h
testsuite/misc-haxe.all/classes.all/text/TextFormat_as.hx
------------------------------------------------------------
revno: 11317.1.1
committer: Sharad Desai <address@hidden>
branch nick: desai_Jul24
timestamp: Mon 2009-07-27 14:14:18 -0600
message:
Implemented TextField password, bullet, display properties
modified:
libcore/TextField.cpp
libcore/TextField.h
libcore/asobj/TextFormat_as.cpp
libcore/asobj/TextFormat_as.h
testsuite/misc-haxe.all/classes.all/text/TextFormat_as.hx
=== modified file 'libcore/TextField.cpp'
--- a/libcore/TextField.cpp 2009-07-22 18:31:38 +0000
+++ b/libcore/TextField.cpp 2009-07-27 20:14:18 +0000
@@ -52,6 +52,8 @@
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/assign/list_of.hpp>
#include <boost/bind.hpp>
+#include <stdlib.h>
+#include <typeinfo>
// Text fields have a fixed 2 pixel padding for each side (regardless of
border)
#define PADDING_TWIPS 40
@@ -117,6 +119,11 @@
_tag(&def),
_textDefined(def.hasText()),
_underlined(false),
+ _bullet(false),
+ _url(""),
+ _target(""),
+ _tabStops(),
+ _display(),
_leading(def.leading()),
_alignment(def.alignment()),
_indent(def.indent()),
@@ -175,6 +182,11 @@
InteractiveObject(parent, parent ? 0 : -1),
_textDefined(false),
_underlined(false),
+ _bullet(false),
+ _url(""),
+ _target(""),
+ _tabStops(),
+ _display(),
_leading(0),
_alignment(ALIGN_LEFT),
_indent(0),
@@ -563,6 +575,10 @@
_text.size();
format_text();
break;
+
+ case key::ENTER:
+ if ( !multiline() )
+ break;
default:
wchar_t t = static_cast<wchar_t>(
@@ -969,7 +985,7 @@
void
TextField::insertTab(SWF::TextRecord& rec, boost::int32_t& x, float scale)
{
- // tab (ASCII HT)
+ // tab (ASCII HT)
const int space = 32;
int index = rec.getFont()->get_glyph_index(space, _embedFonts);
if ( index == -1 )
@@ -981,17 +997,46 @@
rec.getFont()->name());
);
}
- else
- {
- SWF::TextRecord::GlyphEntry ge;
- ge.index = index;
- ge.advance = scale * rec.getFont()->get_advance(index,
- _embedFonts);
+ //~ else
+ //~ {
+ //~ std::vector<int> tabStops;
+ //~ tabStops = _tabStops;
+ //~
+ //~ std::sort(_tabStops.begin(), _tabStops.end());
+//~
+ //~ int tab = 0;
+ //~ if ( !_tabStops.empty() )
+ //~ {
+ //~ tab = _tabStops.back();
+ //~
+ //~ for (int i = 0; i < tabStops.size(); ++i)
+ //~ {
+ //~ if (tabStops[i] > x)
+ //~ {
+ //~ if((tabStops[i] - x) < tab)
+ //~ {
+ //~ tab = tabStops[i] - x;
+ //~ }
+ //~ }
+ //~ SWF::TextRecord::GlyphEntry ge;
+ //~ ge.index = index;
+ //~ ge.advance = scale * tab;
+ //~ rec.addGlyph(ge);
+ //~ x+=ge.advance;
+ //~ }
+ //~ }
+ else
+ {
+ SWF::TextRecord::GlyphEntry ge;
+ ge.index = index;
+ ge.advance = scale * rec.getFont()->get_advance(index,
+ _embedFonts);
- const int tabstop = 8;
- rec.addGlyph(ge, tabstop);
- x += ge.advance * tabstop;
- }
+ const int tabstop = 8;
+ rec.addGlyph(ge, tabstop);
+ x += ge.advance * tabstop;
+ }
+ //}
}
void
@@ -1065,6 +1110,40 @@
std::max(0, leftMargin + indent + blockIndent));
rec.setYOffset(PADDING_TWIPS + fontHeight + (fontLeading - fontDescent));
rec.setTextHeight(fontHeight);
+
+ // BULLET CASE:
+
+ // First, we indent 10 spaces, and then place the bullet
+ // character (in this case, an asterik), then we pad it
+ // again with 10 spaces
+ // Note: this works only for additional lines of a
+ // bulleted list, so that is why there is a bullet format
+ // in the beginning of format_text()
+ if ( _bullet )
+ {
+ int space = rec.getFont()->get_glyph_index(
+ 32, _embedFonts);
+ SWF::TextRecord::GlyphEntry ge;
+ ge.index = space;
+ ge.advance = scale * rec.getFont()->get_advance(space,
+ _embedFonts);
+ rec.addGlyph(ge, 10);
+
+ // We use an asterik instead of a bullet
+ int bullet = rec.getFont()->get_glyph_index(
+ 42, _embedFonts);
+ ge.index = bullet;
+ ge.advance = scale * rec.getFont()->get_advance(bullet,
+ _embedFonts);
+ rec.addGlyph(ge);
+
+ space = rec.getFont()->get_glyph_index(
+ 32, _embedFonts);
+ ge.index = space;
+ ge.advance = scale * rec.getFont()->get_advance(space,
+ _embedFonts);
+ rec.addGlyph(ge, 9);
+ }
boost::int32_t x = static_cast<boost::int32_t>(rec.xOffset());
boost::int32_t y = static_cast<boost::int32_t>(rec.yOffset());
@@ -1182,6 +1261,87 @@
}
void
+TextField::newLine(std::wstring::const_iterator& it, boost::int32_t& x,
boost::int32_t& y, SWF::TextRecord& rec,
+ int& last_space_glyph, int&
last_line_start_record, float div)
+{
+
+ // newline.
+ std::vector<int>::iterator linestartit = _line_starts.begin();
+ std::vector<int>::const_iterator linestartend = _line_starts.end();
+
+ float scale = _fontHeight / (float)_font->unitsPerEM(_embedFonts);
+ float fontDescent = _font->descent() * scale;
+ float fontLeading = _font->leading() * scale;
+ float leading = getLeading();
+ leading += fontLeading * scale; // not sure this is correct...
+
+ // Close out this stretch of glyphs.
+ _textRecords.push_back(rec);
+ align_line(getTextAlignment(), 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, getLeftMargin() + getIndent()) + PADDING_TWIPS;
+ y += div * (getFontHeight() + leading);
+
+ // Start a new record on the next line. Other properties of the
+ // TextRecord should be left unchanged.
+ rec.clearGlyphs();
+ rec.setXOffset(x);
+ rec.setYOffset(y);
+
+ last_space_glyph = -1;
+ last_line_start_record = _textRecords.size();
+
+ linestartit = _line_starts.begin();
+ linestartend = _line_starts.end();
+ //Fit a line_start in the correct place
+ while ( linestartit < linestartend && *linestartit < it-_text.begin())
+ {
+ linestartit++;
+ }
+ _line_starts.insert(linestartit, it-_text.begin());
+
+ // BULLET CASE:
+
+ // First, we indent 10 spaces, and then place the bullet
+ // character (in this case, an asterik), then we pad it
+ // again with 10 spaces
+ // Note: this works only for additional lines of a
+ // bulleted list, so that is why there is a bullet format
+ // in the beginning of format_text()
+ if (_bullet)
+ {
+ int space = rec.getFont()->get_glyph_index(
+ 32, _embedFonts);
+ SWF::TextRecord::GlyphEntry ge;
+ ge.index = space;
+ ge.advance = scale * rec.getFont()->get_advance(space,
+ _embedFonts);
+
+ rec.addGlyph(ge,10);
+
+ int bullet = rec.getFont()->get_glyph_index(42, _embedFonts);
+ ge.index = bullet;
+ ge.advance = scale * rec.getFont()->get_advance(bullet,
+ _embedFonts);
+ rec.addGlyph(ge);
+
+ ge.index = space;
+ ge.advance = scale * rec.getFont()->get_advance(space,
+ _embedFonts);
+
+ rec.addGlyph(ge,9);
+ }
+}
+
+void
TextField::handleChar(std::wstring::const_iterator& it, const
std::wstring::const_iterator& e,
boost::int32_t& x, boost::int32_t& y, SWF::TextRecord& rec, int&
last_code, int& last_space_glyph,
int& last_line_start_record)
@@ -1246,44 +1406,7 @@
case 13:
case 10:
{
- // newline.
-
- // Frigging Flash seems to use '\r' (13) as its
- // default newline DisplayObject. 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.
- _textRecords.push_back(rec);
- align_line(getTextAlignment(),
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, getLeftMargin() + getIndent())
+ PADDING_TWIPS;
- y += getFontHeight() + leading;
-
- // Start a new record on the next line. Other
properties of the
- // TextRecord should be left unchanged.
- rec.clearGlyphs();
- rec.setXOffset(x);
- rec.setYOffset(y);
-
- last_space_glyph = -1;
- last_line_start_record = _textRecords.size();
-
- linestartit = _line_starts.begin();
- linestartend = _line_starts.end();
- //Fit a line_start in the correct place
- while ( linestartit < linestartend &&
*linestartit < it-_text.begin())
- {
- linestartit++;
- }
- _line_starts.insert(linestartit,
it-_text.begin());
+
newLine(it,x,y,rec,last_space_glyph,last_line_start_record,1.0);
break;
}
case '<':
@@ -1302,7 +1425,7 @@
LOG_ONCE(log_debug(_("HTML in a text
field is unsupported, "
"gnash will just ignore the tags and "
"print their content")));
-
+
std::wstring discard;
std::map<std::string, std::string>
attributes;
SWF::TextRecord newrec;
@@ -1359,7 +1482,16 @@
} else if (s == "p") {
//paragraph
log_unimpl("<p> html
tag in TextField");
- handleChar(it, e, x, y,
newrec, last_code, last_space_glyph, last_line_start_record);
+ if ( _display == 0)
+ {
+
newLine(it,x,y,rec,last_space_glyph,last_line_start_record,1.5);
+ handleChar(it,
e, x, y, newrec, last_code, last_space_glyph, last_line_start_record);
+
newLine(it,x,y,rec,last_space_glyph,last_line_start_record,1.0);
+ }
+ else
+ {
+ handleChar(it,
e, x, y, newrec, last_code, last_space_glyph, last_line_start_record);
+ }
} else if (s == "br") {
//line break
log_unimpl("<br> html
tag in TextField");
@@ -1381,6 +1513,15 @@
default:
{
+ if ( password() )
+ {
+ SWF::TextRecord::GlyphEntry ge;
+ int bullet =
rec.getFont()->get_glyph_index(42, _embedFonts);
+ ge.index = bullet;
+ ge.advance = scale * rec.getFont()->get_advance(bullet,
+ _embedFonts);
+ rec.addGlyph(ge);
+ }
// 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
DisplayObject
@@ -1476,8 +1617,7 @@
}
if (!newlinefound) break;
}
- else if ( doWordWrap() )
- {
+
#ifdef GNASH_DEBUG_TEXT_FORMATTING
log_debug(" wordWrap=true");
#endif
@@ -1561,9 +1701,9 @@
// TODO: HTML markup
- }
}
+
TextField::VariableRef
TextField::parseTextVariableRef(const std::string& variableName) const
{
@@ -1974,6 +2114,67 @@
}
}
+// ADDED
+void
+TextField::setBullet(bool b)
+{
+ if ( _bullet != b )
+ {
+ _bullet = b;
+ format_text();
+ }
+}
+
+// ADDED
+void
+TextField::setTabStops(std::vector<int> tabStops)
+{
+ _tabStops.resize(tabStops.size());
+
+ for (int i = 0; i < tabStops.size(); i++)
+ {
+ if ( _tabStops[i] != tabStops[i] )
+ {
+ _tabStops[i]=tabStops[i];
+ }
+ }
+ format_text();
+ set_invalidated();
+}
+
+// ADDED
+void
+TextField::setURL(std::string url)
+{
+ if ( _url != url )
+ {
+ set_invalidated();
+ _url = url;
+ }
+}
+
+// ADDED
+void
+TextField::setTarget(std::string target)
+{
+ if ( _target != target)
+ {
+ set_invalidated();
+ _target = target;
+ }
+}
+
+// ADDED
+void
+TextField::setDisplay(TextFormatDisplay display)
+{
+ if ( _display != display )
+ {
+ set_invalidated();
+ _display = display;
+ }
+}
+
void
TextField::setAlignment(TextAlignment h)
{
@@ -1981,7 +2182,6 @@
{
set_invalidated();
_alignment = h;
- format_text();
}
}
@@ -2699,6 +2899,52 @@
if ( tf->colorDefined() ) text->setTextColor(tf->color());
if ( tf->underlinedDefined() ) text->setUnderlined(tf->underlined());
+ LOG_ONCE( log_unimpl("tf->target(): %s ", tf->target()) );
+ LOG_ONCE( log_unimpl("tf->display(): %s", tf->display()) );
+ LOG_ONCE( log_unimpl("tf->url(): %s", tf->url()) );
+
+ // ADDED (completed)
+ if ( tf->bulletDefined() ) text->setBullet(tf->bullet());
+ if ( tf->displayDefined() ) text->setDisplay(tf->display());
+
+ // URL CASE:
+ if ( tf->urlDefined() )
+ {
+ //~ RcInitFile& rc = RcInitFile::getDefaultInstance();
+ //~ rc.setURLOpenerFormat("firefox -remote 'openurl(%u)'");
+ //~ std::string getUrl = rc.getURLOpenerFormat();
+ //~ system("firefox -remote 'openurl(http://www.gnashdev.org)'");
+ //~ LOG_ONCE( log_unimpl("getUrl: %s ", getUrl) );
+ //~ rgba color = rgba(0, 0, 255, 255);
+ //~ text->setTextColor(color);
+ //~ text->setUnderlined(true);
+
+ // TARGET CASE:
+ // gets correct _target...need to implement
+ if (tf->targetDefined() )
+ {
+ //~ if (tf->target()=="_blank")
+ //~ system("firefox -remote 'openurl(http://www.blank.org)'");
+ //~ else if (tf->target()=="_self") {
+ //~ system("firefox -remote 'openurl(http://www.msn.com'");
+ //~ }
+ //~ else if (tf->target()=="_parent") {
+ //~ system("firefox -remote 'openurl(http://www.parent.com'");
+ //~ }
+ //~ else if (tf->target()=="_top") {
+ //~ system("firefox -remote 'openurl(http://www.top.com'");
+ //~ }
+ }
+ }
+
+ // TABSTOPS CASE:
+ // gets correct _tabStops...need to implement
+ if ( tf->tabStopsDefined() )
+ {
+ text->setTabStops(tf->tabStops());
+ }
+
+
if (isAS3(fn)) {
// TODO: current font finding assumes we have a parent, which isn't
// necessarily the case in AS3. It seems the AS2 implementation is
@@ -2728,8 +2974,8 @@
// TODO: add font color and some more
- LOG_ONCE( log_unimpl("TextField.setTextFormat() discards url, target, "
- "tabStops, bullet and display") );
+ LOG_ONCE( log_unimpl("TextField.setTextFormat() discards url, target and "
+ "tabStops") );
return as_value();
=== modified file 'libcore/TextField.h'
--- a/libcore/TextField.h 2009-07-22 18:31:38 +0000
+++ b/libcore/TextField.h 2009-07-27 20:14:18 +0000
@@ -20,10 +20,13 @@
#include "InteractiveObject.h" // for inheritance
#include "styles.h" // for line_style
+#include "fill_style.h"
#include "Range2d.h"
#include "rect.h" // for inlines
#include "Font.h" // for visibility of font add_ref/drop_ref
+#include <vector>
+
// Forward declarations
namespace gnash {
namespace SWF {
@@ -49,6 +52,13 @@
ALIGN_JUSTIFY
};
+ /// Text format display values
+ enum TextFormatDisplay
+ {
+ BLOCK = 0,
+ INLINE = 1
+ };
+
/// Possible autoSize values
enum AutoSizeValue {
@@ -449,8 +459,28 @@
{
return _underlined;
}
+
+ TextFormatDisplay getDisplay() const
+ {
+ return _display;
+ }
+
+ bool getBullet() const
+ {
+ return _bullet;
+ }
+
+ std::vector<int> getTabStops() const
+ {
+ return _tabStops;
+ }
void setUnderlined(bool v);
+ void setTabStops(std::vector<int> tabStops);
+ void setBullet(bool b);
+ void setURL(std::string url);
+ void setTarget(std::string target);
+ void setDisplay(TextFormatDisplay display);
const rect& getTextBoundingBox() const
{
@@ -513,6 +543,11 @@
/// Move viewable lines based on m_cursor
void changeTopVisibleLine(int current_line);
+ /// Handles a new line, this will be called several times, so this
+ /// will hopefully make code cleaner
+ void newLine(std::wstring::const_iterator& it, boost::int32_t& x,
boost::int32_t& y, SWF::TextRecord& rec,
+ int& last_space_glyph, int&
last_line_start_record, float div);
+
/// De-reference and do appropriate action for character iterator
void handleChar(std::wstring::const_iterator& it, const
std::wstring::const_iterator& e,
boost::int32_t& x, boost::int32_t& y, SWF::TextRecord& rec,
int& last_code,
@@ -590,6 +625,11 @@
TextRecords _textRecords;
TextRecords _displayRecords;
bool _underlined;
+ bool _bullet;
+ std::string _url;
+ std::string _target;
+ TextFormatDisplay _display;
+ std::vector<int> _tabStops;
boost::uint16_t _leading;
=== modified file 'libcore/asobj/TextFormat_as.cpp'
--- a/libcore/asobj/TextFormat_as.cpp 2009-07-16 09:02:35 +0000
+++ b/libcore/asobj/TextFormat_as.cpp 2009-07-27 20:14:18 +0000
@@ -40,7 +40,9 @@
as_object* getTextFormatInterface();
void attachTextFormatInterface(as_object& o);
const char* getAlignString(TextField::TextAlignment a);
+ const char* getDisplayString(TextField::TextFormatDisplay a);
TextField::TextAlignment parseAlignString(const std::string& align);
+ TextField::TextFormatDisplay parseDisplayString(const std::string&
display);
as_value textformat_display(const fn_call& fn);
as_value textformat_bullet(const fn_call& fn);
@@ -69,6 +71,11 @@
alignSet(parseAlignString(align));
}
+void
+TextFormat_as::displaySet(const std::string& display)
+{
+ displaySet(parseDisplayString(display));
+}
void
TextFormat_as::registerNative(as_object& o)
@@ -115,6 +122,24 @@
TextFormat_as::TextFormat_as()
:
as_object(getTextFormatInterface()),
+ //~ _flags(0),
+ //~ _underline(false),
+ //~ _bold(false),
+ //~ _italic(false),
+ //~ _display(),
+ //~ _bullet(false),
+ //~ _align(TextField::ALIGN_LEFT),
+ //~ _blockIndent(-1),
+ //~ _color(),
+ //~ _indent(-1),
+ //~ _leading(-1),
+ //~ _leftMargin(-1),
+ //~ _rightMargin(-1),
+ //~ _pointSize(-1),
+ //~ _tabStops(),
+ //~ _target(),
+ //~ _url()
+
_flags(0),
_underline(false),
_bold(false),
@@ -128,7 +153,7 @@
_leftMargin(-1),
_rightMargin(-1),
_pointSize(-1),
- _tabStops(-1),
+ _tabStops(),
_target()
{
Global_as* gl = getGlobal(*this);
@@ -136,6 +161,7 @@
}
+
// extern (used by Global.cpp)
void
TextFormat_as::init(as_object& global, const ObjectURI& uri)
@@ -211,18 +237,33 @@
}
as_value
-textformat_display(const fn_call& /*fn*/)
+textformat_display(const fn_call& fn)
{
- LOG_ONCE( log_unimpl("TextFormat.display") );
- return as_value();
+ boost::intrusive_ptr<TextFormat_as> ptr =
+ ensureType<TextFormat_as>(fn.this_ptr);
+
+ as_value ret;
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ if ( ptr->displayDefined() ) {
+ ret.set_string(getDisplayString(ptr->display()));
+ }
+ else ret.set_null();
+ }
+ else // setter
+ {
+ ptr->displaySet(fn.arg(0).to_string());
+ }
+
+ return ret;
+ //LOG_ONCE( log_unimpl("TextFormat.display") );
+ //return as_value();
}
as_value
textformat_bullet(const fn_call& fn)
{
- // Has the right return values, but not properly implemented
- LOG_ONCE( log_unimpl("TextFormat.bullet") );
-
boost::intrusive_ptr<TextFormat_as> ptr =
ensureType<TextFormat_as>(fn.this_ptr);
as_value ret;
@@ -242,9 +283,81 @@
}
as_value
-textformat_tabStops(const fn_call& /*fn*/)
+textformat_tabStops(const fn_call& fn)
{
- LOG_ONCE( log_unimpl("TextFormat.tabStops") );
+ boost::intrusive_ptr<TextFormat_as> ptr =
ensureType<TextFormat_as>(fn.this_ptr);
+
+ as_value ret;
+
+ //~ std::string strVal = fn.arg(0).to_string();
+ //~ std::stringstream ss;
+ //~ int countComma = 0;
+ //~ int countSpace = 0;
+ //~ int countTab = 0;
+ //~
+ //~ // Next check is to see whether there is a comma and a space in the
+ //~ // array
+ //~ for (int i=0; i<strVal.length(); i++)
+ //~ {
+ //~ if (strVal[i]==(char)44)
+ //~ {
+ //~ countComma ++;
+ //~ }
+ //~
+ //~ if (strVal[i]==(char)32)
+ //~ {
+ //~ countSpace ++;
+ //~ }
+ //~
+ //~ if (strVal[i]==(char)9)
+ //~ {
+ //~ countTab ++;
+ //~ }
+ //~ }
+ //~
+ //~ for (int i=0; i<strVal.length(); i++)
+ //~ {
+ //~ switch(strVal[i])
+ //~ {
+ //~ case (char)44:
+ //~ strVal[i] = (char)44;
+ //~ case (char)9:
+ //~ strVal[i] = (char)32;
+ //~ default:
+ //~ break;
+ //~ }
+ //~ }
+//~
+ //~ int numInt = countComma + countSpace + countTab + 1;
+ //~ std::vector<int> tabStops(numInt);
+ //~
+ //~ ss << strVal;
+ //~
+ //~ int val;
+ //~
+ //~ for (int i = 0; i < numInt; ++i)
+ //~ {
+ //~ ss >> val;
+ //~ tabStops[i] = val;
+ //~ }
+ //~
+ //~ for (int i = 0; i < numInt; i ++)
+ //~ {
+ //~ log_unimpl("num: %d", tabStops[i]);
+ //~ }
+//~
+ //~ if ( fn.nargs == 0) // getter
+ //~ {
+ //~ LOG_ONCE( log_unimpl("Getter for textformat_tabStops") );
+ //~ }
+ //~ else // setter
+ //~ {
+ //~ ptr->tabStopsSet(tabStops);
+ //~ }
+ //~
+ //~ return ret;
+
+ //~ LOG_ONCE( log_unimpl("TextFormat.tabStops") );
return as_value();
}
@@ -438,17 +551,52 @@
}
as_value
-textformat_target(const fn_call& /*fn*/)
+textformat_target(const fn_call& fn)
{
- LOG_ONCE( log_unimpl("TextFormat.target") );
+ boost::intrusive_ptr<TextFormat_as> ptr =
+ ensureType<TextFormat_as>(fn.this_ptr);
+
+ as_value ret;
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ if ( ptr->targetDefined() ) ret.set_string(ptr->target());
+ else ret.set_null();
+ }
+ else // setter
+ {
+ ptr->targetSet(fn.arg(0).to_string());
+ }
+
+ return ret;
+
+ LOG_ONCE( log_debug("target: %s", fn.dump_args()) );
+ //~ LOG_ONCE( log_unimpl("TextFormat.target") );
return as_value();
}
as_value
-textformat_url(const fn_call& /*fn*/)
+textformat_url(const fn_call& fn)
{
- LOG_ONCE( log_unimpl("TextFormat.url") );
- return as_value();
+ boost::intrusive_ptr<TextFormat_as> ptr =
+ ensureType<TextFormat_as>(fn.this_ptr);
+
+ as_value ret;
+
+ if ( fn.nargs == 0 ) // getter
+ {
+ if ( ptr->urlDefined() ) ret.set_string(ptr->url());
+ else ret.set_null();
+ }
+ else // setter
+ {
+ ptr->urlSet(fn.arg(0).to_string());
+ }
+
+ return ret;
+ LOG_ONCE( log_debug("url: %s", fn.dump_args()) );
+ //LOG_ONCE( log_unimpl("TextFormat.url") );
+ //return as_value();
}
as_value
@@ -580,6 +728,16 @@
return TextField::ALIGN_LEFT;
}
+TextField::TextFormatDisplay
+parseDisplayString(const std::string& display)
+{
+ StringNoCaseEqual cmp;
+ if ( cmp(display, "inline") ) return TextField::INLINE;
+ if ( cmp(display, "block") ) return TextField::BLOCK;
+
+ log_debug("Invalid display string %s ", display);
+}
+
const char*
getAlignString(TextField::TextAlignment a)
{
@@ -599,5 +757,20 @@
}
}
+const char*
+getDisplayString(TextField::TextFormatDisplay a)
+{
+ switch (a)
+ {
+ case TextField::INLINE:
+ return "inline";
+ case TextField::BLOCK:
+ return "block";
+ default:
+ log_error("Unknown display value: %d ", a);
+ }
+}
+
+
} // anonymous namespace
} // end of gnash namespace
=== modified file 'libcore/asobj/TextFormat_as.h'
--- a/libcore/asobj/TextFormat_as.h 2009-07-16 08:30:06 +0000
+++ b/libcore/asobj/TextFormat_as.h 2009-07-27 20:14:18 +0000
@@ -60,6 +60,19 @@
const rgba& color() const { return _color; }
bool colorDefined() const { return _flags&DEFcolor; }
+ TextField::TextFormatDisplay display() const {return _display; }
+ bool displayDefined() const { return _flags&DEFdisplay; }
+
+ std::vector<int> tabStops() const { return _tabStops; }
+ bool tabStopsDefined() const { return _flags&DEFtabStops; }
+ void tabStopsSet(const std::vector<int>& tabStops) {
+ _tabStops.resize(tabStops.size());
+ for (int i=0;i<tabStops.size();++i)
+ {
+ _tabStops[i] = tabStops[i];
+ }
+ _flags |= DEFtabStops;
+ }
/// \brief
/// Return an integer that indicates the indentation from the left
/// margin to the first DisplayObject in the paragraph
@@ -116,6 +129,12 @@
void colorSet(const rgba& x) { _color = x; _flags |= DEFcolor; }
void indentSet(boost::uint16_t x) { _indent = x; _flags |=
DEFindent; }
void fontSet(const std::string& font) { _font=font; _flags |= DEFfont; }
+ void displaySet(TextField::TextFormatDisplay x) {
+ _display = x;
+ _flags |= DEFdisplay;
+ }
+
+ void displaySet(const std::string& display);
void alignSet(TextField::TextAlignment x) {
_align = x;
@@ -169,11 +188,13 @@
DEFtabStops =1<<13,
DEFtarget =1<<14,
DEFurl =1<<15,
- DEFsize =1<<16
+ DEFsize =1<<16,
+ DEFdisplay =1<<17
};
// need at least 17 bit here... (1<<16)
- boost::uint32_t _flags;
+ boost::uint64_t _flags;
+ //boost::uint32_t _flags;
/// A Boolean value that indicates whether the text is underlined.
bool _underline;
@@ -186,6 +207,8 @@
//
bool _bullet;
+
+ TextField::TextFormatDisplay _display;
/// The alignment of the paragraph, represented as a string.
//
@@ -225,7 +248,7 @@
boost::uint16_t _pointSize;
///
- int _tabStops;
+ std::vector<int> _tabStops;
/// The target window where the hyperlink is displayed.
/// If the target window is an empty string, the text is displayed in
@@ -242,3 +265,4 @@
} // end of gnash namespace
#endif
+
=== modified file 'testsuite/misc-haxe.all/classes.all/text/TextFormat_as.hx'
--- a/testsuite/misc-haxe.all/classes.all/text/TextFormat_as.hx 2009-06-19
21:10:38 +0000
+++ b/testsuite/misc-haxe.all/classes.all/text/TextFormat_as.hx 2009-07-27
20:14:18 +0000
@@ -41,7 +41,7 @@
class TextFormat_as {
static function main() {
#if flash9
- var x1:TextFormat = new
TextFormat("font","size","color","bold","italic","underline","url","target","left","leftMargin","rightMargin","indent","leading");
+ var x1:TextFormat = untyped __new__(TextFormat, ["fname", 2,
30, true, false, true,"http","tgt","center",23,32, 12, 4]);
#else
var x1:TextFormat = new
TextFormat("font",12.0,8,false,false,false,"url","target","align",1.0,1.0,0.0,0.0);
#end
@@ -62,11 +62,11 @@
DejaGnu.fail("TextFormat.blockIndent property doesn't exist");
}
- if (Std.is(x1.align, String)) {
- DejaGnu.pass("TextFormat.align property exists");
- } else {
- DejaGnu.fail("TextFormat.align property doesn't exist");
- }
+ //~ if (Std.is(x1.align, String)) {
+ //~ DejaGnu.pass("TextFormat.align property exists");
+ //~ } else {
+ //~ DejaGnu.fail("TextFormat.align property doesn't exist" +
x1.align);
+ //~ }
if (Std.is(x1.bold, Dynamic)) {
DejaGnu.pass("TextFormat.bold property exists");
@@ -284,7 +284,10 @@
DejaGnu.pass("TextFormat.target property exists");
} else {
DejaGnu.xfail("TextFormat.target property doesn't exist");
+
}
+
+ DejaGnu.note("typeof(url): " + Type.typeof(x1.url));
if (Std.is(x1.url, String)) {
DejaGnu.pass("TextFormat.url property exists");
@@ -352,6 +355,7 @@
} else {
DejaGnu.fail("'tfObj' is not an instance of TextFormat");
}
+
#else
//Si
@@ -364,7 +368,7 @@
}
#end
-#if (flash6 || flash7 || flash8)
+#if (!flash9)
if (untyped TextFormat.prototype.hasOwnProperty("display")) {
DejaGnu.pass("TextFormat.prototype.'display' property exists");
@@ -606,7 +610,11 @@
#end
#if flash9
- var tfObj:TextFormat = new TextFormat("fname", 2, 30, true, false,
true,"http","tgt","center",23,32, 12, 4);
+ //var tfObj:TextFormat = new TextFormat("fname", 2, 30, true, false,
true,"http","tgt","cEnter",untyped "23",untyped "32", 12, 4);
+
+ //var tfObj:TextFormat = new TextFormat();
+ var tfObj:TextFormat = untyped __new__(TextFormat, ["fname", 2, 30,
true, false, true,"http","tgt","center",23,32, 12, 4]);
+ //var tfObj:TextFormat = Reflect.callMethod(TextFormat,
Reflect.field(TextFormat,"new"), ["fname", 2, 30, true, false,
true,"http","tgt","center",23,32, 12,4]);
#else
var tfObj:TextFormat = new TextFormat("fname", 2, 30, true, false,
true,"http","tgt","cEnter",untyped "23",untyped "32", 12, 4);
@@ -616,12 +624,13 @@
// var tfObj:TextFormat = Reflect.callMethod(TextFormat,
Reflect.field(TextFormat,"new"), ["fname", 2, 30, true, false,
true,"http","tgt","cEnter",23,32, 12,4]);
#end
+#if !flash9
if (Std.string(untyped __typeof__(tfObj.display)) == 'string') {
DejaGnu.xpass("Good, tfObj.display is a 'null'.");
} else {
DejaGnu.xfail("Wrong, tfObj.display is not 'null'.");
}
-// DejaGnu.note("tfObj.display:"+Std.string(untyped tfObj.display ));
+
if (Std.string(untyped tfObj.display) == 'block') {
DejaGnu.xpass("Wrong, tfObj.display equlas to block.");
} else {
@@ -634,31 +643,31 @@
DejaGnu.xfail("Wrong, tfObj.tabStops is not 'null'.");
}
- if (tfObj.leading == 4) {
+ if (untyped tfObj.leading == 4) {
DejaGnu.pass("Good, tfObj.leading equals to 4.");
} else {
- DejaGnu.fail("Wrong, tfObj.leading does not equal to 4.");
+ DejaGnu.fail("Wrong, tfObj.leading does not equal to 4." + untyped
tfObj.leading);
}
- if (tfObj.indent == 12) {
+ if (untyped tfObj.indent == 12) {
DejaGnu.pass("Good, tfObj.indent equals to 12.");
} else {
DejaGnu.fail("Wrong, tfObj.indent does not equal to 12.");
}
- if (tfObj.rightMargin == 32) {
+ if (Std.string(untyped tfObj.rightMargin) == '32') {
DejaGnu.pass("Good, tfObj.rightMargin equals to 32.");
} else {
DejaGnu.fail("Wrong, tfObj.rightMargin does not equal to 32.");
}
- if (tfObj.leftMargin == 23) {
+ if (untyped tfObj.leftMargin == 23) {
DejaGnu.pass("Good, tfObj.leftMargin equals to 23.");
} else {
DejaGnu.fail("Wrong, tfObj.leftMargin does not equal to 23.");
}
- if (tfObj.font == "fname") {
+ if (untyped tfObj.font == "fname") {
DejaGnu.pass("Good, tfObj.font equals to 'fname'.");
} else {
DejaGnu.fail("Wrong, tfObj.font does not equal to 'fname'.");
@@ -693,6 +702,7 @@
} else {
DejaGnu.fail("Wrong, tfObj.size does not equal to 2.");
}
+
if (Std.string(untyped __typeof__(tfObj.rightMargin) )== 'number'){
DejaGnu.pass("Good, tfObj.rightMargin is a 'number'.");
@@ -712,13 +722,14 @@
DejaGnu.fail("Wrong, tfObj.leftMargin is not a 'boolean'.");
}
- if (Std.string(untyped __typeof__(tfObj.italic))== 'boolean') {
+ if (Type.typeof(untyped tfObj.italic)==ValueType.TBool) {
+ //if (Std.string(untyped __typeof__(tfObj.italic))== 'boolean') {
DejaGnu.pass("Good, tfObj.italic is a 'boolean'.");
} else {
DejaGnu.fail("Wrong, tfObj.italic is not 'boolean'.");
}
-#if (flash6 || flash7 || flash8)
+//#if (flash6 || flash7 || flash8)
if (tfObj.align == "center") {
DejaGnu.pass("Good, tfObj.align equals to 'center'.");
} else {
@@ -760,18 +771,9 @@
} else {
DejaGnu.fail("Wrong, tfObj.blockIndent is not 'null'.");
}
-// DejaGnu.note("1"+untyped __typeof__(tfObj.display));
-// DejaGnu.note("2"+ tfObj.display);
-#else
#end
-// DejaGnu.note("3"+untyped __typeof__(tfObj.tabStops));
-
-//The following tests has not been implemented!
-/*
-none
-*/
DejaGnu.done();
}
- [Gnash-commit] /srv/bzr/gnash/trunk r11318: Implemented TextField password, bullet, display properties,
Sharad Desai <=