Enable selection of rendering engine (graphics.library, Cairo) at runtime, if we're

compiled with Cairo support.

svn path=/trunk/netsurf/; revision=11912

5 files changed, 247 insertions, 204 deletions

diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index 78b557201..250e80475 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -43,6 +43,7 @@ There are a couple of Amiga-specific options which can only be changed directly
 @{b}no_iframes@{ub} Disable IFrames
 @{b}printer_unit@{ub} Specifies which printer.device unit to print to
 @{b}drag_save_icons@{ub} Enables displaying Workbench-style transparent icons under the pointer when performing drag saves (ctrl-drag of objects available if NetSurf is running on the Workbench screen) and text selection drags.  If set to 0 the pointer style will change instead.  OS 4.0 users may want to set this to 0 as icons will appear opaque and obscure the drop position.
+@{b}cairo_renderer@{ub} Set rendering engine (SObjs version only). 0 = graphics.library, 1 = Cairo/graphics.library mixed (recommended), 2 = Full Cairo.
 
 @{b}url_file@{ub} Path to URL database file
 @{b}hotlist_file@{ub} Path to Hotlist file
@@ -244,6 +245,8 @@ There are a number of options which can be changed that will affect the speed of
 @{lindent 2}* In preferences, Rendering tab set:
 @{b}Cache native versions@{ub} to @{b}Scaled@{ub} (or preferably @{b}All@{ub}, but this will use more graphics mem, and scaling images is a bigger performance hit)
 Deselect @{b}Higher quality scaling@{ub}, this will be very slow if not done in hardware.@{lindent}
+
+@{lindent 2}* In @{"Options" link Options}, set cairo_renderer:1
 @endnode
 
 @node contact "Credits"
diff --git a/amiga/gui.c b/amiga/gui.c
index da8311264..35fac8345 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -298,6 +298,11 @@ void ami_set_options(void)
 
 	option_core_select_menu = true;
 
+	#ifndef NS_AMIGA_CAIRO
+	/* Ensure we get some output when Cairo not available */
+	option_cairo_renderer = 0;
+	#endif
+
 	if((!option_accept_language) || (option_accept_language[0] == '\0'))
 	{
 		if(tempacceptlangs = ami_locale_langs())
diff --git a/amiga/menu.c b/amiga/menu.c
index 3259cc603..d2c828da3 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -664,12 +664,8 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
 #endif
 						TDR_Arg1,netsurf_version,
 #ifdef NS_AMIGA_CAIRO
-#ifdef NS_AMIGA_CAIRO_ALL
 						TDR_Arg2,"Cairo (OS4.1+) SObjs build",
 #else
-						TDR_Arg2,"Part-Cairo (OS4.1+) SObjs build",
-#endif
-#else
 						TDR_Arg2,"graphics.library static build",
 #endif
 						TDR_Arg3,versvn,
diff --git a/amiga/options.h b/amiga/options.h
index d1e39b8ec..46928e7ad 100644
--- a/amiga/options.h
+++ b/amiga/options.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 - 2010 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ * Copyright 2008 - 2011 Chris Young <chris@unsatisfactorysoftware.co.uk>
  *
  * This file is part of NetSurf, http://www.netsurf-browser.org/
  *
@@ -63,6 +63,7 @@ extern int option_cookies_window_xpos;
 extern int option_cookies_window_ypos;
 extern int option_cookies_window_xsize;
 extern int option_cookies_window_ysize;
+extern int option_cairo_renderer;
 
 #define EXTRA_OPTION_DEFINE \
 char *option_url_file = 0; \
@@ -108,6 +109,7 @@ int option_cookies_window_xpos = 0; \
 int option_cookies_window_ypos = 0; \
 int option_cookies_window_xsize = 0; \
 int option_cookies_window_ysize = 0; \
+int option_cairo_renderer = 1; \
 
 #define EXTRA_OPTION_TABLE \
 { "url_file",		OPTION_STRING,	&option_url_file }, \
@@ -152,5 +154,6 @@ int option_cookies_window_ysize = 0; \
 { "cookies_window_xpos",	OPTION_INTEGER,	&option_cookies_window_xpos}, \
 { "cookies_window_ypos",	OPTION_INTEGER,	&option_cookies_window_ypos}, \
 { "cookies_window_xsize",	OPTION_INTEGER,	&option_cookies_window_xsize}, \
-{ "cookies_window_ysize",	OPTION_INTEGER,	&option_cookies_window_ysize},
+{ "cookies_window_ysize",	OPTION_INTEGER,	&option_cookies_window_ysize}, \
+{ "cairo_renderer",	OPTION_INTEGER,	&option_cairo_renderer},
 #endif
diff --git a/amiga/plotters.c b/amiga/plotters.c
index 36b5a432a..bb9ef5f73 100755
--- a/amiga/plotters.c
+++ b/amiga/plotters.c
@@ -119,6 +119,8 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
 	 * Height is set to screen width to give enough space for thumbnails *
 	 * Also applies to the further gfx/layers functions and memory below */
 
+	struct BitMap *friend = NULL; /* Required to be NULL for Cairo and ARGB bitmaps */
+
 	if(!width) width = scrn->Width;
 	if(!height) height = scrn->Width;
 
@@ -128,7 +130,7 @@ void ami_init_layers(struct gui_globals *gg, ULONG width, ULONG height)
 	gg->tmprasbuf = AllocVec(width*height,MEMF_PRIVATE | MEMF_CLEAR);
 
 	gg->bm = p96AllocBitMap(width, height, 32,
-						BMF_INTERLEAVED, NULL, RGBFB_A8R8G8B8);
+						BMF_INTERLEAVED, friend, RGBFB_A8R8G8B8);
 
 	if(!gg->bm) warn_user("NoMemory","");
 
