April 2014 - netsurf-commits - listmaster.pepperfish.net

libdom: branch rupindersingh/libdom_elements deleted. release/0.1.0-2-gdd64949

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/0000000000000000000000... ...commit http://git.netsurf-browser.org/libdom.git/commit/000000000000000000000000... ...tree http://git.netsurf-browser.org/libdom.git/tree/00000000000000000000000000... The branch, rupindersingh/libdom_elements has been deleted was dd6494936735e8c057369559e5a3b5b68d723708 ----------------------------------------------------------------------- dd6494936735e8c057369559e5a3b5b68d723708 Directory element ----------------------------------------------------------------------- -- Document Object Model library

9 years, 4 months

1
0
0 / 0

libdom: branch rupindersingh/libdom_elements created. release/0.1.0-2-gdd64949

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/dd6494936735e8c0573695... ...commit http://git.netsurf-browser.org/libdom.git/commit/dd6494936735e8c057369559... ...tree http://git.netsurf-browser.org/libdom.git/tree/dd6494936735e8c057369559e5... The branch, rupindersingh/libdom_elements has been created at dd6494936735e8c057369559e5a3b5b68d723708 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=dd6494936735e8c05736... commit dd6494936735e8c057369559e5a3b5b68d723708 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> Directory element diff --git a/Makefile b/Makefile index 4c6906f..1914637 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ 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) $(I):$(Is)/html_dlist_element.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_directory_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 12245c2..0b727af 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -57,6 +57,7 @@ #include <dom/html/html_options_collection.h> #include <dom/html/html_hr_element.h> #include <dom/html/html_dlist_element.h> +#include <dom/html/html_directory_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_directory_element.h b/include/dom/html/html_directory_element.h index 2e182d5..67fa269 100644 --- a/include/dom/html/html_directory_element.h +++ b/include/dom/html/html_directory_element.h @@ -3,5 +3,21 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_directory_element_h_ +#define dom_html_directory_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +typedef struct dom_html_directory_element dom_html_directory_element; + +dom_exception dom_html_directory_element_get_compact( + dom_html_directory_element *ele, bool *compact); + +dom_exception dom_html_directory_element_set_compact( + dom_html_directory_element *ele, bool compact); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 25e99f4..def64dd 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -7,12 +7,12 @@ 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_dlist_element.c html_directory_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_directory_element.c html_menu_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/html_directory_element.c b/src/html/html_directory_element.c index 2e182d5..e9981ff 100644 --- a/src/html/html_directory_element.c +++ b/src/html/html_directory_element.c @@ -3,5 +3,145 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_directory_element.h> + +#include "html/html_document.h" +#include "html/html_directory_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_DIRECTORY_ELEMENT + }, + DOM_HTML_DIRECTORY_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_directory_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_directory_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_directory_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_directory_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_directory_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_directory_element object + * + * \param doc The document object + * \param ele The dom_html_directory_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_directory_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_directory_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_DIRECTORY], + namespace, prefix); +} + +/** + * Finalise a dom_html_directory_element object + * + * \param ele The dom_html_directory_element object + */ +void _dom_html_directory_element_finalise(struct dom_html_directory_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_directory_element object + * + * \param ele The dom_html_directory_element object + */ +void _dom_html_directory_element_destroy(struct dom_html_directory_element *ele) +{ + _dom_html_directory_element_finalise(ele); + free(ele); +} + +/** + * Get the compact property + * + * \param ele The dom_html_directory_element object + * \param compact The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_directory_element_get_compact(dom_html_directory_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_directory_element object + * \param compact The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_directory_element_set_compact(dom_html_directory_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_directory_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_directory_element_destroy(dom_node_internal *node) +{ + _dom_html_directory_element_destroy((struct dom_html_directory_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_directory_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} diff --git a/src/html/html_directory_element.h b/src/html/html_directory_element.h index 2e182d5..9f3fe2b 100644 --- a/src/html/html_directory_element.h +++ b/src/html/html_directory_element.h @@ -3,5 +3,50 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_directory_element_h_ +#define dom_internal_html_directory_element_h_ + +#include <dom/html/html_directory_element.h> +#include "html/html_element.h" + + +struct dom_html_directory_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_directory_element object */ +dom_exception _dom_html_directory_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_directory_element **ele); + +/* Initialise a dom_html_directory_element object */ +dom_exception _dom_html_directory_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_directory_element *ele); + +/* Finalise a dom_html_directory_element object */ +void _dom_html_directory_element_finalise(struct dom_html_directory_element *ele); + +/* Destroy a dom_html_directory_element object */ +void _dom_html_directory_element_destroy(struct dom_html_directory_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_directory_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_directory_element_destroy(dom_node_internal *node); +dom_exception _dom_html_directory_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_DIRECTORY_ELEMENT_PROTECT_VTABLE \ + _dom_html_directory_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_DIRECTORY_ELEMENT \ + _dom_virtual_html_directory_element_destroy, \ + _dom_html_directory_element_copy + +#endif diff --git a/src/html/html_document.c b/src/html/html_document.c index 0da16bb..11db874 100644 --- a/src/html/html_document.c +++ b/src/html/html_document.c @@ -224,6 +224,9 @@ _dom_html_document_create_element_internal(dom_html_document *html, } 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 if (dom_string_caseless_isequal(tag_name, html->memoised[hds_DIRECTORY])) { + 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 90f3b59..f8eef60 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -128,7 +128,7 @@ HTML_DOCUMENT_STRINGS_ACTION1(LEGEND) HTML_DOCUMENT_STRINGS_ACTION1(UL) HTML_DOCUMENT_STRINGS_ACTION1(OL) HTML_DOCUMENT_STRINGS_ACTION1(DL) -HTML_DOCUMENT_STRINGS_ACTION1(DIR) +HTML_DOCUMENT_STRINGS_ACTION1(DIRECTORY) HTML_DOCUMENT_STRINGS_ACTION1(MENU) HTML_DOCUMENT_STRINGS_ACTION1(LI) HTML_DOCUMENT_STRINGS_ACTION1(BLOCKQUOTE) diff --git a/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml b/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml new file mode 100644 index 0000000..4b1b402 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDirectoryElement01"> +<metadata> +<title>HTMLDirectoryElement01</title> +<creator>NIST</creator> +<description> + The compact attribute specifies a boolean value on whether to display + the list more compactly. + + Retrieve the compact attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7531..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcompact" type="boolean" /> +<var name="doc" type="Document"/> +<load var="doc" href="directory" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"dir"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<compact interface="HTMLDirectoryElement" obj="testNode" var="vcompact"/> +<assertTrue actual="vcompact" id="compactLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl b/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl deleted file mode 100644 index 4b1b402..0000000 --- a/test/testcases/tests/level1/html/HTMLDirectoryElement01.xml.notimpl +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDirectoryElement01"> -<metadata> -<title>HTMLDirectoryElement01</title> -<creator>NIST</creator> -<description> - The compact attribute specifies a boolean value on whether to display - the list more compactly. - - Retrieve the compact attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-7531..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcompact" type="boolean" /> -<var name="doc" type="Document"/> -<load var="doc" href="directory" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"dir"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<compact interface="HTMLDirectoryElement" obj="testNode" var="vcompact"/> -<assertTrue actual="vcompact" id="compactLink"/> -</test> ----------------------------------------------------------------------- -- Document Object Model library

