Experimental/incomplete/non-functional content handlers (files required for NetSurf to

compile from trunk)

svn path=/trunk/netsurf/; revision=12361
This commit is contained in:
Chris Young 2011-05-09 22:14:08 +00:00
parent 1f1fe78c17
commit 48be9f6939
6 changed files with 681 additions and 4 deletions

View File

@ -73,7 +73,7 @@ S_AMIGA := gui.c tree.c history.c hotlist.c schedule.c \
cookies.c context_menu.c clipboard.c save_complete.c \ cookies.c context_menu.c clipboard.c save_complete.c \
launch.c search.c history_local.c download.c iff_dr2d.c \ launch.c search.c history_local.c download.c iff_dr2d.c \
sslcert.c gui_options.c print.c theme.c drag.c icon.c system_colour.c \ sslcert.c gui_options.c print.c theme.c drag.c icon.c system_colour.c \
datatypes.c dt_picture.c \ datatypes.c dt_picture.c dt_anim.c plugin_hack.c \
stringview/stringview.c stringview/urlhistory.c stringview/stringview.c stringview/urlhistory.c
S_AMIGA := $(addprefix amiga/,$(S_AMIGA)) S_AMIGA := $(addprefix amiga/,$(S_AMIGA))

View File

@ -26,11 +26,15 @@ nserror amiga_datatypes_init(void)
err = amiga_dt_picture_init(); err = amiga_dt_picture_init();
if(err != NSERROR_OK) return err; if(err != NSERROR_OK) return err;
err = amiga_dt_anim_init();
if(err != NSERROR_OK) return err;
return NSERROR_OK; return NSERROR_OK;
} }
void amiga_datatypes_fini(void) void amiga_datatypes_fini(void)
{ {
amiga_dt_picture_fini(); amiga_dt_picture_fini();
amiga_dt_anim_fini();
} }
#endif #endif

View File

@ -30,14 +30,14 @@ void amiga_datatypes_fini(void);
nserror amiga_dt_picture_init(void); nserror amiga_dt_picture_init(void);
void amiga_dt_picture_fini(void); void amiga_dt_picture_fini(void);
nserror amiga_dt_anim_init(void);
void amiga_dt_anim_fini(void);
#else #else
#define amiga_datatypes_init() NSERROR_OK #define amiga_datatypes_init() NSERROR_OK
#define amiga_datatypes_fini() ((void) 0) #define amiga_datatypes_fini() ((void) 0)
#define amiga_dt_picture_init() NSERROR_OK
#define amiga_dt_picture_fini() ((void) 0)
#endif /* WITH_AMIGA_DATATYPES */ #endif /* WITH_AMIGA_DATATYPES */
#endif #endif

386
amiga/dt_anim.c Normal file
View File

