First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'.

Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from 
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf

........
  r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines
  
  Pdf plotting skeleton pinned on Print Preview in GTK.
  Just creates a file and draws lines. 
........
  r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines
  
  Pdf plotter - added drawing some graphic primitives.
  Still with limited functionality, but a snapshot of the
  currently viewed page can be made and resembles the original.
........
  r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines
  
  Corrected encoding name
........
  r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines
  
  Colours and polygons added.
........
  r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines
  
  Added rectangles, filled boxes and clipping.
  Taken into consideration joty's comments.
  Added a todo list for this part.
  Added some debug stuff and checking boundaries.
........
  r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines
  
  Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles
........
  r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines
  
  Some more options in graphic primitives and normalizing some parameters.
........
  r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines
  
  Plotting changed as jmb suggested (is the least invasive one from the possible)
  Added dummy bitmap plotting - way of plotting an image is determined by its type. 
........
  r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines
  
  Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;)
........
  r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines
  
  Added hadling images other than png and jpeg - with transparency.
........
  r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines
  
  Added handling NULL-returns from all mallocs.
  Added plot_bitmap_tile handling.
  Changed code style a little.
........
  r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines
  
  Added a first prototype of the paged-output organization.
  Still not sure about naming, file locations etc.
  Works with the same pdf plotting as before.
........
  r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines
  
  Added primitive width adjustment and outputing the whole
  website in multiple pages.