@@ -196,30 +198,35 @@ bool ami_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style)
 
 	if (style->fill_type != PLOT_OP_TYPE_NONE) { 
 
-#ifndef NS_AMIGA_CAIRO_ALL
-		SetRPAttrs(&glob->rp, RPTAG_APenColor,
-			p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
-			TAG_DONE);
-		RectFill(&glob->rp, x0, y0, x1-1, y1-1);
-#else
-		ami_cairo_set_colour(glob->cr, style->fill_colour);
-		ami_cairo_set_solid(glob->cr);
+		if(option_cairo_renderer < 2)
+		{
+			SetRPAttrs(&glob->rp, RPTAG_APenColor,
+				p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
+				TAG_DONE);
+			RectFill(&glob->rp, x0, y0, x1-1, y1-1);
+		}
+		else
+		{
+#ifdef NS_AMIGA_CAIRO
+			ami_cairo_set_colour(glob->cr, style->fill_colour);
+			ami_cairo_set_solid(glob->cr);
 
-		cairo_set_line_width(glob->cr, 0);
-		cairo_rectangle(glob->cr, x0, y0, x1 - x0, y1 - y0);
-		cairo_fill(glob->cr);
-		cairo_stroke(glob->cr);
+			cairo_set_line_width(glob->cr, 0);
+			cairo_rectangle(glob->cr, x0, y0, x1 - x0, y1 - y0);
+			cairo_fill(glob->cr);
+			cairo_stroke(glob->cr);
 #endif
-
+		}
 	}
 
