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, 5 insertions, 12 deletions

diff --git a/gtk/gtk_print.c b/gtk/gtk_print.c
index 6f1bf976c..5828ead75 100644
--- a/gtk/gtk_print.c
+++ b/gtk/gtk_print.c
@@ -242,7 +242,7 @@ bool nsgtk_print_plot_clip(int clip_x0, int clip_y0,
 	cliprect.y = clip_y0;
 	cliprect.width = clip_x1 - clip_x0;
 	cliprect.height = clip_y1 - clip_y0;
-//	gdk_gc_set_clip_rectangle(gtk_print_current_gc, &cliprect);
+	
 	return true;
 	
 }
@@ -411,7 +411,6 @@ void nsgtk_print_set_colour(colour c)
 
 	gdk_color_alloc(gdk_colormap_get_system(),
  			&colour);
-// 	gdk_gc_set_foreground(gtk_print_current_gc, &colour);
 
 	cairo_set_source_rgba(gtk_print_current_cr, r / 255.0,
 			g / 255.0, b / 255.0, 1.0);
@@ -505,28 +504,25 @@ static void gtk_print_end()
  * \param context the print context used to set up the pages
  * \param user_data nothing in here
  */
-
 void gtk_print_signal_begin_print (GtkPrintOperation *operation,
 		GtkPrintContext *context,
 		gpointer user_data)
 {
-
 	int page_number;	
 	double height_on_page, height_to_print;
 	
 	LOG(("Begin print"));
 	
 	
-	settings = print_make_settings(DEFAULT);
+	settings = user_data;
 		
-	settings->margins[MARGINTEXT] = 0;
 	settings->margins[MARGINTOP] = 0;
 	settings->margins[MARGINLEFT] = 0;
 	settings->margins[MARGINBOTTOM] = 0;
 	settings->margins[MARGINRIGHT] = 0;
 	settings->page_width = gtk_print_context_get_width(context);
 	settings->page_height = gtk_print_context_get_height(context);
-	settings->scale = 0.7;
+	settings->scale = 0.7;/*at 0.7 the pages look the best*/
 	settings->font_func = &nsfont;
 	
 	print_set_up(content_to_print, &gtk_printer, settings, &height_to_print);
@@ -542,15 +538,13 @@ void gtk_print_signal_begin_print (GtkPrintOperation *operation,
 	page_number = height_to_print / height_on_page;
 	if (height_to_print - page_number * height_on_page > 0)
 		page_number += 1;
-			
-	
+				
 	gtk_print_operation_set_n_pages(operation, page_number);
 }
   		
 /** Handle the draw_page signal from the GtkPrintOperation.
  * This function changes only the cairo context to print on.
  */  		
-  		
 void gtk_print_signal_draw_page(GtkPrintOperation *operation,
 		GtkPrintContext *context,
 		gint page_nr,
@@ -564,13 +558,12 @@ void gtk_print_signal_draw_page(GtkPrintOperation *operation,
 /** Handle the end_print signal from the GtkPrintOperation.
  * This functions calls only the print_cleanup function from the print interface
  */  	
-  			
 void gtk_print_signal_end_print(GtkPrintOperation *operation,
 		GtkPrintContext *context,
 		gpointer user_data)
 {
 	LOG(("End print"));	
-	print_cleanup(content_to_print, &gtk_printer);
+	print_cleanup(content_to_print, &gtk_printer, user_data);
 }
 
 #endif /* WITH_PDF_EXPORT */