From 35d3d6d0bb16abeeb6aad2fd0398c8e68a40d414 Mon Sep 17 00:00:00 2001 From: John Tytgat Date: Sat, 26 Jul 2008 16:01:59 +0000 Subject: First merge of Adam Blokus' GSoC work from his branch 'branches/adamblokus/netsurf'. Merged revisions 4212-4552,4554-4709,4711-4724 via svnmerge from svn://svn.netsurf-browser.org/branches/adamblokus/netsurf ........ r4212 | adamblokus | 2008-05-26 19:42:31 +0200 (Mon, 26 May 2008) | 4 lines Pdf plotting skeleton pinned on Print Preview in GTK. Just creates a file and draws lines. ........ r4213 | adamblokus | 2008-05-27 00:11:03 +0200 (Tue, 27 May 2008) | 4 lines Pdf plotter - added drawing some graphic primitives. Still with limited functionality, but a snapshot of the currently viewed page can be made and resembles the original. ........ r4214 | adamblokus | 2008-05-27 11:43:31 +0200 (Tue, 27 May 2008) | 2 lines Corrected encoding name ........ r4215 | adamblokus | 2008-05-27 12:47:26 +0200 (Tue, 27 May 2008) | 3 lines Colours and polygons added. ........ r4217 | adamblokus | 2008-05-27 21:39:35 +0200 (Tue, 27 May 2008) | 6 lines Added rectangles, filled boxes and clipping. Taken into consideration joty's comments. Added a todo list for this part. Added some debug stuff and checking boundaries. ........ r4218 | adamblokus | 2008-05-28 12:37:30 +0200 (Wed, 28 May 2008) | 2 lines Added path ploting (not sure if valid argument order for bezier) and dashed/dotted line styles ........ r4221 | adamblokus | 2008-05-28 22:11:05 +0200 (Wed, 28 May 2008) | 3 lines Some more options in graphic primitives and normalizing some parameters. ........ r4235 | adamblokus | 2008-05-31 22:54:56 +0200 (Sat, 31 May 2008) | 4 lines Plotting changed as jmb suggested (is the least invasive one from the possible) Added dummy bitmap plotting - way of plotting an image is determined by its type. ........ r4251 | adamblokus | 2008-06-03 17:12:15 +0200 (Tue, 03 Jun 2008) | 3 lines Added plotting jpg and png images - quite a lot to improve in this code, but it seems to work ;) ........ r4263 | adamblokus | 2008-06-05 14:20:32 +0200 (Thu, 05 Jun 2008) | 3 lines Added hadling images other than png and jpeg - with transparency. ........ r4267 | adamblokus | 2008-06-06 15:36:34 +0200 (Fri, 06 Jun 2008) | 5 lines Added handling NULL-returns from all mallocs. Added plot_bitmap_tile handling. Changed code style a little. ........ r4327 | adamblokus | 2008-06-12 17:46:34 +0200 (Thu, 12 Jun 2008) | 5 lines Added a first prototype of the paged-output organization. Still not sure about naming, file locations etc. Works with the same pdf plotting as before. ........ r4328 | adamblokus | 2008-06-13 13:52:15 +0200 (Fri, 13 Jun 2008) | 4 lines Added primitive width adjustment and outputing the whole website in multiple pages. ........ r4336 | joty | 2008-06-15 15:06:57 +0200 (Sun, 15 Jun 2008) | 1 line Fix RISC OS build failure (change r4235 wasn't complete). ........ r4337 | joty | 2008-06-15 18:15:32 +0200 (Sun, 15 Jun 2008) | 16 lines This enables "Export PDF" in RISC OS build: - Docs/Doxyfile(PREDEFINED): Added WITH_PDF_EXPORT - Makefile.sources(S_PDF): Add to RISC OS target as well. - utils/config.h: Define WITH_PDF_EXPORT which controls if we want to have PDF export functionality or not. - riscos/save_pdf.c,riscos/save_pdf.h(save_as_pdf): Use PDF print API made by Adam Blokus to write a PDF file under RISC OS. - riscos/save.c: Call save_as_pdf added. - riscos/menus.c: Add 'Export->PDF' menu entry. - riscos/menus.h(menu_action): Added BROWSER_EXPORT_PDF. - desktop/gui.h(gui_save_type): Added GUI_SAVE_PDF. - desktop/print.c(print_run): Added return value. - Makefile(CCACHE): Moved closed to the place where CC is set for the first time. (LDFLAGS): Centralised adding all non-pkgconfig libraries and added Haru + PNG libs. ........ r4343 | adamblokus | 2008-06-16 01:08:52 +0200 (Mon, 16 Jun 2008) | 3 lines Added margins and page size adjustment. ........ r4412 | adamblokus | 2008-06-21 20:22:07 +0200 (Sat, 21 Jun 2008) | 4 lines Added 'fuzzy' margins on page bottom. Disabled direct png embedding, because it is too unstable in Haru now. ........ r4421 | adamblokus | 2008-06-22 18:52:28 +0200 (Sun, 22 Jun 2008) | 2 lines Added "Save as.." dialog and Export->PDF menu entry. Print preview still works with default path. ........ r4437 | adamblokus | 2008-06-25 02:44:46 +0200 (Wed, 25 Jun 2008) | 4 lines Added skeleton of applying loose layout. Minor code cleaning-up. ........ r4492 | adamblokus | 2008-07-02 09:02:42 +0200 (Wed, 02 Jul 2008) | 5 lines Implemented the elementar ideas of the loose layout. Added scaling in the printing routine. Added some basic demonstrations. ........ r4493 | adamblokus | 2008-07-02 09:05:55 +0200 (Wed, 02 Jul 2008) | 3 lines Cleaned up the loosing code - commited to much of leftover rubbish code. ........ r4507 | adamblokus | 2008-07-04 14:25:48 +0200 (Fri, 04 Jul 2008) | 4 lines Added duplicating box tree and current content - window flickering during printing solved. Minor error checking after new HPDF_Image_AddSMask call. ........ r4515 | adamblokus | 2008-07-06 22:28:16 +0200 (Sun, 06 Jul 2008) | 2 lines Changes in loosen layout (image resizing). ........ r4517 | adamblokus | 2008-07-06 22:38:23 +0200 (Sun, 06 Jul 2008) | 2 lines Added pdf font handling and rendering functions with the use of Haru functions. ........ r4555 | adamblokus | 2008-07-10 00:59:05 +0200 (Thu, 10 Jul 2008) | 2 lines Added a very basic and still buggy GTK print implementation. ........ r4565 | adamblokus | 2008-07-10 14:50:16 +0200 (Thu, 10 Jul 2008) | 2 lines Added gtk printing one more time - I have forgotten to add the main file. ........ r4566 | adamblokus | 2008-07-10 14:57:02 +0200 (Thu, 10 Jul 2008) | 2 lines removed error with comment ........ r4569 | adamblokus | 2008-07-10 15:52:55 +0200 (Thu, 10 Jul 2008) | 5 lines Major style improvements - added a lot of doxygen comments, followed tlsa's style guide. Added some more error checking, too. ........ r4575 | adamblokus | 2008-07-10 18:48:26 +0200 (Thu, 10 Jul 2008) | 2 lines Cleaned up the code. ........ r4687 | adamblokus | 2008-07-17 14:17:19 +0200 (Thu, 17 Jul 2008) | 2 lines Changed everything according to jmb's review plus some minor bug fixes to gtk_print. ........ r4688 | adamblokus | 2008-07-17 17:16:34 +0200 (Thu, 17 Jul 2008) | 2 lines Solved the netsurf.glade clash from r4421. ........ r4693 | adamblokus | 2008-07-18 18:11:51 +0200 (Fri, 18 Jul 2008) | 2 lines Fixed bug with wrong number of pages in gtk printing. ........ r4695 | adamblokus | 2008-07-18 19:59:24 +0200 (Fri, 18 Jul 2008) | 3 lines - fixed uncommented line from the previous commit - fixed bug with scale bigger than 1.0 (incorretly clipped page) ........ r4696 | adamblokus | 2008-07-18 23:28:00 +0200 (Fri, 18 Jul 2008) | 2 lines Fixed bug in gtk_print_font_paint (and nsfont_paint). ........ r4697 | adamblokus | 2008-07-18 23:35:38 +0200 (Fri, 18 Jul 2008) | 2 lines Bug fix in nsfont_paint. ........ r4711 | adamblokus | 2008-07-19 22:44:15 +0200 (Sat, 19 Jul 2008) | 2 lines Added gtk_selection files. ........ r4712 | adamblokus | 2008-07-20 11:15:06 +0200 (Sun, 20 Jul 2008) | 2 lines Addam missing glade files. ........ r4713 | joty | 2008-07-20 17:13:10 +0200 (Sun, 20 Jul 2008) | 1 line Follow change r4517 for RISC OS and BeOS platforms : Added pdf font handling and rendering functions with the use of Haru functions. ........ r4714 | joty | 2008-07-20 18:19:50 +0200 (Sun, 20 Jul 2008) | 1 line Declare haru_nsfont iso define an instance for each C source including the font_haru.h header. This fixes breakage of PDF export on RISC OS. ........ r4724 | adamblokus | 2008-07-23 03:30:08 +0200 (Wed, 23 Jul 2008) | 6 lines Applied changes according to joty's review. Added checking the dimensions of a plotted image to pdf plotter. Commented out jpg embedding (it seems to cause some problems I'll bring it back when I figure out what's wrong) . Added back some files removed by mistake. ........ svn path=/trunk/netsurf/; revision=4741 --- render/loosen.c | 415 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 415 insertions(+) create mode 100644 render/loosen.c (limited to 'render/loosen.c') diff --git a/render/loosen.c b/render/loosen.c new file mode 100644 index 000000000..91c4056ef --- /dev/null +++ b/render/loosen.c @@ -0,0 +1,415 @@ +/* + * Copyright 2008 Adam Blokus + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include + +#include "content/content.h" + +#include "render/box.h" +#include "render/font.h" + +#include "utils/log.h" +#include "utils/talloc.h" + +#define AUTO INT_MIN + + +static bool loosen_text(struct box *text, int width, struct content *content); + +static bool loosen_table(struct box *box, int available_width, + struct content *content); + +static bool loosen_position_static(struct box *box, int width, int cx, + struct content *content); + +static bool loosen_shrink_object(struct box *box, int width); + +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, + struct content *content); + +/** + * Main loosing procedure + * \param content Reformated content - talloc memory pool for new boxes + * \param layout Root of the loosened box tree + * \param width Width the content is intended to fit + * \param height Height of a single page - to be taken into consideration for \ + * preventing elements for being cropped at top/bottom edges of pages. + * \return true if successful, false otherwise (lack of memory) +*/ +bool loosen_document_layout(struct content *content, struct box *layout, + int width, int height) +{ + /* Optional try - if the current layout is not more than xx% too wide, + * maybe we scale the content to preserve the original layout? + */ + + if (!loosen_all_first_pass(layout, width, 0, content)) + return false; + layout->min_width = 0; + layout->max_width = UNKNOWN_MAX_WIDTH; + content_reformat(content, width, 0); + + /*Check if pass 1 was enough - if re-layouting doesn't give + *us the right width, go on to pass 2. And again - if pass 2 was not + *enough - go on to pass 3 + */ + + if (content->width > width) { + if (!loosen_all_second_pass(layout, width, 0, content)) + return false; + layout->min_width = 0; + layout->max_width = UNKNOWN_MAX_WIDTH; + content_reformat(content, width, 0); + } + + if (content->width > width) { + if (!loosen_all_third_pass(layout, width, 0, content)) + return false; + layout->min_width = 0; + layout->max_width = UNKNOWN_MAX_WIDTH; + content_reformat(content, width, 0); + } + + return true; +} + +/** Primarily - break too wide words into pieces. + * \param text - the box that contains text to be broken + * \param width Width the content is intended to fit + * \param content talloc memory pool for new boxes + * \return true if successful, false otherwise +*/ +bool loosen_text(struct box *text, int width, struct content *content) +{ + unsigned int offset; + int actual_x; + + int *breaks; + int break_count; + + int position, i; + const struct font_functions *font_func; + + if (content->type == CONTENT_HTML) + font_func = content->data.html.font_func; + else + return false; + + if (text->width <= width) { + LOG(("loosen_text called unnecessary?")); + /*Still - not an error for this function*/ + return true; + } + + breaks = malloc( sizeof(int) * text->length); + if (breaks == NULL) + return false; + + break_count = 0; + position = 0; + + while (position < text->length) { + font_func->font_position_in_string(text->style, + text->text + position, + text->length - position, + width, &offset, &actual_x); + + if (offset < text->length - position) { + /*Another break*/ + LOG(("Current text broken at offset %d", + position + offset)); + breaks[break_count++] = position + offset-1; + } + + position += offset; + } + + text->text = talloc_realloc(content, text->text, char, + text->length + break_count); + + i = text->length-1; + text->length = text->length + break_count; + + for (; i>=0; i--) { + text->text[i + break_count] = text->text[i]; + if (i == breaks[break_count - 1]) { + break_count--; + text->text[i + break_count] = ' '; + } + } + + free(breaks); + + return true; +} + +/** + * Changing table layout and structure to fit the contents width. + * 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 + * \param width Width the content is intended to fit + * \param content talloc memory pool for new boxes + * \return true if successful, false otherwise + */ +bool loosen_table(struct box *table, int width, struct content *content) +{ + + struct box *row_group, *row, *cell, *br, *prev, *inline_container; + unsigned int row_sum; + bool first_cell_in_row; + + if (table->min_width <= width) + return true; + + inline_container = box_create(0, 0, 0, 0, 0, content); + inline_container->type = BOX_INLINE_CONTAINER; + inline_container->parent = table; + inline_container->style = talloc_memdup(content, table->style, + sizeof *table->style); + + prev = NULL; + + 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) { + cell->type = BOX_INLINE_BLOCK; + cell->prev = prev; + cell->parent = inline_container; + cell->max_width = width; + cell->min_width = 0; + + if (prev!=NULL) + prev->next = cell; + else + inline_container->children = cell; + + prev = cell; + } + + br = box_create(0, 0, 0, 0, 0, content); + br->type = BOX_BR; + br->parent = inline_container; + br->prev = prev; + br->style = talloc_memdup(content, table->style, + sizeof *table->style); + br->style->clear = CSS_CLEAR_BOTH; + + if (prev != NULL) + prev->next = br; + else + inline_container->children = br; + + prev = br; + } + } + inline_container->last = prev; + + table->type = BOX_BLOCK; + table->children = table->last = inline_container; + table->col = NULL; + + return true; +} + + +/** + * Change absolute and relative positioned elements into block elements + * in case they are positioned to far to the rigth + * \param box - the box that should be changed + * \param width Width the content is intended to fit + * \param cx current x - not yet in use + * \param content talloc memory pool for new boxes + * \return true if successful, false otherwise + */ +bool loosen_position_static(struct box *box, int width, int cx, + struct content *content) +{ + assert(box->style); + + if (box->style->position == CSS_POSITION_ABSOLUTE) { + box->style->position = CSS_POSITION_NOT_SET; + } + + return true; +} + +/** + * Shrink an object (esp. an image) to fit the page-width + * \note Not sure wheter it won't be better for images to be cropped + * \param box - the box that should be changed + * \param width Width the content is intended to fit + * \return true if successful, false otherwise +*/ +bool loosen_shrink_object(struct box *box, int width) +{ + assert(box->object != NULL); + + box->height = AUTO; + box->width = width; + + if (box->style) { + box->style->width.width = CSS_WIDTH_PERCENT; + box->style->width.value.percent = 100; + box->style->height.height= CSS_HEIGHT_AUTO; + } + + return true; +} + +/** + * Pass 1 of loosening - do such obvious changes as: breaking too long words, + * moving absolute positioned objects into the visibile scope of width. + * \param box - the box that should be changed + * \param width Width the content is intended to fit + * \param cx current x - not yet in use + * \param content talloc memory pool for new boxes + * \return true if successful, false otherwise +*/ +bool loosen_all_first_pass(struct box *box, int width, int cx, + struct content *content) +{ + struct box* c; + int got_width; + int x; + + for (c = box->children; c ; c = c->next) { + x = cx + c->x; + if (c->children != NULL) + if (!loosen_all_first_pass(c, width, x, content)) + return false; + + if (c->style) { + if (c->style->position == CSS_POSITION_RELATIVE || + c->style->position == CSS_POSITION_ABSOLUTE ) + if (!loosen_position_static(c, width, cx, content)) + return false; + if ( c->style->width.width == CSS_WIDTH_LENGTH && + css_len2px(&c->style->width.value.length, c->style) > width) + c->style->width.width = CSS_WIDTH_NOT_SET; + } + + if (c->object && c->width > width) + if (!loosen_shrink_object(c, width)) + return false; + + switch (c->type) { + case BOX_TEXT: + if (!loosen_text(c, width, content)) + return false; + break; + } + + c->min_width = 0; + c->max_width = UNKNOWN_MAX_WIDTH; + + } + + return true; +} + +/** + * Pass 2 of loosening - break tables + * \param box - the box that should be changed + * \param width Width the content is intended to fit + * \param cx current x - not yet in use + * \param content talloc memory pool for new boxes + * \return true if successful, false otherwise + */ +bool loosen_all_second_pass(struct box *box, int width, int cx, + struct content *content) +{ + struct box *c; + int got_width; + int x; + + for (c = box->children; c; c = c->next) { + x = cx + c->x; + if (c->children != NULL) + if (!loosen_all_second_pass(c, width, x, content)) + return false; + + switch (c->type) { + case BOX_TABLE: + if (!loosen_table(c, width, content)) + return false; + break; + } + + c->min_width = 0; + c->max_width = UNKNOWN_MAX_WIDTH; + } + + return true; +} + + +/** + * Pass 3 of loosening -zero all margins and paddings + * \param box - the box that should be changed + * \param width Width the content is intended to fit + * \param cx current x - not yet in use + * \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, + struct content *content) +{ + struct box *c; + int got_width; + int x; + + 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)) + return false; + + c->padding[LEFT] = c->padding[RIGHT] = 0; + c->margin[LEFT] = c->margin[RIGHT] = 0; + + if (c->style) { + c->style->margin[LEFT].margin = CSS_MARGIN_PERCENT; + c->style->margin[LEFT].value.percent = 0; + + c->style->margin[RIGHT].margin = CSS_MARGIN_PERCENT; + c->style->margin[RIGHT].value.percent = 0; + + c->style->padding[LEFT].padding = CSS_PADDING_PERCENT; + c->style->padding[LEFT].value.percent = 0; + + c->style->padding[RIGHT].padding = CSS_PADDING_PERCENT; + c->style->padding[RIGHT].value.percent = 0; + + } + + c->min_width = 0; + c->max_width = UNKNOWN_MAX_WIDTH; + + } + + return true; +} + -- cgit v1.2.3