........
  r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line
  
  Fix RISC OS build failure (change r4235 wasn't complete).
........
  r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines
  
  This enables "Export PDF" in RISC OS build:
  
  - Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT
  - Makefile.sources(S_PDF): Add to RISC OS target as well.
  - utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have
    PDF export functionality or not.
  - riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made
    by Adam Blokus to write a PDF file under RISC OS.
  - riscos/save.c: Call save_as_pdf added.
  - riscos/menus.c: Add 'Export->PDF' menu entry.
  - riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF.
  - desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF.
  - desktop/print.c(print_run): Added return value.
  - Makefile(CCACHE): Moved closed to the place where CC is set for the first time.
    (LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs.
........
  r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines
  
  Added margins and page size adjustment.
........
  r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines
  
  Added 'fuzzy' margins on page bottom. 
  Disabled direct png embedding, because it is too unstable in Haru now.
........
  r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines
  
  Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path.
........
  r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines
  
  Added skeleton of applying loose layout.
  Minor code cleaning-up.
........
  r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines
  
  Implemented the elementar ideas of the loose layout.
  Added scaling in the printing routine.
  Added some basic demonstrations.
........
  r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines
  
  Cleaned up the loosing code - commited to much of leftover rubbish code.
........
  r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines
  
  Added duplicating box tree and current content - window flickering during printing solved.
  Minor error checking after new HPDF_Image_AddSMask call.
........
  r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines
  
  Changes in loosen layout (image resizing).
........
  r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines
  
  Added pdf font handling and rendering functions with the use of Haru functions.
........
  r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  Added a very basic and still buggy GTK print implementation.
........
  r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  Added gtk printing one more time - I have forgotten to add the main file.
........
  r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  removed error with comment
........
  r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines
  
  Major style improvements - added a lot of doxygen comments, 
  followed tlsa's style guide.
  Added some more error checking, too.
........
  r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines
  
  Cleaned up the code.
........
  r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines
  
  Changed everything according to jmb's review plus some minor bug fixes to gtk_print.
........
  r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines
  
  Solved the netsurf.glade clash from r4421.
........
  r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines
  
  Fixed bug with wrong number of pages in gtk printing.
........
  r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines
  
  - fixed uncommented line from the previous commit
  - fixed bug with scale bigger than 1.0 (incorretly clipped page)
........
  r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines
  
  Fixed bug in gtk_print_font_paint (and nsfont_paint).
........
  r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines
  
  Bug fix in nsfont_paint.
........
  r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines
  
  Added gtk_selection files.
........
  r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines
  
  Addam missing glade files.
........
  r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line
  
  Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions.
........
  r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line
  
  Declare haru_nsfont iso define an instance for each C source including the font_haru.h header.  This fixes breakage of PDF export on RISC OS.
........
  r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines
  
  Applied changes according to joty's review.
  Added checking the dimensions of a plotted image to pdf plotter.
  Commented out jpg embedding (it seems to cause some problems
  I'll bring it back when I figure out what's wrong) .
  Added back some files removed by mistake.
........


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

1 files changed, 56 insertions, 36 deletions

diff --git a/render/layout.c b/render/layout.c
index 09eaac6a0..300513f66 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -55,7 +55,8 @@
 #define AUTO INT_MIN
 
 
-static void layout_minmax_block(struct box *block);
+static void layout_minmax_block(struct box *block,
+		const struct font_functions *font_func);
 static bool layout_block_object(struct box *block);
 static void layout_block_find_dimensions(int available_width, struct box *box);
 static bool layout_apply_minmax_height(struct box *box);
@@ -71,24 +72,28 @@ static void layout_find_dimensions(int available_width,
 static int layout_clear(struct box *fl, css_clear clear);
 static void find_sides(struct box *fl, int y0, int y1,
 		int *x0, int *x1, struct box **left, struct box **right);
-static void layout_minmax_inline_container(struct box *inline_container);
+static void layout_minmax_inline_container(struct box *inline_container,
+		const struct font_functions *font_func);
 static int line_height(struct css_style *style);
 static bool layout_line(struct box *first, int *width, int *y,
 		int cx, int cy, struct box *cont, bool indent,
 		bool has_text_children,
 		struct content *content, struct box **next_box);
-static struct box *layout_minmax_line(struct box *first, int *min, int *max);
+static struct box *layout_minmax_line(struct box *first, int *min, int *max,
+		const struct font_functions *font_func);
 static int layout_text_indent(struct css_style *style, int width);
 static bool layout_float(struct box *b, int width, struct content *content);
 static void place_float_below(struct box *c, int width, int cx, int y,
 		struct box *cont);
 static bool layout_table(struct box *box, int available_width,
 		struct content *content);
-static void layout_minmax_table(struct box *table);
+static void layout_minmax_table(struct box *table,
+		const struct font_functions *font_func);
 static void layout_move_children(struct box *box, int x, int y);
 static void calculate_mbp_width(struct css_style *style, unsigned int side,
 		int *fixed, float *frac);
-static void layout_lists(struct box *box);
+static void layout_lists(struct box *box,
+		const struct font_functions *font_func);
 static void layout_position_relative(struct box *root);
 static void layout_compute_relative_offset(struct box *box, int *x, int *y);
 static bool layout_position_absolute(struct box *box,
@@ -116,10 +121,11 @@ bool layout_document(struct content *content, int width, int height)
 {
 	bool ret;
 	struct box *doc = content->data.html.layout;
+	const struct font_functions *font_func = content->data.html.font_func;
 
 	assert(content->type == CONTENT_HTML);
 
-	layout_minmax_block(doc);
+	layout_minmax_block(doc, font_func);
 
 	layout_block_find_dimensions(width, doc);
 	doc->x = doc->margin[LEFT] + doc->border[LEFT];
@@ -150,7 +156,7 @@ bool layout_document(struct content *content, int width, int height)
 					 doc->children->margin[BOTTOM]);
 	}
 
-	layout_lists(doc);
+	layout_lists(doc, font_func);
 	layout_position_absolute(doc, doc, 0, 0, content);
 	layout_position_relative(doc);
 
@@ -516,7 +522,7 @@ bool layout_block_context(struct box *block, struct content *content)
  *        0 <= block->min_width <= block->max_width
  */
 
-void layout_minmax_block(struct box *block)
+void layout_minmax_block(struct box *block, const struct font_functions *font_func)
 {
 	struct box *child;
 	int min = 0, max = 0;
@@ -545,7 +551,8 @@ void layout_minmax_block(struct box *block)
 
 	if (block->object) {
 		if (block->object->type == CONTENT_HTML) {
-			layout_minmax_block(block->object->data.html.layout);
+			layout_minmax_block(block->object->data.html.layout,
+					font_func);
 			min = block->object->data.html.layout->min_width;
 			max = block->object->data.html.layout->max_width;
 		} else {
@@ -556,13 +563,14 @@ void layout_minmax_block(struct box *block)
 		for (child = block->children; child; child = child->next) {
 			switch (child->type) {
 			case BOX_BLOCK:
-				layout_minmax_block(child);
+				layout_minmax_block(child, font_func);
 				break;
 			case BOX_INLINE_CONTAINER:
-				layout_minmax_inline_container(child);
+				layout_minmax_inline_container(child,
+						font_func);
 				break;
 			case BOX_TABLE:
-				layout_minmax_table(child);
+				layout_minmax_table(child, font_func);
 				break;
 			default:
 				assert(0);
@@ -1139,7 +1147,8 @@ bool layout_inline_container(struct box *inline_container, int width,
  *        0 <= inline_container->min_width <= inline_container->max_width
  */
 
-void layout_minmax_inline_container(struct box *inline_container)
+void layout_minmax_inline_container(struct box *inline_container,
+		const struct font_functions *font_func)
 {
 	struct box *child;
 	int line_min = 0, line_max = 0;
@@ -1152,7 +1161,9 @@ void layout_minmax_inline_container(struct box *inline_container)
 		return;
 
 	for (child = inline_container->children; child; ) {
-		child = layout_minmax_line(child, &line_min, &line_max);
+		child = layout_minmax_line(child,
+				&line_min, &line_max,
+				font_func);
 		if (min < line_min)
 			min = line_min;
 		if (max < line_max)
@@ -1242,6 +1253,8 @@ bool layout_line(struct box *first, int *width, int *y,
 	struct css_length gadget_size; /* Checkbox / radio buttons */
 	gadget_size.unit = CSS_UNIT_EM;
 	gadget_size.value = 1;
+	
+	const struct font_functions *font_func = content->data.html.font_func;
 
 	LOG(("first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i",
 			first, (int) first->length, first->text, *width,
@@ -1334,7 +1347,8 @@ bool layout_line(struct box *first, int *width, int *y,
 			b->width = 0;
 			if (b->space) {
 				/** \todo optimize out */
-				nsfont_width(b->style, " ", 1, &space_after);
+				font_func->font_width(b->style, " ", 1,
+						&space_after);
 			} else {
 				space_after = 0;
 			}
@@ -1371,7 +1385,8 @@ bool layout_line(struct box *first, int *width, int *y,
 							data.select.items; o;
 							o = o->next) {
 						int opt_width;
-						nsfont_width(b->style, o->text,
+						font_func->font_width(b->style,
+								o->text,
 								strlen(o->text),
 								&opt_width);
 
@@ -1381,7 +1396,7 @@ bool layout_line(struct box *first, int *width, int *y,
 
 					b->width = opt_maxwidth;
 				} else {
-					nsfont_width(b->style, b->text,
+					font_func->font_width(b->style, b->text,
 						b->length, &b->width);
 				}
 			}
@@ -1389,7 +1404,8 @@ bool layout_line(struct box *first, int *width, int *y,
 			x += b->width;
 			if (b->space)
 				/** \todo optimize out */
-				nsfont_width(b->style, " ", 1, &space_after);
+				font_func->font_width(b->style, " ", 1,
+						&space_after);
 			else
 				space_after = 0;
 
@@ -1529,7 +1545,7 @@ bool layout_line(struct box *first, int *width, int *y,
 				space_after = 0;
 				if (b->space)
 					/** \todo handle errors, optimize */
-					nsfont_width(b->style, " ", 1,
+					font_func->font_width(b->style, " ", 1,
 							&space_after);
 			} else
 				space_after = 0;
@@ -1654,7 +1670,7 @@ bool layout_line(struct box *first, int *width, int *y,
 			w = split_box->width;
 		else
 			/** \todo handle errors */
-			nsfont_width(split_box->style, split_box->text,
+			font_func->font_width(split_box->style, split_box->text,
 					space, &w);
 
 		LOG(("splitting: split_box %p \"%.*s\", space %zu, w %i, "
@@ -1725,7 +1741,7 @@ bool layout_line(struct box *first, int *width, int *y,
 			/* fit as many words as possible */
 			assert(space != 0);
 			/** \todo handle errors */
-			nsfont_split(split_box->style,
+			font_func->font_split(split_box->style,
 					split_box->text, split_box->length,
 					x1 - x0 - x - space_before, &space, &w);
 			LOG(("'%.*s' %i %zu %i", (int) split_box->length,
@@ -1827,7 +1843,8 @@ bool layout_line(struct box *first, int *width, int *y,
  */
 
 struct box *layout_minmax_line(struct box *first,
-		int *line_min, int *line_max)
+		int *line_min, int *line_max,
+  		const struct font_functions *font_func)
 {
 	int min = 0, max = 0, width, height, fixed;
 	float frac;
@@ -1855,9 +1872,9 @@ struct box *layout_minmax_line(struct box *first,
 		if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT) {
 			assert(b->children);
 			if (b->children->type == BOX_BLOCK)
-				layout_minmax_block(b->children);
+				layout_minmax_block(b->children, font_func);
 			else
-				layout_minmax_table(b->children);
+				layout_minmax_table(b->children, font_func);
 			b->min_width = b->children->min_width;
 			b->max_width = b->children->max_width;
 			if (min < b->min_width)
@@ -1867,7 +1884,7 @@ struct box *layout_minmax_line(struct box *first,
 		}
 
 		if (b->type == BOX_INLINE_BLOCK) {
-			layout_minmax_block(b);
+			layout_minmax_block(b, font_func);
 			if (min < b->min_width)
 				min = b->min_width;
 			max += b->max_width;
@@ -1890,7 +1907,7 @@ struct box *layout_minmax_line(struct box *first,
 			if (0 < fixed)
 				max += fixed;
 			if (b->next && b->space) {
-				nsfont_width(b->style, " ", 1, &width);
+				font_func->font_width(b->style, " ", 1, &width);
 				max += width;
 			}
 			continue;
@@ -1916,7 +1933,8 @@ struct box *layout_minmax_line(struct box *first,
 							data.select.items; o;
 							o = o->next) {
 						int opt_width;
-						nsfont_width(b->style, o->text,
+						font_func->font_width(b->style,
+								o->text,
 								strlen(o->text),
 								&opt_width);
 
@@ -1926,13 +1944,13 @@ struct box *layout_minmax_line(struct box *first,
 
 					b->width = opt_maxwidth;
 				} else {
-					nsfont_width(b->style, b->text,
+					font_func->font_width(b->style, b->text,
 						b->length, &b->width);
 				}
 			}
 			max += b->width;
 			if (b->next && b->space) {
-				nsfont_width(b->style, " ", 1, &width);
+				font_func->font_width(b->style, " ", 1, &width);
 				max += width;
 			}
 
@@ -1942,7 +1960,7 @@ struct box *layout_minmax_line(struct box *first,
 				for (j = i; j != b->length &&
 						b->text[j] != ' '; j++)
 					;
-				nsfont_width(b->style, b->text + i,
+				font_func->font_width(b->style, b->text + i,
 						j - i, &width);
 				if (min < width)
 					min = width;
@@ -2560,7 +2578,8 @@ bool layout_table(struct box *table, int available_width,
  *        0 <= table->min_width <= table->max_width
  */
 
-void layout_minmax_table(struct box *table)
+void layout_minmax_table(struct box *table,
+		const struct font_functions *font_func)
 {
 	unsigned int i, j;
 	int border_spacing_h = 0;
@@ -2597,7 +2616,7 @@ void layout_minmax_table(struct box *table)
 		if (cell->columns != 1)
 			continue;
 
-		layout_minmax_block(cell);
+		layout_minmax_block(cell, font_func);
 		i = cell->start_column;
 
 		if (col[i].positioned)
@@ -2620,7 +2639,7 @@ void layout_minmax_table(struct box *table)
 		if (cell->columns == 1)
 			continue;
 
-		layout_minmax_block(cell);
+		layout_minmax_block(cell, font_func);
 		i = cell->start_column;
 
 		/* find min width so far of spanned columns, and count
@@ -2766,7 +2785,8 @@ void calculate_mbp_width(struct css_style *style, unsigned int side,
  * Layout list markers.
  */
 
-void layout_lists(struct box *box)
+void layout_lists(struct box *box,
+		const struct font_functions *font_func)
 {
 	struct box *child;
 	struct box *marker;
@@ -2782,7 +2802,7 @@ void layout_lists(struct box *box)
 						marker->height) / 2;
 			} else if (marker->text) {
 				if (marker->width == UNKNOWN_WIDTH)
-					nsfont_width(marker->style,
+					font_func->font_width(marker->style,
 							marker->text,
 							marker->length,
 							&marker->width);
@@ -2798,7 +2818,7 @@ void layout_lists(struct box *box)
 			/* Gap between marker and content */
 			marker->x -= 4;
 		}
-		layout_lists(child);
+		layout_lists(child, font_func);
 	}
 }