From d488d298e303cb2be18ff217330cd1574fcb384f Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 15 Jul 2012 17:40:08 +0100 Subject: XML binding: Not libxml only any more --- bindings/xml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bindings') diff --git a/bindings/xml/Makefile b/bindings/xml/Makefile index e75e362..ea7653c 100644 --- a/bindings/xml/Makefile +++ b/bindings/xml/Makefile @@ -26,7 +26,7 @@ ifeq ($(WITH_EXPAT_BINDING),yes) endif ifeq ($(DO_XML_INSTALL),yes) - DIR_INSTALL_ITEMS := /include/dom/bindings/libxml:xmlerror.h;xmlparser.h + DIR_INSTALL_ITEMS := /include/dom/bindings/xml:xmlerror.h;xmlparser.h endif include $(NSBUILD)/Makefile.subdir -- cgit v1.2.3 From a45056f4dd306e6ff06d2ec77b129b8e27add45e Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 15 Jul 2012 17:41:02 +0100 Subject: XML binding: Expat handler, dodgy external entity ref handler --- bindings/xml/expat_xmlparser.c | 143 +++++++++++++++++++++++++++-------------- 1 file changed, 95 insertions(+), 48 deletions(-) (limited to 'bindings') diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index ce649d7..3f9c51c 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -42,9 +42,7 @@ expat_xmlparser_start_element_handler(void *_parser, dom_exception err; dom_element *elem, *ins_elem; dom_string *tag_name; - - fprintf(stderr, "<%s>\n", name); - + err = dom_string_create((const uint8_t *)name, strlen(name), &tag_name); @@ -53,7 +51,7 @@ expat_xmlparser_start_element_handler(void *_parser, "No memory for tag name"); return; } - + err = dom_document_create_element(parser->doc, tag_name, &elem); if (err != DOM_NO_ERR) { dom_string_unref(tag_name); @@ -61,15 +59,15 @@ expat_xmlparser_start_element_handler(void *_parser, "Failed to create element '%s'", name); return; } - + dom_string_unref(tag_name); - + /* Add attributes to the element */ - + while (*atts) { dom_string *key, *value; - err = dom_string_create((const uint8_t *)(*atts), + err = dom_string_create((const uint8_t *)(*atts), strlen(*atts), &key); if (err != DOM_NO_ERR) { parser->msg(DOM_MSG_CRITICAL, parser->mctx, @@ -88,7 +86,7 @@ expat_xmlparser_start_element_handler(void *_parser, return; } atts++; - + err = dom_element_set_attribute(elem, key, value); dom_string_unref(key); dom_string_unref(value); @@ -99,7 +97,7 @@ expat_xmlparser_start_element_handler(void *_parser, return; } } - + err = dom_node_append_child(parser->current, elem, &ins_elem); if (err != DOM_NO_ERR) { dom_node_unref(elem); @@ -107,9 +105,9 @@ expat_xmlparser_start_element_handler(void *_parser, "No memory for appending child node"); return; } - + dom_node_unref(ins_elem); - + dom_node_unref(parser->current); parser->current = (struct dom_node *)elem; /* Steal initial ref */ } @@ -121,19 +119,17 @@ expat_xmlparser_end_element_handler(void *_parser, dom_xml_parser *parser = _parser; dom_exception err; dom_node *parent; - + UNUSED(name); - - fprintf(stderr, "\n", name); - + err = dom_node_get_parent_node(parser->current, &parent); - + if (err != DOM_NO_ERR) { parser->msg(DOM_MSG_CRITICAL, parser->mctx, "Unable to find a parent while closing element."); return; } - + dom_node_unref(parser->current); parser->current = parent; /* Takes the ref given by get_parent_node */ } @@ -147,14 +143,14 @@ expat_xmlparser_cdata_handler(void *_parser, dom_string *data; dom_exception err; struct dom_cdata_section *cdata, *ins_cdata; - + err = dom_string_create((const uint8_t *)s, len, &data); if (err != DOM_NO_ERR) { parser->msg(DOM_MSG_CRITICAL, parser->mctx, "No memory for cdata section contents"); return; } - + err = dom_document_create_cdata_section(parser->doc, data, &cdata); if (err != DOM_NO_ERR) { dom_string_unref(data); @@ -162,7 +158,7 @@ expat_xmlparser_cdata_handler(void *_parser, "No memory for cdata section"); return; } - + /* No longer need data */ dom_string_unref(data); @@ -184,14 +180,62 @@ expat_xmlparser_cdata_handler(void *_parser, dom_node_unref((struct dom_node *) cdata); } +static int +expat_xmlparser_external_entity_ref_handler(XML_Parser parser, + const XML_Char *context, + const XML_Char *base, + const XML_Char *system_id, + const XML_Char *public_id) +{ + FILE *fh; + XML_Parser subparser; + unsigned char data[1024]; + size_t len; + enum XML_Status status; + + UNUSED(base); + UNUSED(public_id); + + if (system_id == NULL) + return XML_STATUS_OK; + + fh = fopen(system_id, "r"); + + if (fh == NULL) + return XML_STATUS_OK; + + subparser = XML_ExternalEntityParserCreate(parser, + context, + NULL); + + if (subparser == NULL) { + fclose(fh); + return XML_STATUS_OK; + } + + /* Parse the file bit by bit */ + while ((len = fread(data, 1, 1024, fh)) > 0) { + status = XML_Parse(subparser, (const char *)data, len, 0); + if (status != XML_STATUS_OK) { + XML_ParserFree(subparser); + fclose(fh); + return XML_STATUS_OK; + } + } + XML_Parse(subparser, "", 0, 1); + XML_ParserFree(subparser); + fclose(fh); + return XML_STATUS_OK; +} + static void expat_xmlparser_unknown_data_handler(void *_parser, const XML_Char *s, int len) { UNUSED(_parser); - - fprintf(stderr, "!!! %.*s !!!\n", len, s); + UNUSED(s); + UNUSED(len); } /** * Create an XML parser instance @@ -210,29 +254,29 @@ dom_xml_parser_create(const char *enc, const char *int_enc, { dom_xml_parser *parser; dom_exception err; - + UNUSED(int_enc); - + parser = calloc(sizeof(*parser), 1); if (parser == NULL) { msg(DOM_MSG_CRITICAL, mctx, "No memory for parser"); return NULL; } - + parser->msg = msg; parser->mctx = mctx; - + parser->parser = XML_ParserCreateNS(enc, ':'); - + if (parser->parser == NULL) { free(parser); msg(DOM_MSG_CRITICAL, mctx, "No memory for parser"); return NULL; } - + parser->complete = false; parser->doc = NULL; - + err = dom_implementation_create_document( DOM_IMPLEMENTATION_XML, /* namespace */ NULL, @@ -240,32 +284,35 @@ dom_xml_parser_create(const char *enc, const char *int_enc, /* doctype */ NULL, NULL, &parser->doc); - + if (err != DOM_NO_ERR) { - parser->msg(DOM_MSG_CRITICAL, parser->mctx, + parser->msg(DOM_MSG_CRITICAL, parser->mctx, "Failed creating document"); XML_ParserFree(parser->parser); free(parser); return NULL; } - + XML_SetUserData(parser->parser, parser); - + XML_SetElementHandler(parser->parser, expat_xmlparser_start_element_handler, expat_xmlparser_end_element_handler); - + XML_SetCharacterDataHandler(parser->parser, expat_xmlparser_cdata_handler); - - XML_SetParamEntityParsing(parser->parser, + + XML_SetParamEntityParsing(parser->parser, XML_PARAM_ENTITY_PARSING_ALWAYS); - - XML_SetDefaultHandler(parser->parser, + + XML_SetExternalEntityRefHandler(parser->parser, + expat_xmlparser_external_entity_ref_handler); + + XML_SetDefaultHandlerExpand(parser->parser, expat_xmlparser_unknown_data_handler); - + parser->current = dom_node_ref(parser->doc); - + return parser; } @@ -278,7 +325,7 @@ void dom_xml_parser_destroy(dom_xml_parser *parser) { XML_ParserFree(parser->parser); - + free(parser); } @@ -294,14 +341,14 @@ dom_xml_error dom_xml_parser_parse_chunk(dom_xml_parser *parser, uint8_t *data, size_t len) { enum XML_Status status; - + status = XML_Parse(parser->parser, (const char *)data, len, 0); if (status != XML_STATUS_OK) { parser->msg(DOM_MSG_ERROR, parser->mctx, "XML_Parse failed: %d", status); return DOM_XML_EXTERNAL_ERR | status; } - + return DOM_XML_OK; } @@ -313,20 +360,20 @@ dom_xml_parser_parse_chunk(dom_xml_parser *parser, uint8_t *data, size_t len) * * This will force any remaining data through the parser */ -dom_xml_error +dom_xml_error dom_xml_parser_completed(dom_xml_parser *parser) { enum XML_Status status; - + status = XML_Parse(parser->parser, "", 0, 1); if (status != XML_STATUS_OK) { parser->msg(DOM_MSG_ERROR, parser->mctx, "XML_Parse failed: %d", status); return DOM_XML_EXTERNAL_ERR | status; } - + parser->complete = true; - + return DOM_XML_OK; } -- cgit v1.2.3 From c86f1c6c5a5aab4a5e99bf2617ddf4f15dde20c5 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 15 Jul 2012 17:46:33 +0100 Subject: XML Binding: Add comment support to Expat handler --- bindings/xml/expat_xmlparser.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'bindings') diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 3f9c51c..4c5cbef 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -228,6 +228,55 @@ expat_xmlparser_external_entity_ref_handler(XML_Parser parser, return XML_STATUS_OK; } +static void +expat_xmlparser_comment_handler(void *_parser, + const XML_Char *_comment) +{ + dom_xml_parser *parser = _parser; + struct dom_comment *comment, *ins_comment = NULL; + dom_string *data; + dom_exception err; + + /* Create DOM string data for comment */ + err = dom_string_create((const uint8_t *)_comment, + strlen((const char *) _comment), &data); + if (err != DOM_NO_ERR) { + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "No memory for comment data"); + return; + } + + /* Create comment */ + err = dom_document_create_comment(parser->doc, data, &comment); + if (err != DOM_NO_ERR) { + dom_string_unref(data); + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "No memory for comment node"); + return; + } + + /* No longer need data */ + dom_string_unref(data); + + /* Append comment to parent */ + err = dom_node_append_child(parser->current, (struct dom_node *) comment, + (struct dom_node **) (void *) &ins_comment); + if (err != DOM_NO_ERR) { + dom_node_unref((struct dom_node *) comment); + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "Failed attaching comment node"); + return; + } + + /* We're not interested in the inserted comment */ + if (ins_comment != NULL) + dom_node_unref((struct dom_node *) ins_comment); + + /* No longer interested in comment */ + dom_node_unref((struct dom_node *) comment); + +} + static void expat_xmlparser_unknown_data_handler(void *_parser, const XML_Char *s, @@ -308,6 +357,9 @@ dom_xml_parser_create(const char *enc, const char *int_enc, XML_SetExternalEntityRefHandler(parser->parser, expat_xmlparser_external_entity_ref_handler); + XML_SetCommentHandler(parser->parser, + expat_xmlparser_comment_handler); + XML_SetDefaultHandlerExpand(parser->parser, expat_xmlparser_unknown_data_handler); -- cgit v1.2.3 From 575c52aad811bbfce12faac963256d4872c51598 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 15 Jul 2012 17:58:25 +0100 Subject: XML Binding: Add doctype support to Expat handler --- bindings/xml/expat_xmlparser.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'bindings') diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 4c5cbef..42abdfe 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -277,6 +277,48 @@ expat_xmlparser_comment_handler(void *_parser, } +static void +expat_xmlparser_start_doctype_decl_handler(void *_parser, + const XML_Char *doctype_name, + const XML_Char *system_id, + const XML_Char *public_id, + int has_internal_subset) +{ + dom_xml_parser *parser = _parser; + struct dom_document_type *doctype, *ins_doctype = NULL; + dom_exception err; + + UNUSED(has_internal_subset); + + err = dom_implementation_create_document_type( + doctype_name, system_id ? system_id : "", + public_id ? public_id : "", + &doctype); + + if (err != DOM_NO_ERR) { + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "Failed to create document type"); + return; + } + + /* Add doctype to document */ + err = dom_node_append_child(parser->doc, (struct dom_node *) doctype, + (struct dom_node **) (void *) &ins_doctype); + if (err != DOM_NO_ERR) { + dom_node_unref((struct dom_node *) doctype); + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "Failed attaching doctype"); + return; + } + + /* Not interested in inserted node */ + if (ins_doctype != NULL) + dom_node_unref((struct dom_node *) ins_doctype); + + /* No longer interested in doctype */ + dom_node_unref((struct dom_node *) doctype); +} + static void expat_xmlparser_unknown_data_handler(void *_parser, const XML_Char *s, @@ -360,6 +402,9 @@ dom_xml_parser_create(const char *enc, const char *int_enc, XML_SetCommentHandler(parser->parser, expat_xmlparser_comment_handler); + XML_SetStartDoctypeDeclHandler(parser->parser, + expat_xmlparser_start_doctype_decl_handler); + XML_SetDefaultHandlerExpand(parser->parser, expat_xmlparser_unknown_data_handler); -- cgit v1.2.3 From e31173cd5d116a49d3c11ab732e639ca3cc3ecd1 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 15 Jul 2012 18:15:26 +0100 Subject: XML Binding: Allow expat binding to create text nodes if not parsing cdata --- bindings/xml/expat_xmlparser.c | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'bindings') diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 42abdfe..7f4fa03 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -29,6 +29,7 @@ struct dom_xml_parser { bool complete; /**< Indicate stream completion */ struct dom_document *doc; /**< DOM Document we're building */ struct dom_node *current; /**< DOM node we're currently building */ + bool is_cdata; /**< If the character data is cdata or text */ }; /* Binding functions */ @@ -134,6 +135,22 @@ expat_xmlparser_end_element_handler(void *_parser, parser->current = parent; /* Takes the ref given by get_parent_node */ } +static void +expat_xmlparser_start_cdata_handler(void *_parser) +{ + dom_xml_parser *parser = _parser; + + parser->is_cdata = true; +} + +static void +expat_xmlparser_end_cdata_handler(void *_parser) +{ + dom_xml_parser *parser = _parser; + + parser->is_cdata = false; +} + static void expat_xmlparser_cdata_handler(void *_parser, const XML_Char *s, @@ -142,7 +159,7 @@ expat_xmlparser_cdata_handler(void *_parser, dom_xml_parser *parser = _parser; dom_string *data; dom_exception err; - struct dom_cdata_section *cdata, *ins_cdata; + struct dom_node *cdata, *ins_cdata; err = dom_string_create((const uint8_t *)s, len, &data); if (err != DOM_NO_ERR) { @@ -151,7 +168,11 @@ expat_xmlparser_cdata_handler(void *_parser, return; } - err = dom_document_create_cdata_section(parser->doc, data, &cdata); + err = parser->is_cdata ? + dom_document_create_cdata_section(parser->doc, data, + (dom_cdata_section **)&cdata) : + dom_document_create_text_node(parser->doc, data, + (dom_text **)&cdata); if (err != DOM_NO_ERR) { dom_string_unref(data); parser->msg(DOM_MSG_CRITICAL, parser->mctx, @@ -163,8 +184,7 @@ expat_xmlparser_cdata_handler(void *_parser, dom_string_unref(data); /* Append cdata section to parent */ - err = dom_node_append_child(parser->current, (struct dom_node *) cdata, - (struct dom_node **) (void *) &ins_cdata); + err = dom_node_append_child(parser->current, cdata, &ins_cdata); if (err != DOM_NO_ERR) { dom_node_unref((struct dom_node *) cdata); parser->msg(DOM_MSG_ERROR, parser->mctx, @@ -174,10 +194,10 @@ expat_xmlparser_cdata_handler(void *_parser, /* We're not interested in the inserted cdata section */ if (ins_cdata != NULL) - dom_node_unref((struct dom_node *) ins_cdata); + dom_node_unref(ins_cdata); /* No longer interested in cdata section */ - dom_node_unref((struct dom_node *) cdata); + dom_node_unref(cdata); } static int @@ -390,6 +410,10 @@ dom_xml_parser_create(const char *enc, const char *int_enc, expat_xmlparser_start_element_handler, expat_xmlparser_end_element_handler); + XML_SetCdataSectionHandler(parser->parser, + expat_xmlparser_start_cdata_handler, + expat_xmlparser_end_cdata_handler); + XML_SetCharacterDataHandler(parser->parser, expat_xmlparser_cdata_handler); @@ -410,6 +434,8 @@ dom_xml_parser_create(const char *enc, const char *int_enc, parser->current = dom_node_ref(parser->doc); + parser->is_cdata = false; + return parser; } -- cgit v1.2.3 From 2f4be485272446109e4451a19dc29ba6728f0039 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Sun, 15 Jul 2012 18:26:47 +0100 Subject: XML Binding: Allow expat handler to coalesce TEXT nodes. Core suite now passes with expat. --- bindings/xml/expat_xmlparser.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) (limited to 'bindings') diff --git a/bindings/xml/expat_xmlparser.c b/bindings/xml/expat_xmlparser.c index 7f4fa03..1077bc9 100644 --- a/bindings/xml/expat_xmlparser.c +++ b/bindings/xml/expat_xmlparser.c @@ -159,7 +159,8 @@ expat_xmlparser_cdata_handler(void *_parser, dom_xml_parser *parser = _parser; dom_string *data; dom_exception err; - struct dom_node *cdata, *ins_cdata; + struct dom_node *cdata, *ins_cdata, *lastchild = NULL; + dom_node_type ntype = 0; err = dom_string_create((const uint8_t *)s, len, &data); if (err != DOM_NO_ERR) { @@ -168,6 +169,39 @@ expat_xmlparser_cdata_handler(void *_parser, return; } + err = dom_node_get_last_child(parser->current, &lastchild); + + if (err == DOM_NO_ERR && lastchild != NULL) { + err = dom_node_get_node_type(lastchild, &ntype); + } + + if (err != DOM_NO_ERR) { + dom_string_unref(data); + if (lastchild != NULL) + dom_node_unref(lastchild); + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "No memory for cdata section"); + return; + } + + if (ntype == DOM_TEXT_NODE && parser->is_cdata == false) { + /* We can append this text instead */ + err = dom_characterdata_append_data( + (dom_characterdata *)lastchild, data); + dom_string_unref(data); + if (lastchild != NULL) + dom_node_unref(lastchild); + if (err != DOM_NO_ERR) { + parser->msg(DOM_MSG_CRITICAL, parser->mctx, + "No memory for cdata section"); + } + return; + } + + if (lastchild != NULL) + dom_node_unref(lastchild); + + /* We can't append directly, so make a new node */ err = parser->is_cdata ? dom_document_create_cdata_section(parser->doc, data, (dom_cdata_section **)&cdata) : -- cgit v1.2.3 From 4e9b84df0f10116c0e73f1aaf80f9327d2bbbd3d Mon Sep 17 00:00:00 2001 From: Daniel Silverstone Date: Wed, 18 Jul 2012 17:30:16 +0100 Subject: HTMLTextAreaElement: Make it work --- Makefile | 1 + bindings/hubbub/parser.c | 10 + include/dom/dom.h | 1 + include/dom/html/html_text_area_element.h | 82 +++++ include/dom/html/html_textarea_element.h | 7 - src/html/Makefile | 4 +- src/html/html_document.c | 6 + src/html/html_document_strings.h | 2 + src/html/html_text_area_element.c | 494 ++++++++++++++++++++++++++++++ src/html/html_text_area_element.h | 62 ++++ src/html/html_textarea_element.c | 7 - src/html/html_textarea_element.h | 7 - 12 files changed, 660 insertions(+), 23 deletions(-) create mode 100644 include/dom/html/html_text_area_element.h delete mode 100644 include/dom/html/html_textarea_element.h create mode 100644 src/html/html_text_area_element.c create mode 100644 src/html/html_text_area_element.h delete mode 100644 src/html/html_textarea_element.c delete mode 100644 src/html/html_textarea_element.h (limited to 'bindings') diff --git a/Makefile b/Makefile index 1bb3da5..8b64f4b 100644 --- a/Makefile +++ b/Makefile @@ -90,6 +90,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_meta_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_form_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_button_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_input_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_text_area_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /lib/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /lib:$(OUTPUT) diff --git a/bindings/hubbub/parser.c b/bindings/hubbub/parser.c index 173d45f..a4a9a2e 100644 --- a/bindings/hubbub/parser.c +++ b/bindings/hubbub/parser.c @@ -26,6 +26,7 @@ #include "html/html_document.h" #include "html/html_button_element.h" #include "html/html_input_element.h" +#include "html/html_text_area_element.h" #include @@ -496,6 +497,15 @@ static hubbub_error form_associate(void *parser, void *form, void *node) "Error in form_associate"); return HUBBUB_UNKNOWN; } + } else if (dom_string_caseless_isequal(ele->name, + doc->memoised[hds_TEXTAREA])) { + err = _dom_html_text_area_element_set_form( + (dom_html_text_area_element *)node, form_ele); + if (err != DOM_NO_ERR) { + dom_parser->msg(DOM_MSG_CRITICAL, dom_parser->mctx, + "Error in form_associate"); + return HUBBUB_UNKNOWN; + } } return HUBBUB_OK; diff --git a/include/dom/dom.h b/include/dom/dom.h index c07231c..bfe9378 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -49,6 +49,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_text_area_element.h b/include/dom/html/html_text_area_element.h new file mode 100644 index 0000000..37264cf --- /dev/null +++ b/include/dom/html/html_text_area_element.h @@ -0,0 +1,82 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2012 Daniel Silverstone + */ + +#ifndef dom_html_text_area_element_h_ +#define dom_html_text_area_element_h_ + +#include +#include +#include +#include + +typedef struct dom_html_text_area_element dom_html_text_area_element; + +dom_exception dom_html_text_area_element_get_default_value( + dom_html_text_area_element *text_area, dom_string **default_value); + +dom_exception dom_html_text_area_element_set_default_value( + dom_html_text_area_element *text_area, dom_string *default_value); + +dom_exception dom_html_text_area_element_get_form( + dom_html_text_area_element *text_area, dom_html_form_element **form); + +dom_exception dom_html_text_area_element_get_access_key( + dom_html_text_area_element *text_area, dom_string **access_key); + +dom_exception dom_html_text_area_element_set_access_key( + dom_html_text_area_element *text_area, dom_string *access_key); + +dom_exception dom_html_text_area_element_get_disabled( + dom_html_text_area_element *text_area, bool *disabled); + +dom_exception dom_html_text_area_element_set_disabled( + dom_html_text_area_element *text_area, bool disabled); + +dom_exception dom_html_text_area_element_get_cols( + dom_html_text_area_element *text_area, unsigned long *cols); + +dom_exception dom_html_text_area_element_set_cols( + dom_html_text_area_element *text_area, unsigned long cols); + +dom_exception dom_html_text_area_element_get_rows( + dom_html_text_area_element *text_area, unsigned long *rows); + +dom_exception dom_html_text_area_element_set_rows( + dom_html_text_area_element *text_area, unsigned long rows); + +dom_exception dom_html_text_area_element_get_name( + dom_html_text_area_element *text_area, dom_string **name); + +dom_exception dom_html_text_area_element_set_name( + dom_html_text_area_element *text_area, dom_string *name); + +dom_exception dom_html_text_area_element_get_read_only( + dom_html_text_area_element *text_area, bool *read_only); + +dom_exception dom_html_text_area_element_set_read_only( + dom_html_text_area_element *text_area, bool read_only); + +dom_exception dom_html_text_area_element_get_tab_index( + dom_html_text_area_element *text_area, unsigned long *tab_index); + +dom_exception dom_html_text_area_element_set_tab_index( + dom_html_text_area_element *text_area, unsigned long tab_index); + +dom_exception dom_html_text_area_element_get_type( + dom_html_text_area_element *text_area, dom_string **type); + +dom_exception dom_html_text_area_element_get_value( + dom_html_text_area_element *text_area, dom_string **value); + +dom_exception dom_html_text_area_element_set_value( + dom_html_text_area_element *text_area, dom_string *value); + +dom_exception dom_html_text_area_element_blur(dom_html_text_area_element *ele); +dom_exception dom_html_text_area_element_focus(dom_html_text_area_element *ele); +dom_exception dom_html_text_area_element_select(dom_html_text_area_element *ele); + +#endif diff --git a/include/dom/html/html_textarea_element.h b/include/dom/html/html_textarea_element.h deleted file mode 100644 index 2e182d5..0000000 --- a/include/dom/html/html_textarea_element.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This file is part of libdom. - * Licensed under the MIT License, - * http://www.opensource.org/licenses/mit-license.php - * Copyright 2009 Bo Yang - */ - diff --git a/src/html/Makefile b/src/html/Makefile index 4586239..9fdcea4 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -5,10 +5,10 @@ DIR_SOURCES := \ html_link_element.c html_title_element.c html_meta_element.c \ html_base_element.c html_isindex_element.c html_style_element.c \ html_body_element.c html_form_element.c html_select_element.c \ - html_button_element.c html_input_element.c + html_button_element.c html_input_element.c html_text_area_element.c UNINMPLEMENTED_SOURCES := html_optgroup_element.c \ - html_option_element.c html_textarea_element.c \ + html_option_element.c \ html_label_element.c html_fieldset_element.c \ html_legend_element.c html_ulist_element.c html_olist_element.c \ html_dlist_element.c html_directory_element.c html_menu_element.c \ diff --git a/src/html/html_document.c b/src/html/html_document.c index 739477f..ec88ebc 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -19,6 +19,7 @@ #include "html/html_form_element.h" #include "html/html_button_element.h" #include "html/html_input_element.h" +#include "html/html_text_area_element.h" #include "core/string.h" #include "utils/namespace.h" @@ -201,6 +202,11 @@ _dom_html_document_create_element_internal(dom_html_document *html, (dom_html_input_element **) result); } + if (dom_string_caseless_isequal(tag_name, html->memoised[hds_TEXTAREA])) { + return _dom_html_text_area_element_create(html, namespace, prefix, + (dom_html_text_area_element **) result); + } + return _dom_html_element_create(html, tag_name, namespace, prefix, result); } diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 97a4336..f1ff04d 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -77,6 +77,8 @@ HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) /* HTML_DOCUMENT_STRINGS_ACTION1(value) */ +/* HTMLTextAreaElement type */ +HTML_DOCUMENT_STRINGS_ACTION1(textarea) /* Names for elements which get specialised. */ HTML_DOCUMENT_STRINGS_ACTION1(HTML) HTML_DOCUMENT_STRINGS_ACTION1(HEAD) diff --git a/src/html/html_text_area_element.c b/src/html/html_text_area_element.c new file mode 100644 index 0000000..0234076 --- /dev/null +++ b/src/html/html_text_area_element.c @@ -0,0 +1,494 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2012 Daniel Silverstone + */ + +#include +#include + +#include + +#include "html/html_document.h" +#include "html/html_text_area_element.h" + +#include "core/node.h" +#include "core/attr.h" +#include "utils/utils.h" + +static struct dom_element_protected_vtable _protect_vtable = { + { + DOM_NODE_PROTECT_VTABLE_HTML_TEXT_AREA_ELEMENT + }, + DOM_HTML_TEXT_AREA_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_text_area_element object + * + * \param doc The document object + * \param ele The returned element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_text_area_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_text_area_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_text_area_element)); + if (*ele == NULL) + return DOM_NO_MEM_ERR; + + /* Set up vtables */ + node = (struct dom_node_internal *) *ele; + node->base.vtable = &_dom_html_element_vtable; + node->vtable = &_protect_vtable; + + return _dom_html_text_area_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_text_area_element object + * + * \param doc The document object + * \param ele The dom_html_text_area_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_text_area_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_text_area_element *ele) +{ + ele->form = NULL; + ele->default_value = NULL; + ele->default_value_set = false; + ele->value = NULL; + ele->value_set = false; + + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_TEXTAREA], + namespace, prefix); +} + +/** + * Finalise a dom_html_text_area_element object + * + * \param ele The dom_html_text_area_element object + */ +void _dom_html_text_area_element_finalise(struct dom_html_text_area_element *ele) +{ + if (ele->default_value != NULL) { + dom_string_unref(ele->default_value); + ele->default_value = NULL; + ele->default_value_set = false; + } + + if (ele->value != NULL) { + dom_string_unref(ele->value); + ele->value = NULL; + ele->value_set = false; + } + + if (ele->form != NULL) { + dom_node_unref(ele->form); + ele->form = NULL; + } + + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_text_area_element object + * + * \param ele The dom_html_text_area_element object + */ +void _dom_html_text_area_element_destroy(struct dom_html_text_area_element *ele) +{ + _dom_html_text_area_element_finalise(ele); + free(ele); +} + +/*-----------------------------------------------------------------------*/ +/* Public APIs */ + +/** + * Get the disabled property + * + * \param ele The dom_html_text_area_element object + * \param disabled The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_get_disabled(dom_html_text_area_element *ele, + bool *disabled) +{ + return dom_html_element_get_bool_property(&ele->base, "disabled", + SLEN("disabled"), disabled); +} + +/** + * Set the disabled property + * + * \param ele The dom_html_text_area_element object + * \param disabled The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_set_disabled(dom_html_text_area_element *ele, + bool disabled) +{ + return dom_html_element_set_bool_property(&ele->base, "disabled", + SLEN("disabled"), disabled); +} + +/** + * Get the readOnly property + * + * \param ele The dom_html_text_area_element object + * \param disabled The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_get_read_only(dom_html_text_area_element *ele, + bool *read_only) +{ + return dom_html_element_get_bool_property(&ele->base, "readonly", + SLEN("readonly"), read_only); +} + +/** + * Set the readOnly property + * + * \param ele The dom_html_text_area_element object + * \param disabled The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_set_read_only(dom_html_text_area_element *ele, + bool read_only) +{ + return dom_html_element_set_bool_property(&ele->base, "readonly", + SLEN("readonly"), read_only); +} + +/** + * Get the defaultValue property + * + * \param ele The dom_html_text_area_element object + * \param disabled The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_get_default_value( + dom_html_text_area_element *ele, dom_string **default_value) +{ + dom_exception err; + + if (ele->default_value_set == false) { + err = dom_node_get_text_content((dom_node *)ele, + &ele->default_value); + if (err == DOM_NO_ERR) { + ele->default_value_set = true; + } + } + + *default_value = ele->default_value; + + if (*default_value != NULL) + dom_string_ref(*default_value); + + return DOM_NO_ERR; +} + +/** + * Set the defaultValue property + * + * \param ele The dom_html_text_area_element object + * \param disabled The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_set_default_value( + dom_html_text_area_element *ele, dom_string *default_value) +{ + if (ele->default_value != NULL) + dom_string_unref(ele->default_value); + + ele->default_value = default_value; + ele->default_value_set = true; + + if (ele->default_value != NULL) + dom_string_ref(ele->default_value); + + return DOM_NO_ERR; +} + +/** + * Get the value property + * + * \param ele The dom_html_text_area_element object + * \param disabled The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_get_value( + dom_html_text_area_element *ele, dom_string **value) +{ + dom_exception err; + + if (ele->value_set == false) { + err = dom_node_get_text_content((dom_node *)ele, + &ele->value); + if (err == DOM_NO_ERR) { + ele->default_value_set = true; + if (ele->default_value_set == false) { + ele->default_value_set = true; + ele->default_value = ele->value; + dom_string_ref(ele->default_value); + } + } + } + + *value = ele->value; + + if (*value != NULL) + dom_string_ref(*value); + + return DOM_NO_ERR; +} + +/** + * Set the value property + * + * \param ele The dom_html_text_area_element object + * \param disabled The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_set_value( + dom_html_text_area_element *ele, dom_string *value) +{ + dom_exception err; + + if (ele->default_value_set == false) { + err = dom_node_get_text_content((dom_node *)ele, + &ele->default_value); + if (err == DOM_NO_ERR) { + ele->default_value_set = true; + } + } + + if (ele->value != NULL) + dom_string_unref(ele->value); + + ele->value = value; + ele->value_set = true; + + if (ele->value != NULL) + dom_string_ref(ele->value); + + return DOM_NO_ERR; +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_text_area_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed) +{ + UNUSED(ele); + UNUSED(name); + + dom_string_ref(value); + *parsed = value; + + return DOM_NO_ERR; +} + +/* The virtual destroy function, see src/core/node.c for detail */ +void _dom_virtual_html_text_area_element_destroy(dom_node_internal *node) +{ + _dom_html_text_area_element_destroy((struct dom_html_text_area_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_text_area_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} + +/*-----------------------------------------------------------------------*/ +/* API functions */ + +#define SIMPLE_GET(attr) \ + dom_exception dom_html_text_area_element_get_##attr( \ + dom_html_text_area_element *element, \ + dom_string **attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_get_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } +#define SIMPLE_SET(attr) \ +dom_exception dom_html_text_area_element_set_##attr( \ + dom_html_text_area_element *element, \ + dom_string *attr) \ + { \ + dom_exception ret; \ + dom_string *_memo_##attr; \ + \ + _memo_##attr = \ + ((struct dom_html_document *) \ + ((struct dom_node_internal *)element)->owner)->\ + memoised[hds_##attr]; \ + \ + ret = dom_element_set_attribute(element, _memo_##attr, attr); \ + \ + return ret; \ + } + +#define SIMPLE_GET_SET(attr) SIMPLE_GET(attr) SIMPLE_SET(attr) + +SIMPLE_GET_SET(access_key); +SIMPLE_GET_SET(name); + +dom_exception dom_html_text_area_element_get_type( + dom_html_text_area_element *text_area, dom_string **type) +{ + dom_html_document *html = (dom_html_document *) + ((dom_node_internal *)text_area)->owner; + + *type = html->memoised[hds_textarea]; + dom_string_ref(*type); + + return DOM_NO_ERR; +} + +dom_exception dom_html_text_area_element_get_tab_index( + dom_html_text_area_element *text_area, unsigned long *tab_index) +{ + return dom_html_element_get_long_property(&text_area->base, "tabindex", + SLEN("tabindex"), tab_index); +} + +dom_exception dom_html_text_area_element_set_tab_index( + dom_html_text_area_element *text_area, unsigned long tab_index) +{ + return dom_html_element_set_long_property(&text_area->base, "tabindex", + SLEN("tabindex"), tab_index); +} + +dom_exception dom_html_text_area_element_get_cols( + dom_html_text_area_element *text_area, unsigned long *cols) +{ + return dom_html_element_get_long_property(&text_area->base, "cols", + SLEN("cols"), cols); +} + +dom_exception dom_html_text_area_element_set_cols( + dom_html_text_area_element *text_area, unsigned long cols) +{ + return dom_html_element_set_long_property(&text_area->base, "cols", + SLEN("cols"), cols); +} + +dom_exception dom_html_text_area_element_get_rows( + dom_html_text_area_element *text_area, unsigned long *rows) +{ + return dom_html_element_get_long_property(&text_area->base, "rows", + SLEN("rows"), rows); +} + +dom_exception dom_html_text_area_element_set_rows( + dom_html_text_area_element *text_area, unsigned long rows) +{ + return dom_html_element_set_long_property(&text_area->base, "rows", + SLEN("rows"), rows); +} + +dom_exception dom_html_text_area_element_get_form( + dom_html_text_area_element *text_area, dom_html_form_element **form) +{ + *form = text_area->form; + + if (*form != NULL) + dom_node_ref(*form); + + return DOM_NO_ERR; +} + +dom_exception _dom_html_text_area_element_set_form( + dom_html_text_area_element *text_area, dom_html_form_element *form) +{ + if (text_area->form == form) + return DOM_NO_ERR; + + if (text_area->form != NULL) + dom_node_unref(text_area->form); + + text_area->form = form; + + if (text_area->form != NULL) + dom_node_ref(text_area->form); + + return DOM_NO_ERR; +} + +/** + * Blur this control + * + * \param ele The form object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_blur(dom_html_text_area_element *ele) +{ + struct dom_document *doc = dom_node_get_owner(ele); + bool success = false; + assert(doc != NULL); + + /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + return _dom_dispatch_generic_event(doc, (dom_event_target *) ele, + (const uint8_t *) "blur", SLEN("blur"), true, + true, &success); +} + +/** + * Focus this control + * + * \param ele The form object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_focus(dom_html_text_area_element *ele) +{ + struct dom_document *doc = dom_node_get_owner(ele); + bool success = false; + assert(doc != NULL); + + /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + return _dom_dispatch_generic_event(doc, (dom_event_target *) ele, + (const uint8_t *) "focus", SLEN("focus"), true, + true, &success); +} + +/** + * Select this control + * + * \param ele The form object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_text_area_element_select(dom_html_text_area_element *ele) +{ + struct dom_document *doc = dom_node_get_owner(ele); + bool success = false; + assert(doc != NULL); + + /** \todo Is this event (a) default (b) bubbling and (c) cancelable? */ + return _dom_dispatch_generic_event(doc, (dom_event_target *) ele, + (const uint8_t *) "select", SLEN("select"), true, + true, &success); +} diff --git a/src/html/html_text_area_element.h b/src/html/html_text_area_element.h new file mode 100644 index 0000000..a115e85 --- /dev/null +++ b/src/html/html_text_area_element.h @@ -0,0 +1,62 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2012 Daniel Silverstone + */ + +#ifndef dom_internal_html_text_area_element_h_ +#define dom_internal_html_text_area_element_h_ + +#include + +#include "html/html_element.h" + +struct dom_html_text_area_element { + struct dom_html_element base; + /**< The base class */ + struct dom_html_form_element *form; + /**< The form associated with the text_area */ + dom_string *default_value; /**< Initial value */ + bool default_value_set; /**< Whether default_value has been set */ + dom_string *value; /**< Current value */ + bool value_set; /**< Whether value has been set */ +}; + +/* Create a dom_html_text_area_element object */ +dom_exception _dom_html_text_area_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_text_area_element **ele); + +/* Initialise a dom_html_text_area_element object */ +dom_exception _dom_html_text_area_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_text_area_element *ele); + +/* Finalise a dom_html_text_area_element object */ +void _dom_html_text_area_element_finalise(struct dom_html_text_area_element *ele); + +/* Destroy a dom_html_text_area_element object */ +void _dom_html_text_area_element_destroy(struct dom_html_text_area_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_text_area_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_text_area_element_destroy(dom_node_internal *node); +dom_exception _dom_html_text_area_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_TEXT_AREA_ELEMENT_PROTECT_VTABLE \ + _dom_html_text_area_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_TEXT_AREA_ELEMENT \ + _dom_virtual_html_text_area_element_destroy, \ + _dom_html_text_area_element_copy + +/* Internal function for bindings */ + +dom_exception _dom_html_text_area_element_set_form( + dom_html_text_area_element *text_area, dom_html_form_element *form); + +#endif diff --git a/src/html/html_textarea_element.c b/src/html/html_textarea_element.c deleted file mode 100644 index 2e182d5..0000000 --- a/src/html/html_textarea_element.c +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This file is part of libdom. - * Licensed under the MIT License, - * http://www.opensource.org/licenses/mit-license.php - * Copyright 2009 Bo Yang - */ - diff --git a/src/html/html_textarea_element.h b/src/html/html_textarea_element.h deleted file mode 100644 index 2e182d5..0000000 --- a/src/html/html_textarea_element.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * This file is part of libdom. - * Licensed under the MIT License, - * http://www.opensource.org/licenses/mit-license.php - * Copyright 2009 Bo Yang - */ - -- cgit v1.2.3