diff options
author | John Tytgat <joty@netsurf-browser.org> | 2008-08-14 20:32:10 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2008-08-14 20:32:10 +0000 |
commit | e063a2a59d698dd96123b68a44b09f0623f80cab (patch) | |
tree | 1bd06130de988cb0f6da239800229387f189d21c /render/loosen.c | |
parent | 44856d86d4efb12e08c8ef7560f39233107dfa8a (diff) | |
download | netsurf-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/loosen.c')
-rw-r--r-- | render/loosen.c | 103 |
1 files changed, 97 insertions, 6 deletions
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; |