-        if (style->stroke_type != PLOT_OP_TYPE_NONE) {
-#ifndef NS_AMIGA_CAIRO_ALL
-		glob->rp.PenWidth = style->stroke_width;
-		glob->rp.PenHeight = style->stroke_width;
+	if (style->stroke_type != PLOT_OP_TYPE_NONE) {
+		if(option_cairo_renderer < 2)
+		{
+			glob->rp.PenWidth = style->stroke_width;
+			glob->rp.PenHeight = style->stroke_width;
 
-                switch (style->stroke_type) {
-                case PLOT_OP_TYPE_SOLID: /**< Solid colour */
+			switch (style->stroke_type) {
+				case PLOT_OP_TYPE_SOLID: /**< Solid colour */
                 default:
                         glob->rp.LinePtrn = PATT_LINE;
                         break;
@@ -233,21 +240,24 @@ bool ami_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style)
                         break;
                 }
 
-		SetRPAttrs(&glob->rp,
-			   RPTAG_APenColor,
-			   p96EncodeColor(RGBFB_A8B8G8R8, style->stroke_colour),
-			   TAG_DONE);
-		Move(&glob->rp, x0,y0);
-		Draw(&glob->rp, x1, y0);
-		Draw(&glob->rp, x1, y1);
-		Draw(&glob->rp, x0, y1);
-		Draw(&glob->rp, x0, y0);
-
-		glob->rp.PenWidth = 1;
-		glob->rp.PenHeight = 1;
-		glob->rp.LinePtrn = PATT_LINE;
-#else
-		ami_cairo_set_colour(glob->cr, style->stroke_colour);
+			SetRPAttrs(&glob->rp,
+				   RPTAG_APenColor,
+				   p96EncodeColor(RGBFB_A8B8G8R8, style->stroke_colour),
+				   TAG_DONE);
+			Move(&glob->rp, x0,y0);
+			Draw(&glob->rp, x1, y0);
+			Draw(&glob->rp, x1, y1);
+			Draw(&glob->rp, x0, y1);
+			Draw(&glob->rp, x0, y0);
+
+			glob->rp.PenWidth = 1;
+			glob->rp.PenHeight = 1;
+			glob->rp.LinePtrn = PATT_LINE;
+		}
+		else
+		{
+#ifdef NS_AMIGA_CAIRO
+			ami_cairo_set_colour(glob->cr, style->stroke_colour);
 
                 switch (style->stroke_type) {
                 case PLOT_OP_TYPE_SOLID: /**< Solid colour */
@@ -269,9 +279,10 @@ bool ami_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style)
                 else
                         cairo_set_line_width(glob->cr, style->stroke_width);
 
-		cairo_rectangle(glob->cr, x0, y0, x1 - x0, y1 - y0);
-		cairo_stroke(glob->cr);
+			cairo_rectangle(glob->cr, x0, y0, x1 - x0, y1 - y0);
+			cairo_stroke(glob->cr);
 #endif
+		}
 	}
 	return true;
 }
@@ -282,37 +293,41 @@ bool ami_line(int x0, int y0, int x1, int y1, const plot_style_t *style)
 	LOG(("[ami_plotter] Entered ami_line()"));
 	#endif
 
