From 0c0ff3c59631d0968c888279195ea40d4a7fd824 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Tue, 17 Jun 2003 19:24:21 +0000 Subject: [project @ 2003-06-17 19:24:20 by bursa] Change fetchcache system to store loading contents in cache. svn path=/import/netsurf/; revision=180 --- riscos/gif.c | 3 ++- riscos/gui.c | 15 +-------------- riscos/jpeg.c | 3 ++- riscos/plugin.c | 4 ++-- riscos/png.c | 3 ++- 5 files changed, 9 insertions(+), 19 deletions(-) (limited to 'riscos') diff --git a/riscos/gif.c b/riscos/gif.c index dc2756191..881d8fd74 100644 --- a/riscos/gif.c +++ b/riscos/gif.c @@ -10,7 +10,7 @@ * Add better error handling * - especially where bad GIFs are concerned. * - * $Id: gif.c,v 1.6 2003/06/07 13:07:48 philpem Exp $ + * $Id: gif.c,v 1.7 2003/06/17 19:24:21 bursa Exp $ */ #include @@ -274,6 +274,7 @@ int nsgif_convert(struct content *c, unsigned int iwidth, unsigned int iheight) c->title = xcalloc(100, 1); sprintf(c->title, "GIF image (%lux%lu)", c->width, c->height); + c->status = CONTENT_STATUS_DONE; // Enable this if you want to debug the GIF loader // xosspriteop_save_sprite_file(osspriteop_USER_AREA, c->data.gif.sprite_area, diff --git a/riscos/gui.c b/riscos/gui.c index c0ca96be9..8ec03c006 100644 --- a/riscos/gui.c +++ b/riscos/gui.c @@ -1,5 +1,5 @@ /** - * $Id: gui.c,v 1.32 2003/06/14 11:34:02 bursa Exp $ + * $Id: gui.c,v 1.33 2003/06/17 19:24:21 bursa Exp $ */ #include "netsurf/desktop/options.h" @@ -1170,19 +1170,6 @@ void ro_gui_throb(void) { if (g->type == GUI_BROWSER_WINDOW) { - if (g->data.browser.bw->current_content->status == CONTENT_PENDING) { - /* images still loading */ - gui_window_set_status(g, g->data.browser.bw->current_content->status_message); - if (g->data.browser.bw->current_content->active == 0) { - /* any image fetches have finished */ - browser_window_reformat(g->data.browser.bw); - browser_window_stop_throbber(g->data.browser.bw); - /* TODO: move this elsewhere: can't just move it to the image loader, - * because then this if would be triggered when an old content is - * present */ - g->data.browser.bw->current_content->status = CONTENT_DONE; - } - } if ((g->data.browser.bw->flags & browser_TOOLBAR) != 0) { if (g->data.browser.bw->throbbing != 0) diff --git a/riscos/jpeg.c b/riscos/jpeg.c index f3f939551..db5cc9a22 100644 --- a/riscos/jpeg.c +++ b/riscos/jpeg.c @@ -1,5 +1,5 @@ /** - * $Id: jpeg.c,v 1.5 2003/06/14 11:34:02 bursa Exp $ + * $Id: jpeg.c,v 1.6 2003/06/17 19:24:21 bursa Exp $ * * This is just a temporary implementation using the JPEG renderer * available in some versions of RISC OS. @@ -42,6 +42,7 @@ int jpeg_convert(struct content *c, unsigned int width, unsigned int height) c->height = h; c->title = xcalloc(100, 1); sprintf(c->title, "JPEG image (%ux%u, %lu bytes)", w, h, c->data.jpeg.length); + c->status = CONTENT_STATUS_DONE; return 0; } diff --git a/riscos/plugin.c b/riscos/plugin.c index ec5ccc0f2..2497294b7 100644 --- a/riscos/plugin.c +++ b/riscos/plugin.c @@ -1,5 +1,5 @@ /** - * $Id: plugin.c,v 1.9 2003/06/07 22:24:22 jmb Exp $ + * $Id: plugin.c,v 1.10 2003/06/17 19:24:21 bursa Exp $ */ #include @@ -156,7 +156,7 @@ void plugin_decode(struct content* content, char* url, struct box* box, */ xfree(po); LOG(("sending data to image handler")); - html_fetch_image(content, url, box); + html_fetch_object(content, url, box); return; } else { /* not an image; is sys var set? */ diff --git a/riscos/png.c b/riscos/png.c index b3d174d05..4ce4f5d9c 100644 --- a/riscos/png.c +++ b/riscos/png.c @@ -1,5 +1,5 @@ /** - * $Id: png.c,v 1.3 2003/06/14 11:34:02 bursa Exp $ + * $Id: png.c,v 1.4 2003/06/17 19:24:21 bursa Exp $ */ #include @@ -259,6 +259,7 @@ int nspng_convert(struct content *c, unsigned int width, unsigned int height) png_destroy_read_struct(&c->data.png.png, &c->data.png.info, 0); c->title = xcalloc(100, 1); sprintf(c->title, "png image (%ux%u)", c->width, c->height); + c->status = CONTENT_STATUS_DONE; return 0; } -- cgit v1.2.3