diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/box.c | 78 | ||||
| -rw-r--r-- | render/box.h | 2 | ||||
| -rw-r--r-- | render/html_redraw.c | 160 | ||||
| -rw-r--r-- | render/layout.c | 2 | ||||
| -rw-r--r-- | render/layout.h | 3 | ||||
| -rw-r--r-- | render/loosen.c | 103 |
6 files changed, 269 insertions, 79 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); diff --git a/render/box.h b/render/box.h index a670fddb5..c1cce449f 100644 --- a/render/box.h +++ b/render/box.h @@ -189,6 +189,8 @@ struct box { unsigned int rows; /**< Number of rows for TABLE only. */ unsigned int start_column; /**< Start column for TABLE_CELL only. */ + bool printed; /** Whether this box has already been printed*/ + struct box *next; /**< Next sibling box, or 0. */ struct box *prev; /**< Previous sibling box, or 0. */ struct box *children; /**< First child box, or 0. */ 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, - ¤t_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, + ¤t_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) diff --git a/render/layout.c b/render/layout.c index 1469a3484..252b17429 100644 --- a/render/layout.c +++ b/render/layout.c @@ -88,8 +88,6 @@ 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, - 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); diff --git a/render/layout.h b/render/layout.h index 808191a6c..40504624d 100644 --- a/render/layout.h +++ b/render/layout.h @@ -36,5 +36,6 @@ bool layout_block_context(struct box *block, struct content *content); bool layout_inline_container(struct box *box, int width, struct box *cont, int cx, int cy, struct content *content); void layout_calculate_descendant_bboxes(struct box *box); - +void layout_minmax_table(struct box *table, + const struct font_functions *font_func); #endif diff --git a/render/loosen.c b/render/loosen.c index a6f3053ff..88f89a1c6 100644 --- a/render/loosen.c +++ b/render/loosen.c @@ -23,13 +23,15 @@ #include "render/box.h" #include "render/font.h" + +#include "render/layout.h" #include "render/loosen.h" #include "utils/log.h" #include "utils/talloc.h" #define AUTO INT_MIN - +#define LOOSEN_MIN_TEXT_SIZE 10 static bool loosen_text(struct box *text, int width, struct content *content); @@ -45,8 +47,10 @@ static bool loosen_all_first_pass(struct box *box, int width, int cx, struct content *content); static bool loosen_all_second_pass(struct box *box, int width, int cx, struct content *content); -static bool loosen_all_third_pass(struct box *box, int width, int cx, +static bool loosen_all_margins_paddings(struct box *box, int width, int cx, struct content *content); + +static bool loosen_shrink_text(struct box *box); /** * Main loosing procedure @@ -84,7 +88,7 @@ bool loosen_document_layout(struct content *content, struct box *layout, } if (content->width > width) { - if (!loosen_all_third_pass(layout, width, 0, content)) + if (!loosen_all_margins_paddings(layout, width, 0, content)) return false; layout->min_width = 0; layout->max_width = UNKNOWN_MAX_WIDTH; @@ -166,6 +170,9 @@ bool loosen_text(struct box *text, int width, struct content *content) /** * Changing table layout and structure to fit the contents width. + * Firstly the borders are collapsed and the text is shrunken. + * Secondly the text is loosened( this can be helpful for all data tables which + * contain only text) * In the most extreme case - the table has no influence on the width * (each row is broken into one-cell rows). * \param table - the box that contains table to be broken @@ -177,9 +184,66 @@ bool loosen_table(struct box *table, int width, struct content *content) { struct box *row_group, *row, *cell, *br, *prev, *inline_container; + struct box *text, *child; + unsigned int row_sum; + bool first_cell_in_row; + const struct font_functions *font_func; + float scale; + int new_width; + if (table->min_width <= width) - return true; + return true; + if (content->type == CONTENT_HTML) + font_func = content->data.html.font_func; + else + return false; + + table->style->border_collapse = CSS_BORDER_COLLAPSE_COLLAPSE; + + if (!loosen_shrink_text(table)) + return false; + + if (!loosen_all_margins_paddings(table, width, 0, content)) + return false; + + scale = width; + scale /= table->min_width; + + for (row_group = table->children; row_group; + row_group = row_group->next) { + for (row = row_group->children; row; row = row->next) { + for (cell = row->children; cell; cell = cell->next) { + for (child = cell->children; child; + child = child->next) { + if (child->children) + text = child->children; + else + continue; + + /*text in nested boxes won't be broken*/ + if (text->type != BOX_TEXT) + continue; + + + /*break the words propotionally to the + current cell width*/ + new_width = (float)cell->width * scale * 0.9; + loosen_text(text, new_width, content); + } + } + } + } + + + /*check if the table is loosend enough...*/ + layout_minmax_table(table, font_func); + if (table->min_width <= width) + return true; + + + /*...in case it's not continue with bigger changes, + table cells are changed into inline containers*/ inline_container = box_create(0, 0, 0, 0, 0, content); inline_container->type = BOX_INLINE_CONTAINER; inline_container->parent = table; @@ -232,6 +296,31 @@ bool loosen_table(struct box *table, int width, struct content *content) return true; } +/** +* Recursively step through the box tree applying LOOSEN_MIN_TEXT_SIZE wherever +* text is found +* \param box the box where the shrinking should be started +* \return true if successful, false otherwise +*/ +bool loosen_shrink_text(struct box *box) +{ + struct box *child; + + box->max_width = UNKNOWN_MAX_WIDTH; + + if (box->type == BOX_TEXT) { + box->style->font_size.size = CSS_FONT_SIZE_LENGTH; + box->style->font_size.value.length.unit = CSS_UNIT_PX; + box->style->font_size.value.length.value = LOOSEN_MIN_TEXT_SIZE; + } + else if (box->children) + for(child = box->children; child; child = child->next) + if (!loosen_shrink_text(child)) + return false; + + return true; +} + /** * Change absolute and relative positioned elements into block elements @@ -352,6 +441,8 @@ bool loosen_all_second_pass(struct box *box, int width, int cx, if (!loosen_table(c, width, content)) return false; break; + default: + break; } c->min_width = 0; @@ -370,7 +461,7 @@ bool loosen_all_second_pass(struct box *box, int width, int cx, * \param content talloc memory pool for new boxes * \return true if successful, false otherwise */ -bool loosen_all_third_pass(struct box *box, int width, int cx, +bool loosen_all_margins_paddings(struct box *box, int width, int cx, struct content *content) { struct box *c; @@ -379,7 +470,7 @@ bool loosen_all_third_pass(struct box *box, int width, int cx, for (c = box->children; c; c = c->next) { x = cx + c->x; if (c->children != NULL) - if (!loosen_all_third_pass(c, width, x, content)) + if (!loosen_all_margins_paddings(c, width, x, content)) return false; c->padding[LEFT] = c->padding[RIGHT] = 0; |