@ -0,0 +1,386 @@
/*
* Copyright 2011 Chris Young <chris@unsatisfactorysoftware.co.uk>
*
* 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
* DataTypes animation handler (implementation)
*/
#ifdef WITH_AMIGA_DATATYPES
#include "amiga/filetype.h"
#include "amiga/datatypes.h"
#include "amiga/plotters.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include <proto/datatypes.h>
#include <proto/dos.h>
#include <proto/exec.h>
#include <proto/intuition.h>
#include <datatypes/animationclass.h>
#include <datatypes/pictureclass.h>
#include <graphics/blitattr.h>
#include <intuition/classusr.h>
typedef struct amiga_dt_anim_content {
struct content base;
Object *dto;
int x;
int y;
int w;
int h;
} amiga_dt_anim_content;
APTR ami_colormap_to_clut(struct ColorMap *cmap);
static nserror amiga_dt_anim_create(const content_handler *handler,
lwc_string *imime_type, const http_parameter *params,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c);
static bool amiga_dt_anim_convert(struct content *c);
static void amiga_dt_anim_reformat(struct content *c, int width, int height);
static void amiga_dt_anim_destroy(struct content *c);
static bool amiga_dt_anim_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip,
float scale, colour background_colour,
bool repeat_x, bool repeat_y);
static void amiga_dt_anim_open(struct content *c, struct browser_window *bw,
struct content *page, struct box *box,
struct object_params *params);
static void amiga_dt_anim_close(struct content *c);
static nserror amiga_dt_anim_clone(const struct content *old, struct content **newc);
static content_type amiga_dt_anim_content_type(lwc_string *mime_type);
static const content_handler amiga_dt_anim_content_handler = {
.create = amiga_dt_anim_create,
.data_complete = amiga_dt_anim_convert,
.reformat = amiga_dt_anim_reformat,
.destroy = amiga_dt_anim_destroy,
.redraw = amiga_dt_anim_redraw,
.open = amiga_dt_anim_open,
.close = amiga_dt_anim_close,
.clone = amiga_dt_anim_clone,
.type = amiga_dt_anim_content_type,
.no_share = false,
};
nserror amiga_dt_anim_init(void)
{
char dt_mime[50];
struct DataType *dt, *prevdt = NULL;
lwc_string *type;
lwc_error lerror;
nserror error;
BPTR fh = 0;
while((dt = ObtainDataType(DTST_RAM, NULL,
DTA_DataType, prevdt,
DTA_GroupID, GID_ANIMATION,
TAG_DONE)) != NULL)
{
ReleaseDataType(prevdt);
prevdt = dt;
ami_datatype_to_mimetype(dt, dt_mime);
LOG(("Guessed MIME from DT: %s", dt_mime));
lerror = lwc_intern_string(dt_mime, strlen(dt_mime), &type);
if (lerror != lwc_error_ok)
return NSERROR_NOMEM;
error = content_factory_register_handler(type,
&amiga_dt_anim_content_handler);
lwc_string_unref(type);
if (error != NSERROR_OK)
return error;
}
ReleaseDataType(prevdt);
if(fh = FOpen("PROGDIR:Resources/MIME/dt.animation", MODE_OLDFILE, 0))
{
while(FGets(fh, (UBYTE *)&dt_mime, 50) != 0)
{
dt_mime[strlen(dt_mime) - 1] = '\0';
if((dt_mime[0] == '\0') || (dt_mime[0] == '#'))
continue; /* Skip blank lines and comments */
lerror = lwc_intern_string(dt_mime, strlen(dt_mime), &type);
if (lerror != lwc_error_ok)
return NSERROR_NOMEM;
error = content_factory_register_handler(type,
&amiga_dt_anim_content_handler);
lwc_string_unref(type);
if (error != NSERROR_OK)
return error;
}
FClose(fh);
}
return NSERROR_OK;
}
void amiga_dt_anim_fini(void)
{
/* Nothing to do */
}
nserror amiga_dt_anim_create(const content_handler *handler,
lwc_string *imime_type, const http_parameter *params,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c)
{
amiga_dt_anim_content *plugin;
nserror error;
plugin = talloc_zero(0, amiga_dt_anim_content);
if (plugin == NULL)
return NSERROR_NOMEM;
error = content__init(&plugin->base, handler, imime_type, params,
llcache, fallback_charset, quirks);
if (error != NSERROR_OK) {
talloc_free(plugin);
return error;
}
*c = (struct content *) plugin;
return NSERROR_OK;
}
bool amiga_dt_anim_convert(struct content *c)
{
LOG(("amiga_dt_anim_convert"));
amiga_dt_anim_content *plugin = (amiga_dt_anim_content *) c;
union content_msg_data msg_data;
int width, height;
char title[100];
const uint8 *data;
UBYTE *bm_buffer;
ULONG size;
Object *dto;
struct BitMapHeader *bmh;
unsigned int bm_flags = BITMAP_NEW | BITMAP_OPAQUE;
int bm_format = PBPAFMT_RGBA;
struct adtFrame adt_frame;
APTR clut;
data = (uint8 *)content__get_source_data(c, &size);
if(plugin->dto = NewDTObject(NULL,
DTA_SourceType, DTST_MEMORY,
DTA_SourceAddress, data,
DTA_SourceSize, size,
DTA_GroupID, GID_ANIMATION,
TAG_DONE))
{
if(GetDTAttrs(plugin->dto, PDTA_BitMapHeader, &bmh, TAG_DONE))
{
width = (int)bmh->bmh_Width;
height = (int)bmh->bmh_Height;
c->bitmap = bitmap_create(width, height, bm_flags);
if (!c->bitmap) {
msg_data.error = messages_get("NoMemory");
content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
return false;
}
bm_buffer = bitmap_get_buffer(c->bitmap);
adt_frame.MethodID = ADTM_LOADFRAME;
adt_frame.alf_TimeStamp = 0;
IDoMethodA(plugin->dto, &adt_frame);
clut = ami_colormap_to_clut(adt_frame.alf_CMap);
BltBitMapTags(
BLITA_Width, width,
BLITA_Height, height,
BLITA_Source, adt_frame.alf_BitMap,
BLITA_SrcType, BLITT_BITMAP,
BLITA_Dest, bm_buffer,
BLITA_DestType, BLITT_RGB24,
BLITA_DestBytesPerRow, width,
BLITA_CLUT, clut,
TAG_DONE);
FreeVec(clut);
adt_frame.MethodID = ADTM_UNLOADFRAME;
IDoMethodA(plugin->dto, &adt_frame);
}
else return false;
}
else return false;
c->width = width;
c->height = height;
/*
snprintf(title, sizeof(title), "image (%lux%lu, %lu bytes)",
width, height, size);
content__set_title(c, title);
*/
bitmap_modified(c->bitmap);
content_set_ready(c);
content_set_done(c);
content_set_status(c, "");
return true;
}
void amiga_dt_anim_destroy(struct content *c)
{
amiga_dt_anim_content *plugin = (amiga_dt_anim_content *) c;
LOG(("amiga_dt_anim_destroy"));
if (c->bitmap != NULL)
bitmap_destroy(c->bitmap);
DisposeDTObject(plugin->dto);
return;
}
bool amiga_dt_anim_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip,
float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
amiga_dt_anim_content *plugin = (amiga_dt_anim_content *) c;
LOG(("amiga_dt_anim_redraw"));
bitmap_flags_t flags = BITMAPF_NONE;
if (repeat_x)
flags |= BITMAPF_REPEAT_X;
if (repeat_y)
flags |= BITMAPF_REPEAT_Y;
return plot.bitmap(x, y, width, height,
c->bitmap, background_colour, flags);
}
/**
* Handle a window containing a CONTENT_PLUGIN being opened.
*
* \param c content that has been opened
* \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if not an
* object within a page
* \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object
*/
void amiga_dt_anim_open(struct content *c, struct browser_window *bw,
struct content *page, struct box *box,
struct object_params *params)
{
LOG(("amiga_dt_anim_open"));
return;
}
void amiga_dt_anim_close(struct content *c)
{
LOG(("amiga_dt_anim_close"));
return;
}
void amiga_dt_anim_reformat(struct content *c, int width, int height)
{
LOG(("amiga_dt_anim_reformat"));
return;
}
nserror amiga_dt_anim_clone(const struct content *old, struct content **newc)
{
amiga_dt_anim_content *plugin;
nserror error;
LOG(("amiga_dt_anim_clone"));
plugin = talloc_zero(0, amiga_dt_anim_content);
if (plugin == NULL)
return NSERROR_NOMEM;
error = content__clone(old, &plugin->base);
if (error != NSERROR_OK) {
content_destroy(&plugin->base);
return error;
}
/* We "clone" the old content by replaying conversion */
if (old->status == CONTENT_STATUS_READY ||
old->status == CONTENT_STATUS_DONE) {
if (amiga_dt_anim_convert(&plugin->base) == false) {
content_destroy(&plugin->base);
return NSERROR_CLONE_FAILED;
}
}
*newc = (struct content *) plugin;
return NSERROR_OK;
}
content_type amiga_dt_anim_content_type(lwc_string *mime_type)
{
return CONTENT_IMAGE;
}
APTR ami_colormap_to_clut(struct ColorMap *cmap)
{
int i;
UBYTE *clut = AllocVec(256 * 4, MEMF_CLEAR);
ULONG colour[3 * 256];
if(!clut) return NULL;
/* Get the palette from the ColorMap */
GetRGB32(cmap, 0, 256, (ULONG *)&colour);
/* convert it to a table of ARGB values */
for(i = 0; i < 1024; i += 4)
{
clut[i] = (0xff << 24) |
((colour[i] & 0xff000000) >> 8) |
((colour[i + 1] & 0xff000000) >> 16) |
((colour[i + 2] & 0xff000000) >> 24);
}
return clut;
}
#endif

