summaryrefslogtreecommitdiff
path: root/beos
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2015-04-24 13:52:39 +0100
committerVincent Sanders <vince@kyllikki.org>2015-04-24 13:52:39 +0100
commit217aa3adc121e55d996d0ab9669cba71fe0b7a40 (patch)
tree99454e53a21961544888e78d1c6f836d2300dcc9 /beos
parent818b8276df618bd9dbc32e915e58a69e55d95801 (diff)
downloadnetsurf-217aa3adc121e55d996d0ab9669cba71fe0b7a40.tar.gz
netsurf-217aa3adc121e55d996d0ab9669cba71fe0b7a40.tar.bz2
Convert beos to bitmap render API
Diffstat (limited to 'beos')
-rw-r--r--beos/Makefile.target3
-rw-r--r--beos/bitmap.cpp471
-rw-r--r--beos/thumbnail.cpp163
3 files changed, 303 insertions, 334 deletions
diff --git a/beos/Makefile.target b/beos/Makefile.target
index 8b41a96b7..0c8838555 100644
--- a/beos/Makefile.target
+++ b/beos/Makefile.target
@@ -95,8 +95,7 @@ endif
# S_BEOS are sources purely for the BeOS build
S_BEOS := about.cpp bitmap.cpp download.cpp fetch_rsrc.cpp filetype.cpp \
font.cpp gui.cpp login.cpp gui_options.cpp plotters.cpp \
- scaffolding.cpp search.cpp schedule.cpp thumbnail.cpp \
- throbber.cpp window.cpp
+ scaffolding.cpp search.cpp schedule.cpp throbber.cpp window.cpp
S_BEOS := $(addprefix beos/,$(S_BEOS))
RDEF_BEOS := res.rdef
diff --git a/beos/bitmap.cpp b/beos/bitmap.cpp
index 9a4ee521b..2ed73a4c1 100644
--- a/beos/bitmap.cpp
+++ b/beos/bitmap.cpp
@@ -16,15 +16,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-/** \file
- * Generic bitmap handling (BeOS implementation).
+/**
+ * \file
+ * BeOS implementation of generic bitmaps.
*
- * This implements the interface given by desktop/bitmap.h using BBitmap.
+ * This implements the interface given by image/bitmap.h using BBitmap.
*/
#define __STDBOOL_H__ 1
-//#include <stdbool.h>
#include <assert.h>
+#include <sys/param.h>
#include <string.h>
#include <Bitmap.h>
#include <BitmapStream.h>
@@ -32,22 +33,31 @@
#include <GraphicsDefs.h>
#include <TranslatorFormats.h>
#include <TranslatorRoster.h>
+#include <View.h>
+
extern "C" {
+#include "utils/log.h"
#include "content/content.h"
+#include "content/urldb.h"
+#include "desktop/plotters.h"
+#include "desktop/browser.h"
+#include "desktop/font.h"
#include "image/bitmap.h"
-#include "utils/log.h"
}
+
#include "beos/bitmap.h"
#include "beos/gui.h"
#include "beos/scaffolding.h"
+#include "beos/plotters.h"
+
struct bitmap {
- BBitmap *primary;
- BBitmap *shadow; // in NetSurf's ABGR order
- BBitmap *pretile_x;
- BBitmap *pretile_y;
- BBitmap *pretile_xy;
- bool opaque;
+ BBitmap *primary;
+ BBitmap *shadow; // in NetSurf's ABGR order
+ BBitmap *pretile_x;
+ BBitmap *pretile_y;
+ BBitmap *pretile_xy;
+ bool opaque;
};
#define MIN_PRETILE_WIDTH 256
@@ -64,7 +74,7 @@ struct bitmap {
*
* \param src Source 32-bit pixels arranged in ABGR order.
* \param dst Output data in BGRA order.
- * \param width Width of the bitmap
+ * \param width Width of the bitmap
* \param height Height of the bitmap
* \param rowstride Number of bytes to skip after each row (this implementation
* requires this to be a multiple of 4.)
@@ -75,28 +85,28 @@ static inline void nsbeos_rgba_to_bgra(void *src,
int height,
size_t rowstride)
{
- struct abgr { uint8 a, b, g, r; };
- struct rgba { uint8 r, g, b ,a; };
- struct bgra { uint8 b, g, r, a; };
- struct rgba *from = (struct rgba *)src;
- struct bgra *to = (struct bgra *)dst;
-
- rowstride >>= 2;
-
- for (int y = 0; y < height; y++) {
- for (int x = 0; x < width; x++) {
- to[x].b = from[x].b;
- to[x].g = from[x].g;
- to[x].r = from[x].r;
- to[x].a = from[x].a;
- /*
- if (from[x].a == 0)
- *(rgb_color *)&to[x] = B_TRANSPARENT_32_BIT;
- */
- }
- from += rowstride;
- to += rowstride;
- }
+ struct abgr { uint8 a, b, g, r; };
+ struct rgba { uint8 r, g, b ,a; };
+ struct bgra { uint8 b, g, r, a; };
+ struct rgba *from = (struct rgba *)src;
+ struct bgra *to = (struct bgra *)dst;
+
+ rowstride >>= 2;
+
+ for (int y = 0; y < height; y++) {
+ for (int x = 0; x < width; x++) {
+ to[x].b = from[x].b;
+ to[x].g = from[x].g;
+ to[x].r = from[x].r;
+ to[x].a = from[x].a;
+ /*
+ if (from[x].a == 0)
+ *(rgb_color *)&to[x] = B_TRANSPARENT_32_BIT;
+ */
+ }
+ from += rowstride;
+ to += rowstride;
+ }
}
@@ -108,27 +118,26 @@ static inline void nsbeos_rgba_to_bgra(void *src,
* \param state a flag word indicating the initial state
* \return an opaque struct bitmap, or NULL on memory exhaustion
*/
-
void *bitmap_create(int width, int height, unsigned int state)
{
- struct bitmap *bmp = (struct bitmap *)malloc(sizeof(struct bitmap));
- if (bmp == NULL)
- return NULL;
+ struct bitmap *bmp = (struct bitmap *)malloc(sizeof(struct bitmap));
+ if (bmp == NULL)
+ return NULL;
- int32 flags = 0;
- if (state & BITMAP_CLEAR_MEMORY)
- flags |= B_BITMAP_CLEAR_TO_WHITE;
+ int32 flags = 0;
+ if (state & BITMAP_CLEAR_MEMORY)
+ flags |= B_BITMAP_CLEAR_TO_WHITE;
- BRect frame(0, 0, width - 1, height - 1);
- //XXX: bytes per row ?
- bmp->primary = new BBitmap(frame, flags, B_RGBA32);
- bmp->shadow = new BBitmap(frame, flags, B_RGBA32);
+ BRect frame(0, 0, width - 1, height - 1);
+ //XXX: bytes per row ?
+ bmp->primary = new BBitmap(frame, flags, B_RGBA32);
+ bmp->shadow = new BBitmap(frame, flags, B_RGBA32);
- bmp->pretile_x = bmp->pretile_y = bmp->pretile_xy = NULL;
+ bmp->pretile_x = bmp->pretile_y = bmp->pretile_xy = NULL;
- bmp->opaque = (state & BITMAP_OPAQUE) != 0;
+ bmp->opaque = (state & BITMAP_OPAQUE) != 0;
- return bmp;
+ return bmp;
}
@@ -140,9 +149,9 @@ void *bitmap_create(int width, int height, unsigned int state)
*/
void bitmap_set_opaque(void *vbitmap, bool opaque)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- bitmap->opaque = opaque;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ bitmap->opaque = opaque;
}
@@ -154,10 +163,10 @@ void bitmap_set_opaque(void *vbitmap, bool opaque)
*/
bool bitmap_test_opaque(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
-/* todo: test if bitmap is opaque */
- return false;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ /* todo: test if bitmap is opaque */
+ return false;
}
@@ -168,9 +177,9 @@ bool bitmap_test_opaque(void *vbitmap)
*/
bool bitmap_get_opaque(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return bitmap->opaque;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ return bitmap->opaque;
}
@@ -186,9 +195,9 @@ bool bitmap_get_opaque(void *vbitmap)
unsigned char *bitmap_get_buffer(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return (unsigned char *)(bitmap->shadow->Bits());
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ return (unsigned char *)(bitmap->shadow->Bits());
}
@@ -198,12 +207,11 @@ unsigned char *bitmap_get_buffer(void *vbitmap)
* \param vbitmap a bitmap, as returned by bitmap_create()
* \return width of a pixel row in the bitmap
*/
-
size_t bitmap_get_rowstride(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return (bitmap->primary->BytesPerRow());
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ return (bitmap->primary->BytesPerRow());
}
@@ -213,39 +221,42 @@ size_t bitmap_get_rowstride(void *vbitmap)
* \param vbitmap a bitmap, as returned by bitmap_create()
* \return bytes per pixels of the bitmap
*/
-
size_t bitmap_get_bpp(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- return 4;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ return 4;
}
-static void
-nsbeos_bitmap_free_pretiles(struct bitmap *bitmap)
+/**
+ * Free pretiles of a bitmap.
+ *
+ * \param bitmap The bitmap to free the pretiles of.
+ */
+static void nsbeos_bitmap_free_pretiles(struct bitmap *bitmap)
{
#define FREE_TILE(XY) if (bitmap->pretile_##XY) delete (bitmap->pretile_##XY); bitmap->pretile_##XY = NULL
- FREE_TILE(x);
- FREE_TILE(y);
- FREE_TILE(xy);
+ FREE_TILE(x);
+ FREE_TILE(y);
+ FREE_TILE(xy);
#undef FREE_TILE
}
+
/**
* Free a bitmap.
*
* \param vbitmap a bitmap, as returned by bitmap_create()
*/
-
void bitmap_destroy(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- assert(bitmap);
- nsbeos_bitmap_free_pretiles(bitmap);
- delete bitmap->primary;
- delete bitmap->shadow;
- free(bitmap);
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ assert(bitmap);
+ nsbeos_bitmap_free_pretiles(bitmap);
+ delete bitmap->primary;
+ delete bitmap->shadow;
+ free(bitmap);
}
@@ -257,22 +268,21 @@ void bitmap_destroy(void *vbitmap)
* \param flags modify the behaviour of the save
* \return true on success, false on error and error reported
*/
-
bool bitmap_save(void *vbitmap, const char *path, unsigned flags)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- BTranslatorRoster *roster = BTranslatorRoster::Default();
- BBitmapStream stream(bitmap->primary);
- BFile file(path, B_WRITE_ONLY | B_CREATE_FILE);
- uint32 type = B_PNG_FORMAT;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ BTranslatorRoster *roster = BTranslatorRoster::Default();
+ BBitmapStream stream(bitmap->primary);
+ BFile file(path, B_WRITE_ONLY | B_CREATE_FILE);
+ uint32 type = B_PNG_FORMAT;
- if (file.InitCheck() < B_OK)
- return false;
+ if (file.InitCheck() < B_OK)
+ return false;
- if (roster->Translate(&stream, NULL, NULL, &file, type) < B_OK)
- return false;
+ if (roster->Translate(&stream, NULL, NULL, &file, type) < B_OK)
+ return false;
- return true;
+ return true;
}
@@ -283,63 +293,67 @@ bool bitmap_save(void *vbitmap, const char *path, unsigned flags)
*/
void bitmap_modified(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- // convert the shadow (ABGR) to into the primary bitmap
- nsbeos_rgba_to_bgra(bitmap->shadow->Bits(), bitmap->primary->Bits(),
- bitmap->primary->Bounds().Width() + 1,
- bitmap->primary->Bounds().Height() + 1,
- bitmap->primary->BytesPerRow());
- nsbeos_bitmap_free_pretiles(bitmap);
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ // convert the shadow (ABGR) to into the primary bitmap
+ nsbeos_rgba_to_bgra(bitmap->shadow->Bits(), bitmap->primary->Bits(),
+ bitmap->primary->Bounds().Width() + 1,
+ bitmap->primary->Bounds().Height() + 1,
+ bitmap->primary->BytesPerRow());
+ nsbeos_bitmap_free_pretiles(bitmap);
}
+
int bitmap_get_width(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- return bitmap->primary->Bounds().Width() + 1;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ return bitmap->primary->Bounds().Width() + 1;
}
+
int bitmap_get_height(void *vbitmap)
{
- struct bitmap *bitmap = (struct bitmap *)vbitmap;
- return bitmap->primary->Bounds().Height() + 1;
+ struct bitmap *bitmap = (struct bitmap *)vbitmap;
+ return bitmap->primary->Bounds().Height() + 1;
}
+
static BBitmap *
nsbeos_bitmap_generate_pretile(BBitmap *primary, int repeat_x, int repeat_y)
{
- int width = primary->Bounds().Width() + 1;
- int height = primary->Bounds().Height() + 1;
- size_t primary_stride = primary->BytesPerRow();
- BRect frame(0, 0, width * repeat_x - 1, height * repeat_y - 1);
- BBitmap *result = new BBitmap(frame, 0, B_RGBA32);
-
- char *target_buffer = (char *)result->Bits();
- int x,y,row;
- /* This algorithm won't work if the strides are not multiples */
- assert((size_t)(result->BytesPerRow()) ==
- (primary_stride * repeat_x));
-
- if (repeat_x == 1 && repeat_y == 1) {
- delete result;
- // just return a copy
- return new BBitmap(primary);
- }
-
- for (y = 0; y < repeat_y; ++y) {
- char *primary_buffer = (char *)primary->Bits();
- for (row = 0; row < height; ++row) {
- for (x = 0; x < repeat_x; ++x) {
- memcpy(target_buffer,
- primary_buffer, primary_stride);
- target_buffer += primary_stride;
- }
- primary_buffer += primary_stride;
- }
- }
- return result;
+ int width = primary->Bounds().Width() + 1;
+ int height = primary->Bounds().Height() + 1;
+ size_t primary_stride = primary->BytesPerRow();
+ BRect frame(0, 0, width * repeat_x - 1, height * repeat_y - 1);
+ BBitmap *result = new BBitmap(frame, 0, B_RGBA32);
+
+ char *target_buffer = (char *)result->Bits();
+ int x,y,row;
+ /* This algorithm won't work if the strides are not multiples */
+ assert((size_t)(result->BytesPerRow()) ==
+ (primary_stride * repeat_x));
+
+ if (repeat_x == 1 && repeat_y == 1) {
+ delete result;
+ // just return a copy
+ return new BBitmap(primary);
+ }
+
+ for (y = 0; y < repeat_y; ++y) {
+ char *primary_buffer = (char *)primary->Bits();
+ for (row = 0; row < height; ++row) {
+ for (x = 0; x < repeat_x; ++x) {
+ memcpy(target_buffer,
+ primary_buffer, primary_stride);
+ target_buffer += primary_stride;
+ }
+ primary_buffer += primary_stride;
+ }
+ }
+ return result;
}
+
/**
* The primary image associated with this bitmap object.
*
@@ -348,9 +362,10 @@ nsbeos_bitmap_generate_pretile(BBitmap *primary, int repeat_x, int repeat_y)
BBitmap *
nsbeos_bitmap_get_primary(struct bitmap* bitmap)
{
- return bitmap->primary;
+ return bitmap->primary;
}
+
/**
* The X-pretiled image associated with this bitmap object.
*
@@ -359,16 +374,17 @@ nsbeos_bitmap_get_primary(struct bitmap* bitmap)
BBitmap *
nsbeos_bitmap_get_pretile_x(struct bitmap* bitmap)
{
- if (!bitmap->pretile_x) {
- int width = bitmap->primary->Bounds().Width() + 1;
- int xmult = (MIN_PRETILE_WIDTH + width - 1)/width;
- LOG(("Pretiling %p for X*%d", bitmap, xmult));
- bitmap->pretile_x = nsbeos_bitmap_generate_pretile(bitmap->primary, xmult, 1);
- }
- return bitmap->pretile_x;
+ if (!bitmap->pretile_x) {
+ int width = bitmap->primary->Bounds().Width() + 1;
+ int xmult = (MIN_PRETILE_WIDTH + width - 1)/width;
+ LOG(("Pretiling %p for X*%d", bitmap, xmult));
+ bitmap->pretile_x = nsbeos_bitmap_generate_pretile(bitmap->primary, xmult, 1);
+ }
+ return bitmap->pretile_x;
}
+
/**
* The Y-pretiled image associated with this bitmap object.
*
@@ -377,15 +393,16 @@ nsbeos_bitmap_get_pretile_x(struct bitmap* bitmap)
BBitmap *
nsbeos_bitmap_get_pretile_y(struct bitmap* bitmap)
{
- if (!bitmap->pretile_y) {
- int height = bitmap->primary->Bounds().Height() + 1;
- int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height;
- LOG(("Pretiling %p for Y*%d", bitmap, ymult));
- bitmap->pretile_y = nsbeos_bitmap_generate_pretile(bitmap->primary, 1, ymult);
- }
- return bitmap->pretile_y;
+ if (!bitmap->pretile_y) {
+ int height = bitmap->primary->Bounds().Height() + 1;
+ int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height;
+ LOG(("Pretiling %p for Y*%d", bitmap, ymult));
+ bitmap->pretile_y = nsbeos_bitmap_generate_pretile(bitmap->primary, 1, ymult);
+ }
+ return bitmap->pretile_y;
}
+
/**
* The XY-pretiled image associated with this bitmap object.
*
@@ -394,30 +411,146 @@ nsbeos_bitmap_get_pretile_y(struct bitmap* bitmap)
BBitmap *
nsbeos_bitmap_get_pretile_xy(struct bitmap* bitmap)
{
- if (!bitmap->pretile_xy) {
- int width = bitmap->primary->Bounds().Width() + 1;
- int height = bitmap->primary->Bounds().Height() + 1;
- int xmult = (MIN_PRETILE_WIDTH + width - 1)/width;
- int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height;
- LOG(("Pretiling %p for X*%d Y*%d", bitmap, xmult, ymult));
- bitmap->pretile_xy = nsbeos_bitmap_generate_pretile(bitmap->primary, xmult, ymult);
- }
- return bitmap->pretile_xy;
+ if (!bitmap->pretile_xy) {
+ int width = bitmap->primary->Bounds().Width() + 1;
+ int height = bitmap->primary->Bounds().Height() + 1;
+ int xmult = (MIN_PRETILE_WIDTH + width - 1)/width;
+ int ymult = (MIN_PRETILE_HEIGHT + height - 1)/height;
+ LOG(("Pretiling %p for X*%d Y*%d", bitmap, xmult, ymult));
+ bitmap->pretile_xy = nsbeos_bitmap_generate_pretile(bitmap->primary, xmult, ymult);
+ }
+ return bitmap->pretile_xy;
}
+
+/**
+ * Create a thumbnail of a page.
+ *
+ * \param bitmap the bitmap to draw to
+ * \param content content structure to thumbnail
+ * \return true on success and bitmap updated else false
+ */
+static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content)
+{
+ BBitmap *thumbnail;
+ BBitmap *small;
+ BBitmap *big;
+ BView *oldView;
+ BView *view;
+ BView *thumbView;
+ float width;
+ float height;
+ int big_width;
+ int big_height;
+ int depth;
+
+ struct redraw_context ctx;
+ ctx.interactive = false;
+ ctx.background_images = true;
+ ctx.plot = &nsbeos_plotters;
+
+ assert(content);
+ assert(bitmap);
+
+ thumbnail = nsbeos_bitmap_get_primary(bitmap);
+ width = thumbnail->Bounds().Width();
+ height = thumbnail->Bounds().Height();
+ depth = 32;
+
+ big_width = MIN(content_get_width(content), 1024);
+ big_height = (int)(((big_width * height) + (width / 2)) / width);
+
+ BRect contentRect(0, 0, big_width - 1, big_height - 1);
+ big = new BBitmap(contentRect, B_BITMAP_ACCEPTS_VIEWS, B_RGB32);
+
+ if (big->InitCheck() < B_OK) {
+ delete big;
+ return NSERROR_NOMEM;
+ }
+
+ small = new BBitmap(thumbnail->Bounds(),
+ B_BITMAP_ACCEPTS_VIEWS, B_RGB32);
+
+ if (small->InitCheck() < B_OK) {
+ delete small;
+ delete big;
+ return NSERROR_NOMEM;
+ }
+
+ //XXX: _lock ?
+ // backup the current gc
+ oldView = nsbeos_current_gc();
+
+ view = new BView(contentRect, "thumbnailer",
+ B_FOLLOW_NONE, B_WILL_DRAW);
+ big->AddChild(view);
+
+ thumbView = new BView(small->Bounds(), "thumbnail",
+ B_FOLLOW_NONE, B_WILL_DRAW);
+ small->AddChild(thumbView);
+
+ view->LockLooper();
+
+ /* impose our view on the content... */
+ nsbeos_current_gc_set(view);
+
+ /* render the content */
+ content_scaled_redraw(content, big_width, big_height, &ctx);
+
+ view->Sync();
+ view->UnlockLooper();
+
+ // restore the current gc
+ nsbeos_current_gc_set(oldView);
+
+
+ // now scale it down
+ //XXX: use Zeta's bilinear scaler ?
+ //#ifdef B_ZETA_VERSION
+ // err = ScaleBitmap(*shot, *scaledBmp);
+ //#else
+ thumbView->LockLooper();
+ thumbView->DrawBitmap(big, big->Bounds(), small->Bounds());
+ thumbView->Sync();
+ thumbView->UnlockLooper();
+
+ small->LockBits();
+ thumbnail->LockBits();
+
+ // copy it to the bitmap
+ memcpy(thumbnail->Bits(), small->Bits(), thumbnail->BitsLength());
+
+ thumbnail->UnlockBits();
+ small->UnlockBits();
+
+ bitmap_modified(bitmap);
+
+ // cleanup
+ small->RemoveChild(thumbView);
+ delete thumbView;
+ delete small;
+ big->RemoveChild(view);
+ delete view;
+ delete big;
+
+ return NSERROR_OK;
+}
+
+
static struct gui_bitmap_table bitmap_table = {
- .create = bitmap_create,
- .destroy = bitmap_destroy,
- .set_opaque = bitmap_set_opaque,
- .get_opaque = bitmap_get_opaque,
- .test_opaque = bitmap_test_opaque,
- .get_buffer = bitmap_get_buffer,
- .get_rowstride = bitmap_get_rowstride,
- .get_width = bitmap_get_width,
- .get_height = bitmap_get_height,
- .get_bpp = bitmap_get_bpp,
- .save = bitmap_save,
- .modified = bitmap_modified,
+ .create = bitmap_create,
+ .destroy = bitmap_destroy,
+ .set_opaque = bitmap_set_opaque,
+ .get_opaque = bitmap_get_opaque,
+ .test_opaque = bitmap_test_opaque,
+ .get_buffer = bitmap_get_buffer,
+ .get_rowstride = bitmap_get_rowstride,
+ .get_width = bitmap_get_width,
+ .get_height = bitmap_get_height,
+ .get_bpp = bitmap_get_bpp,
+ .save = bitmap_save,
+ .modified = bitmap_modified,
+ .render = bitmap_render,
};
struct gui_bitmap_table *beos_bitmap_table = &bitmap_table;
diff --git a/beos/thumbnail.cpp b/beos/thumbnail.cpp
deleted file mode 100644
index 80944a52b..000000000
--- a/beos/thumbnail.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2008 Fran├žois Revol <mmu_man@users.sourceforge.net>
- *
- * 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
- * Page thumbnail creation (implementation).
- *
- * Thumbnails are created by setting the current drawing contexts to a BView
- * attached to the BBitmap we are passed, and plotting the page at a small
- * scale.
- */
-
-#define __STDBOOL_H__ 1
-#include <assert.h>
-#include <sys/param.h>
-#include <Bitmap.h>
-#include <View.h>
-extern "C" {
-#include "content/content.h"
-#include "content/urldb.h"
-#include "desktop/plotters.h"
-#include "desktop/browser.h"
-#include "desktop/thumbnail.h"
-#include "image/bitmap.h"
-#include "desktop/font.h"
-#include "utils/log.h"
-}
-#include "beos/scaffolding.h"
-#include "beos/plotters.h"
-#include "beos/bitmap.h"
-
-// Zeta PRIVATE: in libzeta for now.
-extern status_t ScaleBitmap(const BBitmap& inBitmap, BBitmap& outBitmap);
-
-#warning XXX do we need to set bitmap:shadow ?
-
-
-/**
- * Create a thumbnail of a page.
- *
- * \param content content structure to thumbnail
- * \param bitmap the bitmap to draw to
- * \return true on success and bitmap updated else false
- */
-bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap)
-{
- BBitmap *thumbnail;
- BBitmap *small;
- BBitmap *big;
- BView *oldView;
- BView *view;
- BView *thumbView;
- float width;
- float height;
- int big_width;
- int big_height;
- int depth;
-
- struct redraw_context ctx;
- ctx.interactive = false;
- ctx.background_images = true;
- ctx.plot = &nsbeos_plotters;
-
- assert(content);
- assert(bitmap);
-
- thumbnail = nsbeos_bitmap_get_primary(bitmap);
- width = thumbnail->Bounds().Width();
- height = thumbnail->Bounds().Height();
- depth = 32;
-
- big_width = MIN(content_get_width(content), 1024);
- big_height = (int)(((big_width * height) + (width / 2)) / width);
-
- BRect contentRect(0, 0, big_width - 1, big_height - 1);
- big = new BBitmap(contentRect, B_BITMAP_ACCEPTS_VIEWS, B_RGB32);
-
- if (big->InitCheck() < B_OK) {
- delete big;
- return false;
- }
-
- small = new BBitmap(thumbnail->Bounds(),
- B_BITMAP_ACCEPTS_VIEWS, B_RGB32);
-
- if (small->InitCheck() < B_OK) {
- delete small;
- delete big;
- return false;
- }
-
- //XXX: _lock ?
- // backup the current gc
- oldView = nsbeos_current_gc();
-
- view = new BView(contentRect, "thumbnailer",
- B_FOLLOW_NONE, B_WILL_DRAW);
- big->AddChild(view);
-
- thumbView = new BView(small->Bounds(), "thumbnail",
- B_FOLLOW_NONE, B_WILL_DRAW);
- small->AddChild(thumbView);
-
- view->LockLooper();
-
- /* impose our view on the content... */
- nsbeos_current_gc_set(view);
-
- /* render the content */
- thumbnail_redraw(content, big_width, big_height, &ctx);
-
- view->Sync();
- view->UnlockLooper();
-
- // restore the current gc
- nsbeos_current_gc_set(oldView);
-
-
- // now scale it down
-//XXX: use Zeta's bilinear scaler ?
-//#ifdef B_ZETA_VERSION
-// err = ScaleBitmap(*shot, *scaledBmp);
-//#else
- thumbView->LockLooper();
- thumbView->DrawBitmap(big, big->Bounds(), small->Bounds());
- thumbView->Sync();
- thumbView->UnlockLooper();
-
- small->LockBits();
- thumbnail->LockBits();
-
- // copy it to the bitmap
- memcpy(thumbnail->Bits(), small->Bits(), thumbnail->BitsLength());
-
- thumbnail->UnlockBits();
- small->UnlockBits();
-
- bitmap_modified(bitmap);
-
- // cleanup
- small->RemoveChild(thumbView);
- delete thumbView;
- delete small;
- big->RemoveChild(view);
- delete view;
- delete big;
-
- return true;
-}