9 years, 4 months

1
0
0 / 0

netsurf-website: branch master updated. 9bfc4605b75d3600f955aca6e675f538a8271001

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-website.git/shortlog/9bfc4605b75d3... ...commit http://git.netsurf-browser.org/netsurf-website.git/commit/9bfc4605b75d360... ...tree http://git.netsurf-browser.org/netsurf-website.git/tree/9bfc4605b75d3600f... The branch, master has been updated via 9bfc4605b75d3600f955aca6e675f538a8271001 (commit) from e4fca06e16c33714371f9152de6a27b795d4de61 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-website.git/commit/?id=9bfc4605b75... commit 9bfc4605b75d3600f955aca6e675f538a8271001 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <tlsa(a)netsurf-browser.org> Update for Amiga NetSurf 3.1 download. diff --git a/downloads/amiga/index.en b/downloads/amiga/index.en index 61d1ed8..9b2aa72 100644 --- a/downloads/amiga/index.en +++ b/downloads/amiga/index.en @@ -63,7 +63,7 @@ <div class="downloadlatestouter"> <div class="downloadlatest"> <div class="downloadlatestbox"> -<a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 2.9 for AmigaOS (5.9MB) 27 Mar 2012</a> +<a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 3.1 for AmigaOS (5.9MB) 26 Apr 2014</a>  Requires: <ul> @@ -72,7 +72,7 @@ </div> <div class="downloadlatestbox downloadlast"> -<a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-2.9-s...">NetSurf 2.9 source code (2.5MB) 27 Mar 2012</a> +<a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s...">NetSurf 3.1 source code (2.9MB) 26 Apr 2014</a> <a href="/downloads/source/#BuildInstructions">Build instructions</a> Build NetSurf for: <ul> @@ -90,6 +90,13 @@ <h2>Previous releases</h2> <dl> +<dt>NetSurf 2.9</dt> +<dd> +<ul> +<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 2.9 browser for AmigaOS 4</a> (27 Mar 2012)</li> +<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-2.9-s...">NetSurf 2.9 source code</a> (27 Mar 2012)</li> +</ul> +</dd> <dt>NetSurf 2.8</dt> <dd> <ul> ----------------------------------------------------------------------- Summary of changes: downloads/amiga/index.en | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/downloads/amiga/index.en b/downloads/amiga/index.en index 61d1ed8..9b2aa72 100644 --- a/downloads/amiga/index.en +++ b/downloads/amiga/index.en @@ -63,7 +63,7 @@ <div class="downloadlatestouter"> <div class="downloadlatest"> <div class="downloadlatestbox"> -<a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 2.9 for AmigaOS (5.9MB) 27 Mar 2012</a> +<a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 3.1 for AmigaOS (5.9MB) 26 Apr 2014</a>  Requires: <ul> @@ -72,7 +72,7 @@ </div> <div class="downloadlatestbox downloadlast"> -<a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-2.9-s...">NetSurf 2.9 source code (2.5MB) 27 Mar 2012</a> +<a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.1-s...">NetSurf 3.1 source code (2.9MB) 26 Apr 2014</a> <a href="/downloads/source/#BuildInstructions">Build instructions</a> Build NetSurf for: <ul> @@ -90,6 +90,13 @@ <h2>Previous releases</h2> <dl> +<dt>NetSurf 2.9</dt> +<dd> +<ul> +<li><a href="http://download.netsurf-browser.org/netsurf/releases/pre-built/amiga/nets...">NetSurf 2.9 browser for AmigaOS 4</a> (27 Mar 2012)</li> +<li><a href="http://download.netsurf-browser.org/netsurf/releases/source/netsurf-2.9-s...">NetSurf 2.9 source code</a> (27 Mar 2012)</li> +</ul> +</dd> <dt>NetSurf 2.8</dt> <dd> <ul> -- NetSurf website source for *.netsurf-browser.org

9 years, 4 months

1
0
0 / 0

