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

Merged revisions 4195-4211,4216,4219-4220,4222-4234,4236-4250,4252-4262,4264-4266,4268-4326,4329-4335,4338-4342,4344-4411,4413-4420,4422-4436,4438-4491,4494-4506,4508-4514,4516,4518-4552,4554,4556-4564,4567-4568,4570-4574,4576-4686,4689-4692,4694,4698-4709,4715-4723,4725-4755,4757-4769,4771-4919,4921-4996,4998-5110,5112-5117 via svnmerge from 
svn://svn.netsurf-browser.org/branches/adamblokus/netsurf

........
  r4736 | adamblokus | 2008-07-26 13:46:54 +0200 (Sat, 26 Jul 2008) | 2 lines
  
  Sorting out some problems with svn.
........
  r4737 | adamblokus | 2008-07-26 13:54:36 +0200 (Sat, 26 Jul 2008) | 4 lines
  
  Added export tab to the options dialog.
  Added the possibility of changing some print options.
........
  r4897 | adamblokus | 2008-08-04 17:59:05 +0200 (Mon, 04 Aug 2008) | 5 lines
  
  Added checking of horizontal clipping.
  Added better table loosening.
  Changed some minor bugs.
  Applied changes in the Export options tab according to the review from tlsa.
........
  r4905 | adamblokus | 2008-08-05 01:53:34 +0200 (Tue, 05 Aug 2008) | 2 lines
  
  Fixed bug which made it impossible to export pdf's.
........
  r4919 | adamblokus | 2008-08-05 16:39:33 +0200 (Tue, 05 Aug 2008) | 2 lines
  
  Fixed some memory leaks which caused Netsurf to break.
........
  r4927 | adamblokus | 2008-08-06 02:26:30 +0200 (Wed, 06 Aug 2008) | 4 lines
  
  Fixed bug with filenames which crashed Netsurf.
  Turned anti aliasing off for printing.
  Fixed some scaling issues.
........
  r4928 | adamblokus | 2008-08-06 17:52:44 +0200 (Wed, 06 Aug 2008) | 5 lines
  
  Added new export/print options:
  - suppressing images
  - turning off backgrounds
  - toggled loosening
........
  r4950 | adamblokus | 2008-08-07 21:15:21 +0200 (Thu, 07 Aug 2008) | 5 lines
  
  Added new options to PDF export:
  - document compression
  - document encryption
  Added PDF password dialog
........
  r4954 | adamblokus | 2008-08-07 22:11:31 +0200 (Thu, 07 Aug 2008) | 2 lines
  
  Added saving print settings.
........
  r4956 | adamblokus | 2008-08-07 22:44:48 +0200 (Thu, 07 Aug 2008) | 2 lines
  
  Fixes to PDF encryption
........
  r4970 | adamblokus | 2008-08-09 15:26:24 +0200 (Sat, 09 Aug 2008) | 3 lines
  
  Fixed bug in plotting tiled bitmaps.
  Fixed bug with too long text decorations.
........
  r4977 | adamblokus | 2008-08-09 19:18:56 +0200 (Sat, 09 Aug 2008) | 2 lines
  
  Fixed JPG embedding bug.
........
  r4988 | adamblokus | 2008-08-10 16:59:51 +0200 (Sun, 10 Aug 2008) | 3 lines
  
  Added clip checking to pdf plotters. No more "blank" clips.
  Made PDF compression a default setting.
........
  r4995 | adamblokus | 2008-08-10 20:03:00 +0200 (Sun, 10 Aug 2008) | 2 lines
  
  Fixed Haru crash on font-size==0.
........
  r4996 | adamblokus | 2008-08-10 21:04:43 +0200 (Sun, 10 Aug 2008) | 2 lines
  
  Added changing text mode only if necessary.
........
  r5045 | adamblokus | 2008-08-11 21:26:26 +0200 (Mon, 11 Aug 2008) | 3 lines
  
  Removing gtk stuff from core code.
  Little fix in options. 
........
  r5048 | adamblokus | 2008-08-11 21:57:45 +0200 (Mon, 11 Aug 2008) | 2 lines
  
  Better font size checking in PDF export.
........
  r5050 | adamblokus | 2008-08-11 22:19:56 +0200 (Mon, 11 Aug 2008) | 2 lines
  
  Fixed riscos text scale bug.
........
  r5073 | adamblokus | 2008-08-12 17:40:57 +0200 (Tue, 12 Aug 2008) | 2 lines
  
  Added missing tooltips
........
  r5092 | adamblokus | 2008-08-13 17:09:25 +0200 (Wed, 13 Aug 2008) | 2 lines
  
  Moved /pdf folder to desktop/save_pdf
........
  r5110 | adamblokus | 2008-08-13 22:44:50 +0200 (Wed, 13 Aug 2008) | 2 lines
  
  Added comments.
........
  r5113 | adamblokus | 2008-08-13 23:07:35 +0200 (Wed, 13 Aug 2008) | 2 lines
  
  Cosmetic changes
........
  r5116 | adamblokus | 2008-08-14 16:10:18 +0200 (Thu, 14 Aug 2008) | 2 lines
  
  Fixed bug with BOX_INLINE_END in tree duplication.
