search for: tags_closed

...TextField's HTML parsing code somewhat, fix few version 6 issues diff --git a/libswfdec/swfdec_html_parser.c b/libswfdec/swfdec_html_parser.c index 5d058df..5bd0367 100644 --- a/libswfdec/swfdec_html_parser.c +++ b/libswfdec/swfdec_html_parser.c @@ -44,6 +44,39 @@ typedef struct { GSList * tags_closed; } ParserData; +static void +swfdec_text_field_movie_html_parse_close_tag (ParserData *data, ParserTag *tag) +{ + if (data->cx->version < 7 && + ((tag->name_length == 1 && !g_strncasecmp (tag->name, "p", 1)) || + (tag->name_length == 2 &amp...

...*n = g_new0 (ParserTag, 1); n->name = f->name; n->name_length = f->name_length; - n->index = g_utf8_strlen (data->text->str, -1); + n->index = data->text->len; n->end_index = n->index + 1; n->format = swfdec_text_format_copy (f->format); data->tags_closed = g_slist_prepend (data->tags_closed, n); @@ -81,7 +81,7 @@ swfdec_text_field_movie_html_parse_close_tag (ParserData *data, ParserTag *tag) data->text = g_string_append_c (data->text, '\n'); } - tag->end_index = g_utf8_strlen (data->text->str, -1); + tag->en...

...>name, "img", 3)) + { + SWFDEC_FIXME ("IMG tag support for TextField's HTML input missing"); + } } if (data->style_sheet && @@ -478,7 +482,7 @@ swfdec_text_field_movie_html_parse (SwfdecTextFieldMovie *text, const char *str) while (data.tags_closed != NULL) { ParserTag *tag = (ParserTag *)data.tags_closed->data; - if (tag->index != tag->end_index) { + if (tag->index != tag->end_index && tag->format != NULL) { swfdec_text_field_movie_set_text_format (text, tag->format, tag->index, tag-&gt...

...mp;& !g_strncasecmp (name, "li", 2))) { @@ -255,6 +253,8 @@ swfdec_text_field_movie_html_parse_tag (ParserData *data, const char *p) } } + tag->end_index = data->text->len; + data->tags_open = g_slist_remove (data->tags_open, tag); data->tags_closed = g_slist_prepend (data->tags_closed, tag); } commit 0e9a542dee29e14e3bc4c26ffcb4711c6dec4090 Author: Pekka Lampila <pekka.lampila at iki.fi> Date: Fri Oct 19 12:23:46 2007 +0300 Don't parse kerning in TextField's html input. Fix font closing tag's position diff --...

...gt;name; n->name_length = f->name_length; - n->index = data->text->len; - n->end_index = data->text->len + 1; + n->index = g_utf8_strlen (data->text->str, -1); + n->end_index = n->index + 1; n->format = swfdec_text_format_copy (f->format); data->tags_closed = g_slist_prepend (data->tags_closed, n); break; @@ -73,7 +73,7 @@ swfdec_text_field_movie_html_parse_close_tag (ParserData *data, ParserTag *tag) data->text = g_string_append_c (data->text, '\n'); } - tag->end_index = data->text->len; + tag->end_index = g...

...movie_html.c index 0a2d950..1a007a9 100644 --- a/libswfdec/swfdec_text_field_movie_html.c +++ b/libswfdec/swfdec_text_field_movie_html.c @@ -494,6 +494,7 @@ swfdec_text_field_movie_html_parse (SwfdecTextFieldMovie *text, const char *str) tag->end_index); } + g_free (tag); data.tags_closed = g_slist_remove (data.tags_closed, tag); } } commit 9ddbc49a70935eeac9fe5e2d22f53a9b2f6c5a7b Author: Pekka Lampila <pekka.lampila at iki.fi> Date: Sat Nov 3 19:11:02 2007 +0200 Fix a memory leak in TextField code (PangoLayoutIter not freed) diff --git a/libswfdec/swfdec_text_fiel...

...ec_style_sheet.h" #include "swfdec_xml.h" #include "swfdec_debug.h" @@ -41,6 +42,7 @@ typedef struct { SwfdecAsContext *cx; gboolean multiline; gboolean condense_white; + SwfdecStyleSheet *style_sheet; GString * text; GSList * tags_open; GSList * tags_closed; @@ -97,8 +99,9 @@ swfdec_text_field_movie_html_parse_comment (ParserData *data, const char *p) } static void -swfdec_text_field_movie_html_tag_set_attribute (ParserTag *tag, - const char *name, int name_length, const char *value, int value_length) +swfdec_text_field_movie_html_tag_set_attri...

...name; - int name_length; - guint index; - guint end_index; - SwfdecTextFormat *format; -} ParserTag; - -typedef struct { - SwfdecAsContext *cx; - gboolean multiline; - gboolean condense_white; - SwfdecStyleSheet *style_sheet; - GString * text; - GSList * tags_open; - GSList * tags_closed; -} ParserData; - -static void -swfdec_text_field_movie_html_parse_close_tag (ParserData *data, ParserTag *tag) -{ - if (data->multiline && - ((tag->name_length == 1 && !g_strncasecmp (tag->name, "p", 1)) || - (tag->name_length == 2 && !g_st...

...quot;); + data.cx = SWFDEC_AS_OBJECT (text)->context; data.multiline = (data.cx->version < 7 || text->text->multiline); data.condense_white = text->condense_white; - data.text = g_string_new (""); + data.text = text->input; data.tags_open = NULL; data.tags_closed = NULL; @@ -422,10 +424,6 @@ swfdec_text_field_movie_html_parse (SwfdecTextFieldMovie *text, const char *str) (ParserTag *)data.tags_open->data); } - // set parsed text - text->text_display = - swfdec_as_context_give_string (data.cx, g_string_free (data.text, FALSE)); - // ad...

...eet = text->style_sheet; + if (text->style_sheet != NULL && SWFDEC_IS_STYLESHEET (text->style_sheet)) { + data.style_sheet = SWFDEC_STYLESHEET (text->style_sheet); + } else { + data.style_sheet = NULL; + } data.text = text->input; data.tags_open = NULL; data.tags_closed = NULL; diff --git a/libswfdec/swfdec_text_field_movie.c b/libswfdec/swfdec_text_field_movie.c index d7f2967..a1c3729 100644 --- a/libswfdec/swfdec_text_field_movie.c +++ b/libswfdec/swfdec_text_field_movie.c @@ -858,8 +858,10 @@ swfdec_text_field_movie_dispose (GObject *object) text = SWFDEC_TE...