libdom: branch rupindersingh/dlist created. release/0.1.0-1-g12d3f1b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/12d3f1b1de5b47f710cb02... ...commit http://git.netsurf-browser.org/libdom.git/commit/12d3f1b1de5b47f710cb02d7... ...tree http://git.netsurf-browser.org/libdom.git/tree/12d3f1b1de5b47f710cb02d7d4... The branch, rupindersingh/dlist has been created at 12d3f1b1de5b47f710cb02d7d4b4136219ea5603 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=12d3f1b1de5b47f710cb... commit 12d3f1b1de5b47f710cb02d7d4b4136219ea5603 Author: rsk1994 <rsk1coder99(a)gmail.com> Commit: rsk1994 <rsk1coder99(a)gmail.com> adding DL element rev.1 diff --git a/Makefile b/Makefile index c6bc2bd..4c6906f 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ 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) $(I):$(Is)/html_dlist_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 d34f27f..12245c2 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -56,6 +56,7 @@ #include <dom/html/html_select_element.h> #include <dom/html/html_options_collection.h> #include <dom/html/html_hr_element.h> +#include <dom/html/html_dlist_element.h> /* DOM Events header */ #include <dom/events/events.h> diff --git a/include/dom/html/html_dlist_element.h b/include/dom/html/html_dlist_element.h index 2e182d5..e537994 100644 --- a/include/dom/html/html_dlist_element.h +++ b/include/dom/html/html_dlist_element.h @@ -3,5 +3,21 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_html_d_list_element_h_ +#define dom_html_d_list_element_h_ +#include <stdbool.h> +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +typedef struct dom_html_d_list_element dom_html_d_list_element; + +dom_exception dom_html_d_list_element_get_compact( + dom_html_d_list_element *ele, bool *compact); + +dom_exception dom_html_d_list_element_set_compact( + dom_html_d_list_element *ele, bool compact); + +#endif diff --git a/src/html/Makefile b/src/html/Makefile index 5226b53..25e99f4 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -6,12 +6,13 @@ 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_hr_element.c + html_opt_group_element.c html_option_element.c html_hr_element.c \ + html_dlist_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_dlist_element.c html_directory_element.c html_menu_element.c \ + html_directory_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/html_dlist_element.c b/src/html/html_dlist_element.c index 2e182d5..c79ad6c 100644 --- a/src/html/html_dlist_element.c +++ b/src/html/html_dlist_element.c @@ -3,5 +3,145 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar<rsk1coder99(a)gmail.com> */ +#include <assert.h> +#include <stdlib.h> + +#include <dom/html/html_dlist_element.h> + +#include "html/html_document.h" +#include "html/html_dlist_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_DL_ELEMENT + }, + DOM_HTML_DL_ELEMENT_PROTECT_VTABLE +}; + +/** + * Create a dom_html_d_list_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_d_list_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_d_list_element **ele) +{ + struct dom_node_internal *node; + + *ele = malloc(sizeof(dom_html_d_list_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_d_list_element_initialise(doc, namespace, prefix, *ele); +} + +/** + * Initialise a dom_html_d_list_element object + * + * \param doc The document object + * \param ele The dom_html_d_list_element object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_d_list_element *ele) +{ + return _dom_html_element_initialise(doc, &ele->base, + doc->memoised[hds_DL], + namespace, prefix); +} + +/** + * Finalise a dom_html_d_list_element object + * + * \param ele The dom_html_d_list_element object + */ +void _dom_html_d_list_element_finalise(struct dom_html_d_list_element *ele) +{ + _dom_html_element_finalise(&ele->base); +} + +/** + * Destroy a dom_html_d_list_element object + * + * \param ele The dom_html_d_list_element object + */ +void _dom_html_d_list_element_destroy(struct dom_html_d_list_element *ele) +{ + _dom_html_d_list_element_finalise(ele); + free(ele); +} + +/** + * Get the compact property + * + * \param ele The dom_html_d_list_element object + * \param compact The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_d_list_element_get_compact(dom_html_d_list_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_d_list_element object + * \param compact The status + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception dom_html_d_list_element_set_compact(dom_html_d_list_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_d_list_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_d_list_element_destroy(dom_node_internal *node) +{ + _dom_html_d_list_element_destroy((struct dom_html_d_list_element *) node); +} + +/* The virtual copy function, see src/core/node.c for detail */ +dom_exception _dom_html_d_list_element_copy(dom_node_internal *old, + dom_node_internal **copy) +{ + return _dom_html_element_copy(old, copy); +} diff --git a/src/html/html_dlist_element.h b/src/html/html_dlist_element.h index 2e182d5..8e40dca 100644 --- a/src/html/html_dlist_element.h +++ b/src/html/html_dlist_element.h @@ -3,5 +3,50 @@ * Licensed under the MIT License, * http://www.opensource.org/licenses/mit-license.php * Copyright 2009 Bo Yang <struggleyb.nku(a)gmail.com> + * Copyright 2014 Rupinder Singh Khokhar <rsk1coder99(a)gmail.com> */ +#ifndef dom_internal_html_d_list_element_h_ +#define dom_internal_html_d_list_element_h_ + +#include <dom/html/html_dlist_element.h> +#include "html/html_element.h" + + +struct dom_html_d_list_element { + struct dom_html_element base; + /**< The base class */ +}; + +/* Create a dom_html_d_list_element object */ +dom_exception _dom_html_d_list_element_create(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_d_list_element **ele); + +/* Initialise a dom_html_d_list_element object */ +dom_exception _dom_html_d_list_element_initialise(struct dom_html_document *doc, + dom_string *namespace, dom_string *prefix, + struct dom_html_d_list_element *ele); + +/* Finalise a dom_html_d_list_element object */ +void _dom_html_d_list_element_finalise(struct dom_html_d_list_element *ele); + +/* Destroy a dom_html_d_list_element object */ +void _dom_html_d_list_element_destroy(struct dom_html_d_list_element *ele); + +/* The protected virtual functions */ +dom_exception _dom_html_d_list_element_parse_attribute(dom_element *ele, + dom_string *name, dom_string *value, + dom_string **parsed); +void _dom_virtual_html_d_list_element_destroy(dom_node_internal *node); +dom_exception _dom_html_d_list_element_copy(dom_node_internal *old, + dom_node_internal **copy); + +#define DOM_HTML_DL_ELEMENT_PROTECT_VTABLE \ + _dom_html_d_list_element_parse_attribute + +#define DOM_NODE_PROTECT_VTABLE_HTML_DL_ELEMENT \ + _dom_virtual_html_d_list_element_destroy, \ + _dom_html_d_list_element_copy + +#endif diff --git a/src/html/html_document_strings.h b/src/html/html_document_strings.h index 8e9d79e..90f3b59 100644 --- a/src/html/html_document_strings.h +++ b/src/html/html_document_strings.h @@ -96,6 +96,8 @@ HTML_DOCUMENT_STRINGS_ACTION1(selected) /* HTMLSelectElement strings */ HTML_DOCUMENT_STRINGS_ACTION(select_multiple,select-multiple) HTML_DOCUMENT_STRINGS_ACTION(select_one,select-one) +/* HTMLDlist attributes */ +HTML_DOCUMENT_STRINGS_ACTION1(compact) /* Some event strings for later */ HTML_DOCUMENT_STRINGS_ACTION1(blur) HTML_DOCUMENT_STRINGS_ACTION1(focus) diff --git a/test/testcases/tests/level1/html/HTMLDlistElement01.xml b/test/testcases/tests/level1/html/HTMLDlistElement01.xml new file mode 100644 index 0000000..727c189 --- /dev/null +++ b/test/testcases/tests/level1/html/HTMLDlistElement01.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> + + +<!DOCTYPE test SYSTEM "dom1.dtd"> +<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDlistElement01"> +<metadata> +<title>HTMLDListElement01</title> +<creator>NIST</creator> +<description> + The compact attribute specifies a boolean value on whether to display + the list more compactly. + + Retrieve the compact attribute and examine its value. +</description> +<contributor>Mary Brady</contributor> +<date qualifier="created">2002-02-22</date> +<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2173..."/> +</metadata> +<var name="nodeList" type="NodeList"/> +<var name="testNode" type="Node"/> +<var name="vcompact" type="boolean" /> +<var name="doc" type="Document"/> +<load var="doc" href="dl" willBeModified="false"/> +<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"dl"'/> +<assertSize collection="nodeList" size="1" id="Asize"/> +<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> +<compact interface="HTMLDListElement" obj="testNode" var="vcompact"/> +<assertTrue actual="vcompact" id="compactLink"/> +</test> diff --git a/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl b/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl deleted file mode 100644 index 727c189..0000000 --- a/test/testcases/tests/level1/html/HTMLDlistElement01.xml.notimpl +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet href="test-to-html.xsl" type="text/xml"?> - - -<!DOCTYPE test SYSTEM "dom1.dtd"> -<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1" name="HTMLDlistElement01"> -<metadata> -<title>HTMLDListElement01</title> -<creator>NIST</creator> -<description> - The compact attribute specifies a boolean value on whether to display - the list more compactly. - - Retrieve the compact attribute and examine its value. -</description> -<contributor>Mary Brady</contributor> -<date qualifier="created">2002-02-22</date> -<subject resource="http://www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-html#ID-2173..."/> -</metadata> -<var name="nodeList" type="NodeList"/> -<var name="testNode" type="Node"/> -<var name="vcompact" type="boolean" /> -<var name="doc" type="Document"/> -<load var="doc" href="dl" willBeModified="false"/> -<getElementsByTagName interface="Document" obj="doc" var="nodeList" tagname='"dl"'/> -<assertSize collection="nodeList" size="1" id="Asize"/> -<item interface="NodeList" obj="nodeList" var="testNode" index="0"/> -<compact interface="HTMLDListElement" obj="testNode" var="vcompact"/> -<assertTrue actual="vcompact" id="compactLink"/> -</test> ----------------------------------------------------------------------- -- Document Object Model library

