summaryrefslogtreecommitdiff
path: root/amiga/dt_picture.c
diff options
context:
space:
mode:
Diffstat (limited to 'amiga/dt_picture.c')
-rw-r--r--amiga/dt_picture.c125
1 files changed, 82 insertions, 43 deletions
diff --git a/amiga/dt_picture.c b/amiga/dt_picture.c
index 1a9dc4f72..280028c69 100644
--- a/amiga/dt_picture.c
+++ b/amiga/dt_picture.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Chris Young <chris@unsatisfactorysoftware.co.uk>
+ * Copyright 2011 - 2012 Chris Young <chris@unsatisfactorysoftware.co.uk>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
*
@@ -42,11 +42,12 @@ static nserror amiga_dt_picture_create(const content_handler *handler,
bool quirks, struct content **c);
static bool amiga_dt_picture_convert(struct content *c);
static nserror amiga_dt_picture_clone(const struct content *old, struct content **newc);
+static void amiga_dt_picture_destroy(struct content *c);
static const content_handler amiga_dt_picture_content_handler = {
.create = amiga_dt_picture_create,
.data_complete = amiga_dt_picture_convert,
- .destroy = image_cache_destroy,
+ .destroy = amiga_dt_picture_destroy,
.redraw = image_cache_redraw,
.clone = amiga_dt_picture_clone,
.get_internal = image_cache_get_internal,
@@ -54,6 +55,10 @@ static const content_handler amiga_dt_picture_content_handler = {
.no_share = false,
};
+struct amiga_dt_picture_content {
+ struct content c;
+ Object *dto;
+};
nserror amiga_dt_picture_init(void)
{
@@ -100,49 +105,80 @@ nserror amiga_dt_picture_create(const content_handler *handler,
llcache_handle *llcache, const char *fallback_charset,
bool quirks, struct content **c)
{
- struct content *adt;
+ struct amiga_dt_picture_content *adt;
nserror error;
- adt = calloc(1, sizeof(struct content));
+ adt = calloc(1, sizeof(struct amiga_dt_picture_content));
if (adt == NULL)
return NSERROR_NOMEM;
- error = content__init(adt, handler, imime_type, params,
+ error = content__init((struct content *)adt, handler, imime_type, params,
llcache, fallback_charset, quirks);
if (error != NSERROR_OK) {
free(adt);
return error;
}
- *c = adt;
+ *c = (struct content *)adt;
return NSERROR_OK;
}
+Object *amiga_dt_picture_newdtobject(struct amiga_dt_picture_content *adt)
+{
+ const uint8 *data;
+ ULONG size;
+
+ if(adt->dto == NULL) {
+ data = (uint8 *)content__get_source_data((struct content *)adt, &size);
+
+ adt->dto = NewDTObject(NULL,
+ DTA_SourceType, DTST_MEMORY,
+ DTA_SourceAddress, data,
+ DTA_SourceSize, size,
+ DTA_GroupID, GID_PICTURE,
+ PDTA_DestMode, PMODE_V43,
+ TAG_DONE);
+ }
+
+ return adt->dto;
+}
+
+char *amiga_dt_picture_datatype(struct content *c)
+{
+ const uint8 *data;
+ ULONG size;
+ struct DataType *dt;
+ char *filetype = NULL;
+
+ data = (uint8 *)content__get_source_data(c, &size);
+
+ if(dt = ObtainDataType(DTST_MEMORY, NULL,
+ DTA_SourceAddress, data,
+ DTA_SourceSize, size,
+ DTA_GroupID, GID_PICTURE,
+ TAG_DONE)) {
+ filetype = strdup(dt->dtn_Header->dth_Name);
+ ReleaseDataType(dt);
+ }
+
+ if(filetype == NULL) filetype = strdup("DataTypes");
+ return filetype;
+}
+
static struct bitmap *amiga_dt_picture_cache_convert(struct content *c)
{
LOG(("amiga_dt_picture_cache_convert"));
union content_msg_data msg_data;
- const uint8 *data;
UBYTE *bm_buffer;
- ULONG size;
Object *dto;
struct bitmap *bitmap;
unsigned int bm_flags = BITMAP_NEW;
int bm_format = PBPAFMT_RGBA;
+ struct amiga_dt_picture_content *adt = (struct amiga_dt_picture_content *)c;
- /* This is only relevant for picture datatypes... */
-
- data = (uint8 *)content__get_source_data(c, &size);
-
- if(dto = NewDTObject(NULL,
- DTA_SourceType, DTST_MEMORY,
- DTA_SourceAddress, data,
- DTA_SourceSize, size,
- DTA_GroupID, GID_PICTURE,
- PDTA_DestMode, PMODE_V43,
- TAG_DONE))
+ if(dto = amiga_dt_picture_newdtobject(adt))
{
bitmap = bitmap_create(c->width, c->height, bm_flags);
if (!bitmap) {
@@ -158,8 +194,9 @@ static struct bitmap *amiga_dt_picture_cache_convert(struct content *c)
0, 0, c->width, c->height);
bitmap_set_opaque(bitmap, bitmap_test_opaque(bitmap));
-
+
DisposeDTObject(dto);
+ adt->dto = NULL;
}
else return NULL;
@@ -172,26 +209,15 @@ bool amiga_dt_picture_convert(struct content *c)
union content_msg_data msg_data;
int width, height;
- char title[100];
- const uint8 *data;
+ char *title;
UBYTE *bm_buffer;
- ULONG size;
Object *dto;
struct BitMapHeader *bmh;
unsigned int bm_flags = BITMAP_NEW;
int bm_format = PBPAFMT_RGBA;
+ char *filetype;
- /* This is only relevant for picture datatypes... */
-
- data = (uint8 *)content__get_source_data(c, &size);
-
- if(dto = NewDTObject(NULL,
- DTA_SourceType, DTST_MEMORY,
- DTA_SourceAddress, data,
- DTA_SourceSize, size,
- DTA_GroupID, GID_PICTURE,
- PDTA_DestMode, PMODE_V43,
- TAG_DONE))
+ if(dto = amiga_dt_picture_newdtobject((struct amiga_dt_picture_content *)c))
{
if(GetDTAttrs(dto, PDTA_BitMapHeader, &bmh, TAG_DONE))
{
@@ -199,8 +225,6 @@ bool amiga_dt_picture_convert(struct content *c)
height = (int)bmh->bmh_Height;
}
else return false;
-
- DisposeDTObject(dto);
}
else return false;
@@ -208,17 +232,22 @@ bool amiga_dt_picture_convert(struct content *c)
c->height = height;
c->size = width * height * 4;
+ /* set title text */
+ if(filetype = amiga_dt_picture_datatype(c)) {
+ title = messages_get_buff("DataTypesTitle",
+ nsurl_access_leaf(llcache_handle_get_url(c->llcache)),
+ filetype, c->width, c->height);
+ if (title != NULL) {
+ content__set_title(c, title);
+ free(title);
+ }
+ free(filetype);
+ }
+
image_cache_add(c, NULL, amiga_dt_picture_cache_convert);
-/*
- snprintf(title, sizeof(title), "image (%lux%lu, %lu bytes)",
- width, height, size);
- content__set_title(c, title);
-*/
-
content_set_ready(c);
content_set_done(c);
-
content_set_status(c, "");
return true;
}
@@ -254,4 +283,14 @@ nserror amiga_dt_picture_clone(const struct content *old, struct content **newc)
return NSERROR_OK;
}
+static void amiga_dt_picture_destroy(struct content *c)
+{
+ struct amiga_dt_picture_content *adt = (struct amiga_dt_picture_content *)c;
+
+ DisposeDTObject(adt->dto);
+ adt->dto = NULL;
+
+ image_cache_destroy(c);
+}
+
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 01:16:08 +0000