2003-06-30 16:44:03 +04:00
|
|
|
/*
|
2003-07-19 01:02:29 +04:00
|
|
|
* Copyright 2003 John M Bell <jmb202@ecs.soton.ac.uk>
|
2004-10-05 03:54:42 +04:00
|
|
|
* Copyright 2004 Richard Wilson <not_ginger_matt@users.sourceforge.net>
|
2007-08-08 20:16:03 +04:00
|
|
|
*
|
|
|
|
* 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/>.
|
2003-06-05 17:24:28 +04:00
|
|
|
*/
|
|
|
|
|
2008-07-27 03:42:24 +04:00
|
|
|
#include "utils/config.h"
|
|
|
|
#ifdef WITH_GIF
|
|
|
|
|
2003-06-05 17:24:28 +04:00
|
|
|
#include <assert.h>
|
|
|
|
#include <string.h>
|
2003-07-19 01:02:29 +04:00
|
|
|
#include <stdbool.h>
|
2003-06-05 17:24:28 +04:00
|
|
|
#include <stdlib.h>
|
2007-05-31 02:39:54 +04:00
|
|
|
#include "content/content.h"
|
|
|
|
#include "desktop/browser.h"
|
|
|
|
#include "desktop/options.h"
|
|
|
|
#include "desktop/plotters.h"
|
|
|
|
#include "image/bitmap.h"
|
|
|
|
#include "image/gif.h"
|
|
|
|
#include "image/gifread.h"
|
|
|
|
#include "utils/log.h"
|
|
|
|
#include "utils/messages.h"
|
|
|
|
#include "utils/utils.h"
|
2003-06-05 17:24:28 +04:00
|
|
|
|
2004-03-18 00:05:44 +03:00
|
|
|
|
2004-04-07 03:13:25 +04:00
|
|
|
/* GIF FUNCTIONALITY
|
|
|
|
=================
|
2004-03-18 00:05:44 +03:00
|
|
|
|
2004-04-07 03:13:25 +04:00
|
|
|
All GIFs are dynamically decompressed using the routines that gifread.c
|
|
|
|
provides. Whilst this allows support for progressive decoding, it is
|
|
|
|
not implemented here as NetSurf currently does not provide such support.
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2004-04-07 03:13:25 +04:00
|
|
|
[rjw] - Sun 4th April 2004
|
2004-03-18 00:05:44 +03:00
|
|
|
*/
|
|
|
|
|
2006-02-22 04:58:19 +03:00
|
|
|
static void nsgif_invalidate(struct bitmap *bitmap, void *private_word);
|
2004-03-21 15:50:10 +03:00
|
|
|
static void nsgif_animate(void *p);
|
2004-11-10 02:34:01 +03:00
|
|
|
static void nsgif_get_frame(struct content *c);
|
2003-06-05 17:24:28 +04:00
|
|
|
|
|
|
|
|
2004-06-11 00:41:26 +04:00
|
|
|
bool nsgif_create(struct content *c, const char *params[]) {
|
|
|
|
union content_msg_data msg_data;
|
2004-12-09 13:30:44 +03:00
|
|
|
/* Initialise our data structure
|
|
|
|
*/
|
|
|
|
c->data.gif.gif = calloc(sizeof(gif_animation), 1);
|
|
|
|
if (!c->data.gif.gif) {
|
2004-06-11 00:41:26 +04:00
|
|
|
msg_data.error = messages_get("NoMemory");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
2004-12-09 13:30:44 +03:00
|
|
|
return false;
|
|
|
|
}
|
2004-06-11 00:41:26 +04:00
|
|
|
return true;
|
2004-03-19 21:14:50 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-06-11 00:41:26 +04:00
|
|
|
bool nsgif_convert(struct content *c, int iwidth, int iheight) {
|
|
|
|
int res;
|
2004-04-07 03:13:25 +04:00
|
|
|
struct gif_animation *gif;
|
2004-06-11 00:41:26 +04:00
|
|
|
union content_msg_data msg_data;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2004-04-07 03:13:25 +04:00
|
|
|
/* Create our animation
|
2004-03-19 21:14:50 +03:00
|
|
|
*/
|
2004-04-07 03:13:25 +04:00
|
|
|
gif = c->data.gif.gif;
|
2008-02-25 20:58:00 +03:00
|
|
|
gif->gif_data = (unsigned char *) c->source_data;
|
2004-04-07 03:13:25 +04:00
|
|
|
gif->buffer_size = c->source_size;
|
2006-01-25 02:06:36 +03:00
|
|
|
gif->buffer_position = 0;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2004-04-07 03:13:25 +04:00
|
|
|
/* Initialise the GIF
|
2004-03-19 21:14:50 +03:00
|
|
|
*/
|
2004-06-11 00:41:26 +04:00
|
|
|
res = gif_initialise(gif);
|
2004-06-12 00:59:53 +04:00
|
|
|
switch (res) {
|
2004-06-24 20:54:28 +04:00
|
|
|
case GIF_INSUFFICIENT_MEMORY:
|
2004-06-11 00:41:26 +04:00
|
|
|
msg_data.error = messages_get("NoMemory");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
2004-06-12 00:59:53 +04:00
|
|
|
return false;
|
|
|
|
case GIF_INSUFFICIENT_DATA:
|
|
|
|
case GIF_DATA_ERROR:
|
2004-06-11 00:41:26 +04:00
|
|
|
msg_data.error = messages_get("BadGIF");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
2004-06-12 00:59:53 +04:00
|
|
|
return false;
|
2004-06-11 00:41:26 +04:00
|
|
|
}
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2004-05-09 20:12:24 +04:00
|
|
|
/* Abort on bad GIFs
|
|
|
|
*/
|
2004-06-11 00:41:26 +04:00
|
|
|
if ((gif->frame_count_partial == 0) || (gif->width == 0) ||
|
|
|
|
(gif->height == 0)) {
|
|
|
|
msg_data.error = messages_get("BadGIF");
|
|
|
|
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
|
|
|
|
return false;
|
|
|
|
}
|
2004-05-09 20:12:24 +04:00
|
|
|
|
2004-06-12 00:59:53 +04:00
|
|
|
/* Store our content width and description
|
2004-03-19 21:14:50 +03:00
|
|
|
*/
|
2004-04-07 03:13:25 +04:00
|
|
|
c->width = gif->width;
|
|
|
|
c->height = gif->height;
|
2004-06-12 00:59:53 +04:00
|
|
|
c->title = malloc(100);
|
2006-01-25 02:06:36 +03:00
|
|
|
if (c->title)
|
2004-06-12 00:59:53 +04:00
|
|
|
snprintf(c->title, 100, messages_get("GIFTitle"), c->width, c->height, c->source_size);
|
2004-06-24 20:54:28 +04:00
|
|
|
c->size += (gif->width * gif->height * 4) + 16 + 44 + 100;
|
2004-03-19 21:14:50 +03:00
|
|
|
|
2004-04-07 03:13:25 +04:00
|
|
|
/* Schedule the animation if we have one
|
2004-03-19 21:14:50 +03:00
|
|
|
*/
|
2006-01-25 02:06:36 +03:00
|
|
|
c->data.gif.current_frame = 0;
|
2004-12-09 13:30:44 +03:00
|
|
|
if (gif->frame_count_partial > 1)
|
2004-05-09 20:12:24 +04:00
|
|
|
schedule(gif->frames[0].frame_delay, nsgif_animate, c);
|
2006-02-22 04:58:19 +03:00
|
|
|
else
|
|
|
|
bitmap_set_suspendable(gif->frame_image, gif, nsgif_invalidate);
|
2004-03-19 21:14:50 +03:00
|
|
|
|
|
|
|
/* Exit as a success
|
|
|
|
*/
|
2004-10-05 03:54:42 +04:00
|
|
|
c->bitmap = gif->frame_image;
|
2004-04-07 03:13:25 +04:00
|
|
|
c->status = CONTENT_STATUS_DONE;
|
2008-03-10 15:41:41 +03:00
|
|
|
/* Done: update status bar */
|
|
|
|
content_set_status(c, "");
|
2004-06-11 00:41:26 +04:00
|
|
|
return true;
|
2003-06-05 17:24:28 +04:00
|
|
|
}
|
|
|
|
|
2006-02-22 04:58:19 +03:00
|
|
|
void nsgif_invalidate(struct bitmap *bitmap, void *private_word) {
|
|
|
|
struct gif_animation *gif = (struct gif_animation *)private_word;
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2006-02-22 04:58:19 +03:00
|
|
|
gif->decoded_frame = -1;
|
|
|
|
}
|
2003-06-05 17:24:28 +04:00
|
|
|
|
2004-08-11 20:26:13 +04:00
|
|
|
bool nsgif_redraw(struct content *c, int x, int y,
|
2004-06-11 00:41:26 +04:00
|
|
|
int width, int height,
|
|
|
|
int clip_x0, int clip_y0, int clip_x1, int clip_y1,
|
2004-08-15 23:06:24 +04:00
|
|
|
float scale, unsigned long background_colour) {
|
2004-04-25 03:42:32 +04:00
|
|
|
|
2004-12-09 13:30:44 +03:00
|
|
|
if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
|
|
|
|
nsgif_get_frame(c);
|
2004-10-05 03:54:42 +04:00
|
|
|
c->bitmap = c->data.gif.gif->frame_image;
|
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
2008-07-26 20:01:59 +04:00
|
|
|
return plot.bitmap(x, y, width, height, c->bitmap, background_colour, c);
|
2004-03-18 00:05:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-02-21 23:49:12 +03:00
|
|
|
bool nsgif_redraw_tiled(struct content *c, int x, int y,
|
|
|
|
int width, int height,
|
|
|
|
int clip_x0, int clip_y0, int clip_x1, int clip_y1,
|
|
|
|
float scale, unsigned long background_colour,
|
|
|
|
bool repeat_x, bool repeat_y) {
|
|
|
|
|
|
|
|
if (c->data.gif.current_frame != c->data.gif.gif->decoded_frame)
|
|
|
|
nsgif_get_frame(c);
|
|
|
|
c->bitmap = c->data.gif.gif->frame_image;
|
|
|
|
return plot.bitmap_tile(x, y, width, height, c->bitmap, background_colour,
|
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
2008-07-26 20:01:59 +04:00
|
|
|
repeat_x, repeat_y, c);
|
2006-02-21 23:49:12 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-21 15:57:14 +03:00
|
|
|
void nsgif_destroy(struct content *c)
|
|
|
|
{
|
2004-03-18 00:05:44 +03:00
|
|
|
/* Free all the associated memory buffers
|
|
|
|
*/
|
2004-03-21 15:57:14 +03:00
|
|
|
schedule_remove(nsgif_animate, c);
|
2004-04-07 03:13:25 +04:00
|
|
|
gif_finalise(c->data.gif.gif);
|
2004-06-11 00:41:26 +04:00
|
|
|
free(c->data.gif.gif);
|
2004-10-05 19:42:15 +04:00
|
|
|
free(c->title);
|
2004-03-18 00:05:44 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-10 02:34:01 +03:00
|
|
|
/**
|
|
|
|
* Updates the GIF bitmap to display the current frame
|
|
|
|
*
|
|
|
|
* \param c the content to update
|
|
|
|
*/
|
|
|
|
void nsgif_get_frame(struct content *c) {
|
2004-12-09 13:30:44 +03:00
|
|
|
int previous_frame, current_frame, frame;
|
2004-11-10 02:34:01 +03:00
|
|
|
|
|
|
|
current_frame = c->data.gif.current_frame;
|
2004-12-09 13:30:44 +03:00
|
|
|
if (!option_animate_images)
|
|
|
|
current_frame = 0;
|
|
|
|
if (current_frame < c->data.gif.gif->decoded_frame)
|
2004-11-10 02:34:01 +03:00
|
|
|
previous_frame = 0;
|
2004-12-09 13:30:44 +03:00
|
|
|
else
|
2004-11-10 02:34:01 +03:00
|
|
|
previous_frame = c->data.gif.gif->decoded_frame + 1;
|
|
|
|
for (frame = previous_frame; frame <= current_frame; frame++)
|
|
|
|
gif_decode_frame(c->data.gif.gif, frame);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-03-18 00:05:44 +03:00
|
|
|
/** Performs any necessary animation.
|
|
|
|
|
|
|
|
@param c The content to animate
|
2004-03-13 21:22:22 +03:00
|
|
|
*/
|
2004-03-21 15:50:10 +03:00
|
|
|
void nsgif_animate(void *p)
|
|
|
|
{
|
|
|
|
struct content *c = p;
|
2004-04-25 03:42:32 +04:00
|
|
|
union content_msg_data data;
|
2005-02-01 04:00:31 +03:00
|
|
|
struct gif_animation *gif;
|
2004-05-25 00:50:57 +04:00
|
|
|
int delay;
|
2005-02-01 04:00:31 +03:00
|
|
|
int f;
|
2006-11-27 18:35:18 +03:00
|
|
|
|
2004-05-11 02:14:33 +04:00
|
|
|
/* Advance by a frame, updating the loop count accordingly
|
|
|
|
*/
|
2005-02-01 04:00:31 +03:00
|
|
|
gif = c->data.gif.gif;
|
2004-03-21 15:50:10 +03:00
|
|
|
c->data.gif.current_frame++;
|
2005-02-01 04:00:31 +03:00
|
|
|
if (c->data.gif.current_frame == (int)gif->frame_count_partial) {
|
2004-05-10 01:05:24 +04:00
|
|
|
c->data.gif.current_frame = 0;
|
2004-05-11 02:53:36 +04:00
|
|
|
|
2004-05-11 02:14:33 +04:00
|
|
|
/* A loop count of 0 has a special meaning of infinite
|
|
|
|
*/
|
2005-02-01 19:55:11 +03:00
|
|
|
if (gif->loop_count != 0) {
|
2005-02-01 04:00:31 +03:00
|
|
|
gif->loop_count--;
|
|
|
|
if (gif->loop_count == 0) {
|
|
|
|
c->data.gif.current_frame = gif->frame_count_partial - 1;
|
|
|
|
gif->loop_count = -1;
|
2004-05-11 02:14:33 +04:00
|
|
|
}
|
|
|
|
}
|
2004-03-21 15:50:10 +03:00
|
|
|
}
|
|
|
|
|
2004-05-11 02:14:33 +04:00
|
|
|
/* Continue animating if we should
|
|
|
|
*/
|
2005-02-01 19:55:11 +03:00
|
|
|
if (gif->loop_count >= 0) {
|
2005-02-01 04:00:31 +03:00
|
|
|
delay = gif->frames[c->data.gif.current_frame].frame_delay;
|
2004-12-09 13:30:44 +03:00
|
|
|
if (delay < option_minimum_gif_delay)
|
|
|
|
delay = option_minimum_gif_delay;
|
2004-05-25 00:50:57 +04:00
|
|
|
schedule(delay, nsgif_animate, c);
|
2004-05-11 02:14:33 +04:00
|
|
|
}
|
2004-03-21 15:50:10 +03:00
|
|
|
|
2004-12-09 13:30:44 +03:00
|
|
|
if (!option_animate_images)
|
|
|
|
return;
|
|
|
|
|
2004-05-10 01:05:24 +04:00
|
|
|
/* area within gif to redraw */
|
2005-02-01 04:00:31 +03:00
|
|
|
f = c->data.gif.current_frame;
|
|
|
|
data.redraw.x = gif->frames[f].redraw_x;
|
|
|
|
data.redraw.y = gif->frames[f].redraw_y;
|
|
|
|
data.redraw.width = gif->frames[f].redraw_width;
|
|
|
|
data.redraw.height = gif->frames[f].redraw_height;
|
2004-04-25 03:42:32 +04:00
|
|
|
|
|
|
|
/* redraw background (true) or plot on top (false) */
|
2004-07-27 02:23:40 +04:00
|
|
|
if (c->data.gif.current_frame > 0) {
|
2005-02-01 04:00:31 +03:00
|
|
|
data.redraw.full_redraw = gif->frames[f - 1].redraw_required;
|
|
|
|
/* previous frame needed clearing: expand the redraw area to cover it */
|
|
|
|
if (data.redraw.full_redraw) {
|
|
|
|
if (data.redraw.x > gif->frames[f - 1].redraw_x) {
|
|
|
|
data.redraw.width += data.redraw.x - gif->frames[f - 1].redraw_x;
|
|
|
|
data.redraw.x = gif->frames[f - 1].redraw_x;
|
|
|
|
}
|
|
|
|
if (data.redraw.y > gif->frames[f - 1].redraw_y) {
|
|
|
|
data.redraw.height += (data.redraw.y - gif->frames[f - 1].redraw_y);
|
|
|
|
data.redraw.y = gif->frames[f - 1].redraw_y;
|
|
|
|
}
|
|
|
|
if ((gif->frames[f - 1].redraw_x + gif->frames[f - 1].redraw_width) >
|
|
|
|
(data.redraw.x + data.redraw.width))
|
|
|
|
data.redraw.width = gif->frames[f - 1].redraw_x - data.redraw.x +
|
|
|
|
gif->frames[f - 1].redraw_width;
|
|
|
|
if ((gif->frames[f - 1].redraw_y + gif->frames[f - 1].redraw_height) >
|
|
|
|
(data.redraw.y + data.redraw.height))
|
|
|
|
data.redraw.height = gif->frames[f - 1].redraw_y - data.redraw.y +
|
|
|
|
gif->frames[f - 1].redraw_height;
|
|
|
|
}
|
2004-07-27 02:23:40 +04:00
|
|
|
} else {
|
2004-11-10 22:51:32 +03:00
|
|
|
/* do advanced check */
|
2005-01-23 18:20:45 +03:00
|
|
|
if ((data.redraw.x == 0) && (data.redraw.y == 0) &&
|
2005-02-01 19:55:11 +03:00
|
|
|
(data.redraw.width == gif->width) &&
|
|
|
|
(data.redraw.height == gif->height)) {
|
|
|
|
data.redraw.full_redraw = !gif->frames[f].opaque;
|
|
|
|
} else {
|
2005-01-23 18:20:45 +03:00
|
|
|
data.redraw.full_redraw = true;
|
|
|
|
data.redraw.x = 0;
|
|
|
|
data.redraw.y = 0;
|
2005-02-01 19:55:11 +03:00
|
|
|
data.redraw.width = gif->width;
|
|
|
|
data.redraw.height = gif->height;
|
2005-01-23 18:20:45 +03:00
|
|
|
}
|
2004-07-27 02:23:40 +04:00
|
|
|
}
|
2004-04-25 03:42:32 +04:00
|
|
|
|
|
|
|
/* other data */
|
|
|
|
data.redraw.object = c;
|
|
|
|
data.redraw.object_x = 0;
|
|
|
|
data.redraw.object_y = 0;
|
2004-04-26 17:47:51 +04:00
|
|
|
data.redraw.object_width = c->width;
|
|
|
|
data.redraw.object_height = c->height;
|
2004-05-25 00:50:57 +04:00
|
|
|
|
2004-04-25 03:42:32 +04:00
|
|
|
content_broadcast(c, CONTENT_MSG_REDRAW, data);
|
2004-03-21 15:50:10 +03:00
|
|
|
}
|
|
|
|
|
2004-01-05 05:10:59 +03:00
|
|
|
#endif
|