9 years, 4 months

1
0
0 / 0

netsurf-all: branch master updated. release/3.1-3-gd65dba6

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/d65dba6f6e4d4c35b... ...commit http://git.netsurf-browser.org/netsurf-all.git/commit/d65dba6f6e4d4c35b9d... ...tree http://git.netsurf-browser.org/netsurf-all.git/tree/d65dba6f6e4d4c35b9db3... The branch, master has been updated via d65dba6f6e4d4c35b9db3c8036913e48809fad2e (commit) from 3c80f49dc4e5da4e32febe077d17c19897417ad5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=d65dba6f6e4d4c3... commit d65dba6f6e4d4c35b9db3c8036913e48809fad2e Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> netsurf extra config options must be passed to install and package targets diff --git a/Makefile b/Makefile index 2d2c4ce..eef87cb 100644 --- a/Makefile +++ b/Makefile @@ -63,10 +63,10 @@ $(TMP_PREFIX)/build-stamp: touch $@ package: $(TMP_PREFIX)/build-stamp - $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) package + $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) package $(NETSURF_CONFIG) install: $(TMP_PREFIX)/build-stamp - $(MAKE) install --directory=$(NETSURF_TARG) TARGET=$(TARGET) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) + $(MAKE) install --directory=$(NETSURF_TARG) TARGET=$(TARGET) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) $(NETSURF_CONFIG) clean: $(RM) -r $(TMP_PREFIX) ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2d2c4ce..eef87cb 100644 --- a/Makefile +++ b/Makefile @@ -63,10 +63,10 @@ $(TMP_PREFIX)/build-stamp: touch $@ package: $(TMP_PREFIX)/build-stamp - $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) package + $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) package $(NETSURF_CONFIG) install: $(TMP_PREFIX)/build-stamp - $(MAKE) install --directory=$(NETSURF_TARG) TARGET=$(TARGET) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) + $(MAKE) install --directory=$(NETSURF_TARG) TARGET=$(TARGET) PREFIX=$(PREFIX) DESTDIR=$(DESTDIR) $(NETSURF_CONFIG) clean: $(RM) -r $(TMP_PREFIX) -- NetSurf 'all' tree. Typically used for releases

