diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/browser.c | 11 | ||||
| -rw-r--r-- | desktop/gui.h | 1 | ||||
| -rw-r--r-- | desktop/history_core.c | 4 | ||||
| -rw-r--r-- | desktop/knockout.c | 22 | ||||
| -rw-r--r-- | desktop/plotters.h | 6 | ||||
| -rw-r--r-- | desktop/print.c | 280 | ||||
| -rw-r--r-- | desktop/print.h | 75 | ||||
| -rw-r--r-- | desktop/printer.h | 41 | ||||
| -rw-r--r-- | desktop/selection.c | 2 | ||||
| -rw-r--r-- | desktop/textinput.c | 20 |
10 files changed, 434 insertions, 28 deletions
diff --git a/desktop/browser.c b/desktop/browser.c index 155febc50..495cdf9ee 100644 --- a/desktop/browser.c +++ b/desktop/browser.c @@ -1442,7 +1442,7 @@ void browser_window_mouse_action_html(struct browser_window *bw, int pixel_offset; size_t idx; - nsfont_position_in_string(text_box->style, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, x - gadget_box_x - text_box->x, @@ -1483,7 +1483,7 @@ void browser_window_mouse_action_html(struct browser_window *bw, BROWSER_MOUSE_DRAG_2)) selection_init(bw->sel, gadget_box); - nsfont_position_in_string(text_box->style, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, x - gadget_box_x - text_box->x, @@ -1573,7 +1573,7 @@ void browser_window_mouse_action_html(struct browser_window *bw, int pixel_offset; size_t idx; - nsfont_position_in_string(text_box->style, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, x - text_box_x, @@ -1836,8 +1836,7 @@ void browser_window_mouse_track_html(struct browser_window *bw, if (box) { int pixel_offset; size_t idx; - - nsfont_position_in_string(box->style, + nsfont.font_position_in_string(box->style, box->text, box->length, dx, &idx, &pixel_offset); @@ -1917,7 +1916,7 @@ void browser_window_mouse_drag_end(struct browser_window *bw, box = browser_window_pick_text_box(bw, x, y, dir, &dx, &dy); if (box) { - nsfont_position_in_string( + nsfont.font_position_in_string( box->style, box->text, box->length, diff --git a/desktop/gui.h b/desktop/gui.h index 77fd861c3..c6b1b49cb 100644 --- a/desktop/gui.h +++ b/desktop/gui.h @@ -27,6 +27,7 @@ typedef enum { GUI_SAVE_SOURCE, GUI_SAVE_DRAW, + GUI_SAVE_PDF, GUI_SAVE_TEXT, GUI_SAVE_COMPLETE, GUI_SAVE_OBJECT_ORIG, diff --git a/desktop/history_core.c b/desktop/history_core.c index 2081d132d..9fa085d8d 100644 --- a/desktop/history_core.c +++ b/desktop/history_core.c @@ -597,13 +597,13 @@ bool history_redraw_entry(struct history *history, int tailsize = 5; if (!plot.bitmap(entry->x, entry->y, WIDTH, HEIGHT, - entry->bitmap, 0xffffff)) + entry->bitmap, 0xffffff, NULL)) return false; if (!plot.rectangle(entry->x - 1, entry->y - 1, WIDTH + 1, HEIGHT + 1, entry == history->current ? 2 : 1, c, false, false)) return false; - if (!nsfont_position_in_string(&css_base_style, entry->page.title, + if (!nsfont.font_position_in_string(&css_base_style, entry->page.title, strlen(entry->page.title), WIDTH, &char_offset, &actual_x)) return false; diff --git a/desktop/knockout.c b/desktop/knockout.c index f57ae5b54..cbffa3d39 100644 --- a/desktop/knockout.c +++ b/desktop/knockout.c @@ -61,10 +61,10 @@ static bool knockout_plot_disc(int x, int y, int radius, colour colour, bool fil static bool knockout_plot_arc(int x, int y, int radius, int angle1, int angle2, colour c); static bool knockout_plot_bitmap(int x, int y, int width, int height, - struct bitmap *bitmap, colour bg); + struct bitmap *bitmap, colour bg, struct content *content); static bool knockout_plot_bitmap_tile(int x, int y, int width, int height, struct bitmap *bitmap, colour bg, - bool repeat_x, bool repeat_y); + bool repeat_x, bool repeat_y, struct content *content); static bool knockout_plot_group_start(const char *name); static bool knockout_plot_group_end(void); @@ -194,6 +194,7 @@ struct knockout_entry { int height; struct bitmap *bitmap; colour bg; + struct content *content; } bitmap; struct { int x; @@ -204,6 +205,7 @@ struct knockout_entry { colour bg; bool repeat_x; bool repeat_y; + struct content *content; } bitmap_tile; struct { const char *name; @@ -379,7 +381,8 @@ bool knockout_plot_flush(void) knockout_entries[i].data.bitmap.width, knockout_entries[i].data.bitmap.height, knockout_entries[i].data.bitmap.bitmap, - knockout_entries[i].data.bitmap.bg); + knockout_entries[i].data.bitmap.bg, + knockout_entries[i].data.bitmap.content); break; case KNOCKOUT_PLOT_BITMAP_TILE: box = knockout_entries[i].box->child; @@ -403,7 +406,9 @@ bool knockout_plot_flush(void) knockout_entries[i].data. bitmap_tile.repeat_x, knockout_entries[i].data. - bitmap_tile.repeat_y); + bitmap_tile.repeat_y, + knockout_entries[i].data. + bitmap_tile.content); } break; case KNOCKOUT_PLOT_GROUP_START: @@ -608,7 +613,8 @@ bool knockout_plot_bitmap_tile_recursive(struct knockout_box *box, entry->data.bitmap_tile.bitmap, entry->data.bitmap_tile.bg, entry->data.bitmap_tile.repeat_x, - entry->data.bitmap_tile.repeat_y); + entry->data.bitmap_tile.repeat_y, + entry->data.bitmap_tile.content); } } return success; @@ -802,7 +808,7 @@ bool knockout_plot_arc(int x, int y, int radius, int angle1, int angle2, colour } bool knockout_plot_bitmap(int x, int y, int width, int height, - struct bitmap *bitmap, colour bg) + struct bitmap *bitmap, colour bg, struct content *content) { int kx0, ky0, kx1, ky1; @@ -824,6 +830,7 @@ bool knockout_plot_bitmap(int x, int y, int width, int height, knockout_entries[knockout_entry_cur].data.bitmap.height = height; knockout_entries[knockout_entry_cur].data.bitmap.bitmap = bitmap; knockout_entries[knockout_entry_cur].data.bitmap.bg = bg; + knockout_entries[knockout_entry_cur].data.bitmap.content = content; knockout_entries[knockout_entry_cur].type = KNOCKOUT_PLOT_BITMAP; if (++knockout_entry_cur >= KNOCKOUT_ENTRIES) knockout_plot_flush(); @@ -833,7 +840,7 @@ bool knockout_plot_bitmap(int x, int y, int width, int height, bool knockout_plot_bitmap_tile(int x, int y, int width, int height, struct bitmap *bitmap, colour bg, - bool repeat_x, bool repeat_y) + bool repeat_x, bool repeat_y, struct content *content) { int kx0, ky0, kx1, ky1; @@ -879,6 +886,7 @@ bool knockout_plot_bitmap_tile(int x, int y, int width, int height, knockout_entries[knockout_entry_cur].data.bitmap_tile.bg = bg; knockout_entries[knockout_entry_cur].data.bitmap_tile.repeat_x = repeat_x; knockout_entries[knockout_entry_cur].data.bitmap_tile.repeat_y = repeat_y; + knockout_entries[knockout_entry_cur].data.bitmap_tile.content = content; knockout_entries[knockout_entry_cur].type = KNOCKOUT_PLOT_BITMAP_TILE; if ((++knockout_entry_cur >= KNOCKOUT_ENTRIES) || (++knockout_box_cur >= KNOCKOUT_BOXES)) diff --git a/desktop/plotters.h b/desktop/plotters.h index 79eac8170..16e0d47e6 100644 --- a/desktop/plotters.h +++ b/desktop/plotters.h @@ -25,6 +25,7 @@ #include <stdbool.h> #include "css/css.h" +#include "content/content.h" struct bitmap; @@ -46,10 +47,11 @@ struct plotter_table { bool (*arc)(int x, int y, int radius, int angle1, int angle2, colour c); bool (*bitmap)(int x, int y, int width, int height, - struct bitmap *bitmap, colour bg); + struct bitmap *bitmap, colour bg, + struct content *content); bool (*bitmap_tile)(int x, int y, int width, int height, struct bitmap *bitmap, colour bg, - bool repeat_x, bool repeat_y); + bool repeat_x, bool repeat_y, struct content *content); bool (*group_start)(const char *name); /** optional */ bool (*group_end)(void); /** optional */ bool (*flush)(void); diff --git a/desktop/print.c b/desktop/print.c new file mode 100644 index 000000000..0852fa34c --- /dev/null +++ b/desktop/print.c @@ -0,0 +1,280 @@ +/* + * Copyright 2008 Adam Blokus <adamblokus@gmail.com> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +/** \file + * Output-in-pages implementation +*/ + +#include "desktop/print.h" +#include "desktop/printer.h" + +#include "content/content.h" + +#include "utils/log.h" +#include "utils/talloc.h" + +#include "render/loosen.h" +#include "render/box.h" + +#include "pdf/font_haru.h" + +static struct content *print_init(struct content *, struct print_settings *); +static bool print_apply_settings(struct content *, struct print_settings *); + + +/*TODO: should these be passed as parameters in order to allow simultaneous + printings? +*/ +static float page_content_width, page_content_height; +static float text_margin_height; +static struct content *printed_content; +static float done_height; + +/** + * This function calls print setup, prints page after page until the whole + * content is printed calls cleaning up afterwise. + * \param content The content to be printed + * \param printer The printer interface for the printer to be used + * \param settings The settings for printing to use or NULL for DEFAULT + * \return true if successful, false otherwise +*/ +bool print_basic_run(struct content *content, + const struct printer *printer, + struct print_settings *settings) +{ + bool ret = true; + + if (settings == NULL) + settings = print_make_settings(DEFAULT); + + if (!print_set_up(content, printer, settings, NULL)) + ret = false; + + while (ret && (done_height < printed_content->height) ) + ret = print_draw_next_page(printer, settings); + + print_cleanup(content, printer); + + return ret; +} + +/** + * This function prepares the content to be printed. The current browser content + * is duplicated and resized, printer initialization is called. + * \param content The content to be printed + * \param printer The printer interface for the printer to be used + * \param settings The settings for printing to use + * \param height updated to the height of the printed content + * \return true if successful, false otherwise +*/ +bool print_set_up(struct content *content, + const struct printer *printer, struct print_settings *settings, + double *height) +{ + + printed_content = print_init(content, settings); + + if (!printed_content) + return false; + + print_apply_settings(printed_content, settings); + + if (height) + *height = printed_content->height; + + printer->print_begin(settings); + + done_height = 0; + + return true; +} + +/** + * This function draws one page, beginning with the height offset of done_height + * \param printer The printer interface for the printer to be used + * \param settings The settings for printing to use + * \return true if successful, false otherwise + */ +bool print_draw_next_page(const struct printer *printer, + struct print_settings *settings) +{ + + /*TODO:Plotter will have to be duplicated and passed + as an argument - to allow simultaneous screen and + page plotting*/ + plot = *(printer->plotter); + + printer->print_next_page(); + if( !content_redraw(printed_content, + 0, + -done_height, + 0,0, + 0, + 0, + page_content_width * settings->scale, + page_content_height * settings->scale, + settings->scale, 0xffffff)) + return false; + done_height += page_content_height - text_margin_height; + + return true; +} + +/** + * The content passed to the function is duplicated with its boxes, font + * measuring functions are being set. + * \param content The content to be printed + * \param settings The settings for printing to use + * \return true if successful, false otherwise + */ +struct content *print_init(struct content *content, + struct print_settings *settings) +{ + struct content* printed_content; + struct content_user *user_sentinel; + + content_add_user(content, NULL, (intptr_t)print_init, 0); + + printed_content = talloc_memdup(content, content, sizeof *content); + + if (!printed_content) + return NULL; + + printed_content->data.html.bw = 0; + + user_sentinel = talloc(printed_content, struct content_user); + user_sentinel->callback = 0; + user_sentinel->p1 = user_sentinel->p2 = 0; + user_sentinel->next = 0; + printed_content->user_list = user_sentinel; + content_add_user(printed_content, NULL, (intptr_t)print_init, 0); + + printed_content->data.html.layout = + box_duplicate_tree(content->data.html.layout, + printed_content); + + if (!printed_content->data.html.layout) + return NULL; + + if (settings->font_func == NULL) + printed_content->data.html.font_func = &haru_nsfont; + else + printed_content->data.html.font_func = settings->font_func; + + return printed_content; +} + +/** + * The content is resized to fit page width. In case it is to wide, it is + * loosened. + * \param content The content to be printed + * \param settings The settings for printing to use + * \return true if successful, false otherwise + */ +bool print_apply_settings(struct content *content, + struct print_settings *settings) +{ + if (settings == NULL) + return false; + + /*Apply settings - adjust page size etc*/ + + text_margin_height = settings->margins[MARGINTEXT]; + + page_content_width = (settings->page_width - settings->margins[MARGINLEFT] - + settings->margins[MARGINRIGHT]) / settings->scale; + + page_content_height = (settings->page_height - settings->margins[MARGINTOP] - + settings->margins[MARGINBOTTOM]) / settings->scale; + + content_reformat(content, page_content_width, 0); + LOG(("New layout applied.New height = %d ; New width = %d ", + content->height, content->width)); + + if (content->width > page_content_width) + return loosen_document_layout(content, content->data.html.layout, + page_content_width, page_content_height); + + return true; +} + +/** + * Memory allocated during printing is being freed here. + * \param content The original content + * \param printer The printer interface for the printer to be used + * \return true if successful, false otherwise + */ +bool print_cleanup(struct content *content, + const struct printer *printer) +{ + printer->print_end(); + + if (printed_content) { + content_remove_user(printed_content, NULL, (intptr_t)print_init, 0); + talloc_free(printed_content); + } + + content_remove_user(content, NULL, (intptr_t)print_init, 0); + + return true; +} + +/** + * Generates one of the predefined print settings sets. + * \return print_settings in case if successful, NULL if unknown configuration \ + * or lack of memory. + */ +struct print_settings *print_make_settings(print_configuration configuration) +{ + + struct print_settings *settings; + + switch (configuration){ + case DEFAULT: + settings = (struct print_settings*) + malloc(sizeof (struct print_settings) ); + + if (settings == NULL) + return NULL; + + settings->page_width = 595; + settings->page_height = 840; + settings->copies = 1; + /*with 0.7 the pages look the best, the value in + haru_nsfont_apply_style should be kept the same as this + */ + settings->scale = 0.7; + + settings->margins[MARGINLEFT] = 30; + settings->margins[MARGINRIGHT] = 30; + settings->margins[MARGINTOP] = 30; + settings->margins[MARGINBOTTOM] = 30; + + settings->margins[MARGINTEXT] = 10; + + settings->output = "out.pdf"; + settings->font_func = &haru_nsfont; + + break; + + default: + return NULL; + } + + return settings; +} diff --git a/desktop/print.h b/desktop/print.h new file mode 100644 index 000000000..dc4cde642 --- /dev/null +++ b/desktop/print.h @@ -0,0 +1,75 @@ +/* + * Copyright 2008 Adam Blokus <adamblokus@gmail.com> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +/** \file + * Conception: + * Generalized output-in-pages. Allows the current content to be 'printed': + * either into a pdf file (any other later?) or to any kind of other output + * destination that divides the website into pages - as a printer. + * The basic usage is calling print_basic_run which sets everything up, + * prints page after page until the whole content is printed and cleans + * everyting up. + * If there are any other, printer specific routines to be performed in the + * meantime - there can be set up any other printing funcion, which can use + * print_set_up, print_draw_next_page and print_cleanup directly. +*/ + +#ifndef NETSURF_DESKTOP_PRINT_H +#define NETSURF_DESKTOP_PRINT_H + +#include <stdbool.h> + +struct content; +struct printer; + +enum { MARGINLEFT = 0, MARGINRIGHT = 1, MARGINTOP = 2, MARGINBOTTOM = 3, + MARGINTEXT = 4}; + +/** Predefined printing configuration names*/ +typedef enum {DEFAULT} print_configuration; + +/** Settings for a print - filled in by print_make_settings or + * 'manually' by the caller +*/ +struct print_settings{ + /*Standard parameters*/ + float page_width, page_height; + float margins[5]; + + float scale; + + unsigned int copies; + + /*Output destinations - file/printer name*/ + const char *output; + + /*TODO: more options?*/ + const struct font_functions *font_func; +}; + +bool print_basic_run(struct content *, const struct printer *, struct print_settings *); +bool print_set_up(struct content *content, + const struct printer *printer, struct print_settings *settings, + double *height); +bool print_draw_next_page(const struct printer *printer, + struct print_settings *settings); +bool print_cleanup(struct content *, const struct printer *); + +struct print_settings *print_make_settings(print_configuration configuration); + +#endif diff --git a/desktop/printer.h b/desktop/printer.h new file mode 100644 index 000000000..358922379 --- /dev/null +++ b/desktop/printer.h @@ -0,0 +1,41 @@ +/* + * Copyright 2008 Adam Blokus <adamblokus@gmail.com> + * + * 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 <http://www.gnu.org/licenses/>. + */ + +/** \file + * Printer interface - contains plotter to use, functions for + * initialization, handling pages and cleaning up. +*/ + +#ifndef NETSURF_DESKTOP_PRINTER_H +#define NETSURF_DESKTOP_PRINTER_H + +#include "desktop/plotters.h" +#include "desktop/print.h" + +/** Printer interface */ +struct printer{ + const struct plotter_table *plotter; + + bool (*print_begin) (struct print_settings*); + + bool (*print_next_page)(void); + + void (*print_end)(void); +}; + +#endif diff --git a/desktop/selection.c b/desktop/selection.c index 2be6853a2..0dc8e493e 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -601,7 +601,7 @@ bool redraw_handler(const char *text, size_t length, struct box *box, height = box->padding[TOP] + box->height + box->padding[BOTTOM]; if (box->type == BOX_TEXT && box->space && - nsfont_width(box->style, " ", 1, &space_width)) + nsfont.font_width(box->style, " ", 1, &space_width)) width += space_width; if (r->inited) { diff --git a/desktop/textinput.c b/desktop/textinput.c index a90919afe..8cfe01050 100644 --- a/desktop/textinput.c +++ b/desktop/textinput.c @@ -181,7 +181,7 @@ struct box *textarea_get_position(struct box *textarea, int x, int y, assert(text_box->type == BOX_TEXT); assert(text_box->text); /** \todo handle errors */ - nsfont_position_in_string(text_box->style, text_box->text, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, (unsigned int)(x - text_box->x), (size_t *) pchar_offset, ppixel_offset); @@ -203,7 +203,7 @@ struct box *textarea_get_position(struct box *textarea, int x, int y, text_box = inline_container->last; assert(text_box->type == BOX_TEXT); assert(text_box->text); - nsfont_position_in_string(text_box->style, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, textarea->width, @@ -223,7 +223,7 @@ struct box *textarea_get_position(struct box *textarea, int x, int y, } assert(text_box->type == BOX_TEXT); assert(text_box->text); - nsfont_position_in_string(text_box->style, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, (unsigned int)(x - text_box->x), @@ -761,7 +761,7 @@ bool browser_window_textarea_callback(struct browser_window *bw, } } - nsfont_width(text_box->style, text_box->text, + nsfont.font_width(text_box->style, text_box->text, char_offset, &pixel_offset); selection_clear(bw->sel, true); @@ -813,7 +813,7 @@ void browser_window_input_click(struct browser_window* bw, int pixel_offset = 0, dx = 0; struct box *text_box = input->children->children; - nsfont_position_in_string(text_box->style, text_box->text, + nsfont.font_position_in_string(text_box->style, text_box->text, text_box->length, x - text_box->x, &char_offset, &pixel_offset); assert(char_offset <= text_box->length); @@ -1375,7 +1375,7 @@ bool browser_window_textarea_paste_text(struct browser_window *bw, textarea->gadget->caret_text_box = text_box; textarea->gadget->caret_box_offset = char_offset; - nsfont_width(text_box->style, text_box->text, + nsfont.font_width(text_box->style, text_box->text, char_offset, &pixel_offset); textarea->gadget->caret_pixel_offset = pixel_offset; @@ -1508,7 +1508,7 @@ void browser_window_textarea_move_caret(struct browser_window *bw, void *p) box_x -= textarea->scroll_x; box_y -= textarea->scroll_y; - nsfont_width(text_box->style, text_box->text, + nsfont.font_width(text_box->style, text_box->text, char_offset, &pixel_offset); browser_window_place_caret(bw, @@ -1541,7 +1541,7 @@ void browser_window_input_move_caret(struct browser_window *bw, void *p) box_coords(input, &box_x, &box_y); - nsfont_width(text_box->style, text_box->text, box_offset, + nsfont.font_width(text_box->style, text_box->text, box_offset, &pixel_offset); browser_window_place_caret(bw, @@ -1576,12 +1576,12 @@ void input_update_display(struct browser_window *bw, struct box *input, int dx; if (redraw) - nsfont_width(text_box->style, text_box->text, text_box->length, + nsfont.font_width(text_box->style, text_box->text, text_box->length, &text_box->width); box_coords(input, &box_x, &box_y); - nsfont_width(text_box->style, text_box->text, box_offset, + nsfont.font_width(text_box->style, text_box->text, box_offset, (int *) &pixel_offset); /* Shift text box horizontally, so caret is visible */ |