250
amiga/plugin_hack.c Normal file
View File

@ -0,0 +1,250 @@
/*
* Copyright 2011 Chris Young <chris@unsatisfactorysoftware.co.uk>
*
* 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
* DataTypes picture handler (implementation)
*/
#ifdef WITH_AMIGA_PLUGIN_HACK
#include "amiga/filetype.h"
#include "amiga/plugin_hack.h"
#include "content/content_protected.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "render/box.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/talloc.h"
#include <proto/datatypes.h>
#include <proto/dos.h>
#include <proto/intuition.h>
#include <datatypes/pictureclass.h>
#include <intuition/classusr.h>
typedef struct amiga_plugin_hack_content {
struct content base;
Object *dto;
int x;
int y;
int w;
int h;
} amiga_plugin_hack_content;
static nserror amiga_plugin_hack_create(const content_handler *handler,
lwc_string *imime_type, const http_parameter *params,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c);
static bool amiga_plugin_hack_convert(struct content *c);
static void amiga_plugin_hack_reformat(struct content *c, int width, int height);
static void amiga_plugin_hack_destroy(struct content *c);
static bool amiga_plugin_hack_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip,
float scale, colour background_colour,
bool repeat_x, bool repeat_y);
static void amiga_plugin_hack_open(struct content *c, struct browser_window *bw,
struct content *page, struct box *box,
struct object_params *params);
static void amiga_plugin_hack_close(struct content *c);
static nserror amiga_plugin_hack_clone(const struct content *old, struct content **newc);
static content_type amiga_plugin_hack_content_type(lwc_string *mime_type);
static void amiga_plugin_hack_mouse_action(struct content *c,
struct browser_window *bw, browser_mouse_state mouse, int x, int y);
static const content_handler amiga_plugin_hack_content_handler = {
.create = amiga_plugin_hack_create,
.data_complete = amiga_plugin_hack_convert,
.reformat = amiga_plugin_hack_reformat,
.destroy = amiga_plugin_hack_destroy,
.mouse_action = amiga_plugin_hack_mouse_action,
.redraw = amiga_plugin_hack_redraw,
.open = amiga_plugin_hack_open,
.close = amiga_plugin_hack_close,
.clone = amiga_plugin_hack_clone,
.type = amiga_plugin_hack_content_type,
.no_share = false,
};
nserror amiga_plugin_hack_init(void)
{
char dt_mime[50];
struct DataType *dt, *prevdt = NULL;
lwc_string *type;
lwc_error lerror;
nserror error;
BPTR fh = 0;
if(fh = FOpen("PROGDIR:Resources/MIME/pluginhack", MODE_OLDFILE, 0))
{
while(FGets(fh, (UBYTE *)&dt_mime, 50) != 0)
{
dt_mime[strlen(dt_mime) - 1] = '\0';
if((dt_mime[0] == '\0') || (dt_mime[0] == '#'))
continue; /* Skip blank lines and comments */
lerror = lwc_intern_string(dt_mime, strlen(dt_mime), &type);
if (lerror != lwc_error_ok)
return NSERROR_NOMEM;
error = content_factory_register_handler(type,
&amiga_plugin_hack_content_handler);
lwc_string_unref(type);
if (error != NSERROR_OK)
return error;
}
FClose(fh);
}
return NSERROR_OK;
}
void amiga_plugin_hack_fini(void)
{
/* Nothing to do */
}
nserror amiga_plugin_hack_create(const content_handler *handler,
lwc_string *imime_type, const http_parameter *params,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c)
{
amiga_plugin_hack_content *plugin;
nserror error;
plugin = talloc_zero(0, amiga_plugin_hack_content);
if (plugin == NULL)
return NSERROR_NOMEM;
error = content__init(&plugin->base, handler, imime_type, params,
llcache, fallback_charset, quirks);
if (error != NSERROR_OK) {
talloc_free(plugin);
return error;
}
*c = (struct content *) plugin;
return NSERROR_OK;
}
bool amiga_plugin_hack_convert(struct content *c)
{
LOG(("amiga_plugin_hack_convert"));
return true;
}
void amiga_plugin_hack_destroy(struct content *c)
{
amiga_plugin_hack_content *plugin = (amiga_plugin_hack_content *) c;
LOG(("amiga_plugin_hack_destroy"));
return;
}
static void amiga_plugin_hack_mouse_action(struct content *c,
struct browser_window *bw, browser_mouse_state mouse, int x, int y)
{
printf("action %ld for object %s\n", mouse, content__get_url(c));
return;
}
bool amiga_plugin_hack_redraw(struct content *c, int x, int y,
int width, int height, const struct rect *clip,
float scale, colour background_colour,
bool repeat_x, bool repeat_y)
{
LOG(("amiga_plugin_hack_redraw"));
return plot.bitmap(x, y, width, height,
c->bitmap, background_colour, BITMAPF_NONE);
}
/**
* Handle a window containing a CONTENT_PLUGIN being opened.
*
* \param c content that has been opened
* \param bw browser window containing the content
* \param page content of type CONTENT_HTML containing c, or 0 if not an
* object within a page
* \param box box containing c, or 0 if not an object
* \param params object parameters, or 0 if not an object
*/
void amiga_plugin_hack_open(struct content *c, struct browser_window *bw,
struct content *page, struct box *box,
struct object_params *params)
{
LOG(("amiga_plugin_hack_open"));
printf("open %s\n",content__get_url(c));
return;
}
void amiga_plugin_hack_close(struct content *c)
{
LOG(("amiga_plugin_hack_close"));
return;
}
void amiga_plugin_hack_reformat(struct content *c, int width, int height)
{
LOG(("amiga_plugin_hack_reformat"));
return;
}
nserror amiga_plugin_hack_clone(const struct content *old, struct content **newc)
{
amiga_plugin_hack_content *plugin;
nserror error;
LOG(("amiga_plugin_hack_clone"));
plugin = talloc_zero(0, amiga_plugin_hack_content);
if (plugin == NULL)
return NSERROR_NOMEM;
error = content__clone(old, &plugin->base);
if (error != NSERROR_OK) {
content_destroy(&plugin->base);
return error;
}
/* We "clone" the old content by replaying conversion */
if (old->status == CONTENT_STATUS_READY ||
old->status == CONTENT_STATUS_DONE) {
if (amiga_plugin_hack_convert(&plugin->base) == false) {
content_destroy(&plugin->base);
return NSERROR_CLONE_FAILED;
}
}
*newc = (struct content *) plugin;
return NSERROR_OK;
}
content_type amiga_plugin_hack_content_type(lwc_string *mime_type)
{
return CONTENT_PLUGIN;
}
#endif

37
amiga/plugin_hack.h Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright 2011 Chris Young <chris@unsatisfactorysoftware.co.uk>
*
* 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/>.
*/
#ifndef NETSURF_AMIGA_PLUGIN_HACK_H_
#define NETSURF_AMIGA_PLUGIN_HACK_H_
#include "utils/config.h"
#include "utils/errors.h"
#ifdef WITH_AMIGA_PLUGIN_HACK
nserror amiga_plugin_hack_init(void);
void amiga_plugin_hack_fini(void);
#else
#define amiga_plugin_hack_init() NSERROR_OK
#define amiga_plugin_hack_fini() ((void) 0)
#endif /* WITH_AMIGA_DATATYPES */
#endif