-#ifndef NS_AMIGA_CAIRO_ALL
-	glob->rp.PenWidth = style->stroke_width;
-	glob->rp.PenHeight = style->stroke_width;
+	if(option_cairo_renderer < 2)
+	{
+		glob->rp.PenWidth = style->stroke_width;
+		glob->rp.PenHeight = style->stroke_width;
 
-	switch (style->stroke_type) {
-	case PLOT_OP_TYPE_SOLID: /**< Solid colour */
-	default:
-		glob->rp.LinePtrn = PATT_LINE;
+		switch (style->stroke_type) {
+		case PLOT_OP_TYPE_SOLID: /**< Solid colour */
+		default:
+			glob->rp.LinePtrn = PATT_LINE;
 		break;
 
-	case PLOT_OP_TYPE_DOT: /**< Doted plot */
-		glob->rp.LinePtrn = PATT_DOT;
+		case PLOT_OP_TYPE_DOT: /**< Doted plot */
+			glob->rp.LinePtrn = PATT_DOT;
 		break;
 
-	case PLOT_OP_TYPE_DASH: /**< dashed plot */
-		glob->rp.LinePtrn = PATT_DASH;
+		case PLOT_OP_TYPE_DASH: /**< dashed plot */
+			glob->rp.LinePtrn = PATT_DASH;
 		break;
-	}
+		}
 
-	SetRPAttrs(&glob->rp,
+		SetRPAttrs(&glob->rp,
 		   RPTAG_APenColor,
 		   p96EncodeColor(RGBFB_A8B8G8R8, style->stroke_colour),
 		   TAG_DONE);
-	Move(&glob->rp,x0,y0);
-	Draw(&glob->rp,x1,y1);
+		Move(&glob->rp,x0,y0);
+		Draw(&glob->rp,x1,y1);
 
-	glob->rp.PenWidth = 1;
-	glob->rp.PenHeight = 1;
-	glob->rp.LinePtrn = PATT_LINE;
-#else
-	ami_cairo_set_colour(glob->cr, style->stroke_colour);
+		glob->rp.PenWidth = 1;
+		glob->rp.PenHeight = 1;
+		glob->rp.LinePtrn = PATT_LINE;
+	}
+	else
+	{
+#ifdef NS_AMIGA_CAIRO
+		ami_cairo_set_colour(glob->cr, style->stroke_colour);
 
 	switch (style->stroke_type) {
 	case PLOT_OP_TYPE_SOLID: /**< Solid colour */
@@ -334,14 +349,15 @@ bool ami_line(int x0, int y0, int x1, int y1, const plot_style_t *style)
 	else
 		cairo_set_line_width(glob->cr, style->stroke_width);
 
-	/* core expects horizontal and vertical lines to be on pixels, not
-	 * between pixels */
-	cairo_move_to(glob->cr, (x0 == x1) ? x0 + 0.5 : x0,
-			(y0 == y1) ? y0 + 0.5 : y0);
-	cairo_line_to(glob->cr, (x0 == x1) ? x1 + 0.5 : x1,
-			(y0 == y1) ? y1 + 0.5 : y1);
-	cairo_stroke(glob->cr);
+		/* core expects horizontal and vertical lines to be on pixels, not
+		 * between pixels */
+		cairo_move_to(glob->cr, (x0 == x1) ? x0 + 0.5 : x0,
+				(y0 == y1) ? y0 + 0.5 : y0);
+		cairo_line_to(glob->cr, (x0 == x1) ? x1 + 0.5 : x1,
+				(y0 == y1) ? y1 + 0.5 : y1);
+		cairo_stroke(glob->cr);
 #endif
+	}
 	return true;
 }
 
@@ -352,10 +368,12 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style)
 	#endif
 
 	int k;
-#ifndef NS_AMIGA_CAIRO
-	ULONG cx,cy;
 
-	SetRPAttrs(&glob->rp,
+	if(option_cairo_renderer < 1)
+	{
+		ULONG cx,cy;
+
+		SetRPAttrs(&glob->rp,
 		   RPTAG_APenColor,
 		   p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
 		   RPTAG_OPenColor,
@@ -363,28 +381,31 @@ bool ami_polygon(const int *p, unsigned int n, const plot_style_t *style)
 //					RPTAG_OPenColor,0xffffffff,
 		   TAG_DONE);
 
-	AreaMove(&glob->rp,p[0],p[1]);
+		AreaMove(&glob->rp,p[0],p[1]);
 
-	for(k=1;k<n;k++)
-	{
-		AreaDraw(&glob->rp,p[k*2],p[(k*2)+1]);
-	}
-
-	AreaEnd(&glob->rp);
-	BNDRYOFF(&glob->rp);
-#else
-	ami_cairo_set_colour(glob->cr, style->fill_colour);
-	ami_cairo_set_solid(glob->cr);
+		for(k=1;k<n;k++)
+		{
+			AreaDraw(&glob->rp,p[k*2],p[(k*2)+1]);
+		}
 
-	cairo_set_line_width(glob->cr, 0);
-	cairo_move_to(glob->cr, p[0], p[1]);
-	for (k = 1; k != n; k++) {
-		cairo_line_to(glob->cr, p[k * 2], p[k * 2 + 1]);
+		AreaEnd(&glob->rp);
+		BNDRYOFF(&glob->rp);
 	}
-	cairo_fill(glob->cr);
-	cairo_stroke(glob->cr);
-#endif
+	else
+	{
+#ifdef NS_AMIGA_CAIRO
+		ami_cairo_set_colour(glob->cr, style->fill_colour);
+		ami_cairo_set_solid(glob->cr);
 
+		cairo_set_line_width(glob->cr, 0);
+		cairo_move_to(glob->cr, p[0], p[1]);
+		for (k = 1; k != n; k++) {
+			cairo_line_to(glob->cr, p[k * 2], p[k * 2 + 1]);
+		}
+		cairo_fill(glob->cr);
+		cairo_stroke(glob->cr);
+#endif
+	}
 	return true;
 }
 
@@ -413,11 +434,14 @@ bool ami_clip(const struct rect *clip)
 		if(reg) DisposeRegion(reg);
 	}
 