9 years, 4 months

1
0
0 / 0

netsurf-all: branch master updated. release/3.1-2-g3c80f49

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/3c80f49dc4e5da4e3... ...commit http://git.netsurf-browser.org/netsurf-all.git/commit/3c80f49dc4e5da4e32f... ...tree http://git.netsurf-browser.org/netsurf-all.git/tree/3c80f49dc4e5da4e32feb... The branch, master has been updated via 3c80f49dc4e5da4e32febe077d17c19897417ad5 (commit) from 325d4643fc8536f1a461e7889b3568085bfc3312 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=3c80f49dc4e5da4... commit 3c80f49dc4e5da4e32febe077d17c19897417ad5 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> make atri build explicitly specify javascript parameter diff --git a/Makefile b/Makefile index 78c2356..2d2c4ce 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,19 @@ NSLIB_FB_TARG := libnsfb NSLIB_RO_TARG := librufl libpencil -# only build what we reuire for the target +# only build what we require for the target ifeq ($(TARGET),riscos) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_RO_TARG) else ifeq ($(TARGET),framebuffer) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_FB_TARG) else - NSLIB_TARG := $(NSLIB_ALL_TARG) + ifeq ($(TARGET),amiga) + NSLIB_TARG := $(NSLIB_ALL_TARG) + NETSURF_CONFIG := NETSURF_USE_MOZJS=YES + else + NSLIB_TARG := $(NSLIB_ALL_TARG) + endif endif endif @@ -54,7 +59,7 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) - $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) + $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) $(NETSURF_CONFIG) touch $@ package: $(TMP_PREFIX)/build-stamp ----------------------------------------------------------------------- Summary of changes: Makefile | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 78c2356..2d2c4ce 100644 --- a/Makefile +++ b/Makefile @@ -23,14 +23,19 @@ NSLIB_FB_TARG := libnsfb NSLIB_RO_TARG := librufl libpencil -# only build what we reuire for the target +# only build what we require for the target ifeq ($(TARGET),riscos) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_RO_TARG) else ifeq ($(TARGET),framebuffer) NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_FB_TARG) else - NSLIB_TARG := $(NSLIB_ALL_TARG) + ifeq ($(TARGET),amiga) + NSLIB_TARG := $(NSLIB_ALL_TARG) + NETSURF_CONFIG := NETSURF_USE_MOZJS=YES + else + NSLIB_TARG := $(NSLIB_ALL_TARG) + endif endif endif @@ -54,7 +59,7 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) - $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) + $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) $(NETSURF_CONFIG) touch $@ package: $(TMP_PREFIX)/build-stamp -- NetSurf 'all' tree. Typically used for releases

9 years, 4 months

1
0
0 / 0

netsurf-all: branch master updated. release/3.1-1-g325d464

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-all.git/shortlog/325d4643fc8536f1a... ...commit http://git.netsurf-browser.org/netsurf-all.git/commit/325d4643fc8536f1a46... ...tree http://git.netsurf-browser.org/netsurf-all.git/tree/325d4643fc8536f1a461e... The branch, master has been updated via 325d4643fc8536f1a461e7889b3568085bfc3312 (commit) from ef5ffaf00951a72d45d8280b6f75302058b106fd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf-all.git/commit/?id=325d4643fc8536f... commit 325d4643fc8536f1a461e7889b3568085bfc3312 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> Improve handling of target specific library builds diff --git a/Makefile b/Makefile index 1fb4fba..78c2356 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,23 @@ NETSURF_TARG := netsurf # nsgenbind host tool NSGENBIND_TARG := nsgenbind -NSLIB_TARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libnsfb libsvgtiny +NSLIB_ALL_TARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libsvgtiny + +NSLIB_FB_TARG := libnsfb NSLIB_RO_TARG := librufl libpencil +# only build what we reuire for the target +ifeq ($(TARGET),riscos) + NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_RO_TARG) +else + ifeq ($(TARGET),framebuffer) + NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_FB_TARG) + else + NSLIB_TARG := $(NSLIB_ALL_TARG) + endif +endif + # clean macro for each sub target define do_clean $(MAKE) distclean --directory=$1 TARGET=$(TARGET) @@ -40,9 +53,6 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/lib mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) -ifeq ($(TARGET),riscos) - $(foreach L,$(NSLIB_RO_TARG),$(call do_prefix_install,$(L))) -endif $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) touch $@ @@ -56,9 +66,6 @@ install: $(TMP_PREFIX)/build-stamp clean: $(RM) -r $(TMP_PREFIX) $(foreach L,$(NSLIB_TARG),$(call do_clean,$(L))) -ifeq ($(TARGET),riscos) - $(foreach L,$(NSLIB_RO_TARG),$(call do_clean,$(L))) -endif $(MAKE) clean --directory=$(NSGENBIND_TARG) TARGET=$(TARGET) $(MAKE) clean --directory=$(NETSURF_TARG) TARGET=$(TARGET) ----------------------------------------------------------------------- Summary of changes: Makefile | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1fb4fba..78c2356 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,23 @@ NETSURF_TARG := netsurf # nsgenbind host tool NSGENBIND_TARG := nsgenbind -NSLIB_TARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libnsfb libsvgtiny +NSLIB_ALL_TARG := buildsystem libwapcaplet libparserutils libcss libhubbub libdom libnsbmp libnsgif librosprite libsvgtiny + +NSLIB_FB_TARG := libnsfb NSLIB_RO_TARG := librufl libpencil +# only build what we reuire for the target +ifeq ($(TARGET),riscos) + NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_RO_TARG) +else + ifeq ($(TARGET),framebuffer) + NSLIB_TARG := $(NSLIB_ALL_TARG) $(NSLIB_FB_TARG) + else + NSLIB_TARG := $(NSLIB_ALL_TARG) + endif +endif + # clean macro for each sub target define do_clean $(MAKE) distclean --directory=$1 TARGET=$(TARGET) @@ -40,9 +53,6 @@ $(TMP_PREFIX)/build-stamp: mkdir -p $(TMP_PREFIX)/lib mkdir -p $(TMP_PREFIX)/bin $(foreach L,$(NSLIB_TARG),$(call do_prefix_install,$(L))) -ifeq ($(TARGET),riscos) - $(foreach L,$(NSLIB_RO_TARG),$(call do_prefix_install,$(L))) -endif $(MAKE) install --directory=$(NSGENBIND_TARG) PREFIX=$(TMP_PREFIX) TARGET=$(shell uname -s) $(MAKE) --directory=$(NETSURF_TARG) PREFIX=$(PREFIX) TARGET=$(TARGET) touch $@ @@ -56,9 +66,6 @@ install: $(TMP_PREFIX)/build-stamp clean: $(RM) -r $(TMP_PREFIX) $(foreach L,$(NSLIB_TARG),$(call do_clean,$(L))) -ifeq ($(TARGET),riscos) - $(foreach L,$(NSLIB_RO_TARG),$(call do_clean,$(L))) -endif $(MAKE) clean --directory=$(NSGENBIND_TARG) TARGET=$(TARGET) $(MAKE) clean --directory=$(NETSURF_TARG) TARGET=$(TARGET) -- NetSurf 'all' tree. Typically used for releases

