From 9402e110e904b4644ebc467e7f8e78ba4e91333c Mon Sep 17 00:00:00 2001
From: James Shaw <jshaw@netsurf-browser.org>
Date: Sat, 29 Mar 2008 13:30:04 +0000
Subject: Implement sprite support for GTK using librosprite

svn path=/trunk/netsurf/; revision=4051
---
 content/content.c      | 11 +++++++++--
 content/content.h      |  6 ++++++
 content/content_type.h |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'content')

diff --git a/content/content.c b/content/content.c
index 19bb45b0a..6d8ed22e7 100644
--- a/content/content.c
+++ b/content/content.c
@@ -63,6 +63,9 @@
 #ifdef WITH_SPRITE
 #include "riscos/sprite.h"
 #endif
+#ifdef WITH_NSSPRITE
+#include "image/nssprite.h"
+#endif
 #ifdef WITH_DRAW
 #include "riscos/draw.h"
 #endif
@@ -168,7 +171,7 @@ static const struct mime_entry mime_map[] = {
 #ifdef WITH_BMP
 	{"image/x-ms-bmp", CONTENT_BMP},
 #endif
-#ifdef WITH_SPRITE
+#if defined(WITH_SPRITE) || defined(WITH_NSSPRITE)
 	{"image/x-riscos-sprite", CONTENT_SPRITE},
 #endif
 #ifdef WITH_BMP
@@ -205,7 +208,7 @@ const char *content_type_name[] = {
 	"JNG",
 	"MNG",
 #endif
-#ifdef WITH_SPRITE
+#if defined(WITH_SPRITE) || defined(WITH_NSSPRITE)
 	"SPRITE",
 #endif
 #ifdef WITH_DRAW
@@ -301,6 +304,10 @@ static const struct handler_entry handler_map[] = {
 	{0, 0, sprite_convert,
 		0, sprite_destroy, 0, sprite_redraw, 0, 0, 0, false},
 #endif
+#ifdef WITH_NSSPRITE
+	{0, 0, nssprite_convert,
+		0, nssprite_destroy, 0, nssprite_redraw, 0, 0, 0, false},
+#endif
 #ifdef WITH_DRAW
 	{0, 0, draw_convert,
 		0, draw_destroy, 0, draw_redraw, 0, 0, 0, false},
diff --git a/content/content.h b/content/content.h
index 4f2fa0ed6..5e130e138 100644
--- a/content/content.h
+++ b/content/content.h
@@ -51,6 +51,9 @@
 #ifdef WITH_SPRITE
 #include "riscos/sprite.h"
 #endif
+#ifdef WITH_NSSPRITE
+#include "image/nssprite.h"
+#endif
 #ifdef WITH_DRAW
 #include "riscos/draw.h"
 #endif
@@ -173,6 +176,9 @@ struct content {
 #ifdef WITH_SPRITE
 		struct content_sprite_data sprite;
 #endif
+#ifdef WITH_NSSPRITE
+		struct content_nssprite_data nssprite;
+#endif
 #ifdef WITH_DRAW
 		struct content_draw_data draw;
 #endif
diff --git a/content/content_type.h b/content/content_type.h
index 51d25858f..a7c59e85a 100644
--- a/content/content_type.h
+++ b/content/content_type.h
@@ -48,7 +48,7 @@ typedef enum {
 	CONTENT_JNG,
 	CONTENT_MNG,
 #endif
-#ifdef WITH_SPRITE
+#if defined(WITH_SPRITE) || defined(WITH_NSSPRITE)
 	CONTENT_SPRITE,
 #endif
 #ifdef WITH_DRAW
-- 
cgit v1.2.3