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, 101 insertions, 40 deletions

diff --git a/desktop/print.c b/desktop/print.c
index 931dbe087..433a0bd89 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -23,31 +23,34 @@
 #include "utils/config.h"
 #ifdef WITH_PDF_EXPORT
 
+#include <string.h>
+
+#include "desktop/options.h"
 #include "desktop/print.h"
 #include "desktop/printer.h"
+#include "desktop/save_pdf/font_haru.h"
 
 #include "content/content.h"
 
+#include "gtk/options.h"
+
 #include "utils/log.h"
 #include "utils/talloc.h"
 
 #include "render/loosen.h"
 #include "render/box.h"
 
-#include "pdf/font_haru.h"
-
 static struct content *print_init(struct content *, struct print_settings *);
 static bool print_apply_settings(struct content *, struct print_settings *);
 
-
-/*TODO:	should these be passed as parameters in order to allow simultaneous
-	printings?
-*/
 static float page_content_width, page_content_height;
-static float text_margin_height;
 static struct content *printed_content;
 static float done_height;
 
+bool html_redraw_printing = false;
+int html_redraw_printing_border = 0;
+int html_redraw_printing_top_cropped = 0;
+
 /**
  * This function calls print setup, prints page after page until the whole
  * content is printed calls cleaning up afterwise.
@@ -61,9 +64,9 @@ bool print_basic_run(struct content *content,
 		struct print_settings *settings)
 {
 	bool ret = true;
-
+	
 	if (settings == NULL)
-		settings = print_make_settings(DEFAULT);
+		settings = print_make_settings(DEFAULT, NULL);
 
 	if (!print_set_up(content, printer, settings, NULL))
 		ret = false;
@@ -71,7 +74,7 @@ bool print_basic_run(struct content *content,
 	while (ret && (done_height < printed_content->height) )
 		ret = print_draw_next_page(printer, settings);
 
-	print_cleanup(content, printer);
+	print_cleanup(content, printer, settings);
 	
 	return ret;
 }
@@ -115,11 +118,17 @@ bool print_set_up(struct content *content,
 bool print_draw_next_page(const struct printer *printer,
 			struct print_settings *settings)
 {
-	/*TODO:Plotter will have to be duplicated and passed
-	as an argument - to allow simultaneous screen and
-	page plotting*/
+	int clip_x1, clip_y1;
+	
 	plot = *(printer->plotter);
-
+	html_redraw_printing_top_cropped = INT_MAX;
+	
+	clip_x1 = page_content_width * settings->scale;
+	clip_y1 = page_content_height  * settings->scale;
+	
+	html_redraw_printing = true;
+	html_redraw_printing_border = clip_y1;
+	
 	printer->print_next_page();
 	if( !content_redraw(printed_content,
 			0,
@@ -127,11 +136,13 @@ bool print_draw_next_page(const struct printer *printer,
 			0,0,
 			0,
 			0,
-			page_content_width * settings->scale,
-   			page_content_height  * settings->scale,
+			clip_x1,
+			clip_y1,
 			settings->scale, 0xffffff))
 		return false;
-	done_height += page_content_height - text_margin_height;
+	done_height += page_content_height -
+			(html_redraw_printing_top_cropped != INT_MAX ?
+			clip_y1 - html_redraw_printing_top_cropped : 0) / settings->scale;
 	
 	return true;
 }