9 years, 4 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-8-ga73f22c

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/a73f22c966e97fc3a706f... ...commit http://git.netsurf-browser.org/netsurf.git/commit/a73f22c966e97fc3a706ff9... ...tree http://git.netsurf-browser.org/netsurf.git/tree/a73f22c966e97fc3a706ff980... The branch, master has been updated via a73f22c966e97fc3a706ff9804aa2ea73a4d5428 (commit) from 3a7fb23b878167d007df21fee25413d483ebdc79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=a73f22c966e97fc3a70... commit a73f22c966e97fc3a706ff9804aa2ea73a4d5428 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> make gtk commandline filename loading use snprintf diff --git a/gtk/gui.c b/gtk/gui.c index 1c108a1..3147bf1 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -421,13 +421,15 @@ static void gui_init(int argc, char** argv, char **respath) if (argc > 1) { struct stat fs; if (stat(argv[1], &fs) == 0) { + size_t addrlen; char *rp = realpath(argv[1], NULL); assert(rp != NULL); - addr = malloc(SLEN("file://") + strlen(rp) + /*\0 */ 1); + + /* calculate file url length including terminator */ + addrlen = SLEN("file://") + strlen(rp) + 1; + addr = malloc(addrlen); assert(addr != NULL); - /* These are safe thanks to the above sum */ - strcpy(addr, "file://"); - strcat(addr, rp); + snprintf(addr, addrlen, "file://%s", rp); free(rp); } else { addr = strdup(argv[1]); ----------------------------------------------------------------------- Summary of changes: gtk/gui.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gtk/gui.c b/gtk/gui.c index 1c108a1..3147bf1 100644 --- a/gtk/gui.c +++ b/gtk/gui.c @@ -421,13 +421,15 @@ static void gui_init(int argc, char** argv, char **respath) if (argc > 1) { struct stat fs; if (stat(argv[1], &fs) == 0) { + size_t addrlen; char *rp = realpath(argv[1], NULL); assert(rp != NULL); - addr = malloc(SLEN("file://") + strlen(rp) + /*\0 */ 1); + + /* calculate file url length including terminator */ + addrlen = SLEN("file://") + strlen(rp) + 1; + addr = malloc(addrlen); assert(addr != NULL); - /* These are safe thanks to the above sum */ - strcpy(addr, "file://"); - strcat(addr, rp); + snprintf(addr, addrlen, "file://%s", rp); free(rp); } else { addr = strdup(argv[1]); -- NetSurf Browser

9 years, 4 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-7-g3a7fb23

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/3a7fb23b878167d007df2... ...commit http://git.netsurf-browser.org/netsurf.git/commit/3a7fb23b878167d007df21f... ...tree http://git.netsurf-browser.org/netsurf.git/tree/3a7fb23b878167d007df21fee... The branch, master has been updated via 3a7fb23b878167d007df21fee25413d483ebdc79 (commit) from 56b42943d0ad0d032b2219290a2b7a02fa598466 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3a7fb23b878167d007d... commit 3a7fb23b878167d007df21fee25413d483ebdc79 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> monkey should not force external iconv diff --git a/monkey/Makefile.defaults b/monkey/Makefile.defaults index bbe4c6c..d6a90a3 100644 --- a/monkey/Makefile.defaults +++ b/monkey/Makefile.defaults @@ -9,6 +9,5 @@ NETSURF_USE_RSVG := NO NETSURF_USE_NSSVG := NO NETSURF_USE_ROSPRITE := NO NETSURF_USE_HARU_PDF := NO -NETSURF_USE_LIBICONV_PLUG := NO CFLAGS += -O2 ----------------------------------------------------------------------- Summary of changes: monkey/Makefile.defaults | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/monkey/Makefile.defaults b/monkey/Makefile.defaults index bbe4c6c..d6a90a3 100644 --- a/monkey/Makefile.defaults +++ b/monkey/Makefile.defaults @@ -9,6 +9,5 @@ NETSURF_USE_RSVG := NO NETSURF_USE_NSSVG := NO NETSURF_USE_ROSPRITE := NO NETSURF_USE_HARU_PDF := NO -NETSURF_USE_LIBICONV_PLUG := NO CFLAGS += -O2 -- NetSurf Browser

9 years, 4 months

1
0
0 / 0

