Merge remote-tracking branch 'origin/master' into svenw/cocoa

12 files changed, 117 insertions, 85 deletions

diff --git a/frontends/framebuffer/bitmap.c b/frontends/framebuffer/bitmap.c
index 027e0122b..1fc9f46a2 100644
--- a/frontends/framebuffer/bitmap.c
+++ b/frontends/framebuffer/bitmap.c
@@ -51,7 +51,8 @@ static void *bitmap_create(int width, int height, unsigned int state)
 {
         nsfb_t *bm;
 
-        LOG("width %d, height %d, state %u", width, height, state);
+        NSLOG(netsurf, INFO, "width %d, height %d, state %u", width, height,
+              state);
 
 	bm = nsfb_new(NSFB_SURFACE_RAM);
 	if (bm == NULL) {
@@ -69,7 +70,7 @@ static void *bitmap_create(int width, int height, unsigned int state)
 		return NULL;
 	}
 
-        LOG("bitmap %p", bm);
+        NSLOG(netsurf, INFO, "bitmap %p", bm);
 
         return bm;
 }
@@ -197,11 +198,11 @@ static bool bitmap_test_opaque(void *bitmap)
 
         while (tst-- > 0) {
                 if (bmpptr[(tst << 2) + 3] != 0xff) {
-                        LOG("bitmap %p has transparency", bm);
+                        NSLOG(netsurf, INFO, "bitmap %p has transparency", bm);
                         return false;
                 }
         }
-        LOG("bitmap %p is opaque", bm);
+        NSLOG(netsurf, INFO, "bitmap %p is opaque", bm);
 	return true;
 }
 
