diff options
author | John Tytgat <joty@netsurf-browser.org> | 2008-07-26 16:01:59 +0000 |
---|---|---|
committer | John Tytgat <joty@netsurf-browser.org> | 2008-07-26 16:01:59 +0000 |
commit | 35d3d6d0bb16abeeb6aad2fd0398c8e68a40d414 (patch) | |
tree | 9967569fb69077f96f6f7e63998001c673dd82c5 /render/box.c | |
parent | 9fb65c709676d5b665ba0bd8aeb706ce28de46ea (diff) | |
download | netsurf-35d3d6d0bb16abeeb6aad2fd0398c8e68a40d414.tar.gz netsurf-35d3d6d0bb16abeeb6aad2fd0398c8e68a40d414.tar.bz2 |
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
Diffstat (limited to 'render/box.c')
-rw-r--r-- | render/box.c | 203 |
1 files changed, 202 insertions, 1 deletions
diff --git a/render/box.c b/render/box.c index 2a29b06c9..e6495174e 100644 --- a/render/box.c +++ b/render/box.c @@ -33,7 +33,6 @@ #include "utils/log.h" #include "utils/talloc.h" - static bool box_contains_point(struct box *box, int x, int y); #define box_is_float(box) (box->type == BOX_FLOAT_LEFT || \ @@ -545,6 +544,10 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth) fprintf(stream, "(%i %i %i %i) ", box->descendant_x0, box->descendant_y0, box->descendant_x1, box->descendant_y1); + + fprintf(stream, "m(%i %i %i %i) ", + box->margin[TOP], box->margin[LEFT], + box->margin[BOTTOM], box->margin[RIGHT]); switch (box->type) { case BOX_BLOCK: fprintf(stream, "BLOCK "); break; @@ -638,3 +641,201 @@ void box_dump(FILE *stream, struct box *box, unsigned int depth) box_dump(stream, c, depth + 1); } } + +/* Box tree duplication below +*/ + +/** structure for translating addresses in the box tree */ +struct box_dict_element{ + struct box *old, *new; +}; + +static bool box_duplicate_main_tree(struct box *box, struct content *c, + int *count); +static void box_duplicate_create_dict(struct box *old_box, struct box *new_box, + struct box_dict_element **dict); +static void box_duplicate_update( struct box *box, + struct box_dict_element *dict, + int n); + +static int box_compare_dict_elements(const struct box_dict_element *a, + const struct box_dict_element *b); + +int box_compare_dict_elements(const struct box_dict_element *a, + const struct box_dict_element *b) +{ + return (a->old < b->old) ? -1 : ((a->old > b->old) ? 1 : 0); +} + +/** Duplication of a box tree. We assume that all the content is fetched, +fallbacks have been applied where necessary and we reuse a lot of content +like strings, fetched objects etc - just replicating all we need to create +two different layouts. +\return true on success, false on lack of memory +*/ +struct box* box_duplicate_tree(struct box *root, struct content *c) +{ + struct box *new_root;/**< Root of the new box tree*/ + int box_number = 0; + struct box *old_addr, *new_addr; + struct box_dict_element *box_dict, *box_dict_end; + + /* 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)) + return NULL; + + /* 2. Create address translation dictionary*/ + /*TODO: dont save unnecessary addresses*/ + + box_dict_end = box_dict = malloc(box_number * + sizeof(struct box_dict_element)); + + if (box_dict == NULL) + return NULL; + box_duplicate_create_dict(root, new_root, &box_dict_end); + + assert((box_dict_end - box_dict) == box_number); + + /*3. Sort it*/ + + qsort(box_dict, (box_dict_end - box_dict), sizeof(struct box_dict_element), + (int (*)(const void *, const void *))box_compare_dict_elements); + + /* 4. Update inline_end and float_children pointers */ + + box_duplicate_update(new_root, box_dict, (box_dict_end - box_dict)); + + free(box_dict); + + return new_root; +} + +/** + * Recursively duplicates children of an element, and also if present - its + * list_marker, style and text. + * \param box Current box to duplicate its children + * \param c talloc memory pool + * \param count number of boxes seen so far + * \return true if successful, false otherwise (lack of memory) +*/ +bool box_duplicate_main_tree(struct box *box, struct content *c, int *count) +{ + + struct box *b, *prev, *copy; + + prev = NULL; + + for (b = box->children; b; b = b->next) { + /*Copy child*/ + copy = talloc_memdup(c, b, sizeof (struct box)); + if (copy == NULL) + return false; + + copy->parent = box; + + if (prev != NULL) + prev->next = copy; + else + box->children = copy; + + /* Recursively visit child */ + box_duplicate_main_tree(copy, c, count); + + prev = copy; + } + + box->last = prev; + + if (box->list_marker) { + box->list_marker = talloc_memdup(c, box->list_marker, + sizeof *box->list_marker); + if (box->list_marker == NULL) + return false; + box->list_marker->parent = box; + } + + if (box->text) { + box->text = talloc_memdup(c, box->text, box->length); + if (box->text == NULL) + return false; + } + + if (box->style) { + box->style = talloc_memdup(c, box->style, sizeof *box->style); + if (box->style == NULL) + return false; + } + + /*Make layout calculate the size of this element later + (might change because of font change etc.) */ + box->width = UNKNOWN_WIDTH; + box->min_width = 0; + box->max_width = UNKNOWN_MAX_WIDTH; + + (*count)++; + + return true; +} + +/** + * Recursively creates a dictionary of addresses - binding the address of a box + * with its copy. + * \param old_box original box + * \param new_box copy of the original box + * \param dict pointer to a pointer to the current position in the dictionary + */ +void box_duplicate_create_dict(struct box *old_box, struct box *new_box, + struct box_dict_element **dict) +{ + /**Children of the old and new boxes*/ + struct box *b_old, *b_new; + + for (b_old = old_box->children, b_new = new_box->children; + b_old != NULL && b_new != NULL; + b_old = b_old->next, b_new = b_new->next) + box_duplicate_create_dict(b_old, b_new, dict); + + /*The new tree should be a exact copy*/ + assert(b_old == NULL && b_new == NULL); + + (*dict)->old = old_box; + (*dict)->new = new_box; + (*dict)++; +} + +/** + * Recursively updates pointers in box tree. + * \param box current box in the new box tree + * \param box_dict box pointers dictionary + * \param n number of memory addresses in the dictionary + */ +void box_duplicate_update(struct box *box, + struct box_dict_element *box_dict, + int n) +{ + struct box_dict_element *box_dict_element; + struct box *b; + struct box_dict_element element; + + for (b = box->children; b; b = b->next) + box_duplicate_update(b, box_dict, n); + + if (box->float_children) { + element.old = box->float_children; + box_dict_element = bsearch(&element, + box_dict, n, + sizeof(struct box_dict_element), + (int (*)(const void *, const void *))box_compare_dict_elements); + box->float_children = box_dict_element->new; + } + + if (box->next_float) { + element.old = box->next_float; + box_dict_element = bsearch(&element, + box_dict, n, + sizeof(struct box_dict_element), + (int (*)(const void *, const void *))box_compare_dict_elements); + box->next_float = box_dict_element->new; + } +} |