-#ifdef NS_AMIGA_CAIRO_ALL
-	cairo_reset_clip(glob->cr);
-	cairo_rectangle(glob->cr, clip->x0, clip->y0,
+#ifdef NS_AMIGA_CAIRO
+	if(option_cairo_renderer == 2)
+	{
+		cairo_reset_clip(glob->cr);
+		cairo_rectangle(glob->cr, clip->x0, clip->y0,
 			clip->x1 - clip->x0, clip->y1 - clip->y0);
-	cairo_clip(glob->cr);
+		cairo_clip(glob->cr);
+	}
 #endif
 
 	return true;
@@ -440,49 +464,50 @@ bool ami_disc(int x, int y, int radius, const plot_style_t *style)
 	LOG(("[ami_plotter] Entered ami_disc()"));
 	#endif
 
-#ifndef NS_AMIGA_CAIRO_ALL
-	if (style->fill_type != PLOT_OP_TYPE_NONE) {
-		SetRPAttrs(&glob->rp,
-			   RPTAG_APenColor,
-			   p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
-			   TAG_DONE);
-		AreaCircle(&glob->rp,x,y,radius);
-		AreaEnd(&glob->rp);
-	}
-
-	if (style->stroke_type != PLOT_OP_TYPE_NONE) {
-		SetRPAttrs(&glob->rp,
-			   RPTAG_APenColor,
-			   p96EncodeColor(RGBFB_A8B8G8R8, style->stroke_colour),
-			   TAG_DONE);
-
-		DrawEllipse(&glob->rp,x,y,radius,radius);
-	}
-#else
-	if (style->fill_type != PLOT_OP_TYPE_NONE) {
-		ami_cairo_set_colour(glob->cr, style->fill_colour);
-		ami_cairo_set_solid(glob->cr);
-
-		cairo_set_line_width(glob->cr, 0);
-
-		cairo_arc(glob->cr, x, y, radius, 0, M_PI * 2);
+	if(option_cairo_renderer < 2)
+	{
+		if (style->fill_type != PLOT_OP_TYPE_NONE) {
+			SetRPAttrs(&glob->rp,
+					RPTAG_APenColor,
+					p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
+					TAG_DONE);
+			AreaCircle(&glob->rp,x,y,radius);
+			AreaEnd(&glob->rp);
+		}
 
-		cairo_fill(glob->cr);
+		if (style->stroke_type != PLOT_OP_TYPE_NONE) {
+			SetRPAttrs(&glob->rp,
+					RPTAG_APenColor,
+					p96EncodeColor(RGBFB_A8B8G8R8, style->stroke_colour),
+					TAG_DONE);
 
-		cairo_stroke(glob->cr);
+			DrawEllipse(&glob->rp,x,y,radius,radius);
+		}
 	}
+	else
+	{
+#ifdef NS_AMIGA_CAIRO
+		if (style->fill_type != PLOT_OP_TYPE_NONE) {
+			ami_cairo_set_colour(glob->cr, style->fill_colour);
+			ami_cairo_set_solid(glob->cr);
 
-	if (style->stroke_type != PLOT_OP_TYPE_NONE) {
-		ami_cairo_set_colour(glob->cr, style->stroke_colour);
-		ami_cairo_set_solid(glob->cr);
+			cairo_set_line_width(glob->cr, 0);
 
-		cairo_set_line_width(glob->cr, 1);
+			cairo_arc(glob->cr, x, y, radius, 0, M_PI * 2);
+			cairo_fill(glob->cr);
+			cairo_stroke(glob->cr);
+		}
 
-		cairo_arc(glob->cr, x, y, radius, 0, M_PI * 2);
+		if (style->stroke_type != PLOT_OP_TYPE_NONE) {
+			ami_cairo_set_colour(glob->cr, style->stroke_colour);
+			ami_cairo_set_solid(glob->cr);
 
-		cairo_stroke(glob->cr);
-	}
+			cairo_set_line_width(glob->cr, 1);
+			cairo_arc(glob->cr, x, y, radius, 0, M_PI * 2);
+			cairo_stroke(glob->cr);
+		}
 #endif
+	}
 	return true;
 }
 
@@ -492,27 +517,32 @@ bool ami_arc(int x, int y, int radius, int angle1, int angle2, const plot_style_
 	LOG(("[ami_plotter] Entered ami_arc()"));
 	#endif
 
+	if(option_cairo_renderer >= 1)
+	{
 #ifdef NS_AMIGA_CAIRO
-	ami_cairo_set_colour(glob->cr, style->fill_colour);
-	ami_cairo_set_solid(glob->cr);
+		ami_cairo_set_colour(glob->cr, style->fill_colour);
+		ami_cairo_set_solid(glob->cr);
 
-	cairo_set_line_width(glob->cr, 1);
-	cairo_arc(glob->cr, x, y, radius,
+		cairo_set_line_width(glob->cr, 1);
+		cairo_arc(glob->cr, x, y, radius,
 			(angle1 + 90) * (M_PI / 180),
 			(angle2 + 90) * (M_PI / 180));
-	cairo_stroke(glob->cr);
-#else
+		cairo_stroke(glob->cr);
+#endif
+	}
+	else
+	{
+		/* TODO: gfx.lib plotter needs arc support */
 /* http://www.crbond.com/primitives.htm
 CommonFuncsPPC.lha */
 
-	SetRPAttrs(&glob->rp,
-                   RPTAG_APenColor,
-                   p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
-		   TAG_DONE);
+		SetRPAttrs(&glob->rp,
+				RPTAG_APenColor,
+				p96EncodeColor(RGBFB_A8B8G8R8, style->fill_colour),
+				TAG_DONE);
 
 //	DrawArc(&glob->rp,x,y,(float)angle1,(float)angle2,radius);
-#endif
-
+	}
 	return true;
 }
 
@@ -760,78 +790,84 @@ bool ami_path(const float *p, unsigned int n, colour fill, float width,
 /* For SVG only, because it needs Bezier curves we are going to cheat
    and insist on Cairo */
 #ifdef NS_AMIGA_CAIRO
-	unsigned int i;
-	cairo_matrix_t old_ctm, n_ctm;
-
-	if (n == 0)
-		return true;
+/* We should probably check if the off-screen bitmap is 32-bit and render
+ * using Cairo regardless if it is.  For now, we respect user preferences.
+ */
+	if(option_cairo_renderer >= 1)
+	{
+		unsigned int i;
+		cairo_matrix_t old_ctm, n_ctm;
 
-	if (p[0] != PLOTTER_PATH_MOVE) {
-		LOG(("Path does not start with move"));
-		return false;
-	}
+		if (n == 0)
+			return true;
 
-	/* Save CTM */
-	cairo_get_matrix(glob->cr, &old_ctm);
-
-	/* Set up line style and width */
-	cairo_set_line_width(glob->cr, 1);
-	ami_cairo_set_solid(glob->cr);
-
-	/* Load new CTM */
-	n_ctm.xx = transform[0];
-	n_ctm.yx = transform[1];
-	n_ctm.xy = transform[2];
-	n_ctm.yy = transform[3];
-	n_ctm.x0 = transform[4];
-	n_ctm.y0 = transform[5];
-
-	cairo_set_matrix(glob->cr, &n_ctm);
-
-	/* Construct path */
-	for (i = 0; i < n; ) {
-		if (p[i] == PLOTTER_PATH_MOVE) {
-			cairo_move_to(glob->cr, p[i+1], p[i+2]);
-			i += 3;
-		} else if (p[i] == PLOTTER_PATH_CLOSE) {
-			cairo_close_path(glob->cr);
-			i++;
-		} else if (p[i] == PLOTTER_PATH_LINE) {
-			cairo_line_to(glob->cr, p[i+1], p[i+2]);
-			i += 3;
-		} else if (p[i] == PLOTTER_PATH_BEZIER) {
-			cairo_curve_to(glob->cr, p[i+1], p[i+2],
-					p[i+3], p[i+4],
-					p[i+5], p[i+6]);
-			i += 7;
-		} else {
-			LOG(("bad path command %f", p[i]));
-			/* Reset matrix for safety */
-			cairo_set_matrix(glob->cr, &old_ctm);
+		if (p[0] != PLOTTER_PATH_MOVE) {
+			LOG(("Path does not start with move"));
 			return false;
 		}
-	}
 
-	/* Restore original CTM */
-	cairo_set_matrix(glob->cr, &old_ctm);
+		/* Save CTM */
+		cairo_get_matrix(glob->cr, &old_ctm);
 
-	/* Now draw path */
-	if (fill != NS_TRANSPARENT) {
-		ami_cairo_set_colour(glob->cr,fill);
+		/* Set up line style and width */
+		cairo_set_line_width(glob->cr, 1);
+		ami_cairo_set_solid(glob->cr);
 
-		if (c != NS_TRANSPARENT) {
-			/* Fill & Stroke */
-			cairo_fill_preserve(glob->cr);
+		/* Load new CTM */
+		n_ctm.xx = transform[0];
+		n_ctm.yx = transform[1];
+		n_ctm.xy = transform[2];
+		n_ctm.yy = transform[3];
+		n_ctm.x0 = transform[4];
+		n_ctm.y0 = transform[5];
+
+		cairo_set_matrix(glob->cr, &n_ctm);
+
+		/* Construct path */
+		for (i = 0; i < n; ) {
+			if (p[i] == PLOTTER_PATH_MOVE) {
+				cairo_move_to(glob->cr, p[i+1], p[i+2]);
+				i += 3;
+			} else if (p[i] == PLOTTER_PATH_CLOSE) {
+				cairo_close_path(glob->cr);
+				i++;
+			} else if (p[i] == PLOTTER_PATH_LINE) {
+				cairo_line_to(glob->cr, p[i+1], p[i+2]);
+				i += 3;
+			} else if (p[i] == PLOTTER_PATH_BEZIER) {
+				cairo_curve_to(glob->cr, p[i+1], p[i+2],
+					p[i+3], p[i+4],
+					p[i+5], p[i+6]);
+				i += 7;
+			} else {
+				LOG(("bad path command %f", p[i]));
+				/* Reset matrix for safety */
+				cairo_set_matrix(glob->cr, &old_ctm);
+				return false;
+			}
+		}
+
+		/* Restore original CTM */
+		cairo_set_matrix(glob->cr, &old_ctm);
+
+		/* Now draw path */
+		if (fill != NS_TRANSPARENT) {
+			ami_cairo_set_colour(glob->cr,fill);
+
+			if (c != NS_TRANSPARENT) {
+				/* Fill & Stroke */
+				cairo_fill_preserve(glob->cr);
+				ami_cairo_set_colour(glob->cr,c);
+				cairo_stroke(glob->cr);
+			} else {
+				/* Fill only */
+				cairo_fill(glob->cr);
+			}
+		} else if (c != NS_TRANSPARENT) {
+			/* Stroke only */
 			ami_cairo_set_colour(glob->cr,c);
 			cairo_stroke(glob->cr);
-		} else {
-			/* Fill only */
-			cairo_fill(glob->cr);
 		}
-	} else if (c != NS_TRANSPARENT) {
-		/* Stroke only */
-		ami_cairo_set_colour(glob->cr,c);
-		cairo_stroke(glob->cr);
 	}
 #endif
 	return true;