........
  r5117 | joty | 2008-08-14 21:47:46 +0200 (Thu, 14 Aug 2008) | 1 line
  
  Improvement for r5116: use local vars when possible; rename global last to box_duplicate_last; check on box_duplicate_main_tree failure.
........

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

1 files changed, 74 insertions, 4 deletions

diff --git a/render/box.c b/render/box.c
index d248f60d4..ef8b43310 100644
--- a/render/box.c
+++ b/render/box.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include "content/content.h"
 #include "css/css.h"
+#include "desktop/options.h"
 #include "render/box.h"
 #include "render/form.h"
 #include "utils/log.h"
@@ -38,6 +39,12 @@ static bool box_contains_point(struct box *box, int x, int y);
 #define box_is_float(box) (box->type == BOX_FLOAT_LEFT || \
 		box->type == BOX_FLOAT_RIGHT)
 
+typedef struct box_duplicate_llist box_duplicate_llist;
+struct box_duplicate_llist {
+	struct box_duplicate_llist *prev;
+	struct box *box;
+};
+static struct box_duplicate_llist *box_duplicate_last = NULL;
 
 /**
  * Create a box tree node.
@@ -86,6 +93,7 @@ struct box * box_create(struct css_style *style,
 	box->columns = 1;
 	box->rows = 1;
 	box->start_column = 0;
+	box->printed = false;
 	box->next = NULL;
 	box->prev = NULL;
 	box->children = NULL;
@@ -107,7 +115,6 @@ struct box * box_create(struct css_style *style,
 	return box;
 }
 
-
 /**
  * Add a child to a box tree node.
  *
@@ -679,6 +686,8 @@ struct box* box_duplicate_tree(struct box *root, struct content *c)
 	int box_number = 0;
 	struct box_dict_element *box_dict, *box_dict_end;
 	
+	box_duplicate_last = NULL;
+	
 	/* 1. Duplicate parent - children structure, list_markers*/
 	new_root = talloc_memdup(c, root, sizeof (struct box));
 	if (!box_duplicate_main_tree(new_root, c, &box_number))
@@ -720,12 +729,13 @@ struct box* box_duplicate_tree(struct box *root, struct content *c)
 */
 bool box_duplicate_main_tree(struct box *box, struct content *c, int *count)
 {
-
-	struct box *b, *prev, *copy;
+	struct box *b, *prev;
 	
 	prev = NULL;
 	
 	for (b = box->children; b; b = b->next) {
+		struct box *copy;
+
 		/*Copy child*/
 		copy = talloc_memdup(c, b, sizeof (struct box));
 		if (copy == NULL)
@@ -738,14 +748,74 @@ bool box_duplicate_main_tree(struct box *box, struct content *c, int *count)
 		else
 			box->children = copy;
 		
+		if (copy->type == BOX_INLINE) {
+			struct box_duplicate_llist *temp;
+
+			temp = malloc(sizeof(struct box_duplicate_llist));
+			if (temp == NULL)
+				return false;
+			temp->prev = box_duplicate_last;
+			temp->box = copy;
+			box_duplicate_last = temp;
+		}
+		else if (copy->type == BOX_INLINE_END) {
+			struct box_duplicate_llist *temp;
+
+			box_duplicate_last->box->inline_end = copy;
+			copy->inline_end = box_duplicate_last->box;
+			
+			temp = box_duplicate_last;
+			box_duplicate_last = temp->prev;
+			free(temp);
+		}
+		
 		/* Recursively visit child */
-		box_duplicate_main_tree(copy, c, count);
+		if (!box_duplicate_main_tree(copy, c, count))
+			return false;
 		
 		prev = copy;
 	}
 	
 	box->last = prev;
 	
+	if (box->object && option_suppress_images && (
+#ifdef WITH_JPEG
+			box->object->type == CONTENT_JPEG ||
+#endif
+#ifdef WITH_GIF
+			box->object->type == CONTENT_GIF ||
+#endif
+#ifdef WITH_BMP
+			box->object->type ==  CONTENT_BMP ||
+			box->object->type == CONTENT_ICO ||
+#endif
+#ifdef WITH_MNG
+			box->object->type == CONTENT_PNG ||
+			box->object->type == CONTENT_JNG ||
+			box->object->type == CONTENT_MNG ||
+#endif
+#if defined(WITH_SPRITE) || defined(WITH_NSSPRITE)
+			box->object->type == CONTENT_SPRITE ||
+#endif
+#ifdef WITH_DRAW
+			box->object->type == CONTENT_DRAW ||
+#endif
+#ifdef WITH_PLUGIN
+			box->object->type == CONTENT_PLUGIN ||
+#endif
+			box->object->type == CONTENT_DIRECTORY ||
+#ifdef WITH_THEME_INSTALL
+			box->object->type == CONTENT_THEME ||
+#endif
+#ifdef WITH_ARTWORKS
+			box->object->type == CONTENT_ARTWORKS ||
+#endif
+#if defined(WITH_NS_SVG) || defined(WITH_RSVG)
+			box->object->type == CONTENT_SVG ||
+#endif
+			false))
+		box->object = NULL;
+	
 	if (box->list_marker) {
 		box->list_marker = talloc_memdup(c, box->list_marker,
 				sizeof *box->list_marker);