From dc6bcfdcc5058940a0ffc919587f1cce5c63ec2f Mon Sep 17 00:00:00 2001 From: rsk1994 Date: Wed, 5 Mar 2014 19:25:45 +0530 Subject: final patch for adding hr tag to libdom --- Makefile | 1 + include/dom/dom.h | 1 + include/dom/html/html_hr_element.h | 34 ++++ src/html/Makefile | 4 +- src/html/TODO | 2 +- src/html/html_document.c | 4 + src/html/html_document_strings.h | 1 + src/html/html_hr_element.c | 184 +++++++++++++++++++++ src/html/html_hr_element.h | 45 +++++ test/DOMTSHandler.pm | 1 + .../tests/level1/html/HTMLHRElement01.xml | 42 +++++ .../tests/level1/html/HTMLHRElement01.xml.kfail | 42 ----- .../tests/level1/html/HTMLHRElement02.xml | 43 +++++ .../tests/level1/html/HTMLHRElement02.xml.kfail | 43 ----- .../tests/level1/html/HTMLHRElement03.xml | 42 +++++ .../tests/level1/html/HTMLHRElement03.xml.kfail | 42 ----- .../tests/level1/html/HTMLHRElement04.xml | 42 +++++ .../tests/level1/html/HTMLHRElement04.xml.kfail | 42 ----- 18 files changed, 443 insertions(+), 172 deletions(-) create mode 100644 test/testcases/tests/level1/html/HTMLHRElement01.xml delete mode 100644 test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLHRElement02.xml delete mode 100644 test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLHRElement03.xml delete mode 100644 test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail create mode 100644 test/testcases/tests/level1/html/HTMLHRElement04.xml delete mode 100644 test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail diff --git a/Makefile b/Makefile index 7c50cad..3aac0c3 100644 --- a/Makefile +++ b/Makefile @@ -96,6 +96,7 @@ INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_text_area_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_option_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_opt_group_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_options_collection.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_hr_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 2ef6e9b..d34f27f 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -55,6 +55,7 @@ #include #include #include +#include /* DOM Events header */ #include diff --git a/include/dom/html/html_hr_element.h b/include/dom/html/html_hr_element.h index 2e182d5..14f09f6 100644 --- a/include/dom/html/html_hr_element.h +++ b/include/dom/html/html_hr_element.h @@ -3,5 +3,39 @@ * 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_hr_element_h_ +#define dom_html_hr_element_h_ +#include +#include +#include + +typedef struct dom_html_hr_element dom_html_hr_element; + +dom_exception dom_html_hr_element_get_no_shade( + dom_html_hr_element *ele, bool *no_shade); + +dom_exception dom_html_hr_element_set_no_shade( + dom_html_hr_element *ele, bool no_shade); + +dom_exception dom_html_hr_element_get_align( + dom_html_hr_element *element, dom_string **align); + +dom_exception dom_html_hr_element_set_align( + dom_html_hr_element *element, dom_string *align); + +dom_exception dom_html_hr_element_get_size( + dom_html_hr_element *element, dom_string **size); + +dom_exception dom_html_hr_element_set_size( + dom_html_hr_element *ele, dom_string *size); + +dom_exception dom_html_hr_element_get_width( + dom_html_hr_element *ele, dom_string **width); + +dom_exception dom_html_hr_element_set_width( + dom_html_hr_element *ele, dom_string *width); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 4e1b4c4..5226b53 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -6,7 +6,7 @@ DIR_SOURCES := \ 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_text_area_element.c \ - html_opt_group_element.c html_option_element.c + html_opt_group_element.c html_option_element.c html_hr_element.c UNINMPLEMENTED_SOURCES := \ html_label_element.c html_fieldset_element.c \ @@ -15,7 +15,7 @@ UNINMPLEMENTED_SOURCES := \ 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 \ - html_hr_element.c html_mod_element.c html_anchor_element.c \ + html_mod_element.c html_anchor_element.c \ html_image_element.c html_object_element.c html_param_element.c \ html_applet_element.c html_map_element.c html_area_element.c \ html_script_element.c html_table_element.c html_tablecaption_element.c \ diff --git a/src/html/TODO b/src/html/TODO index 8ff489d..37ade2c 100644 --- a/src/html/TODO +++ b/src/html/TODO @@ -36,7 +36,7 @@ HTMLPreElement html_pre_element MISSING HTMLBRElement html_br_element MISSING HTMLBaseFontElement html_basefont_element MISSING HTMLFontElement html_font_element MISSING -HTMLHRElement html_hr_element MISSING +HTMLHRElement html_hr_element DONE HTMLModElement html_mod_element MISSING HTMLAnchorElement html_anchor_element MISSING HTMLImageElement html_image_element MISSING diff --git a/src/html/html_document.c b/src/html/html_document.c index fb880cf..0da16bb 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -24,6 +24,7 @@ #include "html/html_opt_group_element.h" #include "html/html_option_element.h" #include "html/html_select_element.h" +#include "html/html_hr_element.h" #include "core/attr.h" #include "core/string.h" @@ -220,6 +221,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_SELECT])) { exc = _dom_html_select_element_create(html, namespace, prefix, (dom_html_select_element **) result); + } else if (dom_string_caseless_isequal(tag_name, html->memoised[hds_HR])) { + exc = _dom_html_hr_element_create(html, namespace, prefix, + (dom_html_hr_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 f2d6fa2..8e9d79e 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -80,6 +80,7 @@ HTML_DOCUMENT_STRINGS_ACTION(max_length,maxlength) HTML_DOCUMENT_STRINGS_ACTION(read_only,readonly) HTML_DOCUMENT_STRINGS_ACTION1(size) HTML_DOCUMENT_STRINGS_ACTION1(src) +HTML_DOCUMENT_STRINGS_ACTION1(width) HTML_DOCUMENT_STRINGS_ACTION(tab_index,tabindex) /* HTML_DOCUMENT_STRINGS_ACTION1(type) */ HTML_DOCUMENT_STRINGS_ACTION(use_map,usemap) diff --git a/src/html/html_hr_element.c b/src/html/html_hr_element.c index 2e182d5..eb8aa68 100644 --- a/src/html/html_hr_element.c +++ b/src/html/html_hr_element.c @@ -3,5 +3,189 @@ * 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_hr_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_HR_ELEMENT + }, + DOM_HTML_HR_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_hr_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_hr_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_hr_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_hr_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_hr_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_hr_element object + * + * \param doc The document object + * \param ele The dom_html_hr_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_hr_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_hr_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_HR], + namespace, prefix); +} + +/** + * Finalise a dom_html_hr_element object + * + * \param ele The dom_html_hr_element object + */ +void _dom_html_hr_element_finalise(struct dom_html_hr_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_hr_element object + * + * \param ele The dom_html_hr_element object + */ +void _dom_html_hr_element_destroy(struct dom_html_hr_element *ele) +{ + _dom_html_hr_element_finalise(ele); + free(ele); +} + +/** + * Get the no_shade property + * + * \param ele The dom_html_hr_element object + * \param no_shade The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_hr_element_get_no_shade(dom_html_hr_element *ele, + bool *no_shade) +{ + return dom_html_element_get_bool_property(&ele->base, "noshade", + SLEN("noshade"), no_shade); +} + +/** + * Set the no_shade property + * + * \param ele The dom_html_hr_element object + * \param no_shade The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_hr_element_set_no_shade(dom_html_hr_element *ele, + bool no_shade) +{ + return dom_html_element_set_bool_property(&ele->base, "noshade", + SLEN("noshade"), no_shade); +} + +/*------------------------------------------------------------------------*/ +/* The protected virtual functions */ + +/* The virtual function used to parse attribute value, see src/core/element.c + * for detail */ +dom_exception _dom_html_hr_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_hr_element_destroy(dom_node_internal *node) +{ + _dom_html_hr_element_destroy((struct dom_html_hr_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_hr_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_hr_element_get_##attr( \ + dom_html_hr_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_hr_element_set_##attr( \ + dom_html_hr_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(size); +SIMPLE_GET_SET(align); +SIMPLE_GET_SET(width); diff --git a/src/html/html_hr_element.h b/src/html/html_hr_element.h index 2e182d5..c3cf717 100644 --- a/src/html/html_hr_element.h +++ b/src/html/html_hr_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_hr_element_h_ +#define dom_internal_html_hr_element_h_ + +#include +#include "html/html_element.h" + + +struct dom_html_hr_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_hr_element object */ +dom_exception _dom_html_hr_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_hr_element **ele); + +/* Initialise a dom_html_hr_element object */ +dom_exception _dom_html_hr_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_hr_element *ele); + +/* Finalise a dom_html_hr_element object */ +void _dom_html_hr_element_finalise(struct dom_html_hr_element *ele); + +/* Destroy a dom_html_hr_element object */ +void _dom_html_hr_element_destroy(struct dom_html_hr_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_hr_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_hr_element_destroy(dom_node_internal *node); +dom_exception _dom_html_hr_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_HR_ELEMENT_PROTECT_VTABLE \ + _dom_html_hr_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_HR_ELEMENT \ + _dom_virtual_html_hr_element_destroy, \ + _dom_html_hr_element_copy + +#endif diff --git a/test/DOMTSHandler.pm b/test/DOMTSHandler.pm index 22fb418..df2b028 100644 --- a/test/DOMTSHandler.pm +++ b/test/DOMTSHandler.pm @@ -52,6 +52,7 @@ our %special_prefix = ( HTMLFormElement => "dom_html_form_element", CharacterData => "dom_characterdata", CDATASection => "dom_cdata_section *", + HTMLHRElement => "dom_html_hr_element", ); our %unref_prefix = ( diff --git a/test/testcases/tests/level1/html/HTMLHRElement01.xml b/test/testcases/tests/level1/html/HTMLHRElement01.xml new file mode 100644 index 0000000..c074605 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLHRElement01.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLHRElement01 +NIST + + The align attribute specifies the rule alignment on the page. + + Retrieve the align attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail b/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail deleted file mode 100644 index c074605..0000000 --- a/test/testcases/tests/level1/html/HTMLHRElement01.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLHRElement01 -NIST - - The align attribute specifies the rule alignment on the page. - - Retrieve the align attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLHRElement02.xml b/test/testcases/tests/level1/html/HTMLHRElement02.xml new file mode 100644 index 0000000..37f1293 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLHRElement02.xml @@ -0,0 +1,43 @@ + + + + + + + +HTMLHRElement02 +NIST + + The noShade attribute specifies that the rule should be drawn as + a solid color. + + Retrieve the noShade attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail b/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail deleted file mode 100644 index 37f1293..0000000 --- a/test/testcases/tests/level1/html/HTMLHRElement02.xml.kfail +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - -HTMLHRElement02 -NIST - - The noShade attribute specifies that the rule should be drawn as - a solid color. - - Retrieve the noShade attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLHRElement03.xml b/test/testcases/tests/level1/html/HTMLHRElement03.xml new file mode 100644 index 0000000..03ddebc --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLHRElement03.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLHRElement03 +NIST + + The size attribute specifies the height of the rule. + + Retrieve the size attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail b/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail deleted file mode 100644 index 03ddebc..0000000 --- a/test/testcases/tests/level1/html/HTMLHRElement03.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLHRElement03 -NIST - - The size attribute specifies the height of the rule. - - Retrieve the size attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - diff --git a/test/testcases/tests/level1/html/HTMLHRElement04.xml b/test/testcases/tests/level1/html/HTMLHRElement04.xml new file mode 100644 index 0000000..2090d14 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLHRElement04.xml @@ -0,0 +1,42 @@ + + + + + + + +HTMLHRElement04 +NIST + + The width attribute specifies the width of the rule. + + Retrieve the width attribute and examine its value. + +Mary Brady +2002-02-22 + + + + + + + + + + + + + diff --git a/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail b/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail deleted file mode 100644 index 2090d14..0000000 --- a/test/testcases/tests/level1/html/HTMLHRElement04.xml.kfail +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - -HTMLHRElement04 -NIST - - The width attribute specifies the width of the rule. - - Retrieve the width attribute and examine its value. - -Mary Brady -2002-02-22 - - - - - - - - - - - - - -- cgit v1.2.3