From 2c4fcd2e416c51dc95af1e9054df1dc1fa28ff25 Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Sun, 18 May 2014 07:57:15 +0530 Subject: [Map Element Rev.2(fix)] & [Script Element add] --- src/html/Makefile | 4 +- src/html/TODO | 2 +- src/html/html_document.c | 12 +++ src/html/html_document_strings.h | 2 + src/html/html_map_element.c | 19 ++-- src/html/html_script_element.c | 213 +++++++++++++++++++++++++++++++++++++++ src/html/html_script_element.h | 45 +++++++++ 7 files changed, 284 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/html/Makefile b/src/html/Makefile index 240f54e..66d6ab0 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -15,10 +15,10 @@ DIR_SOURCES := \ html_font_element.c html_mod_element.c html_anchor_element.c \ html_basefont_element.c html_image_element.c html_object_element.c \ html_param_element.c html_applet_element.c html_area_element.c \ - html_map_element.c + html_map_element.c html_script_element.c UNINMPLEMENTED_SOURCES := \ - html_script_element.c html_table_element.c \ + html_table_element.c \ html_tablecaption_element.c html_tablecol_element.c html_tablesection_element.c \ html_tablerow_element.c html_tablecell_element.c html_frameset_element.c \ html_frame_element.c html_iframe_element.c diff --git a/src/html/TODO b/src/html/TODO index 28ff163..3888e23 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -45,7 +45,7 @@ HTMLParamElement html_param_element DONE HTMLAppletElement html_applet_element DONE HTMLMapElement html_map_element DONE HTMLAreaElement html_area_element DONE -HTMLScriptElement html_script_element MISSING +HTMLScriptElement html_script_element DONE HTMLTableElement html_table_element MISSING HTMLTableCaptionElement html_tablecaption_element MISSING HTMLTableColElement html_tablecol_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index 08dbe23..b7bf117 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -47,6 +47,9 @@ #include "html/html_object_element.h" #include "html/html_param_element.h" #include "html/html_applet_element.h" +#include "html/html_map_element.h" +#include "html/html_area_element.h" +#include "html/html_script_element.h" #include "core/attr.h" #include "core/string.h" @@ -319,6 +322,15 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_APPLET])) { exc = _dom_html_applet_element_create(html, namespace, prefix, (dom_html_applet_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_MAP])) { + exc = _dom_html_map_element_create(html, namespace, prefix, + (dom_html_map_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_AREA])) { + exc = _dom_html_area_element_create(html, namespace, prefix, + (dom_html_area_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_SCRIPT])) { + exc = _dom_html_script_element_create(html, namespace, prefix, + (dom_html_script_element **) result); } else { exc = _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 ad8e602..8ed3bb2 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -96,6 +96,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(data) HTML_DOCUMENT_STRINGS_ACTION1(height) HTML_DOCUMENT_STRINGS_ACTION1(standby) HTML_DOCUMENT_STRINGS_ACTION1(object) +HTML_DOCUMENT_STRINGS_ACTION1(event) +HTML_DOCUMENT_STRINGS_ACTION1(defer) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) HTML_DOCUMENT_STRINGS_ACTION(html_for,for) HTML_DOCUMENT_STRINGS_ACTION(date_time,datetime) diff --git a/src/html/html_map_element.c b/src/html/html_map_element.c index bdd4ef0..cf0fe5e 100644 --- a/src/html/html_map_element.c +++ b/src/html/html_map_element.c @@ -165,10 +165,13 @@ SIMPLE_GET_SET(name); /* The callback function for _dom_html_collection_create*/ bool callback(struct dom_node_internal *node, void *ctx) { - if(dom_string_caseless_isequal - (node->name,((dom_html_document *)ctx)->memoised[hds_AREA])) { + if(node->type == DOM_ELEMENT_NODE && + dom_string_caseless_isequal(node->name, + ((dom_html_document *)ctx)->memoised[hds_AREA])) + { return true; } + return false; } @@ -185,12 +188,8 @@ dom_exception dom_html_map_element_get_areas( { dom_html_document *doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; - dom_node_internal *root = ((dom_node_internal *) ele); - - while (root->parent != NULL) { - root = root->parent; - } - - return _dom_html_collection_create(doc, root, - callback, (void *)doc, areas); + + /*doc is passed as a parameter to callback to avoid repeated calculations */ + return _dom_html_collection_create(doc, (dom_node_internal *) ele, + callback, (void *) doc, areas); } diff --git a/src/html/html_script_element.c b/src/html/html_script_element.c index 2e182d5..f107d45 100644 --- a/src/html/html_script_element.c +++ b/src/html/html_script_element.c @@ -3,5 +3,218 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#include +#include +#include + +#include "html/html_document.h" +#include "html/html_script_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_SCRIPT_ELEMENT + }, + DOM_HTML_SCRIPT_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_script_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_script_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_script_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_script_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_script_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_script_element object + * + * \param doc The document object + * \param ele The dom_html_script_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_script_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_script_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_SCRIPT], + namespace, prefix); +} + +/** + * Finalise a dom_html_script_element object + * + * \param ele The dom_html_script_element object + */ +void _dom_html_script_element_finalise(struct dom_html_script_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_script_element object + * + * \param ele The dom_html_script_element object + */ +void _dom_html_script_element_destroy(struct dom_html_script_element *ele) +{ + _dom_html_script_element_finalise(ele); + free(ele); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_script_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_script_element_destroy(dom_node_internal *node) +{ + _dom_html_script_element_destroy((struct dom_html_script_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_script_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_script_element_get_##attr( \ + dom_html_script_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_script_element_set_##attr( \ + dom_html_script_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(html_for); +SIMPLE_GET_SET(event); +SIMPLE_GET_SET(charset); +SIMPLE_GET_SET(src); +SIMPLE_GET_SET(type); + +/** + * Get the defer property + * + * \param ele The dom_html_script_element object + * \param defer The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_script_element_get_defer(dom_html_script_element *ele, + bool *defer) +{ + return dom_html_element_get_bool_property(&ele->base, "defer", + SLEN("defer"), defer); +} + +/** + * Set the defer property + * + * \param ele The dom_html_script_element object + * \param defer The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_script_element_set_defer(dom_html_script_element *ele, + bool defer) +{ + return dom_html_element_set_bool_property(&ele->base, "defer", + SLEN("defer"), defer); +} + +/** + * Get the text property + * + * \param ele The dom_html_script_element object + * \param text The returned dom_string object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_script_element_get_text( + dom_html_script_element *ele, + dom_string **text) +{ + return _dom_node_get_text_content((dom_node_internal *)ele, text); +} + +/** + * Set the text property + * + * \param ele The dom_html_script_element object + * \param text The dom_string value to be set + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_script_element_set_text( + dom_html_script_element *ele, + dom_string *text) +{ + return _dom_node_set_text_content((dom_node_internal *)ele, text); +} diff --git a/src/html/html_script_element.h b/src/html/html_script_element.h index 2e182d5..dcb7b72 100644 --- a/src/html/html_script_element.h +++ b/src/html/html_script_element.h @@ -3,5 +3,50 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#ifndef dom_internal_html_script_element_h_ +#define dom_internal_html_script_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_script_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_script_element object */ +dom_exception _dom_html_script_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_script_element **ele); + +/* Initialise a dom_html_script_element object */ +dom_exception _dom_html_script_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_script_element *ele); + +/* Finalise a dom_html_script_element object */ +void _dom_html_script_element_finalise(struct dom_html_script_element *ele); + +/* Destroy a dom_html_script_element object */ +void _dom_html_script_element_destroy(struct dom_html_script_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_script_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_script_element_destroy(dom_node_internal *node); +dom_exception _dom_html_script_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_SCRIPT_ELEMENT_PROTECT_VTABLE \ + _dom_html_script_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_SCRIPT_ELEMENT \ + _dom_virtual_html_script_element_destroy, \ + _dom_html_script_element_copy + +#endif -- cgit v1.2.3