@@ -282,14 +283,14 @@ bitmap_render(struct bitmap *bitmap,
 
 	nsfb_get_geometry(tbm, &width, &height, NULL);
 
-	LOG("width %d, height %d", width, height);
+	NSLOG(netsurf, INFO, "width %d, height %d", width, height);
 
 	/* Calculate size of buffer to render the content into */
-	/* We get the width from the content width, unless it exceeds 1024,
-	 * in which case we use 1024. This means we never create excessively
-	 * large render buffers for huge contents, which would eat memory and
-	 * cripple performance. */
-	cwidth = min(content_get_width(content), 1024);
+	/* We get the width from the largest of the bitmap width and the content
+	 * width, unless it exceeds 1024, in which case we use 1024. This means
+	 * we never create excessively large render buffers for huge contents,
+	 * which would eat memory and cripple performance. */
+	cwidth = max(width, min(content_get_width(content), 1024));
 	/* The height is set in proportion with the width, according to the
 	 * aspect ratio of the required thumbnail. */
 	cheight = ((cwidth * height) + (width / 2)) / width;
diff --git a/frontends/framebuffer/clipboard.c b/frontends/framebuffer/clipboard.c
index 1254c36f3..20a00e038 100644
--- a/frontends/framebuffer/clipboard.c
+++ b/frontends/framebuffer/clipboard.c
@@ -53,8 +53,8 @@ static void gui_get_clipboard(char **buffer, size_t *length)
 
 	if (gui_clipboard.length > 0) {
 		assert(gui_clipboard.buffer != NULL);
-		LOG("Pasting %zd bytes: \"%s\"\n",
-		    gui_clipboard.length, gui_clipboard.buffer);
+		NSLOG(netsurf, INFO, "Pasting %zd bytes: \"%s\"\n",
+		      gui_clipboard.length, gui_clipboard.buffer);
 
 		*buffer = malloc(gui_clipboard.length);
 
diff --git a/frontends/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h
index 3cc326cef..86bdc864b 100644
--- a/frontends/framebuffer/fbtk.h
+++ b/frontends/framebuffer/fbtk.h
@@ -21,12 +21,6 @@
 
 #include "netsurf/types.h"
 
-#ifdef FBTK_LOGGING
-#define FBTK_LOG(x) LOG(x)
-#else
-#define FBTK_LOG(x)
-#endif
-
 #define FB_SCROLL_COLOUR 0xFFAAAAAA
 #define FB_FRAME_COLOUR 0xFFDDDDDD
 #define FB_COLOUR_BLACK 0xFF000000
diff --git a/frontends/framebuffer/fbtk/event.c b/frontends/framebuffer/fbtk/event.c
index a48e63809..84c6c3791 100644
--- a/frontends/framebuffer/fbtk/event.c
+++ b/frontends/framebuffer/fbtk/event.c
@@ -51,7 +51,7 @@ fbtk_input(fbtk_widget_t *root, nsfb_event_t *event)
 	/* obtain widget with input focus */
 	input = root->u.root.input;
 	if (input == NULL) {
-		LOG("No widget has input focus.");
+		NSLOG(netsurf, INFO, "No widget has input focus.");
 		return; /* no widget with input */
 	}
 
@@ -84,7 +84,7 @@ fbtk_click(fbtk_widget_t *widget, nsfb_event_t *event)
 	x = fbtk_get_absx(clicked);
 	y = fbtk_get_absy(clicked);
 
-	LOG("clicked %p at %d,%d", clicked, x, y);
+	NSLOG(netsurf, INFO, "clicked %p at %d,%d", clicked, x, y);
 
 	/* post the click */
 	fbtk_post_callback(clicked, FBTK_CBT_CLICK, event, cloc.x0 - x, cloc.y0 - y);
diff --git a/frontends/framebuffer/fbtk/fbtk.c b/frontends/framebuffer/fbtk/fbtk.c
index c63a6d8c9..91f6e2570 100644
--- a/frontends/framebuffer/fbtk/fbtk.c
+++ b/frontends/framebuffer/fbtk/fbtk.c
@@ -53,7 +53,7 @@ dump_tk_tree(fbtk_widget_t *widget)
 	int indent = 0;
 
 	while (widget != NULL) {
-		LOG("%*s%p", indent, "", widget);
+		NSLOG(fbtk, DEBUG, "%*s%p", indent, "", widget);
 		if (widget->first_child != NULL) {
 			widget = widget->first_child;
 			indent += 6;
@@ -100,9 +100,13 @@ fbtk_request_redraw(fbtk_widget_t *widget)
 	widget->redraw.width = widget->width;
 	widget->redraw.height = widget->height;
 
-#ifdef FBTK_LOGGING
-	LOG("redrawing %p %d,%d %d,%d", widget, widget->redraw.x, widget->redraw.y, widget->redraw.width, widget->redraw.height);
-#endif
+	NSLOG(fbtk, DEBUG,
+	      "redrawing %p %d,%d %d,%d",
+	      widget,
+	      widget->redraw.x,
+	      widget->redraw.y,
+	      widget->redraw.width,
+	      widget->redraw.height);
 
 	cwidget = widget->last_child;
 	while (cwidget != NULL) {
@@ -122,7 +126,7 @@ fbtk_request_redraw(fbtk_widget_t *widget)
 int
 fbtk_set_mapping(fbtk_widget_t *widget, bool map)
 {
-	LOG("setting mapping on %p to %d", widget, map);
+	NSLOG(netsurf, INFO, "setting mapping on %p to %d", widget, map);
 	widget->mapped = map;
 	if (map) {
 		fbtk_request_redraw(widget);
@@ -132,9 +136,11 @@ fbtk_set_mapping(fbtk_widget_t *widget, bool map)
 	return 0;
 }
 
-/** swap the widget given with the next sibling.
- *
+
+/**
  * Swap a sibling widget with the next deepest in the hierachy
+ *
+ * \param lw The widget to swap
  */
 static void
 swap_siblings(fbtk_widget_t *lw)
@@ -145,7 +151,7 @@ swap_siblings(fbtk_widget_t *lw)
 
 	assert(rw != NULL);
 
-	LOG("Swapping %p with %p", lw, rw);
+	NSLOG(netsurf, INFO, "Swapping %p with %p", lw, rw);
 	before = lw->prev;
 	after = rw->next;
 
@@ -401,7 +407,6 @@ fbtk_set_ptr(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 }
 
 
-
 /* internally exported function documented in widget.h */
 fbtk_widget_t *
 fbtk_get_root_widget(fbtk_widget_t *widget)
@@ -411,7 +416,8 @@ fbtk_get_root_widget(fbtk_widget_t *widget)
 
 	/* check root widget was found */
 	if (widget->type != FB_WIDGET_TYPE_ROOT) {
-		LOG("Widget with null parent that is not the root widget!");
+		NSLOG(netsurf, INFO,
+		      "Widget with null parent that is not the root widget!");
 		return NULL;
 	}
 
@@ -433,6 +439,7 @@ fbtk_get_absx(fbtk_widget_t *widget)
 	return x;
 }
 
+
 /* exported function documented in fbtk.h */
 int
 fbtk_get_absy(fbtk_widget_t *widget)
@@ -447,6 +454,7 @@ fbtk_get_absy(fbtk_widget_t *widget)
 	return y;
 }
 
+
 /* exported function documented in fbtk.h */
 int
 fbtk_get_height(fbtk_widget_t *widget)
@@ -551,9 +559,7 @@ fbtk_widget_new(fbtk_widget_t *parent,
 	if (neww == NULL)
 		return NULL;
 
-#ifdef FBTK_LOGGING
-	LOG("creating %p %d,%d %d,%d", neww, x, y, width, height);
-#endif
+	NSLOG(fbtk, DEBUG, "creating %p %d,%d %d,%d", neww, x, y, width, height);
 
 	/* make new window fit inside parent */
 	if (width == 0) {
@@ -574,9 +580,8 @@ fbtk_widget_new(fbtk_widget_t *parent,
 		height = parent->height - y;
 	}
 
-#ifdef FBTK_LOGGING
-	LOG("using %p %d,%d %d,%d", neww, x, y, width, height);
-#endif
+	NSLOG(fbtk, DEBUG, "using %p %d,%d %d,%d", neww, x, y, width, height);
+
 	/* set values */
 	neww->type = type;
 	neww->x = x;
@@ -634,9 +639,12 @@ do_redraw(nsfb_t *nsfb, fbtk_widget_t *widget)
 		plot_ctx.x1 = plot_ctx.x0 + widget->redraw.width;
 		plot_ctx.y1 = plot_ctx.y0 + widget->redraw.height;
 
-#ifdef FBTK_LOGGING
-		LOG("clipping %p %d,%d %d,%d", widget, plot_ctx.x0, plot_ctx.y0, plot_ctx.x1, plot_ctx.y1);
-#endif
+		NSLOG(fbtk, DEBUG,
+		      "clipping %p %d,%d %d,%d",
+		      widget,
+		      plot_ctx.x0, plot_ctx.y0,
+		      plot_ctx.x1, plot_ctx.y1);
+
 		if (nsfb_plot_set_clip(nsfb, &plot_ctx) == true) {
 			fbtk_post_callback(widget, FBTK_CBT_REDRAW);
 		}
diff --git a/frontends/framebuffer/fbtk/scroll.c b/frontends/framebuffer/fbtk/scroll.c
index cc98fb2dd..b056ac81f 100644
--- a/frontends/framebuffer/fbtk/scroll.c
+++ b/frontends/framebuffer/fbtk/scroll.c
@@ -334,7 +334,7 @@ hscroll_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 		hpos = 0;
 	}
 
-	LOG("hscroll %d", hscroll);
+	NSLOG(netsurf, INFO, "hscroll %d", hscroll);
 
 	rect.x0 = bbox.x0 + 3 + hpos;
 	rect.y0 = bbox.y0 + 5;
@@ -362,7 +362,7 @@ hscrolll_click(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 		newpos = scrollw->u.scroll.minimum;
 
 	if (newpos == scrollw->u.scroll.position) {
-		LOG("horiz scroll was the same %d", newpos);
+		NSLOG(netsurf, INFO, "horiz scroll was the same %d", newpos);
 		return 0;
 	}
 
diff --git a/frontends/framebuffer/fbtk/text.c b/frontends/framebuffer/fbtk/text.c
index 31417c2e0..4f3a2385d 100644
--- a/frontends/framebuffer/fbtk/text.c
+++ b/frontends/framebuffer/fbtk/text.c
@@ -388,6 +388,22 @@ text_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 		}
 		break;
 
+	case NSFB_KEY_HOME:
+		if (widget->u.text.idx > 0) {
+			widget->u.text.idx = 0;
+
+			caret_moved = true;
+		}
+		break;
+
+	case NSFB_KEY_END:
+		if (widget->u.text.idx < widget->u.text.len) {
+			widget->u.text.idx = widget->u.text.len;
+
+			caret_moved = true;
+		}
+		break;
+
 	case NSFB_KEY_PAGEUP:
 	case NSFB_KEY_PAGEDOWN:
 	case NSFB_KEY_UP:
diff --git a/frontends/framebuffer/fetch.c b/frontends/framebuffer/fetch.c
index 801b87a74..23cbb4f21 100644
--- a/frontends/framebuffer/fetch.c
+++ b/frontends/framebuffer/fetch.c
@@ -65,7 +65,7 @@ static nsurl *get_resource_url(const char *path)
 static const char *fetch_filetype(const char *unix_path)
 {
 	int l;
-	LOG("unix path %s", unix_path);
+	NSLOG(netsurf, INFO, "unix path %s", unix_path);
 	l = strlen(unix_path);
 	if (2 < l && strcasecmp(unix_path + l - 3, "css") == 0)
 		return "text/css";
diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c
index e7c07f5ff..9e47e4b99 100644
--- a/frontends/framebuffer/font_freetype.c
+++ b/frontends/framebuffer/font_freetype.c
@@ -90,12 +90,13 @@ ft_face_requester(FTC_FaceID face_id,
 
         error = FT_New_Face(library, fb_face->fontfile, fb_face->index, face); 
         if (error) {
-                LOG("Could not find font (code %d)", error);
+                NSLOG(netsurf, INFO, "Could not find font (code %d)", error);
         } else {
 
                 error = FT_Select_Charmap(*face, FT_ENCODING_UNICODE);
                 if (error) {
-                        LOG("Could not select charmap (code %d)", error);
+                        NSLOG(netsurf, INFO,
+                              "Could not select charmap (code %d)", error);
                 } else {
                         for (cidx = 0; cidx < (*face)->num_charmaps; cidx++) {
                                 if ((*face)->charmap == (*face)->charmaps[cidx]) {
@@ -105,7 +106,7 @@ ft_face_requester(FTC_FaceID face_id,
                         }
                 }
         }
-        LOG("Loaded face from %s", fb_face->fontfile);
+        NSLOG(netsurf, INFO, "Loaded face from %s", fb_face->fontfile);
 
         return error;
 }
@@ -132,7 +133,8 @@ fb_new_face(const char *option, const char *resname, const char *fontname)
 
         error = FTC_Manager_LookupFace(ft_cmanager, (FTC_FaceID)newf, &aface);
         if (error) {
-                LOG("Could not find font face %s (code %d)", fontname, error);
+                NSLOG(netsurf, INFO, "Could not find font face %s (code %d)",
+                      fontname, error);
                 free(newf->fontfile);
                 free(newf);
                 newf = NULL;
@@ -152,7 +154,8 @@ bool fb_font_init(void)
         /* freetype library initialise */
         error = FT_Init_FreeType( &library ); 
         if (error) {
-                LOG("Freetype could not initialised (code %d)", error);
+                NSLOG(netsurf, INFO,
+                      "Freetype could not initialised (code %d)", error);
                 return false;
         }
 
@@ -172,7 +175,9 @@ bool fb_font_init(void)
                                 NULL, 
                                 &ft_cmanager);
         if (error) {
-                LOG("Freetype could not initialise cache manager (code %d)", error);
+                NSLOG(netsurf, INFO,
+                      "Freetype could not initialise cache manager (code %d)",
+                      error);
                 FT_Done_FreeType(library);
                 return false;
         }
@@ -189,7 +194,7 @@ bool fb_font_init(void)
 			      NETSURF_FB_FONT_SANS_SERIF);
 	if (fb_face == NULL) {
 		/* The sans serif font is the default and must be found. */
-                LOG("Could not find the default font");
+                NSLOG(netsurf, INFO, "Could not find the default font");
                 FTC_Manager_Done(ft_cmanager);
                 FT_Done_FreeType(library);
                 return false;
diff --git a/frontends/framebuffer/framebuffer.c b/frontends/framebuffer/framebuffer.c
index de8a3695d..2ccc75062 100644
--- a/frontends/framebuffer/framebuffer.c
+++ b/frontends/framebuffer/framebuffer.c
@@ -271,7 +271,7 @@ framebuffer_plot_path(const struct redraw_context *ctx,
 		float width,
 		const float transform[6])
 {
-	LOG("path unimplemented");
+	NSLOG(netsurf, INFO, "path unimplemented");
 	return NSERROR_OK;
 }
 
@@ -564,7 +564,7 @@ static bool framebuffer_format_from_bpp(int bpp, enum nsfb_format_e *fmt)
 		break;
 
 	default:
-		LOG("Bad bits per pixel (%d)\n", bpp);
+		NSLOG(netsurf, INFO, "Bad bits per pixel (%d)\n", bpp);
 		return false;
 	}
 
@@ -586,18 +586,19 @@ framebuffer_initialise(const char *fename, int width, int height, int bpp)
 
     fbtype = nsfb_type_from_name(fename);
     if (fbtype == NSFB_SURFACE_NONE) {
-	LOG("The %s surface is not available from libnsfb\n", fename);
+	NSLOG(netsurf, INFO,
+              "The %s surface is not available from libnsfb\n", fename);
 	return NULL;
     }
 
     nsfb = nsfb_new(fbtype);
     if (nsfb == NULL) {
-	LOG("Unable to create %s fb surface\n", fename);
+	NSLOG(netsurf, INFO, "Unable to create %s fb surface\n", fename);
 	return NULL;
     }
 
     if (nsfb_set_geometry(nsfb, width, height, fbfmt) == -1) {
-	LOG("Unable to set surface geometry\n");
+	NSLOG(netsurf, INFO, "Unable to set surface geometry\n");
 	nsfb_free(nsfb);
 	return NULL;
     }
@@ -605,7 +606,7 @@ framebuffer_initialise(const char *fename, int width, int height, int bpp)
     nsfb_cursor_init(nsfb);
 
     if (nsfb_init(nsfb) == -1) {
-	LOG("Unable to initialise nsfb surface\n");
+	NSLOG(netsurf, INFO, "Unable to initialise nsfb surface\n");
 	nsfb_free(nsfb);
 	return NULL;
     }
@@ -625,7 +626,7 @@ framebuffer_resize(nsfb_t *nsfb, int width, int height, int bpp)
     }
 
     if (nsfb_set_geometry(nsfb, width, height, fbfmt) == -1) {
-	LOG("Unable to change surface geometry\n");
+	NSLOG(netsurf, INFO, "Unable to change surface geometry\n");
 	return false;
     }
 
diff --git a/frontends/framebuffer/gui.c b/frontends/framebuffer/gui.c
index 1460c77f6..e252f25f3 100644
--- a/frontends/framebuffer/gui.c
+++ b/frontends/framebuffer/gui.c
@@ -120,7 +120,7 @@ static void die(const char *error)
  */
 static nserror fb_warn_user(const char *warning, const char *detail)
 {
-	LOG("%s %s", warning, detail);
+	NSLOG(netsurf, INFO, "%s %s", warning, detail);
 	return NSERROR_OK;
 }
 
@@ -153,7 +153,7 @@ widget_scroll_y(struct gui_window *gw, int y, bool abs)
 	int content_width, content_height;
 	int height;
 
-	LOG("window scroll");
+	NSLOG(netsurf, INFO, "window scroll");
 	if (abs) {
 		bwidget->pany = y - bwidget->scrolly;
 	} else {
@@ -237,7 +237,7 @@ fb_pan(fbtk_widget_t *widget,
 	height = fbtk_get_height(widget);
 	width = fbtk_get_width(widget);
 
-	LOG("panning %d, %d", bwidget->panx, bwidget->pany);
+	NSLOG(netsurf, INFO, "panning %d, %d", bwidget->panx, bwidget->pany);
 
 	x = fbtk_get_absx(widget);
 	y = fbtk_get_absy(widget);
@@ -413,7 +413,8 @@ fb_browser_window_redraw(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 
 	bwidget = fbtk_get_userpw(widget);
 	if (bwidget == NULL) {
-		LOG("browser widget from widget %p was null", widget);
+		NSLOG(netsurf, INFO,
+		      "browser widget from widget %p was null", widget);
 		return -1;
 	}
 
@@ -465,7 +466,7 @@ process_cmdline(int argc, char** argv)
 		{0, 0, 0,  0 }
 	}; /* no long options */
 
-	LOG("argc %d, argv %p", argc, argv);
+	NSLOG(netsurf, INFO, "argc %d, argv %p", argc, argv);
 
 	fename = "sdl";
 	febpp = 32;
@@ -534,7 +535,7 @@ static nserror set_defaults(struct nsoption_s *defaults)
 
 	if (nsoption_charp(cookie_file) == NULL ||
 	    nsoption_charp(cookie_jar) == NULL) {
-		LOG("Failed initialising cookie options");
+		NSLOG(netsurf, INFO, "Failed initialising cookie options");
 		return NSERROR_BAD_PARAMETER;
 	}
 
@@ -612,7 +613,7 @@ static void framebuffer_run(void)
 
 static void gui_quit(void)
 {
-	LOG("gui_quit");
+	NSLOG(netsurf, INFO, "gui_quit");
 
 	urldb_save_cookies(nsoption_charp(cookie_jar));
 
@@ -639,7 +640,8 @@ fb_browser_window_click(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 	    cbi->event->type != NSFB_EVENT_KEY_UP)
 		return 0;
 
-	LOG("browser window clicked at %d,%d", cbi->x, cbi->y);
+	NSLOG(netsurf, INFO, "browser window clicked at %d,%d", cbi->x,
+	      cbi->y);
 
 	switch (cbi->event->type) {
 	case NSFB_EVENT_KEY_DOWN:
@@ -824,7 +826,7 @@ fb_browser_window_input(fbtk_widget_t *widget, fbtk_callback_info *cbi)
 	static fbtk_modifier_type modifier = FBTK_MOD_CLEAR;
 	int ucs4 = -1;
 
-	LOG("got value %d", cbi->event->value.keycode);
+	NSLOG(netsurf, INFO, "got value %d", cbi->event->value.keycode);
 
 	switch (cbi->event->type) {
 	case NSFB_EVENT_KEY_DOWN:
@@ -1200,7 +1202,7 @@ create_toolbar(struct gui_window *gw,
 		toolbar_layout = NSFB_TOOLBAR_DEFAULT_LAYOUT;
 	}
 
-	LOG("Using toolbar layout %s", toolbar_layout);
+	NSLOG(netsurf, INFO, "Using toolbar layout %s", toolbar_layout);
 
 	itmtype = toolbar_layout;
 
@@ -1234,7 +1236,7 @@ create_toolbar(struct gui_window *gw,
 	       (*itmtype != 0) && 
 	       (xdir !=0)) {
 
-		LOG("toolbar adding %c", *itmtype);
+		NSLOG(netsurf, INFO, "toolbar adding %c", *itmtype);
 
 
 		switch (*itmtype) {
@@ -1376,7 +1378,9 @@ create_toolbar(struct gui_window *gw,
 		default:
 			widget = NULL;
 			xdir = 0;
-			LOG("Unknown element %c in toolbar layout", *itmtype);
+			NSLOG(netsurf, INFO,
+			      "Unknown element %c in toolbar layout",
+			      *itmtype);
 		        break;
 
 		}
@@ -1385,7 +1389,7 @@ create_toolbar(struct gui_window *gw,
 			xpos += (xdir * (fbtk_get_width(widget) + padding));
 		}
 
-		LOG("xpos is %d", xpos);
+		NSLOG(netsurf, INFO, "xpos is %d", xpos);
 
 		itmtype += xdir;
 	}
@@ -1595,7 +1599,7 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 	int statusbar_width = 0;
 	int toolbar_height = nsoption_int(fb_toolbar_size);
 
-	LOG("Normal window");
+	NSLOG(netsurf, INFO, "Normal window");
 
 	gw->window = fbtk_create_window(fbtk, 0, 0, 0, 0, 0);
 
@@ -1626,7 +1630,8 @@ create_normal_browser_window(struct gui_window *gw, int furniture_width)
 				      false);
 	fbtk_set_handler(gw->status, FBTK_CBT_POINTERENTER, set_ptr_default_move, NULL);
 
-	LOG("status bar %p at %d,%d", gw->status, fbtk_get_absx(gw->status), fbtk_get_absy(gw->status));
+	NSLOG(netsurf, INFO, "status bar %p at %d,%d", gw->status,
+	      fbtk_get_absx(gw->status), fbtk_get_absy(gw->status));
 
 	/* create horizontal scrollbar */
 	gw->hscroll = fbtk_create_hscroll(gw->window,
@@ -2183,7 +2188,7 @@ main(int argc, char** argv)
 
 	/* create an initial browser window */
 
-	LOG("calling browser_window_create");
+	NSLOG(netsurf, INFO, "calling browser_window_create");
 
 	ret = nsurl_create(feurl, &url);
 	if (ret == NSERROR_OK) {
@@ -2205,11 +2210,14 @@ main(int argc, char** argv)
 	netsurf_exit();
 
 	if (fb_font_finalise() == false)
-		LOG("Font finalisation failed.");
+		NSLOG(netsurf, INFO, "Font finalisation failed.");
 
 	/* finalise options */
 	nsoption_finalise(nsoptions, nsoptions_default);
 
+	/* finalise logging */
+	nslog_finalise();
+
 	return 0;
 }
 
diff --git a/frontends/framebuffer/schedule.c b/frontends/framebuffer/schedule.c
index 581ad72f1..6d1711236 100644
--- a/frontends/framebuffer/schedule.c
+++ b/frontends/framebuffer/schedule.c
@@ -24,12 +24,6 @@
 
 #include "framebuffer/schedule.h"
 
-#ifdef DEBUG_SCHEDULER
-#define SRLOG(x...) LOG(x)
-#else
-#define SRLOG(x...) ((void) 0)
-#endif
-
 /* linked list of scheduled callbacks */
 static struct nscallback *schedule_list = NULL;
 
@@ -63,7 +57,7 @@ static nserror schedule_remove(void (*callback)(void *p), void *p)
                 return NSERROR_OK;
 	}
 
-	SRLOG("removing %p, %p", callback, p);
+	NSLOG(schedule, DEBUG, "removing %p, %p", callback, p);
 
         cur_nscb = schedule_list;
         prev_nscb = NULL;
@@ -73,7 +67,8 @@ static nserror schedule_remove(void (*callback)(void *p), void *p)
                     (cur_nscb->p ==  p)) {
                         /* item to remove */
 
-                        SRLOG("callback entry %p removing  %p(%p)",
+                        NSLOG(schedule, DEBUG,
+			      "callback entry %p removing  %p(%p)",
                              cur_nscb, cur_nscb->callback, cur_nscb->p);
 
                         /* remove callback */
@@ -109,7 +104,7 @@ nserror framebuffer_schedule(int tival, void (*callback)(void *p), void *p)
 		return ret;
 	}
 
-	SRLOG("Adding %p(%p) in %d", callback, p, tival);
+	NSLOG(schedule, DEBUG, "Adding %p(%p) in %d", callback, p, tival);
 
         tv.tv_sec = tival / 1000; /* miliseconds to seconds */
         tv.tv_usec = (tival % 1000) * 1000; /* remainder to microseconds */
@@ -190,7 +185,9 @@ int schedule_run(void)
 	/* make rettime relative to now */
 	timersub(&nexttime, &tv, &rettime);
 
-	SRLOG("returning time to next event as %ldms",(rettime.tv_sec * 1000) + (rettime.tv_usec / 1000)); 
+	NSLOG(schedule, DEBUG,
+	      "returning time to next event as %ldms",
+	      (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000)); 
 
 	/* return next event time in milliseconds (24days max wait) */
         return (rettime.tv_sec * 1000) + (rettime.tv_usec / 1000);
@@ -203,12 +200,14 @@ void list_schedule(void)
 
 	gettimeofday(&tv, NULL);
 
-        LOG("schedule list at %ld:%ld", tv.tv_sec, tv.tv_usec);
+        NSLOG(netsurf, INFO, "schedule list at %ld:%ld", tv.tv_sec,
+              tv.tv_usec);
 
         cur_nscb = schedule_list;
 
         while (cur_nscb != NULL) {
-                LOG("Schedule %p at %ld:%ld", cur_nscb, cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
+                NSLOG(netsurf, INFO, "Schedule %p at %ld:%ld", cur_nscb,
+                      cur_nscb->tv.tv_sec, cur_nscb->tv.tv_usec);
                 cur_nscb = cur_nscb->next;
         }
 }