netsurf: branch master updated. release/3.1-6-g56b4294

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/56b42943d0ad0d032b221... ...commit http://git.netsurf-browser.org/netsurf.git/commit/56b42943d0ad0d032b22192... ...tree http://git.netsurf-browser.org/netsurf.git/tree/56b42943d0ad0d032b2219290... The branch, master has been updated via 56b42943d0ad0d032b2219290a2b7a02fa598466 (commit) from 1822b7c1633671cd41e60a04f7eeaf86dcec4141 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=56b42943d0ad0d032b2... commit 56b42943d0ad0d032b2219290a2b7a02fa598466 Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> improve iconv library handling diff --git a/Makefile b/Makefile index 4f9380a..864c5bd 100644 --- a/Makefile +++ b/Makefile @@ -314,6 +314,8 @@ DEPROOT := $(OBJROOT)/deps TOOLROOT := $(OBJROOT)/tools +# A macro that conditionaly adds flags to the build when a feature is enabled. +# # 1: Feature name (ie, NETSURF_USE_BMP -> BMP) # 2: Parameters to add to CFLAGS # 3: Parameters to add to LDFLAGS @@ -335,6 +337,33 @@ define feature_enabled endif endef +# A macro that conditionaly adds flags to the build with a uniform display. +# +# 1: Feature name (ie, NETSURF_USE_BMP -> BMP) +# 2: Human-readable name for the feature +# 3: Parameters to add to CFLAGS when enabled +# 4: Parameters to add to LDFLAGS when enabled +# 5: Parameters to add to CFLAGS when disabled +# 6: Parameters to add to LDFLAGS when disabled +define feature_switch + ifeq ($$(NETSURF_USE_$(1)),YES) + CFLAGS += $(3) + LDFLAGS += $(4) + ifneq ($(MAKECMDGOALS),clean) + $$(info M.CONFIG: $(2) enabled (NETSURF_USE_$(1) := YES)) + endif + else ifeq ($$(NETSURF_USE_$(1)),NO) + CFLAGS += $(5) + LDFLAGS += $(6) + ifneq ($(MAKECMDGOALS),clean) + $$(info M.CONFIG: $(2) disabled (NETSURF_USE_$(1) := NO)) + endif + else + $$(info M.CONFIG: $(4) error (NETSURF_USE_$(1) := $$(NETSURF_USE_$(1)))) + $$(error NETSURF_USE_$(1) must be YES or NO) + endif +endef + # Extend flags with appropriate values from pkg-config for enabled features # # 1: pkg-config required modules for feature @@ -431,10 +460,14 @@ endif # Pull in the configuration include Makefile.defaults -$(eval $(call feature_enabled,JPEG,-DWITH_JPEG,-ljpeg,JPEG (libjpeg))) +# Build flags for libjpeg as it has no pkgconfig file +$(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,)) + +# Build flags for haru +$(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,)) -$(eval $(call feature_enabled,HARU_PDF,-DWITH_PDF_EXPORT,-lhpdf -lpng,PDF export (haru))) -$(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal iconv)) +# Build flags for iconv +$(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv)) # common libraries without pkg-config support LDFLAGS += -lz diff --git a/atari/Makefile.target b/atari/Makefile.target index 60f6e80..6851400 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -69,7 +69,7 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall $(WARNFLAGS) -Dnsatari \ LDFLAGS += -lcflib -lcurl LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub LDFLAGS += -lssl -lcrypto -LDFLAGS += -lz -liconv -lcares -lHermes -lgem -lm +LDFLAGS += -lz -lcares -lHermes -lgem -lm LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib diff --git a/beos/Makefile.target b/beos/Makefile.target index ed7532d..a1259d6 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -12,7 +12,7 @@ LDFLAGS += -L/boot/common/lib LDFLAGS += -lssl -lcrypto -lcss $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet -LDFLAGS += -lexpat -lcurl -liconv +LDFLAGS += -lexpat -lcurl CFLAGS += -O $(WARNFLAGS) -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE \ -Drestrict="" -Wno-multichar diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index e6292c1..6e65b13 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -7,7 +7,7 @@ POSTEXES += NetSurf.app LDFLAGS += -L/usr/lib LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom) LDFLAGS += -L/usr/X11/lib -LDFLAGS += -lm -lcurl -liconv +LDFLAGS += -lm -lcurl LDFLAGS += -lssl -lcrypto CFLAGS += -O $(WARNFLAGS) -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE \ diff --git a/gtk/Makefile.defaults b/gtk/Makefile.defaults index 6c48b0c..eb17cb1 100644 --- a/gtk/Makefile.defaults +++ b/gtk/Makefile.defaults @@ -27,6 +27,12 @@ ifeq ($(HOST),macosx) NETSURF_USE_HARU_PDF := NO endif +# Configuration overrides for OpenBSD +ifeq ($(HOST),OpenBSD) + NETSURF_USE_LIBICONV_PLUG := NO + NETSURF_USE_HARU_PDF := NO +endif + # Set default GTK version to build for (2 or 3) NETSURF_GTK_MAJOR := 2 diff --git a/windows/Makefile.target b/windows/Makefile.target index 87544e3..93ee50a 100644 --- a/windows/Makefile.target +++ b/windows/Makefile.target @@ -30,8 +30,7 @@ else LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz endif -LDFLAGS += -lssl -lcrypto -lregex -liconv \ - -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows +LDFLAGS += -lssl -lcrypto -lregex -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows CFLAGS += -U__STRICT_ANSI__ -mwin32 # only windows versions after XP are supported ----------------------------------------------------------------------- Summary of changes: Makefile | 39 ++++++++++++++++++++++++++++++++++++--- atari/Makefile.target | 2 +- beos/Makefile.target | 2 +- cocoa/Makefile.target | 2 +- gtk/Makefile.defaults | 6 ++++++ windows/Makefile.target | 3 +-- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 4f9380a..864c5bd 100644 --- a/Makefile +++ b/Makefile @@ -314,6 +314,8 @@ DEPROOT := $(OBJROOT)/deps TOOLROOT := $(OBJROOT)/tools +# A macro that conditionaly adds flags to the build when a feature is enabled. +# # 1: Feature name (ie, NETSURF_USE_BMP -> BMP) # 2: Parameters to add to CFLAGS # 3: Parameters to add to LDFLAGS @@ -335,6 +337,33 @@ define feature_enabled endif endef +# A macro that conditionaly adds flags to the build with a uniform display. +# +# 1: Feature name (ie, NETSURF_USE_BMP -> BMP) +# 2: Human-readable name for the feature +# 3: Parameters to add to CFLAGS when enabled +# 4: Parameters to add to LDFLAGS when enabled +# 5: Parameters to add to CFLAGS when disabled +# 6: Parameters to add to LDFLAGS when disabled +define feature_switch + ifeq ($$(NETSURF_USE_$(1)),YES) + CFLAGS += $(3) + LDFLAGS += $(4) + ifneq ($(MAKECMDGOALS),clean) + $$(info M.CONFIG: $(2) enabled (NETSURF_USE_$(1) := YES)) + endif + else ifeq ($$(NETSURF_USE_$(1)),NO) + CFLAGS += $(5) + LDFLAGS += $(6) + ifneq ($(MAKECMDGOALS),clean) + $$(info M.CONFIG: $(2) disabled (NETSURF_USE_$(1) := NO)) + endif + else + $$(info M.CONFIG: $(4) error (NETSURF_USE_$(1) := $$(NETSURF_USE_$(1)))) + $$(error NETSURF_USE_$(1) must be YES or NO) + endif +endef + # Extend flags with appropriate values from pkg-config for enabled features # # 1: pkg-config required modules for feature @@ -431,10 +460,14 @@ endif # Pull in the configuration include Makefile.defaults -$(eval $(call feature_enabled,JPEG,-DWITH_JPEG,-ljpeg,JPEG (libjpeg))) +# Build flags for libjpeg as it has no pkgconfig file +$(eval $(call feature_switch,JPEG,JPEG (libjpeg),-DWITH_JPEG,-ljpeg,-UWITH_JPEG,)) + +# Build flags for haru +$(eval $(call feature_switch,HARU_PDF,PDF export (haru),-DWITH_PDF_EXPORT,-lhpdf -lpng,-UWITH_PDF_EXPORT,)) -$(eval $(call feature_enabled,HARU_PDF,-DWITH_PDF_EXPORT,-lhpdf -lpng,PDF export (haru))) -$(eval $(call feature_enabled,LIBICONV_PLUG,-DLIBICONV_PLUG,,glibc internal iconv)) +# Build flags for iconv +$(eval $(call feature_switch,LIBICONV_PLUG,glibc internal iconv,-DLIBICONV_PLUG,,-ULIBICONV_PLUG,-liconv)) # common libraries without pkg-config support LDFLAGS += -lz diff --git a/atari/Makefile.target b/atari/Makefile.target index 60f6e80..6851400 100644 --- a/atari/Makefile.target +++ b/atari/Makefile.target @@ -69,7 +69,7 @@ CFLAGS += -U__STRICT_ANSI__ -std=c99 -Dsmall $(WARNFLAGS) -Dnsatari \ LDFLAGS += -lcflib -lcurl LDFLAGS += -lcss -lparserutils -ldom -lwapcaplet -lhubbub LDFLAGS += -lssl -lcrypto -LDFLAGS += -lz -liconv -lcares -lHermes -lgem -lm +LDFLAGS += -lz -lcares -lHermes -lgem -lm LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib diff --git a/beos/Makefile.target b/beos/Makefile.target index ed7532d..a1259d6 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -12,7 +12,7 @@ LDFLAGS += -L/boot/common/lib LDFLAGS += -lssl -lcrypto -lcss $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG (libsvgtiny))) LDFLAGS += -ldom -lparserutils -lhubbub -lwapcaplet -LDFLAGS += -lexpat -lcurl -liconv +LDFLAGS += -lexpat -lcurl CFLAGS += -O $(WARNFLAGS) -Dnsbeos -D_BSD_SOURCE -D_POSIX_C_SOURCE \ -Drestrict="" -Wno-multichar diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index e6292c1..6e65b13 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -7,7 +7,7 @@ POSTEXES += NetSurf.app LDFLAGS += -L/usr/lib LDFLAGS += $(shell $(PKG_CONFIG) --libs libhubbub libcss libdom) LDFLAGS += -L/usr/X11/lib -LDFLAGS += -lm -lcurl -liconv +LDFLAGS += -lm -lcurl LDFLAGS += -lssl -lcrypto CFLAGS += -O $(WARNFLAGS) -Dnscocoa -D_BSD_SOURCE -D_POSIX_C_SOURCE \ diff --git a/gtk/Makefile.defaults b/gtk/Makefile.defaults index 6c48b0c..eb17cb1 100644 --- a/gtk/Makefile.defaults +++ b/gtk/Makefile.defaults @@ -27,6 +27,12 @@ ifeq ($(HOST),macosx) NETSURF_USE_HARU_PDF := NO endif +# Configuration overrides for OpenBSD +ifeq ($(HOST),OpenBSD) + NETSURF_USE_LIBICONV_PLUG := NO + NETSURF_USE_HARU_PDF := NO +endif + # Set default GTK version to build for (2 or 3) NETSURF_GTK_MAJOR := 2 diff --git a/windows/Makefile.target b/windows/Makefile.target index 87544e3..93ee50a 100644 --- a/windows/Makefile.target +++ b/windows/Makefile.target @@ -30,8 +30,7 @@ else LDFLAGS += -lhubbub -lcss -lparserutils -lwapcaplet -lcurl -lz endif -LDFLAGS += -lssl -lcrypto -lregex -liconv \ - -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows +LDFLAGS += -lssl -lcrypto -lregex -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -mwindows CFLAGS += -U__STRICT_ANSI__ -mwin32 # only windows versions after XP are supported -- NetSurf Browser

9 years, 4 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits April 2014