From 6bff7533b61a5d376d9f08a7a62d185a8e7155b3 Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Thu, 5 Jun 2014 21:06:09 +0530 Subject: FrameSet Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_frameset_element.h | 22 ++ src/html/Makefile | 4 +- src/html/html_document.c | 4 + src/html/html_document_strings.h | 2 + src/html/html_frameset_element.c | 229 +++++++++++++++++++++ src/html/html_frameset_element.h | 46 +++++ .../tests/level1/html/HTMLFrameSetElement01.xml | 44 ++++ .../level1/html/HTMLFrameSetElement01.xml.kfail | 44 ---- .../tests/level1/html/HTMLFrameSetElement02.xml | 44 ++++ .../level1/html/HTMLFrameSetElement02.xml.kfail | 44 ---- 12 files changed, 395 insertions(+), 90 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLFrameSetElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLFrameSetElement02.xml delete mode 100644 test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail diff --git a/Makefile b/Makefile index 9b47c36..2de8d0c 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_table_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_tablerow_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_base_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_style_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_frameset_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR)/pkgconfig:lib$(COMPONENT).pc.in INSTALL_ITEMS := $(INSTALL_ITEMS) /$(LIBDIR):$(OUTPUT) diff --git a/include/dom/dom.h b/include/dom/dom.h index 68ae227..376ef14 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -90,6 +90,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_frameset_element.h b/include/dom/html/html_frameset_element.h index 2e182d5..c0de3b4 100644 --- a/include/dom/html/html_frameset_element.h +++ b/include/dom/html/html_frameset_element.h @@ -3,5 +3,27 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang + * Copyright 2014 Rupinder Singh Khokhar */ +#ifndef dom_html_frame_set_element_h_ +#define dom_html_frame_set_element_h_ +#include +#include +#include + +typedef struct dom_html_frame_set_element dom_html_frame_set_element; + +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *element, dom_string **rows); + +dom_exception dom_html_frame_set_element_set_rows( + dom_html_frame_set_element *element, dom_string *rows); + +dom_exception dom_html_frame_set_element_set_cols( + dom_html_frame_set_element *ele, dom_string *cols); + +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, dom_string **cols); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 2cb85d9..a9532cd 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -17,10 +17,10 @@ DIR_SOURCES := \ html_param_element.c html_applet_element.c html_area_element.c \ html_map_element.c html_script_element.c html_tablecaption_element.c \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ - html_table_element.c html_tablerow_element.c + html_table_element.c html_tablerow_element.c html_frameset_element.c UNINMPLEMENTED_SOURCES := \ - html_frameset_element.c html_isindex_element.c \ + html_isindex_element.c \ html_frame_element.c html_iframe_element.c include $(NSBUILD)/Makefile.subdir diff --git a/src/html/html_document.c b/src/html/html_document.c index 0e39f77..a4ba62b 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -57,6 +57,7 @@ #include "html/html_table_element.h" #include "html/html_tablerow_element.h" #include "html/html_style_element.h" +#include "html/html_frameset_element.h" #include "core/attr.h" #include "core/string.h" @@ -365,6 +366,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_STYLE])) { exc = _dom_html_style_element_create(html, (dom_html_style_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_FRAMESET])) { + exc = _dom_html_frame_set_element_create(html, namespace, prefix, + (dom_html_frame_set_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 5d5ddaf..10ec80d 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -106,6 +106,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(frame) HTML_DOCUMENT_STRINGS_ACTION1(rules) HTML_DOCUMENT_STRINGS_ACTION1(summary) HTML_DOCUMENT_STRINGS_ACTION1(prompt) +HTML_DOCUMENT_STRINGS_ACTION1(rows) +HTML_DOCUMENT_STRINGS_ACTION1(cols) 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_frameset_element.c b/src/html/html_frameset_element.c index 2e182d5..b096156 100644 --- a/src/html/html_frameset_element.c +++ b/src/html/html_frameset_element.c @@ -3,5 +3,234 @@ * 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_frameset_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_FRAME_SET_ELEMENT + }, + DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_frame_set_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_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_frame_set_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_frame_set_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_frame_set_element object + * + * \param doc The document object + * \param ele The dom_html_frame_set_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele) +{ + dom_string *cols_rows_default = NULL; + dom_exception err; + err = dom_string_create((const uint8_t *) "100%", SLEN("100%"), &cols_rows_default); + if (err != DOM_NO_ERR) + return err; + + err = _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_FRAMESET], + namespace, prefix); + ele->cols_rows_default = cols_rows_default; + return err; +} + +/** + * Finalise a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_frame_set_element object + * + * \param ele The dom_html_frame_set_element object + */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele) +{ + _dom_html_frame_set_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_frame_set_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_frame_set_element_destroy(dom_node_internal *node) +{ + _dom_html_frame_set_element_destroy((struct dom_html_frame_set_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_frame_set_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_frame_set_element_get_##attr( \ + dom_html_frame_set_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_frame_set_element_set_##attr( \ + dom_html_frame_set_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_SET(rows); +SIMPLE_SET(cols); + +/** + * Get the rows property + * + * \param ele The dom_html_frame_set_element object + * \param rows The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_rows( + dom_html_frame_set_element *ele, + dom_string **rows) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_rows], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_rows], rows); + } + + *rows = ele->cols_rows_default; + if (*rows != NULL) + dom_string_ref(*rows); + + return DOM_NO_ERR; +} + +/** + * Get the cols property + * + * \param ele The dom_html_frame_set_element object + * \param cols The returned status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_frame_set_element_get_cols( + dom_html_frame_set_element *ele, + dom_string **cols) +{ + dom_html_document *doc; + bool has_value = false; + dom_exception err; + + doc = (dom_html_document *) ((dom_node_internal *) ele)->owner; + + err = dom_element_has_attribute(ele, + doc->memoised[hds_cols], &has_value); + if(err !=DOM_NO_ERR) + return err; + + if(has_value) { + return dom_element_get_attribute(ele, + doc->memoised[hds_cols], cols); + } + + *cols = ele->cols_rows_default; + if (*cols != NULL) + dom_string_ref(*cols); + return DOM_NO_ERR; +} diff --git a/src/html/html_frameset_element.h b/src/html/html_frameset_element.h index 2e182d5..fd1c255 100644 --- a/src/html/html_frameset_element.h +++ b/src/html/html_frameset_element.h @@ -3,5 +3,51 @@ * 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_frame_set_element_h_ +#define dom_internal_html_frame_set_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_frame_set_element { + struct dom_html_element base; + /**< The base class */ + dom_string *cols_rows_default; +}; + +/* Create a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element **ele); + +/* Initialise a dom_html_frame_set_element object */ +dom_exception _dom_html_frame_set_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_frame_set_element *ele); + +/* Finalise a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_finalise(struct dom_html_frame_set_element *ele); + +/* Destroy a dom_html_frame_set_element object */ +void _dom_html_frame_set_element_destroy(struct dom_html_frame_set_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_frame_set_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_frame_set_element_destroy(dom_node_internal *node); +dom_exception _dom_html_frame_set_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_FRAME_SET_ELEMENT_PROTECT_VTABLE \ + _dom_html_frame_set_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_FRAME_SET_ELEMENT \ + _dom_virtual_html_frame_set_element_destroy, \ + _dom_html_frame_set_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml new file mode 100644 index 0000000..18e5ff5 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml @@ -0,0 +1,44 @@ + + + + + + + +HTMLFrameSetElement01 +NIST + + The cols attribute specifies the number of columns of frames in the + frameset. + + Retrieve the cols attribute of the first FRAMESET element and examine + it's value. + +Rick Rivello +2002-05-08 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail deleted file mode 100644 index 18e5ff5..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameSetElement01.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - -HTMLFrameSetElement01 -NIST - - The cols attribute specifies the number of columns of frames in the - frameset. - - Retrieve the cols attribute of the first FRAMESET element and examine - it's value. - -Rick Rivello -2002-05-08 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml new file mode 100644 index 0000000..e598cef --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml @@ -0,0 +1,44 @@ + + + + + + + +HTMLFrameSetElement02 +NIST + + The rows attribute specifies the number of rows of frames in the + frameset. + + Retrieve the rows attribute of the second FRAMESET element and examine + it's value. + +Rick Rivello +2002-05-08 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail deleted file mode 100644 index e598cef..0000000 --- a/test/testcases/tests/level1/html/HTMLFrameSetElement02.xml.kfail +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - -HTMLFrameSetElement02 -NIST - - The rows attribute specifies the number of rows of frames in the - frameset. - - Retrieve the rows attribute of the second FRAMESET element and examine - it's value. - -Rick Rivello -2002-05-08 - - - - - - - - - - - - - -- cgit v1.2.3