From 23349bc58f238d7b1ecb28d9d344c06fae6650fa Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Thu, 1 May 2014 08:14:33 +0530 Subject: Menu Element --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_menu_element.h | 16 +++ src/html/Makefile | 3 +- src/html/TODO | 2 +- src/html/html_document.c | 4 + src/html/html_menu_element.c | 140 +++++++++++++++++++++ src/html/html_menu_element.h | 45 +++++++ .../tests/level1/html/HTMLMenuElement01.xml | 43 +++++++ .../tests/level1/html/HTMLMenuElement01.xml.kfail | 43 ------- 10 files changed, 252 insertions(+), 46 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLMenuElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail diff --git a/Makefile b/Makefile index 1914637..19c239f 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_options_collection.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_hr_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_dlist_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_directory_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_menu_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 0b727af..38bb996 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -58,6 +58,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_menu_element.h b/include/dom/html/html_menu_element.h index 2e182d5..f4dad74 100644 --- a/include/dom/html/html_menu_element.h +++ b/include/dom/html/html_menu_element.h @@ -3,5 +3,21 @@ * 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_menu_element_h_ +#define dom_html_menu_element_h_ +#include +#include +#include + +typedef struct dom_html_menu_element dom_html_menu_element; + +dom_exception dom_html_menu_element_get_compact( + dom_html_menu_element *ele, bool *compact); + +dom_exception dom_html_menu_element_set_compact( + dom_html_menu_element *ele, bool compact); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index def64dd..ed27c07 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -7,12 +7,11 @@ DIR_SOURCES := \ html_body_element.c html_form_element.c html_select_element.c \ html_button_element.c html_input_element.c html_text_area_element.c \ html_opt_group_element.c html_option_element.c html_hr_element.c \ - html_dlist_element.c html_directory_element.c + html_dlist_element.c html_directory_element.c html_menu_element.c UNINMPLEMENTED_SOURCES := \ html_label_element.c html_fieldset_element.c \ html_legend_element.c html_ulist_element.c html_olist_element.c \ - html_menu_element.c \ html_li_element.c html_div_element.c html_paragraph_element.c \ html_heading_element.c html_quote_element.c html_pre_element.c \ html_br_element.c html_basefont_element.c html_font_element.c \ diff --git a/src/html/TODO b/src/html/TODO index 307505a..5cdf641 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -25,7 +25,7 @@ HTMLUListElement html_ulist_element MISSING HTMLOListElement html_olist_element MISSING HTMLDListElement html_dlist_element DONE HTMLDirectoryElement html_directory_element DONE -HTMLMenuElement html_menu_element MISSING +HTMLMenuElement html_menu_element DONE HTMLLIElement html_li_element MISSING HTMLBlockquoteElement html_blockquote_element MISSING HTMLDivElement html_div_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index 5a6e72e..7a10f2a 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -27,6 +27,7 @@ #include "html/html_hr_element.h" #include "html/html_dlist_element.h" #include "html/html_directory_element.h" +#include "html/html_menu_element.h" #include "core/attr.h" #include "core/string.h" @@ -232,6 +233,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_DIRECTORY])) { exc = _dom_html_directory_element_create(html, namespace, prefix, (dom_html_directory_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_MENU])) { + exc = _dom_html_menu_element_create(html, namespace, prefix, + (dom_html_menu_element **) result); } else { exc = _dom_html_element_create(html, tag_name, namespace, prefix, result); diff --git a/src/html/html_menu_element.c b/src/html/html_menu_element.c index 2e182d5..af0f34c 100644 --- a/src/html/html_menu_element.c +++ b/src/html/html_menu_element.c @@ -3,5 +3,145 @@ * 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_menu_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_MENU_ELEMENT + }, + DOM_HTML_MENU_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_menu_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_menu_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_menu_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_menu_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_menu_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_menu_element object + * + * \param doc The document object + * \param ele The dom_html_menu_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_menu_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_menu_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_MENU], + namespace, prefix); +} + +/** + * Finalise a dom_html_menu_element object + * + * \param ele The dom_html_menu_element object + */ +void _dom_html_menu_element_finalise(struct dom_html_menu_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_menu_element object + * + * \param ele The dom_html_menu_element object + */ +void _dom_html_menu_element_destroy(struct dom_html_menu_element *ele) +{ + _dom_html_menu_element_finalise(ele); + free(ele); +} + +/** + * Get the compact property + * + * \param ele The dom_html_menu_element object + * \param compact The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_menu_element_get_compact(dom_html_menu_element *ele, + bool *compact) +{ + return dom_html_element_get_bool_property(&ele->base, "compact", + SLEN("compact"), compact); +} + +/** + * Set the compact property + * + * \param ele The dom_html_menu_element object + * \param compact The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_menu_element_set_compact(dom_html_menu_element *ele, + bool compact) +{ + return dom_html_element_set_bool_property(&ele->base, "compact", + SLEN("compact"), compact); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_menu_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_menu_element_destroy(dom_node_internal *node) +{ + _dom_html_menu_element_destroy((struct dom_html_menu_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_menu_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} diff --git a/src/html/html_menu_element.h b/src/html/html_menu_element.h index 2e182d5..cb84e3d 100644 --- a/src/html/html_menu_element.h +++ b/src/html/html_menu_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_menu_element_h_ +#define dom_internal_html_menu_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_menu_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_menu_element object */ +dom_exception _dom_html_menu_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_menu_element **ele); + +/* Initialise a dom_html_menu_element object */ +dom_exception _dom_html_menu_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_menu_element *ele); + +/* Finalise a dom_html_menu_element object */ +void _dom_html_menu_element_finalise(struct dom_html_menu_element *ele); + +/* Destroy a dom_html_menu_element object */ +void _dom_html_menu_element_destroy(struct dom_html_menu_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_menu_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_menu_element_destroy(dom_node_internal *node); +dom_exception _dom_html_menu_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_MENU_ELEMENT_PROTECT_VTABLE \ + _dom_html_menu_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_MENU_ELEMENT \ + _dom_virtual_html_menu_element_destroy, \ + _dom_html_menu_element_copy + +#endif diff --git a/test/testcases/tests/level1/html/HTMLMenuElement01.xml b/test/testcases/tests/level1/html/HTMLMenuElement01.xml new file mode 100644 index 0000000..509a114 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLMenuElement01.xml @@ -0,0 +1,43 @@ + + + + + + + +HTMLMenuElement01 +NIST + + The compact attribute specifies a boolean value on whether to display + the list more compactly. + + Retrieve the compact attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail deleted file mode 100644 index 509a114..0000000 --- a/test/testcases/tests/level1/html/HTMLMenuElement01.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -HTMLMenuElement01 -NIST - - The compact attribute specifies a boolean value on whether to display - the list more compactly. - - Retrieve the compact attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3