@@ -194,9 +205,7 @@ bool print_apply_settings(struct content *content,
 		return false;
 	
 	/*Apply settings - adjust page size etc*/
-	
-	text_margin_height = settings->margins[MARGINTEXT];
-	
+
 	page_content_width = (settings->page_width - settings->margins[MARGINLEFT] - 
 			settings->margins[MARGINRIGHT]) / settings->scale;
 	
@@ -207,9 +216,10 @@ bool print_apply_settings(struct content *content,
 	LOG(("New layout applied.New height = %d ; New width = %d ",
 	     content->height, content->width));
 	
-	if (content->width > page_content_width)
-		return loosen_document_layout(content, content->data.html.layout,
-				page_content_width, page_content_height);
+	/*check if loosening is necessary and requested*/
+	if (option_enable_loosening && content->width > page_content_width)
+  		return loosen_document_layout(content, content->data.html.layout,
+  				page_content_width, page_content_height);
 			
 	return true;	
 }
@@ -221,10 +231,13 @@ bool print_apply_settings(struct content *content,
  * \return true if successful, false otherwise
  */
 bool print_cleanup(struct content *content,
-		   const struct printer *printer)
+		const struct printer *printer,
+		struct print_settings *settings)
 {
 	printer->print_end();
 	
+	html_redraw_printing = false;
+	
 	if (printed_content) {
 		content_remove_user(printed_content, NULL, (intptr_t)print_init, 0);
 		talloc_free(printed_content);
@@ -232,50 +245,98 @@ bool print_cleanup(struct content *content,
 	
 	content_remove_user(content, NULL, (intptr_t)print_init, 0);
 	
+	free((void *)settings->output);
+	free(settings);
+	
 	return true;
 }
 
 /**
  * Generates one of the predefined print settings sets.
+ * \param configuration the requested configuration
+ * \param filename the filename or NULL
  * \return print_settings in case if successful, NULL if unknown configuration \
  * 	or lack of memory.
  */
-struct print_settings *print_make_settings(print_configuration configuration)
+struct print_settings *print_make_settings(print_configuration configuration,
+		const char *filename)
 {
 	struct print_settings *settings;
+	char *path;
+	struct css_length length;
+	
+	path = malloc(PATH_MAX * sizeof(char));
+	if (path == NULL)
+		return NULL;
+	
+	length.unit = CSS_UNIT_MM;
 	
 	switch (configuration){
 		case DEFAULT:	
 			settings = (struct print_settings*) 
-					malloc(sizeof (struct print_settings) );
+					malloc(sizeof(struct print_settings) );
 			
 			if (settings == NULL)
 				return NULL;
 			
-			settings->page_width  = 595;
-			settings->page_height = 840;
-			settings->copies = 1;
-			/*with 0.7 the pages look the best, the value in 
-			haru_nsfont_apply_style should be kept the same as this
-			*/
-			settings->scale = 0.7;
+			settings->page_width  = DEFAULT_PAGE_WIDTH;
+			settings->page_height = DEFAULT_PAGE_HEIGHT;
+			settings->copies = DEFAULT_COPIES;
+
+			settings->scale = DEFAULT_EXPORT_SCALE;
+			
+			length.value = DEFAULT_MARGIN_LEFT_MM;
+			settings->margins[MARGINLEFT] = css_len2px(&length, 0);
+			length.value = DEFAULT_MARGIN_RIGHT_MM;
+			settings->margins[MARGINRIGHT] = css_len2px(&length, 0);
+			length.value = DEFAULT_MARGIN_TOP_MM;
+			settings->margins[MARGINTOP] = css_len2px(&length, 0);
+			length.value = DEFAULT_MARGIN_BOTTOM_MM;
+			settings->margins[MARGINBOTTOM] = css_len2px(&length, 0);
 			
-			settings->margins[MARGINLEFT] = 30;
-			settings->margins[MARGINRIGHT] = 30;
-			settings->margins[MARGINTOP] = 30;
-			settings->margins[MARGINBOTTOM] = 30;
+			settings->font_func = &haru_nsfont;
 			
-			settings->margins[MARGINTEXT] = 10;
+			break;
+		/*use settings from the Export options tab*/
+		case OPTIONS:
+			settings = (struct print_settings*) 
+					malloc(sizeof(struct print_settings) );
+			
+			if (settings == NULL)
+				return NULL;
+			
+			settings->page_width  = DEFAULT_PAGE_WIDTH;
+			settings->page_height = DEFAULT_PAGE_HEIGHT;
+			settings->copies = DEFAULT_COPIES;
+			
+			settings->scale = (float)option_export_scale / 100;
+			
+			length.value = option_margin_left;
+			settings->margins[MARGINLEFT] = css_len2px(&length, 0);
+			length.value = option_margin_right;
+			settings->margins[MARGINRIGHT] = css_len2px(&length, 0);
+			length.value = option_margin_top;
+			settings->margins[MARGINTOP] = css_len2px(&length, 0);
+			length.value = option_margin_bottom;
+			settings->margins[MARGINBOTTOM] = css_len2px(&length, 0);
 			
-			settings->output = "out.pdf";
 			settings->font_func = &haru_nsfont;
 			
 			break;
-		
 		default:
 			return NULL;
 	}
 	
+	/*if no filename is specified use one without an extension*/
+	if (filename == NULL) {
+		/*TODO: the "/" is not platform independent*/
+		strcpy(path, "/out");
+	}
+	else
+		strcpy(path, filename);
+	
+	settings->output = path;	
+	
 	return settings;	
 }