Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/bitmap-fonts

!NetSurf/Resources/nl/licence.html,faf

@@ -36,7 +36,7 @@ dl.components > dd > span + span {
 
 <h1>NetSurf-gebruikerslicentie</h1>
 
-<p>De broncode van NetSurf, de documentie, evenals de verschillende
+<p>De broncode van NetSurf, de documentatie, evenals de verschillende
 vertalingen, bijbehorende bestanden en de gebruikersinterface-definities zijn
 vrijgegeven onder de voorwaarden van de GNU General Public Licence, versie
 2.0. Bovendien, als speciale uitzondering is het toegestaan om de code van

!NetSurf/Resources/nl/welcome.html,faf

@@ -10,10 +10,10 @@
 <h1 class="banner"><a href="http://www.netsurf-browser.org/"><img src="about:logo" alt="NetSurf"></a></h1>
 
 <ul class="nslinks">
-<li><a href="http://www.netsurf-browser.org/"><strong>NetSurf-webstek</strong> </a> (Engels)</li>
+<li><a href="http://www.netsurf-browser.org/"><strong>NetSurf-website</strong> </a> (Engels)</li>
 <li><a href="http://www.netsurf-browser.org/documentation/">Engelstalige documentatie</a></li>
 <li>Nieuwste <a href="http://www.netsurf-browser.org/downloads/"><strong>NetSurf-versie</strong></a> ophalen</li>
-<li>Schrijf de <a href="../contact/index_nl"><strong>ontwikkelaars</strong> </a> (Engels)</li>
+<li>Schrijf de <a href="http://www.netsurf-browser.org/contact/"><strong>ontwikkelaars</strong> </a> (Engels)</li>
 <li>Schrijf de <a href="mailto:g.vankatwijk@freeler.nl">vertalers</a>
 </ul>
 

Docs/QUICK-START

@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-  Quick Build Steps for NetSurf                               26 February 2014
+  Quick Build Steps for NetSurf                               24 February 2015
 --------------------------------------------------------------------------------
 
   This document provides steps for building NetSurf.
@@ -63,6 +63,42 @@
       $ ./nsfb
 
 
+  Cross Compiling
+=================
+
+  If you are cross compiling, you can follow the above steps, but when sourcing
+  env.sh, you should set TARGET_ABI to the appropriate triplet for your cross
+  compiler.  For example, to cross compile for RISC OS:
+
+      $ TARGET_ABI=arm-unknown-riscos source env.sh
+
+  After that, the commands such as `ns-package-install` and `ns-pull-install`
+  will do what is appropriate for the platform you are building for.
+
+  To do the final build of NetSurf, pass the appropriate TARGET to make.  For
+  example, to cross compile for RISC OS:
+
+      $ make TARGET=riscos
+
+  Finally, you can package up your build to transfer to the system you are
+  developing for.  For example, to produce a package for RISC OS:
+
+      $ make TARGET=riscos package
+
+  Getting a cross compiler set up
+---------------------------------
+
+  We maintain cross compilation environments and an SDK for a number of
+  platforms.  These may be found in our toolchains repository.
+
+      $ git clone git://git.netsurf-browser.org/toolchains
+
+  Pre-built versions of the toolchains for Debian systems are often available
+  via our automated build and test infrastructure:
+
+      http://ci.netsurf-browser.org/builds/toolchains/
+
+
   Not working?
 ==============
 

atari/findfile.c

@@ -26,7 +26,7 @@
 #include <curl/curl.h>
 
 #include "utils/log.h"
-#include "utils/url.h"
+#include "utils/corestrings.h"
 #include "atari/gemtk/gemtk.h"
 #include "atari/findfile.h"
 #include "atari/misc.h"

beos/gui.cpp

@@ -49,6 +49,7 @@ extern "C" {
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/url.h"
+#include "utils/corestrings.h"
 #include "utils/utf8.h"
 #include "utils/utils.h"
 

beos/scaffolding.cpp

@@ -64,6 +64,7 @@ extern "C" {
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/log.h"
+#include "utils/nsurl.h"
 #include "desktop/gui_clipboard.h"
 }
 #include "beos/about.h"

beos/scaffolding.h

@@ -28,6 +28,7 @@ extern "C" {
 #include "desktop/plotters.h"
 
 struct hlcache_handle;
+struct nsurl;
 
 }
 

content/content.h

@@ -34,7 +34,6 @@
 #include "utils/config.h"
 #include "utils/errors.h"
 #include "utils/http.h"
-#include "utils/nsurl.h"
 #include "content/content_factory.h"
 #include "content/content_type.h"
 #include "desktop/search.h"
@@ -105,7 +104,7 @@ struct content_rfc5988_link {
 	struct content_rfc5988_link *next; /**< next rfc5988_link in list */
 
 	lwc_string *rel; /**< the link relationship - must be present */
-	nsurl *href; /**< the link href - must be present */
+	struct nsurl *href; /**< the link href - must be present */
 	lwc_string *hreflang;
 	lwc_string *type;
 	lwc_string *media;
@@ -120,8 +119,8 @@ union content_msg_data {
 	nserror errorcode;
         /** CONTENT_MSG_REDIRECT - Redirect info */
 	struct {
-		nsurl *from;	/**< Redirect origin */
-		nsurl *to;	/**< Redirect target */
+		struct nsurl *from;	/**< Redirect origin */
+		struct nsurl *to;	/**< Redirect target */
 	} redirect;		/**< Fetch URL redirect occured */
 	/** CONTENT_MSG_REDRAW - Area of content which needs redrawing */
 	struct {
@@ -171,7 +170,7 @@ union content_msg_data {
 	} dragsave;
 	/** CONTENT_MSG_SAVELINK - Save a URL */
 	struct {
-		nsurl *url;
+		struct nsurl *url;
 		const char *title;
 	} savelink;
 	/** CONTENT_MSG_POINTER - Mouse pointer to set */
@@ -252,7 +251,7 @@ bool content_matches_quirks(struct content *c, bool quirks);
 bool content_is_shareable(struct content *c);
 
 const struct llcache_handle *content_get_llcache_handle(struct content *c);
-nsurl *content_get_url(struct content *c);
+struct nsurl *content_get_url(struct content *c);
 
 struct content *content_clone(struct content *c);
 
@@ -426,7 +425,7 @@ void content_invalidate_reuse_data(struct hlcache_handle *h);
  * \param h Content to retrieve refresh URL from
  * \return Pointer to URL, or NULL if none
  */
-nsurl *content_get_refresh_url(struct hlcache_handle *h);
+struct nsurl *content_get_refresh_url(struct hlcache_handle *h);
 
 /**
  * Retrieve the bitmap contained in an image content

content/dirlist.h

@@ -33,15 +33,17 @@
 #define DIRLIST_NO_DATE_COLUMN 1 << 3
 #define DIRLIST_NO_TIME_COLUMN 1 << 4
 
+struct nsurl;
+
 bool dirlist_generate_top(char *buffer, int buffer_length);
 bool dirlist_generate_hide_columns(int flags, char *buffer, int buffer_length);
 bool dirlist_generate_title(const char *title, char *buffer, int buffer_length);
 bool dirlist_generate_parent_link(const char *parent, char *buffer,
 		int buffer_length);
 bool dirlist_generate_headings(char *buffer, int buffer_length);
-bool dirlist_generate_row(bool even, bool directory, nsurl *url, char *name,
-		const char *mimetype, long long size, char *date, char *time,
-		char *buffer, int buffer_length);
+bool dirlist_generate_row(bool even, bool directory, struct nsurl *url,
+		char *name, const char *mimetype, long long size, char *date,
+		char *time, char *buffer, int buffer_length);
 bool dirlist_generate_bottom(char *buffer, int buffer_length);
 
 #endif

css/select.h

@@ -24,9 +24,9 @@
 #include <dom/dom.h>
 
 #include "css/css.h"
-#include "utils/nsurl.h"
 
 struct content;
+struct nsurl;
 
 /**
  * Selection context
@@ -35,7 +35,7 @@ typedef struct nscss_select_ctx
 {
 	css_select_ctx *ctx;
 	bool quirks;
-	nsurl *base_url;
+	struct nsurl *base_url;
 	lwc_string *universal;
 	const css_computed_style *parent_style;
 } nscss_select_ctx;

gtk/scaffolding.c

@@ -27,7 +27,7 @@
 
 #include "utils/filepath.h"
 #include "utils/messages.h"
-#include "utils/url.h"
+#include "utils/corestrings.h"
 #include "utils/log.h"
 #include "utils/nsoption.h"
 #include "utils/file.h"

gtk/viewsource.c

@@ -20,6 +20,7 @@
 
 #include "utils/utils.h"
 #include "utils/utf8.h"
+#include "utils/nsurl.h"
 #include "utils/messages.h"
 #include "desktop/browser.h"
 #include "content/content.h"

monkey/main.c

@@ -78,8 +78,6 @@ static void monkey_quit(void)
 {
   urldb_save_cookies(nsoption_charp(cookie_jar));
   urldb_save(nsoption_charp(url_file));
-  free(nsoption_charp(cookie_file));
-  free(nsoption_charp(cookie_jar));
   monkey_fetch_filetype_fin();
 }
 

render/imagemap.h

@@ -21,16 +21,15 @@
 
 #include <dom/dom.h>
 
-#include "utils/nsurl.h"
-
 struct html_content;
 struct hlcache_handle;
+struct nsurl;
 
 void imagemap_destroy(struct html_content *c);
 void imagemap_dump(struct html_content *c);
 nserror imagemap_extract(struct html_content *c);
 
-nsurl *imagemap_get(struct html_content *c, const char *key,
+struct nsurl *imagemap_get(struct html_content *c, const char *key,
 		unsigned long x, unsigned long y,
 		unsigned long click_x, unsigned long click_y,
 		const char **target);

riscos/gui.c

@@ -438,7 +438,7 @@ static void ro_gui_signal(int sig)
 #else
 	/* Save WimpSlot and UnixLib managed DAs when UnixEnv$coredump
 	 * defines a coredump directory.  */
-	_kernel_oserror *err = __unixlib_write_coredump (NULL);
+	const _kernel_oserror *err = __unixlib_write_coredump (NULL);
 	if (err != NULL)
 		LOG(("Coredump failed: %s", err->errmess));
 #endif

riscos/save.h

@@ -27,6 +27,7 @@
 #include "oslib/wimp.h"
 
 enum gui_save_type;
+struct nsurl;
 
 void gui_drag_save_object(struct gui_window *g, struct hlcache_handle *c, enum gui_save_type save_type);
 void gui_drag_save_selection(struct gui_window *g, const char *selection);
@@ -34,10 +35,10 @@ void gui_drag_save_selection(struct gui_window *g, const char *selection);
 wimp_w ro_gui_saveas_create(const char *template_name);
 void ro_gui_saveas_quit(void);
 void ro_gui_save_prepare(enum gui_save_type save_type, struct hlcache_handle *h,
-			char *s, const nsurl *url,
+			char *s, const struct nsurl *url,
 			const char *title);
 void ro_gui_save_start_drag(wimp_pointer *pointer);
-void ro_gui_drag_save_link(enum gui_save_type save_type, const nsurl *url,
+void ro_gui_drag_save_link(enum gui_save_type save_type, const struct nsurl *url,
 			const char *title, struct gui_window *g);
 void ro_gui_drag_icon(int x, int y, const char *sprite);
 void ro_gui_drag_box_cancel(void);

riscos/window.c

@@ -4878,9 +4878,10 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
 
 		/* Need to consider what we have and decide whether to fire
 		 * triple click instead */
-		switch (state) {
-		case BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_CLICK_1:
-		case BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_CLICK_2:
+		if ((state == (BROWSER_MOUSE_PRESS_1 |
+				BROWSER_MOUSE_CLICK_1)) ||
+		    (state == (BROWSER_MOUSE_PRESS_2 |
+				BROWSER_MOUSE_CLICK_2))) {
 			/* WIMP told us single click, but maybe we want to call
 			 * it a triple click */
 
@@ -4899,12 +4900,12 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
 				/* Single click */
 				last_click.type = CLICK_SINGLE;
 			}
-			break;
-
-		case BROWSER_MOUSE_PRESS_1 | BROWSER_MOUSE_CLICK_1 |
-				BROWSER_MOUSE_DOUBLE_CLICK:
-		case BROWSER_MOUSE_PRESS_2 | BROWSER_MOUSE_CLICK_2 |
-				BROWSER_MOUSE_DOUBLE_CLICK:
+		} else if ((state == (BROWSER_MOUSE_PRESS_1 |
+					BROWSER_MOUSE_CLICK_1 |
+					BROWSER_MOUSE_DOUBLE_CLICK)) ||
+			   (state == (BROWSER_MOUSE_PRESS_2 |
+					BROWSER_MOUSE_CLICK_2 |
+					BROWSER_MOUSE_DOUBLE_CLICK))) {
 			/* Wimp told us double click, but we may want to
 			 * call it single click */
 
@@ -4915,11 +4916,8 @@ browser_mouse_state ro_gui_mouse_click_state(wimp_mouse_state buttons,
 				last_click.type = CLICK_DOUBLE;
 				last_click.time = wallclock();
 			}
-			break;
-
-		default:
+		} else {
 			last_click.type = CLICK_SINGLE;
-			break;
 		}
 		break;
 	}

test/llcache.c

@@ -28,6 +28,7 @@
 #include "utils/nsurl.h"
 #include "utils/schedule.h"
 #include "utils/url.h"
+#include "utils/corestrings.h"
 #include "utils/utils.h"
 
 /******************************************************************************

utils/corestrings.c

@@ -23,6 +23,7 @@
 #include <dom/dom.h>
 
 #include "utils/corestrings.h"
+#include "utils/nsurl.h"
 #include "utils/utils.h"
 
 /* lwc_string strings */

utils/corestrings.h

@@ -24,9 +24,14 @@
 #define NETSURF_UTILS_CORESTRINGS_H_
 
 #include <libwapcaplet/libwapcaplet.h>
-#include "utils/nsurl.h"
 #include "utils/errors.h"
 
+/** File url prefix. */
+#define FILE_SCHEME_PREFIX "file:///"
+
+/** File url prefix length. */
+#define FILE_SCHEME_PREFIX_LEN 8
+
 nserror corestrings_init(void);
 void corestrings_fini(void);
 
@@ -283,6 +288,6 @@ extern struct dom_string *corestring_dom___ns_key_file_name_node_data;
 extern struct dom_string *corestring_dom___ns_key_image_coords_node_data;
 
 /* URLs */
-extern nsurl *corestring_nsurl_about_blank;
+extern struct nsurl *corestring_nsurl_about_blank;
 
 #endif

utils/url.h

@@ -27,12 +27,6 @@
 
 #include "utils/errors.h"
 
-/** File url prefix. */
-#define FILE_SCHEME_PREFIX "file:///"
-
-/** File url prefix length. */
-#define FILE_SCHEME_PREFIX_LEN 8
-
 
 /**
  * Escape a string suitable for inclusion in an URL.
@@ -44,7 +38,8 @@
  * \param  result         pointer to pointer to buffer to hold escaped string
  * \return  NSERROR_OK on success
  */
-nserror url_escape(const char *unescaped, size_t toskip, bool sptoplus, const char *escexceptions, char **result);
+nserror url_escape(const char *unescaped, size_t toskip, bool sptoplus,
+		const char *escexceptions, char **result);
 
 
 /**