summaryrefslogtreecommitdiff
path: root/render/html_redraw.c
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2008-08-14 20:32:10 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2008-08-14 20:32:10 +0000
commite063a2a59d698dd96123b68a44b09f0623f80cab (patch)
tree1bd06130de988cb0f6da239800229387f189d21c /render/html_redraw.c
parent44856d86d4efb12e08c8ef7560f39233107dfa8a (diff)
downloadnetsurf-e063a2a59d698dd96123b68a44b09f0623f80cab.tar.gz
netsurf-e063a2a59d698dd96123b68a44b09f0623f80cab.tar.bz2
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
Diffstat (limited to 'render/html_redraw.c')
-rw-r--r--render/html_redraw.c160
1 files changed, 94 insertions, 66 deletions
diff --git a/render/html_redraw.c b/render/html_redraw.c
index 51bcceb8f..d76f0d9bd 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -38,6 +38,7 @@
#include "desktop/selection.h"
#include "desktop/textinput.h"
#include "desktop/options.h"
+#include "desktop/print.h"
#include "render/box.h"
#include "render/font.h"
#include "render/form.h"
@@ -173,6 +174,9 @@ bool html_redraw_box(struct box *box,
int x0, y0, x1, y1;
int x_scrolled, y_scrolled;
struct box *bg_box = NULL;
+
+ if (html_redraw_printing && box->printed)
+ return true;
/* avoid trivial FP maths */
if (scale == 1.0) {
@@ -227,6 +231,23 @@ bool html_redraw_box(struct box *box,
if (clip_y1 < y0 || y1 < clip_y0 || clip_x1 < x0 || x1 < clip_x0)
return true;
+ /*if the rectangle is under the page bottom but it can fit in a page,
+ don't print it now*/
+ if (html_redraw_printing)
+ if (y1 > html_redraw_printing_border) {
+ if (y1 - y0 <= html_redraw_printing_border &&
+ (box->type == BOX_TEXT ||
+ box->type == BOX_TABLE_CELL
+ || box->object || box->gadget)) {
+ /*remember the highest of all points from the
+ not printed elements*/
+ if (y0 < html_redraw_printing_top_cropped)
+ html_redraw_printing_top_cropped = y0;
+ return true;
+ }
+ }
+ else box->printed = true;/*it won't be printed anymore*/
+
/* if visibility is hidden render children only */
if (box->style && box->style->visibility == CSS_VISIBILITY_HIDDEN) {
if ((plot.group_start) && (!plot.group_start("hidden box")))
@@ -296,74 +317,78 @@ bool html_redraw_box(struct box *box,
* element is processed, ignore the background.
* + For any other box, just use its own styling.
*/
- if (!box->parent) {
- /* Root box */
- if (box->style &&
- (box->style->background_color != TRANSPARENT ||
- box->background)) {
- /* With its own background */
- bg_box = box;
- } else if (!box->style ||
- (box->style->background_color == TRANSPARENT &&
- !box->background)) {
- /* Without its own background */
- if (box->children && box->children->style &&
- (box->children->style->background_color !=
- TRANSPARENT ||
- box->children->background)) {
- /* But body has one, so use that */
- bg_box = box->children;
- }
- }
- } else if (box->parent && !box->parent->parent) {
- /* Body box */
- if (box->style &&
- (box->style->background_color != TRANSPARENT ||
- box->background)) {
- /* With a background */
- if (box->parent->style &&
- (box->parent->style->background_color !=
- TRANSPARENT ||
- box->parent->background)) {
- /* Root has own background; process normally */
+
+ if (!html_redraw_printing ||
+ (html_redraw_printing && !option_remove_backgrounds)) {
+ if (!box->parent) {
+ /* Root box */
+ if (box->style &&
+ (box->style->background_color != TRANSPARENT ||
+ box->background)) {
+ /* With its own background */
bg_box = box;
+ } else if (!box->style ||
+ (box->style->background_color == TRANSPARENT &&
+ !box->background)) {
+ /* Without its own background */
+ if (box->children && box->children->style &&
+ (box->children->style->background_color !=
+ TRANSPARENT ||
+ box->children->background)) {
+ /* But body has one, so use that */
+ bg_box = box->children;
+ }
+ }
+ } else if (box->parent && !box->parent->parent) {
+ /* Body box */
+ if (box->style &&
+ (box->style->background_color != TRANSPARENT ||
+ box->background)) {
+ /* With a background */
+ if (box->parent->style &&
+ (box->parent->style->background_color !=
+ TRANSPARENT ||
+ box->parent->background)) {
+ /* Root has own background; process normally */
+ bg_box = box;
+ }
}
+ } else {
+ /* Any other box */
+ bg_box = box;
}
- } else {
- /* Any other box */
- bg_box = box;
- }
-
- /* bg_box == NULL implies that this box should not have
- * its background rendered. Otherwise filter out linebreaks,
- * optimize away non-differing inlines, only plot background
- * for BOX_TEXT it's in an inline and ensure the bg_box
- * has something worth rendering */
- if (bg_box && (bg_box->style && bg_box->type != BOX_BR &&
- (bg_box->type != BOX_INLINE ||
- bg_box->style != bg_box->parent->parent->style)) &&
- (bg_box->type != BOX_TEXT ||
- (bg_box->type == BOX_TEXT && inline_depth > 0)) &&
- ((bg_box->style->background_color != TRANSPARENT) ||
- (bg_box->background))) {
- /* find intersection of clip box and border edge */
- int px0 = x - border_left < x0 ? x0 : x - border_left;
- int py0 = y - border_top < y0 ? y0 : y - border_top;
- int px1 = x + padding_width + border_right < x1 ?
- x + padding_width + border_right : x1;
- int py1 = y + padding_height + border_bottom < y1 ?
- y + padding_height + border_bottom : y1;
-
- /* valid clipping rectangles only */
- if ((px0 < px1) && (py0 < py1)) {
- /* plot background */
- if (!html_redraw_background(x, y, box, scale,
- px0, py0, px1, py1,
- &current_background_color, bg_box))
- return false;
- /* restore previous graphics window */
- if (!plot.clip(x0, y0, x1, y1))
- return false;
+
+ /* bg_box == NULL implies that this box should not have
+ * its background rendered. Otherwise filter out linebreaks,
+ * optimize away non-differing inlines, only plot background
+ * for BOX_TEXT it's in an inline and ensure the bg_box
+ * has something worth rendering */
+ if (bg_box && (bg_box->style && bg_box->type != BOX_BR &&
+ (bg_box->type != BOX_INLINE ||
+ bg_box->style != bg_box->parent->parent->style)) &&
+ (bg_box->type != BOX_TEXT ||
+ (bg_box->type == BOX_TEXT && inline_depth > 0)) &&
+ ((bg_box->style->background_color != TRANSPARENT) ||
+ (bg_box->background))) {
+ /* find intersection of clip box and border edge */
+ int px0 = x - border_left < x0 ? x0 : x - border_left;
+ int py0 = y - border_top < y0 ? y0 : y - border_top;
+ int px1 = x + padding_width + border_right < x1 ?
+ x + padding_width + border_right : x1;
+ int py1 = y + padding_height + border_bottom < y1 ?
+ y + padding_height + border_bottom : y1;
+
+ /* valid clipping rectangles only */
+ if ((px0 < px1) && (py0 < py1)) {
+ /* plot background */
+ if (!html_redraw_background(x, y, box, scale,
+ px0, py0, px1, py1,
+ &current_background_color, bg_box))
+ return false;
+ /* restore previous graphics window */
+ if (!plot.clip(x0, y0, x1, y1))
+ return false;
+ }
}
}
@@ -1419,7 +1444,10 @@ bool html_redraw_text_decoration(struct box *box,
unsigned int i;
/* antialias colour for under/overline */
- colour = html_redraw_aa(background_colour, box->style->color);
+ if (html_redraw_printing)
+ colour = box->style->color;
+ else
+ colour = html_redraw_aa(background_colour, box->style->color);
if (box->type == BOX_INLINE) {
if (!box->inline_end)