No OneTemporary
Actions

Authored By

Unknown

Size

93 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/util/allegro5/bitmap.cpp b/util/allegro5/bitmap.cpp
	index ecbfc635..d5743d96 100644
	--- a/util/allegro5/bitmap.cpp
	+++ b/util/allegro5/bitmap.cpp
	@@ -1,1141 +1,1174 @@
	#include <sstream>
	#include <allegro5/allegro5.h>
	#include <allegro5/allegro_memfile.h>
	#include <allegro5/allegro_primitives.h>
	#include "util/debug.h"
	#include "util/thread.h"

	namespace Graphics{

	/* it doesnt look like we need to pack colors into 16-bit values */
	#if 0
	static const int rgb_r_shift_16 = 0;
	static const int rgb_g_shift_16 = 5;
	static const int rgb_b_shift_16 = 11;

	static inline int pack565(unsigned char red, unsigned char green, unsigned char blue){
	return (((red >> 3) << rgb_r_shift_16) \|
	((green >> 2) << rgb_g_shift_16) \|
	((blue >> 3) << rgb_b_shift_16));
	}

	/* from allegro4 */
	static inline void unpack565(int color, unsigned char * red, unsigned char * green, unsigned char * blue){
	static int _rgb_scale_5[32] = {
	0, 8, 16, 24, 33, 41, 49, 57,
	66, 74, 82, 90, 99, 107, 115, 123,
	132, 140, 148, 156, 165, 173, 181, 189,
	198, 206, 214, 222, 231, 239, 247, 255
	};

	static int _rgb_scale_6[64] = {
	0, 4, 8, 12, 16, 20, 24, 28,
	32, 36, 40, 44, 48, 52, 56, 60,
	65, 69, 73, 77, 81, 85, 89, 93,
	97, 101, 105, 109, 113, 117, 121, 125,
	130, 134, 138, 142, 146, 150, 154, 158,
	162, 166, 170, 174, 178, 182, 186, 190,
	195, 199, 203, 207, 211, 215, 219, 223,
	227, 231, 235, 239, 243, 247, 251, 255
	};

	*red = _rgb_scale_5[(color >> rgb_r_shift_16) & 0x1F];
	*green = _rgb_scale_6[(color >> rgb_g_shift_16) & 0x3F];
	*blue = _rgb_scale_5[(color >> rgb_b_shift_16) & 0x1F];
	}
	#endif

	ALLEGRO_DISPLAY * the_display = NULL;

	enum BlendingType{
	Translucent,
	Add,
	Difference,
	Multiply
	};

	struct BlendingData{
	BlendingData():
	red(0), green(0), blue(0), alpha(0), type(Translucent){
	}

	int red, green, blue, alpha;
	BlendingType type;
	};

	static BlendingData globalBlend;

	/* must be a pointer so it can be created dynamically after allegro init */
	// Util::Thread::LockObject * allegroLock;

	Color makeColorAlpha(unsigned char red, unsigned char green, unsigned char blue, unsigned char alpha){
	return al_map_rgba(red, green, blue, alpha);
	}

	Color MaskColor(){
	static Color mask = makeColorAlpha(0, 0, 0, 0);
	return mask;
	}

	Color getBlendColor(){
	/* sort of a hack */
	if (globalBlend.type == Multiply){
	return makeColorAlpha(255, 255, 255, 255);
	}
	return makeColorAlpha(255, 255, 255, globalBlend.alpha);
	}

	Color doTransBlend(const Color & color, int alpha){
	unsigned char red, green, blue;
	al_unmap_rgb(color, &red, &green, &blue);
	return makeColorAlpha(red, green, blue, alpha);
	/*
	red *= alpha_f;
	green *= alpha_f;
	blue *= alpha_f;
	return al_map_rgb_f(red, green, blue);
	*/
	}

	Color transBlendColor(const Color & color){
	return doTransBlend(color, globalBlend.alpha);
	}

	+int getRealWidth(const Bitmap & what){
	+ return al_get_bitmap_width(what.getData()->getBitmap());
	+}
	+
	+int getRealHeight(const Bitmap & what){
	+ return al_get_bitmap_height(what.getData()->getBitmap());
	+}
	+
	class Blender{
	public:
	Blender(){
	}

	virtual ~Blender(){
	/* default is to draw the source and ignore the destination */
	al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE, ALLEGRO_ZERO);
	}
	};

	class MaskedBlender: public Blender {
	public:
	MaskedBlender(){
	al_set_blender(ALLEGRO_ADD, ALLEGRO_ALPHA, ALLEGRO_INVERSE_ALPHA);
	}
	};

	class LitBlender: public Blender {
	public:
	LitBlender(ALLEGRO_COLOR lit){
	// al_set_blend_color(lit);
	// al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE_MINUS_DST_COLOR, ALLEGRO_ZERO);
	}
	};

	class TransBlender: public Blender {
	public:
	TransBlender(){
	switch (globalBlend.type){
	case Translucent: al_set_blender(ALLEGRO_ADD, ALLEGRO_ALPHA, ALLEGRO_INVERSE_ALPHA); break;
	case Add: al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE, ALLEGRO_ONE); break;
	case Multiply: al_set_blender(ALLEGRO_ADD, ALLEGRO_DST_COLOR, ALLEGRO_INVERSE_ALPHA); break;
	case Difference: al_set_blender(ALLEGRO_DEST_MINUS_SRC, ALLEGRO_ONE, ALLEGRO_ONE); break;
	}
	}
	};

	static const int WINDOWED = 0;
	static const int FULLSCREEN = 1;

	// static Bitmap * Scaler = NULL;

	Bitmap::Bitmap():
	mustResize(false),
	-bit8MaskColor(makeColor(0, 0, 0)){
	+bit8MaskColor(makeColor(0, 0, 0)),
	+width(0),
	+height(0){
	/* TODO */
	}

	Bitmap::Bitmap( const char * load_file ):
	mustResize(false),
	bit8MaskColor(makeColor(0, 0, 0)){
	internalLoadFile(load_file);
	+ width = al_get_bitmap_width(getData()->getBitmap());
	+ height = al_get_bitmap_height(getData()->getBitmap());
	}

	Bitmap::Bitmap( const std::string & load_file ):
	mustResize(false),
	bit8MaskColor(makeColor(0, 0, 0)){
	internalLoadFile(load_file.c_str());
	+ width = al_get_bitmap_width(getData()->getBitmap());
	+ height = al_get_bitmap_height(getData()->getBitmap());
	}

	Bitmap::Bitmap(ALLEGRO_BITMAP * who, bool deep_copy):
	mustResize(false),
	bit8MaskColor(makeColor(0, 0, 0)){
	if (deep_copy){
	ALLEGRO_BITMAP * clone = al_clone_bitmap(who);
	setData(new BitmapData(clone));
	} else {
	setData(new BitmapData(who));
	}
	+ this->width = al_get_bitmap_width(getData()->getBitmap());
	+ this->height = al_get_bitmap_height(getData()->getBitmap());
	}

	Bitmap::Bitmap(int width, int height):
	mustResize(false),
	bit8MaskColor(makeColor(0, 0, 0)){
	ALLEGRO_BITMAP * bitmap = al_create_bitmap(width, height);
	if (bitmap == NULL){
	std::ostringstream out;
	out << "Could not create bitmap with dimensions " << width << ", " << height;
	throw BitmapException(__FILE__, __LINE__, out.str());
	}
	setData(new BitmapData(bitmap));
	+ this->width = al_get_bitmap_width(getData()->getBitmap());
	+ this->height = al_get_bitmap_height(getData()->getBitmap());
	}

	Bitmap::Bitmap( const Bitmap & copy, bool deep_copy):
	mustResize(false),
	-bit8MaskColor(copy.bit8MaskColor){
	+bit8MaskColor(copy.bit8MaskColor),
	+width(copy.width),
	+height(copy.height){
	if (deep_copy){
	ALLEGRO_BITMAP * clone = al_clone_bitmap(copy.getData()->getBitmap());
	setData(new BitmapData(clone));
	} else {
	setData(copy.getData());
	}
	}

	void Bitmap::convertToVideo(){
	ALLEGRO_BITMAP * original = getData()->getBitmap();
	ALLEGRO_BITMAP * copy = al_clone_bitmap(original);
	if (copy == NULL){
	throw BitmapException(__FILE__, __LINE__, "Could not create video bitmap");
	}
	al_destroy_bitmap(getData()->getBitmap());
	getData()->setBitmap(copy);
	}

	void changeTarget(const Bitmap & from, const Bitmap & who){
	al_set_target_bitmap(who.getData()->getBitmap());
	if ((al_get_bitmap_flags(who.getData()->getBitmap()) & ALLEGRO_VIDEO_BITMAP) &&
	(al_get_bitmap_flags(from.getData()->getBitmap()) & ALLEGRO_MEMORY_BITMAP)){
	((Bitmap&) from).convertToVideo();
	if (&from == &who){
	al_set_target_bitmap(who.getData()->getBitmap());
	}
	}
	}

	void changeTarget(const Bitmap * from, const Bitmap & who){
	changeTarget(*from, who);
	}

	void changeTarget(const Bitmap & from, const Bitmap * who){
	changeTarget(from, *who);
	}

	void changeTarget(const Bitmap * from, const Bitmap * who){
	changeTarget(from, who);
	}

	enum Format{
	PNG,
	GIF,
	};

	void dumpColor(const Color & color){
	unsigned char red, green, blue, alpha;
	al_unmap_rgba(color, &red, &green, &blue, &alpha);
	Global::debug(0) << "red " << (int) red << " green " << (int) green << " blue " << (int) blue << " alpha " << (int) alpha << std::endl;
	}

	Color pcxMaskColor(unsigned char * data, const int length){
	if (length >= 769){
	if (data[length - 768 - 1] == 12){
	unsigned char * palette = &data[length - 768];
	unsigned char red = palette[0];
	unsigned char green = palette[1];
	unsigned char blue = palette[2];
	return makeColorAlpha(red, green, blue, 255);
	}
	}
	return makeColorAlpha(255, 255, 255, 255);
	}

	Bitmap Bitmap::memoryPCX(unsigned char * const data, const int length, const bool mask){
	ALLEGRO_FILE * memory = al_open_memfile((void *) data, length, "r");
	ALLEGRO_BITMAP * pcx = al_load_bitmap_f(memory, ".pcx");
	al_fclose(memory);
	if (pcx == NULL){
	throw BitmapException(__FILE__, __LINE__, "Could not load pcx");
	}
	// dumpColor(al_get_pixel(pcx, 0, 0));
	Bitmap out(pcx);
	out.set8BitMaskColor(pcxMaskColor(data, length));
	return out;
	}

	static bool isVideoBitmap(ALLEGRO_BITMAP * bitmap){
	return (al_get_bitmap_flags(bitmap) & ALLEGRO_VIDEO_BITMAP) &&
	!(al_get_bitmap_flags(bitmap) & ALLEGRO_MEMORY_BITMAP);
	}

	void Bitmap::replaceColor(const Color & original, const Color & replaced){
	changeTarget(this, this);

	if (isVideoBitmap(getData()->getBitmap())){
	al_lock_bitmap(getData()->getBitmap(), ALLEGRO_PIXEL_FORMAT_ANY, ALLEGRO_LOCK_READWRITE);
	}

	- for (int x = 0; x < getWidth(); x++){
	- for (int y = 0; y < getHeight(); y++){
	+ int width = getRealWidth(*this);
	+ int height = getRealHeight(*this);
	+ for (int x = 0; x < width; x++){
	+ for (int y = 0; y < height; y++){
	Color pixel = getPixel(x, y);
	if (pixel == original){
	al_put_pixel(x, y, replaced);
	}
	}
	}

	if (isVideoBitmap(getData()->getBitmap())){
	al_unlock_bitmap(getData()->getBitmap());
	}
	}

	static ALLEGRO_BITMAP * memoryGIF(const char * data, int length){
	ALLEGRO_FILE * memory = al_open_memfile((void *) data, length, "r");
	al_fclose(memory);

	/* FIXME: get gif addon for a5 */

	#if 0
	RGB * palette = NULL;
	/* algif will close the packfile for us in both error and success cases */
	BITMAP * gif = load_gif_packfile(pack, palette);
	if (!gif){
	al_fclose(memory);
	// pack_fclose(pack);
	ostringstream out;
	out <<"Could not load gif from memory: " << (void*) data << " length " << length;
	throw LoadException(__FILE__, __LINE__, out.str());
	}

	BITMAP * out = create_bitmap(gif->w, gif->h);
	blit(gif, out, 0, 0, 0, 0, gif->w, gif->h);
	destroy_bitmap(gif);
	// pack_fclose(pack);
	#endif

	ALLEGRO_BITMAP * out = NULL;

	return out;
	}

	void Bitmap::internalLoadFile(const char * path){
	this->path = path;
	ALLEGRO_BITMAP * loaded = al_load_bitmap(path);
	if (loaded == NULL){
	std::ostringstream out;
	out << "Could not load file '" << path << "'";
	throw BitmapException(__FILE__, __LINE__, out.str());
	}
	al_convert_mask_to_alpha(loaded, al_map_rgb(255, 0, 255));
	setData(new BitmapData(loaded));
	}

	static ALLEGRO_BITMAP * load_bitmap_from_memory(const char * data, int length, Format type){
	switch (type){
	case PNG : {
	break;
	}
	case GIF : {
	return memoryGIF(data, length);
	break;
	}
	}
	throw Exception::Base(__FILE__, __LINE__);
	}

	Bitmap::Bitmap(const char * data, int length):
	mustResize(false),
	bit8MaskColor(makeColor(0, 0, 0)){
	Format type = GIF;
	setData(new BitmapData(load_bitmap_from_memory(data, length, type)));
	if (getData()->getBitmap() == NULL){
	std::ostringstream out;
	out << "Could not create bitmap from memory";
	throw BitmapException(__FILE__, __LINE__, out.str());
	}
	+ width = al_get_bitmap_width(getData()->getBitmap());
	+ height = al_get_bitmap_height(getData()->getBitmap());
	}

	Bitmap::Bitmap( const Bitmap & copy, int x, int y, int width, int height ):
	mustResize(false),
	-bit8MaskColor(copy.bit8MaskColor){
	+bit8MaskColor(copy.bit8MaskColor),
	+width(width),
	+height(height){
	path = copy.getPath();
	ALLEGRO_BITMAP * his = copy.getData()->getBitmap();
	if (x < 0)
	x = 0;
	if (y < 0)
	y = 0;
	if (width + x > al_get_bitmap_width(his)){
	width = al_get_bitmap_width(his) - x;
	}
	if (height + y > al_get_bitmap_height(his)){
	height = al_get_bitmap_height(his) - y;
	}

	ALLEGRO_BITMAP * old_target = al_get_target_bitmap();
	ALLEGRO_TRANSFORM transform;
	al_identity_transform(&transform);
	+ al_set_target_bitmap(copy.getData()->getBitmap());
	if (al_get_current_transform() != NULL){
	al_set_target_bitmap(copy.getData()->getBitmap());
	al_copy_transform(&transform, al_get_current_transform());
	}

	float x_scaled = x;
	float y_scaled = y;
	float width_scaled = width;
	float height_scaled = height;

	al_transform_coordinates(&transform, &x_scaled, &y_scaled);
	al_transform_coordinates(&transform, &width_scaled, &height_scaled);

	// ALLEGRO_BITMAP * sub = al_create_sub_bitmap(his, x, y, width, height);
	ALLEGRO_BITMAP * sub = al_create_sub_bitmap(his, (int) x_scaled, (int) y_scaled, (int) width_scaled, (int) height_scaled);
	setData(new BitmapData(sub));

	al_set_target_bitmap(sub);
	al_use_transform(&transform);
	al_set_target_bitmap(old_target);
	}

	int Bitmap::getWidth() const {
	+ return width;
	+ /*
	if (getData()->getBitmap() != NULL){
	return al_get_bitmap_width(getData()->getBitmap());
	}

	return 0;
	+ */
	}

	int getRed(Color color){
	unsigned char red, green, blue;
	al_unmap_rgb(color, &red, &green, &blue);
	return red;
	}

	int getGreen(Color color){
	unsigned char red, green, blue;
	al_unmap_rgb(color, &red, &green, &blue);
	return green;
	}

	int getBlue(Color color){
	unsigned char red, green, blue;
	al_unmap_rgb(color, &red, &green, &blue);
	return blue;
	}

	Color makeColor(int red, int blue, int green){
	return al_map_rgb(red, blue, green);
	}

	int Bitmap::getHeight() const {
	+ return height;
	+ /*
	if (getData()->getBitmap() != NULL){
	return al_get_bitmap_height(getData()->getBitmap());
	}

	return 0;
	+ */
	}

	void initializeExtraStuff(){
	// al_set_new_bitmap_format(ALLEGRO_PIXEL_FORMAT_RGB_565);
	// allegroLock = new Util::Thread::LockObject();
	}

	int setGraphicsMode(int mode, int width, int height){
	initializeExtraStuff();
	switch (mode){
	case FULLSCREEN: {
	al_set_new_display_flags(ALLEGRO_FULLSCREEN);
	break;
	}
	case WINDOWED: {
	al_set_new_display_flags(ALLEGRO_WINDOWED \| ALLEGRO_RESIZABLE);
	break;
	}
	default: break;
	}
	the_display = al_create_display(width, height);
	if (the_display == NULL){
	std::ostringstream out;
	out << "Could not create display with dimensions " << width << ", " << height;
	throw BitmapException(__FILE__, __LINE__, out.str());
	}
	Screen = new Bitmap(al_get_backbuffer(the_display));
	/* dont destroy the backbuffer */
	Screen->getData()->setDestroy(false);
	// Scaler = new Bitmap(width, height);
	/* default drawing mode */
	al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE, ALLEGRO_ZERO);
	return 0;
	}

	void Bitmap::lock() const {
	al_lock_bitmap(getData()->getBitmap(), ALLEGRO_PIXEL_FORMAT_ANY, ALLEGRO_LOCK_READWRITE);
	}

	void Bitmap::lock(int x, int y, int width, int height) const {
	al_lock_bitmap_region(getData()->getBitmap(), x, y, width, height, ALLEGRO_PIXEL_FORMAT_ANY, ALLEGRO_LOCK_READWRITE);
	}

	void Bitmap::unlock() const {
	al_unlock_bitmap(getData()->getBitmap());
	}

	Color Bitmap::getPixel(const int x, const int y) const {
	// changeTarget(this, this);
	return al_get_pixel(getData()->getBitmap(), x, y);
	}

	void Bitmap::putPixel(int x, int y, Color pixel) const {
	changeTarget(this, this);
	al_put_pixel(x, y, pixel);
	}

	void Bitmap::putPixelNormal(int x, int y, Color col) const {
	putPixel(x, y, col);
	}

	void Bitmap::fill(Color color) const {
	changeTarget(this, this);
	al_clear_to_color(color);
	}

	void Bitmap::startDrawing() const {
	}

	void Bitmap::endDrawing() const {
	}

	void TranslucentBitmap::startDrawing() const {
	al_set_blender(ALLEGRO_ADD, ALLEGRO_ALPHA, ALLEGRO_INVERSE_ALPHA);
	}

	void TranslucentBitmap::endDrawing() const {
	al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE, ALLEGRO_ZERO);
	}

	Color Bitmap::blendColor(const Color & input) const {
	return input;
	}

	Color TranslucentBitmap::blendColor(const Color & color) const {
	unsigned char red, green, blue;
	unsigned char alpha = globalBlend.alpha;
	al_unmap_rgb(color, &red, &green, &blue);
	return makeColorAlpha(red, green, blue, alpha);
	}

	void Bitmap::Stretch( const Bitmap & where, const int sourceX, const int sourceY, const int sourceWidth, const int sourceHeight, const int destX, const int destY, const int destWidth, const int destHeight ) const {
	/* TODO */
	}

	void Bitmap::StretchBy2( const Bitmap & where ){
	/* TODO */
	}

	void Bitmap::StretchBy4( const Bitmap & where ){
	/* TODO */
	}

	void Bitmap::drawRotate(const int x, const int y, const int angle, const Bitmap & where ){
	changeTarget(this, where);
	MaskedBlender blender;
	al_draw_rotated_bitmap(getData()->getBitmap(), getWidth() / 2, getHeight() / 2, x, y, Util::radians(angle), ALLEGRO_FLIP_HORIZONTAL);
	}

	void Bitmap::drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const Bitmap & where ){
	/* TODO */
	}

	void Bitmap::drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const double scale, const Bitmap & where ){
	/* TODO */
	}

	void Bitmap::drawStretched( const int x, const int y, const int new_width, const int new_height, const Bitmap & who ) const {
	/* FIXME */
	changeTarget(this, who);
	MaskedBlender blender;
	- al_draw_scaled_bitmap(getData()->getBitmap(), 0, 0, getWidth(), getHeight(), x, y, new_width, new_height, 0);
	+ al_draw_scaled_bitmap(getData()->getBitmap(), 0, 0, al_get_bitmap_width(getData()->getBitmap()), al_get_bitmap_height(getData()->getBitmap()), x, y, new_width, new_height, 0);
	#if 0
	ALLEGRO_TRANSFORM save;
	al_copy_transform(&save, al_get_current_transform());
	ALLEGRO_TRANSFORM stretch;
	al_identity_transform(&stretch);
	// al_translate_transform(&stretch, x / ((double) new_width / getWidth()), y / ((double) new_height / getHeight()));
	al_scale_transform(&stretch, (double) new_width / getWidth(), (double) new_height / getHeight());
	al_translate_transform(&stretch, x, y);
	// al_translate_transform(&stretch, -x / ((double) new_width / getWidth()), -y / ((double) (new_height / getHeight())));
	al_use_transform(&stretch);
	/* any source pixels with an alpha value of 0 will be masked */
	// al_draw_bitmap(getData().getBitmap(), x, y, 0);
	al_draw_bitmap(getData().getBitmap(), 0, 0, 0);
	al_use_transform(&save);
	#endif
	}

	void Bitmap::Blit(const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where) const {
	// double start = al_get_time();
	// changeTarget(this, where);
	// al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE, ALLEGRO_ZERO);
	/*
	if (&where != Screen){
	al_draw_bitmap(getData().getBitmap(), wx, wy, 0);
	}
	*/

	/* FIXME: deal with mx, my, width, height */

	changeTarget(this, where);
	Bitmap part(*this, mx, my, width, height);
	// al_set_blender(ALLEGRO_ADD, ALLEGRO_ONE, ALLEGRO_ZERO);
	al_draw_bitmap(part.getData()->getBitmap(), wx, wy, 0);
	/*
	double end = al_get_time();
	Global::debug(0) << "Draw in " << (end - start) << " seconds" << std::endl;
	*/
	}

	void Bitmap::drawHFlip(const int x, const int y, const Bitmap & where) const {
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, ALLEGRO_FLIP_HORIZONTAL);
	}

	void Bitmap::drawHFlip(const int x, const int y, Filter * filter, const Bitmap & where) const {
	/* FIXME: deal with filter */
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, ALLEGRO_FLIP_HORIZONTAL);
	}

	void Bitmap::drawVFlip( const int x, const int y, const Bitmap & where ) const {
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, ALLEGRO_FLIP_VERTICAL);
	}

	void Bitmap::drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* FIXME: deal with filter */
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, ALLEGRO_FLIP_VERTICAL);
	}

	void Bitmap::drawHVFlip( const int x, const int y, const Bitmap & where ) const {
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, ALLEGRO_FLIP_VERTICAL \| ALLEGRO_FLIP_HORIZONTAL);
	}

	void Bitmap::drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* FIXME: deal with filter */
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, ALLEGRO_FLIP_VERTICAL \| ALLEGRO_FLIP_HORIZONTAL);
	}

	void Bitmap::BlitMasked(const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where) const {
	/* TODO */
	}

	void Bitmap::BlitToScreen(const int upper_left_x, const int upper_left_y) const {
	#if 0
	if (getWidth() != Screen->getWidth() \|\| getHeight() != Screen->getHeight()){
	/*
	this->Blit( upper_left_x, upper_left_y, *Buffer );
	Buffer->Stretch(*Scaler);
	Scaler->Blit(0, 0, 0, 0, *Screen);
	*/

	this->Stretch(*Scaler, 0, 0, getWidth(), getHeight(), upper_left_x, upper_left_y, Scaler->getWidth(), Scaler->getHeight());
	Scaler->Blit(0, 0, 0, 0, *Screen);
	} else {
	this->Blit(upper_left_x, upper_left_y, *Screen);
	}
	#endif
	/*
	if (&where == Screen){
	al_flip_display();
	}
	*/
	changeTarget(this, Screen);
	if (getData()->getBitmap() != Screen->getData()->getBitmap()){
	Blit(*Screen);
	}
	al_flip_display();
	}

	void Bitmap::BlitAreaToScreen(const int upper_left_x, const int upper_left_y) const {
	changeTarget(this, Screen);
	/*
	if (getData()->getBitmap() != Screen->getData()->getBitmap()){
	Blit(upper_left_y, upper_left_y, *Screen);
	}
	*/
	al_flip_display();
	}

	void Bitmap::draw(const int x, const int y, const Bitmap & where) const {
	// TransBlender blender;
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, 0);
	}

	void Bitmap::draw(const int x, const int y, Filter * filter, const Bitmap & where) const {
	/* FIXME */
	changeTarget(this, where);
	MaskedBlender blender;
	/* any source pixels with an alpha value of 0 will be masked */
	al_draw_bitmap(getData()->getBitmap(), x, y, 0);

	}

	void Bitmap::hLine(const int x1, const int y, const int x2, const Color color) const {
	line(x1, y, x2, y, color);
	}

	void Bitmap::vLine(const int y1, const int x, const int y2, const Color color) const {
	line(x, y1, x, y2, color);
	}

	void Bitmap::arc(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const {
	changeTarget(this, this);
	al_draw_arc(x, y, radius, ang1 - Util::pi/2, ang2 - ang1, color, 1);
	}

	void TranslucentBitmap::arc(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const {
	TransBlender blender;
	Bitmap::arc(x, y, ang1, ang2, radius, transBlendColor(color));
	/*
	changeTarget(this);
	al_draw_arc(x, y, radius, ang1 + S_PI/2, ang2 - ang1, doTransBlend(color, globalBlend.alpha), 0);
	*/
	}

	/* from http://www.allegro.cc/forums/thread/605684/892721#target */
	void al_draw_filled_pieslice(float cx, float cy, float r, float start_theta,
	float delta_theta, ALLEGRO_COLOR color){
	ALLEGRO_VERTEX vertex_cache[ALLEGRO_VERTEX_CACHE_SIZE];
	int num_segments, ii;

	num_segments = fabs(delta_theta / (2 * ALLEGRO_PI) * ALLEGRO_PRIM_QUALITY * sqrtf(r));

	if (num_segments < 2)
	return;

	if (num_segments >= ALLEGRO_VERTEX_CACHE_SIZE) {
	num_segments = ALLEGRO_VERTEX_CACHE_SIZE - 1;
	}

	al_calculate_arc(&(vertex_cache[1].x), sizeof(ALLEGRO_VERTEX), cx, cy, r, r, start_theta, delta_theta, 0, num_segments);
	vertex_cache[0].x = cx; vertex_cache[0].y = cy;

	for (ii = 0; ii < num_segments + 1; ii++) {
	vertex_cache[ii].color = color;
	vertex_cache[ii].z = 0;
	}

	al_draw_prim(vertex_cache, NULL, NULL, 0, num_segments + 1, ALLEGRO_PRIM_TRIANGLE_FAN);
	// al_draw_prim(vertex_cache, NULL, NULL, 0, 3, ALLEGRO_PRIM_TRIANGLE_FAN);
	}

	void Bitmap::arcFilled(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const {
	changeTarget(this, this);
	al_draw_filled_pieslice(x, y, radius, ang1 - Util::pi/2, ang2 - ang1, color);
	}

	void TranslucentBitmap::arcFilled(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const {
	TransBlender blender;
	Bitmap::arcFilled(x, y, ang1, ang2, radius, transBlendColor(color));
	}

	void Bitmap::floodfill( const int x, const int y, const Color color ) const {
	/* TODO */
	}

	void Bitmap::line(const int x1, const int y1, const int x2, const int y2, const Color color) const {
	al_draw_line(x1, y1, x2, y2, color, 1.5);
	}

	void TranslucentBitmap::line(const int x1, const int y1, const int x2, const int y2, const Color color) const {
	TransBlender blender;
	Bitmap::line(x1, y1, x2, y2, transBlendColor(color));
	}

	void Bitmap::circleFill(int x, int y, int radius, Color color) const {
	changeTarget(this, this);
	al_draw_filled_circle(x, y, radius, color);
	}

	void Bitmap::circle(int x, int y, int radius, Color color) const {
	changeTarget(this, this);
	al_draw_circle(x, y, radius, color, 0);
	}

	void Bitmap::rectangle( int x1, int y1, int x2, int y2, Color color ) const {
	changeTarget(this, this);
	al_draw_rectangle(x1, y1, x2, y2, color, 0);
	}

	void Bitmap::rectangleFill( int x1, int y1, int x2, int y2, Color color ) const {
	changeTarget(this, this);
	al_draw_filled_rectangle(x1 - 0.5, y1 - 0.5, x2 + 0.5, y2 + 0.5, color);
	}

	void Bitmap::triangle( int x1, int y1, int x2, int y2, int x3, int y3, Color color ) const {
	changeTarget(this, this);
	al_draw_filled_triangle(x1, y1, x2, y2, x3, y3, color);
	}

	void Bitmap::polygon( const int * verts, const int nverts, const Color color ) const {
	/* TODO */
	}

	void Bitmap::ellipse( int x, int y, int rx, int ry, Color color ) const {
	changeTarget(this, this);
	al_draw_ellipse(x, y, rx, ry, color, 0);
	}

	void Bitmap::ellipseFill( int x, int y, int rx, int ry, Color color ) const {
	changeTarget(this, this);
	al_draw_filled_ellipse(x, y, rx, ry, color);
	}

	void Bitmap::applyTrans(const Color color) const {
	TransBlender blender;
	changeTarget(this, this);
	al_draw_filled_rectangle(0, 0, getWidth(), getHeight(), transBlendColor(color));
	}

	void Bitmap::light(int x, int y, int width, int height, int start_y, int focus_alpha, int edge_alpha, int focus_color, Color edge_color) const {
	/* TODO */
	}

	void Bitmap::drawCharacter( const int x, const int y, const int color, const int background, const Bitmap & where ) const {
	/* TODO */
	}

	void Bitmap::save( const std::string & str ) const {
	/* TODO */
	}

	void Bitmap::readLine(std::vector<Color> & line, int y){
	/* TODO */
	}

	void TranslucentBitmap::draw(const int x, const int y, const Bitmap & where) const {
	changeTarget(this, where);
	TransBlender blender;
	al_draw_tinted_bitmap(getData()->getBitmap(), getBlendColor(), x, y, 0);
	}

	void LitBitmap::draw(const int x, const int y, const Bitmap & where) const {
	// changeTarget(this, where);
	// LitBlender blender(makeColorAlpha(globalBlend.red, globalBlend.green, globalBlend.blue, globalBlend.alpha));
	// TransBlender blender;
	// al_draw_bitmap(getData()->getBitmap(), x, y, 0);
	// al_draw_tinted_bitmap(getData()->getBitmap(), al_map_rgba_f(1, 0, 0, 1), x, y, 0);
	}

	void LitBitmap::draw( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* TODO */
	}

	void LitBitmap::drawHFlip( const int x, const int y, const Bitmap & where ) const {
	/* TODO */
	}

	void LitBitmap::drawHFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* TODO */
	}

	void LitBitmap::drawVFlip( const int x, const int y, const Bitmap & where ) const {
	/* TODO */
	}

	void LitBitmap::drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* TODO */
	}

	void LitBitmap::drawHVFlip( const int x, const int y, const Bitmap & where ) const {
	/* TODO */
	}

	void LitBitmap::drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::draw( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	changeTarget(this, where);
	TransBlender blender;
	al_draw_tinted_bitmap(getData()->getBitmap(), getBlendColor(), x, y, 0);
	}

	void TranslucentBitmap::drawHFlip( const int x, const int y, const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::drawHFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::drawVFlip( const int x, const int y, const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::drawHVFlip( const int x, const int y, const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::drawHVFlip( const int x, const int y, Filter * filter,const Bitmap & where ) const {
	/* TODO */
	}

	void TranslucentBitmap::hLine( const int x1, const int y, const int x2, const Color color ) const {
	/* TODO */
	}

	void TranslucentBitmap::circleFill(int x, int y, int radius, Color color) const {
	TransBlender blender;
	Bitmap::circleFill(x, y, radius, doTransBlend(color, globalBlend.alpha));
	}

	void TranslucentBitmap::putPixelNormal(int x, int y, Color color) const {
	TransBlender blender;
	Bitmap::putPixelNormal(x, y, doTransBlend(color, globalBlend.alpha));
	}

	void TranslucentBitmap::rectangle( int x1, int y1, int x2, int y2, Color color ) const {
	TransBlender blender;
	Bitmap::rectangle(x1, y1, x2, y2, doTransBlend(color, globalBlend.alpha));
	}

	void TranslucentBitmap::rectangleFill(int x1, int y1, int x2, int y2, Color color) const {
	TransBlender blender;
	Bitmap::rectangleFill(x1, y1, x2, y2, doTransBlend(color, globalBlend.alpha));
	}

	void TranslucentBitmap::ellipse( int x, int y, int rx, int ry, Color color ) const {
	TransBlender blender;
	Bitmap::ellipse(x, y, rx, ry, doTransBlend(color, globalBlend.alpha));
	}

	void Bitmap::setClipRect( int x1, int y1, int x2, int y2 ) const {
	/* TODO */
	}

	void Bitmap::getClipRect(int & x1, int & y1, int & x2, int & y2) const {
	/* TODO */
	}

	int setGfxModeFullscreen(int x, int y){
	return setGraphicsMode(FULLSCREEN, x, y);
	}

	int setGfxModeWindowed( int x, int y ){
	return setGraphicsMode(WINDOWED, x, y);
	}

	int setGfxModeText(){
	/* TODO */
	return 0;
	}

	bool Bitmap::getError(){
	/* TODO */
	return false;
	}

	void Bitmap::transBlender(int r, int g, int b, int a){
	globalBlend.red = r;
	globalBlend.green = g;
	globalBlend.blue = b;
	globalBlend.alpha = a;
	globalBlend.type = Translucent;
	}

	void Bitmap::addBlender(int r, int g, int b, int a){
	globalBlend.red = r;
	globalBlend.green = g;
	globalBlend.blue = b;
	globalBlend.alpha = a;
	globalBlend.type = Add;
	}

	void Bitmap::differenceBlender( int r, int g, int b, int a ){
	globalBlend.red = r;
	globalBlend.green = g;
	globalBlend.blue = b;
	globalBlend.alpha = a;
	globalBlend.type = Difference;
	}

	void Bitmap::multiplyBlender( int r, int g, int b, int a ){
	globalBlend.red = r;
	globalBlend.green = g;
	globalBlend.blue = b;
	globalBlend.alpha = a;
	globalBlend.type = Multiply;
	}

	void Bitmap::drawingMode(int type){
	/* TODO */
	}

	void Bitmap::shutdown(){
	delete Screen;
	Screen = NULL;
	// delete allegroLock;
	// allegroLock = NULL;
	/*
	delete Scaler;
	Scaler = NULL;
	delete Buffer;
	Buffer = NULL;
	*/
	}

	StretchedBitmap::StretchedBitmap(int width, int height, const Bitmap & parent):
	Bitmap(parent, 0, 0, parent.getWidth(), parent.getHeight()),
	width(width),
	height(height),
	where(parent){
	scale_x = (double) parent.getWidth() / width;
	scale_y = (double) parent.getHeight() / height;
	ALLEGRO_BITMAP * old_target = al_get_target_bitmap();
	al_set_target_bitmap(parent.getData()->getBitmap());
	ALLEGRO_TRANSFORM transform;
	al_identity_transform(&transform);
	if (al_get_current_transform() != NULL){
	al_copy_transform(&transform, al_get_current_transform());
	}
	al_scale_transform(&transform, scale_x, scale_y);
	al_set_target_bitmap(getData()->getBitmap());
	al_use_transform(&transform);
	al_set_target_bitmap(old_target);
	}

	void StretchedBitmap::start(){
	#if 0
	ALLEGRO_TRANSFORM transform;
	changeTarget(this, this);
	al_copy_transform(&transform, al_get_current_transform());
	// al_identity_transform(&transform);
	// al_scale_transform(&transform, Bitmap::getWidth() / width, Bitmap::getHeight() / height);
	al_scale_transform(&transform, scale_x, scale_y);
	al_use_transform(&transform);
	#endif
	}

	void StretchedBitmap::finish(){
	#if 0
	ALLEGRO_TRANSFORM transform;
	changeTarget(this, this);
	al_copy_transform(&transform, al_get_current_transform());
	/* apply the inverse transform */
	al_scale_transform(&transform, 1.0/scale_x, 1.0/scale_y);
	// al_identity_transform(&transform);
	al_use_transform(&transform);
	#endif
	}

	TranslatedBitmap::TranslatedBitmap(int x, int y, const Bitmap & where):
	Bitmap(where),
	x(x),
	y(y){
	ALLEGRO_TRANSFORM transform;
	changeTarget(this, where);
	al_identity_transform(&transform);
	if (al_get_current_transform() != NULL){
	al_copy_transform(&transform, al_get_current_transform());
	}
	al_translate_transform(&transform, x, y);
	al_use_transform(&transform);
	}

	void TranslatedBitmap::BlitToScreen() const {
	Bitmap::BlitToScreen();
	}

	TranslatedBitmap::~TranslatedBitmap(){
	ALLEGRO_TRANSFORM transform;
	al_copy_transform(&transform, al_get_current_transform());
	al_translate_transform(&transform, -x, -y);
	al_use_transform(&transform);
	}

	Bitmap getScreenBuffer(){
	return *Screen;
	}

	RestoreState::RestoreState(){
	al_store_state(&state, ALLEGRO_STATE_ALL);
	}

	RestoreState::~RestoreState(){
	al_restore_state(&state);
	}

	}

	static inline bool close(float x, float y){
	static float epsilon = 0.001;
	return fabs(x - y) < epsilon;
	}

	static inline bool sameColor(Graphics::Color color1, Graphics::Color color2){
	// return memcmp(&color1, &color2, sizeof(Graphics::Color)) == 0;
	float r1, g1, b1, a1;
	float r2, g2, b2, a2;
	al_unmap_rgba_f(color1, &r1, &g1, &b1, &a1);
	al_unmap_rgba_f(color2, &r2, &g2, &b2, &a2);
	return close(r1, r2) &&
	close(g1, g2) &&
	close(b1, b2) &&
	close(a1, a2);

	/*
	unsigned char r1, g1, b1, a1;
	unsigned char r2, g2, b2, a2;
	al_unmap_rgba(color1, &r1, &g1, &b1, &a1);
	al_unmap_rgba(color2, &r2, &g2, &b2, &a2);
	return r1 == r2 &&
	g1 == g2 &&
	b1 == b2 &&
	a1 == a2;
	*/
	}

	static uint32_t quantify(const ALLEGRO_COLOR & color){
	unsigned char red, green, blue, alpha;
	al_unmap_rgba(color, &red, &green, &blue, &alpha);
	return (red << 24) \|
	(green << 16) \|
	(blue << 8) \|
	alpha;
	}

	bool operator<(const ALLEGRO_COLOR & color1, const ALLEGRO_COLOR & color2){
	return quantify(color1) < quantify(color2);
	}

	bool operator!=(const ALLEGRO_COLOR & color1, const ALLEGRO_COLOR & color2){
	return !(color1 == color2);
	}

	bool operator==(const ALLEGRO_COLOR & color1, const ALLEGRO_COLOR & color2){
	return sameColor(color1, color2);
	}
	diff --git a/util/bitmap.h b/util/bitmap.h
	index bf452349..66889570 100644
	--- a/util/bitmap.h
	+++ b/util/bitmap.h
	@@ -1,421 +1,422 @@
	#ifndef _paintown_bitmap_h_
	#define _paintown_bitmap_h_

	#include "exceptions/exception.h"
	#include "pointer.h"
	#include <string>
	#include <vector>
	#include <iostream>

	#ifdef USE_ALLEGRO
	#include "allegro/bitmap.h"
	#endif
	#ifdef USE_SDL
	#include "sdl/bitmap.h"
	#endif
	#ifdef USE_ALLEGRO5
	#include "allegro5/bitmap.h"
	#endif

	namespace Graphics{

	class TranslucentBitmap;

	extern const int SPRITE_NORMAL;
	extern const int SPRITE_LIT;
	extern const int SPRITE_TRANS;

	extern const int SPRITE_NO_FLIP;
	extern const int SPRITE_V_FLIP;
	extern const int SPRITE_H_FLIP;

	extern int SCALE_X;
	extern int SCALE_Y;

	class BitmapException: public Exception::Base {
	public:
	BitmapException(const std::string & file, int line, const std::string & reason):
	Base(file, line),
	reason(reason){
	}

	BitmapException(const BitmapException & copy):
	Base(copy),
	reason(copy.reason){
	}

	virtual void throwSelf() const {
	throw *this;
	}

	virtual ~BitmapException() throw () {
	}

	protected:
	virtual const std::string getReason() const {
	return reason;
	}

	std::string reason;
	};

	/* create a color from components */
	Color makeColor(int r, int g, int b);
	Color darken(Color color, double factor);
	void hsvToRGB( float h, float s, float v, int * r, int * g, int * b );

	int setGfxModeText();
	int setGfxModeFullscreen( int x, int y );
	int setGfxModeWindowed( int x, int y );
	int setGraphicsMode(int mode, int width, int height);

	/* get color components */
	int getRed(Color x);
	int getBlue(Color x);
	int getGreen(Color x);

	Color MaskColor();

	class Bitmap{
	private:

	/* these constructors don't really matter, get rid of them at some point */
	Bitmap( const Bitmap & copy, int sx, int sy, double accuracy );
	Bitmap( const char * load_file, int sx, int sy, double accuracy );
	public:

	/* equivalent to a GPU shader */
	class Filter{
	public:
	virtual Color filter(Color pixel) const = 0;
	virtual ~Filter(){
	}
	};


	/* default constructor makes 10x10 bitmap */
	Bitmap();
	Bitmap( int x, int y );
	Bitmap( const char * load_file );
	Bitmap(const char * data, int length);
	Bitmap( const std::string & load_file );
	Bitmap( const char * load_file, int sx, int sy );

	/* 4/24/2010: remove this at some point */
	#ifdef USE_ALLEGRO
	explicit Bitmap( BITMAP * who, bool deep_copy = false );
	#endif
	#ifdef USE_SDL
	explicit Bitmap(SDL_Surface * who, bool deep_copy = false );
	#endif
	#ifdef USE_ALLEGRO5
	explicit Bitmap(ALLEGRO_BITMAP * who, bool deep_copy = false );
	#endif
	Bitmap( const Bitmap & copy, bool deep_copy = false );
	Bitmap( const Bitmap & copy, int sx, int sy );
	Bitmap( const Bitmap & copy, int x, int y, int width, int height );
	virtual ~Bitmap();

	virtual TranslucentBitmap translucent() const;

	virtual void save( const std::string & str ) const;

	Bitmap & operator=( const Bitmap & );

	virtual void load( const std::string & str );

	virtual int getWidth() const;
	virtual int getHeight() const;

	/*
	inline const int getWidth() const{
	return getBitmap()->w;
	}

	inline const int getHeight() const{
	return getBitmap()->h;
	}
	*/

	/*
	inline const int getWidth() const{
	return my_bitmap->w;
	}

	inline const int getHeight() const{
	return my_bitmap->h;
	}
	*/

	static Bitmap memoryPCX(unsigned char * const data, const int length, const bool mask = true);

	void detach();

	/* replace all pixels that have value `original' with `replaced' */
	void replaceColor(const Color & original, const Color & replaced);
	void set8BitMaskColor(const Color & color);
	Color get8BitMaskColor();

	static void transBlender( int r, int g, int b, int a );
	static void multiplyBlender( int r, int g, int b, int a );
	static void dissolveBlender( int r, int g, int b, int a );
	static void addBlender( int r, int g, int b, int a );
	static void burnBlender( int r, int g, int b, int a );
	static void colorBlender( int r, int g, int b, int a );
	static void differenceBlender( int r, int g, int b, int a );
	static void dodgeBlender( int r, int g, int b, int a );
	static void hueBlender( int r, int g, int b, int a );
	static void luminanceBlender( int r, int g, int b, int a );
	static void invertBlender( int r, int g, int b, int a );
	static void screenBlender( int r, int g, int b, int a );
	/* for testing */
	static void setFakeGraphicsMode(int width, int height);

	/* clean up any remaining state */
	static void shutdown();

	static void drawingMode( int type );

	virtual Color blendColor(const Color & input) const;
	/* sets the blend state. try not to use these function unless
	* absolutely necessary.
	*/
	virtual void startDrawing() const;
	virtual void endDrawing() const;

	void acquire();
	void release();

	void updateOnResize();

	void resize(const int width, const int height);

	void debugSelf() const;

	/* convert to a grey scale version */
	virtual Bitmap greyScale();

	virtual void triangle( int x1, int y1, int x2, int y2, int x3, int y3, Color color ) const;

	/* draws an equilateral triangle centered at (x,y) pointing at `angle'
	* where each side has `size' pixels using the color.
	*/
	virtual void equilateralTriangle(int x, int y, int angle, int size, Color color) const;
	virtual void ellipse( int x, int y, int rx, int ry, Color color ) const;
	virtual void ellipseFill( int x, int y, int rx, int ry, Color color ) const;

	virtual void light(int x, int y, int width, int height, int start_y, int focus_alpha, int edge_alpha, int focus_color, Color edge_color) const;
	virtual void applyTrans(const Color color) const;

	virtual void border( int min, int max, Color color ) const;
	virtual void rectangle( int x1, int y1, int x2, int y2, Color color ) const;
	virtual void rectangleFill( int x1, int y1, int x2, int y2, Color color ) const;
	virtual void circleFill( int x, int y, int radius, Color color ) const;
	virtual void circle( int x, int y, int radius, Color color ) const;
	virtual void line( const int x1, const int y1, const int x2, const int y2, const Color color ) const;

	virtual void floodfill( const int x, const int y, const Color color ) const;
	virtual void horizontalLine( const int x1, const int y, const int x2, const Color color ) const;
	virtual void hLine( const int x1, const int y, const int x2, const Color color ) const;
	virtual void vLine( const int y1, const int x, const int y2, const Color color ) const;
	virtual void polygon( const int * verts, const int nverts, const Color color ) const;
	virtual void arc(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const;
	virtual void arcFilled(const int x, const int y, const double ang1, const double ang2, const int radius, const Color color ) const;

	virtual void draw(const int x, const int y, const Bitmap & where) const;
	virtual void draw(const int x, const int y, Filter * filter, const Bitmap & where) const;
	virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	virtual void draw(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	virtual void drawCharacter( const int x, const int y, const int color, const int background, const Bitmap & where ) const;

	/* flip horizontally */
	virtual void drawHFlip(const int x, const int y, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, Filter * filter, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, const Bitmap & where) const;
	virtual void drawHFlip(const int x, const int y, const int startWidth, const int startHeight, const int width, const int height, Filter * filter, const Bitmap & where) const;
	/* flip vertically */
	virtual void drawVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;

	/* flip horizontal and vertical */
	virtual void drawHVFlip( const int x, const int y, const Bitmap & where ) const;
	virtual void drawHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTrans( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTrans( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransHFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransHFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransVFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	// virtual void drawTransHVFlip( const int x, const int y, const Bitmap & where ) const;
	// virtual void drawTransHVFlip( const int x, const int y, Filter * filter, const Bitmap & where ) const;
	virtual void drawMask( const int x, const int y, const Bitmap & where );
	virtual void drawStretched( const int x, const int y, const int new_width, const int new_height, const Bitmap & who ) const;
	virtual void drawRotate( const int x, const int y, const int angle, const Bitmap & where );
	virtual void drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const Bitmap & where );
	virtual void drawPivot( const int centerX, const int centerY, const int x, const int y, const int angle, const double scale, const Bitmap & where );

	virtual void Stretch( const Bitmap & where ) const;
	virtual void Stretch( const Bitmap & where, const int sourceX, const int sourceY, const int sourceWidth, const int sourceHeight, const int destX, const int destY, const int destWidth, const int destHeight ) const;
	virtual void StretchBy2( const Bitmap & where );
	virtual void StretchBy4( const Bitmap & where );
	virtual void Blit( const std::string & xpath ) const;
	virtual void Blit( const Bitmap & where ) const;
	virtual void Blit( const int x, const int y, const Bitmap & where ) const;
	virtual void Blit( const int mx, const int my, const int wx, const int wy, const Bitmap & where ) const;
	virtual void Blit( const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where ) const;
	virtual void BlitMasked( const int mx, const int my, const int width, const int height, const int wx, const int wy, const Bitmap & where ) const;
	virtual void BlitToScreen() const;
	virtual void BlitAreaToScreen(const int upper_left_x, const int upper_left_y) const;
	virtual void BlitToScreen(const int upper_left_x, const int upper_left_y) const;
	virtual void BlitFromScreen(const int x, const int y) const;

	/* try to call Global::getScreenWidth/Height() instead of these directly */
	static int getScreenWidth();
	static int getScreenHeight();

	virtual void fill(Color color) const;

	virtual void clear() const;

	inline void clearToMask() const{
	this->fill(MaskColor());
	}

	bool getError();

	inline const Util::ReferenceCount<BitmapData> & getData() const {
	return data;
	}

	inline Util::ReferenceCount<BitmapData> getData(){
	return data;
	}

	void setData(Util::ReferenceCount<BitmapData> data){
	this->data = data;
	}

	virtual void readLine( std::vector<Color> & vec, int y );
	Color getPixel( const int x, const int y ) const;

	/* lock video bitmap to memory */
	void lock() const;
	void lock(int x, int y, int width, int height) const;
	void unlock() const;

	/* true if the point is within the bounds of the bitmap */
	bool inRange(int x, int y) const;

	/* uses _putpixel16 underneath which ignores translucent behavior */
	void putPixel( int x, int y, Color col ) const;
	/* respects the current trans mode */
	virtual void putPixelNormal(int x, int y, Color col) const;

	/*
	inline int getPixel( int x, int y ) const{
	if ( x >= 0 && x < my_bitmap->w && y >= 0 && y <= my_bitmap->h )
	return _getpixel16( my_bitmap, x, y );
	return -1;
	}

	inline void putPixel( int x, int y, int col ) const{
	if ( x >= 0 && x < my_bitmap->w && y >= 0 && y <= my_bitmap->h )
	_putpixel16( my_bitmap, x, y, col );
	}
	*/

	void setClipRect( int x1, int y1, int x2, int y2 ) const;
	void getClipRect( int & x1, int & y1, int & x2, int & y2 ) const;

	inline const std::string & getPath() const{
	return path;
	}

	/* produce a temporary bitmap that is not guaranteed to be preserved
	* after your function returns. do not hold references to this bitmap
	* and if you make a temporary bitmap, do not call functions that
	* might also make temporary bitmaps.
	*/
	static Bitmap temporaryBitmap(int w, int h);
	static Bitmap temporaryBitmap2(int w, int h);

	/* call this method to delete all temporary bitmaps.
	* don't call this unless you know what you are doing
	*/
	static void cleanupTemporaryBitmaps();

	static double getScale();


	/*
	* Convert color values between the HSV and RGB color spaces. The RGB values
	* range from 0 to 255, hue is from 0 to 360, and saturation and value are
	* from 0 to 1.
	*/
	static void rgbToHSV(int r, int g, int b, float * h, float * s, float * v);

	/* convert cymk to rgb. values should be in the range 0-255 */
	static void cymkToRGB(int c, int y, int m, int k, int * r, int * g, int * b);

	/* Add two RGB16 colors together
	* r = c1.r + c2.r
	* g = c1.g + c2.g
	* b = c1.b + c2.b
	*/
	static int addColor( int color1, int color2 );

	/*
	inline static int makeColor( int r, int g, int b ){
	return makecol16( r, g, b );
	}
	*/

	// static const int MaskColor = MASK_COLOR_16;
	static const int MODE_TRANS;
	static const int MODE_SOLID;

	#ifdef USE_ALLEGRO5
	void convertToVideo();
	#endif
	protected:
	/* release a reference count, and possibly destroy data */
	// void releaseInternalBitmap();

	/* really destroy private data */
	// void destroyPrivateData();

	/*
	inline void setBitmap( BITMAP * bitmap ){
	if ( bitmap == NULL ){
	std::cout << "FATAL Setting null bitmap" << std::endl;
	}
	_my_bitmap = bitmap;
	}
	*/

	void internalLoadFile( const char * load_file );

	/* implementation specific data */
	Util::ReferenceCount<BitmapData> data;
	// int * own;
	bool mustResize;
	// bool own;
	bool error;
	std::string path;
	static Bitmap * temporary_bitmap;
	static Bitmap * temporary_bitmap2;
	Color bit8MaskColor;

	+ int width, height;
	};

	/* creates a bitmap that can be used as a buffer for the screen.
	* on opengl/allegro5 systems this will return the current backbuffer
	*/
	Bitmap getScreenBuffer();

	void blend_palette(Color * pal, int mp, Color sc, Color ec);
	// bool sameColors(Color color1, Color color2);

	}

	#endif
	diff --git a/util/ftalleg.cpp b/util/ftalleg.cpp
	index b0112d31..616f6ced 100644
	--- a/util/ftalleg.cpp
	+++ b/util/ftalleg.cpp
	@@ -1,732 +1,733 @@
	/*
	--------------
	About
	--------------
	A Freetype wrapper for use with allegro
	Feel free to do whatever you like with this, by all means enjoy!
	Just add it to your project

	--------------
	Linking
	--------------
	on linux:
	g++ `freetype-config --cflags` ftalleg.cpp myfiles.cpp `freetype-config --libs` `allegro-config --libs`

	on windows (you may need to include the freetype dir location, ie -Ic:/mingw/include):
	g++ ftalleg.cpp myfiles.cpp -lfreetype -lalleg

	--------------
	Disclaimer
	--------------
	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
	INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
	TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE
	SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
	ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	*/

	#ifndef FT_FONT_CPP
	#define FT_FONT_CPP

	#include "bitmap.h"

	/*
	#include <allegro.h>
	#ifdef _WIN32
	#include <winalleg.h>
	#endif
	*/

	#include "ftalleg.h"
	#include <iostream>
	#include <sstream>
	#include <cassert>
	#include <exception>
	#ifdef USE_ALLEGRO5
	#include <allegro5/allegro_font.h>
	#include <allegro5/allegro_ttf.h>
	#endif

	namespace ftalleg{

	Exception::Exception():
	std::exception(){
	}

	Exception::Exception(const std::string reason):
	std::exception(),
	reason(reason){
	}

	Exception::~Exception() throw(){
	}

	// typedef void (pixeler)( BITMAP bitmap, int x, int y, int color );

	static Graphics::Color fixColor(const unsigned char c, short grays){
	// Safety checks
	// assert(c != 0);
	assert(grays != 1);

	// invariant: c can be dereferenced safely
	// invariant: (grays - 1) != 0, thus it can be used as divisor.

	int red = c * 255 / (grays - 1);
	int green = c * 255 / (grays - 1);
	int blue = c * 255 / (grays - 1);
	//alpha = c 255 / (grays - 1);
	return Graphics::makeColor(red,green,blue);
	}
	// Static count of instances of fonts to track library
	static int instances = 0;
	static FT_Library ftLibrary = 0;

	character::character() {
	}

	character::~character() {
	if (line){
	delete [] line;
	}
	}

	fontSize::fontSize() {
	width = height = italics = angle = 0;
	}

	fontSize::fontSize(int width, int height):
	width(width),
	height(height),
	italics(0),
	angle(0){
	}

	fontSize::~fontSize() {
	}

	bool fontSize::operator<(const fontSize &fs) const {
	return (width<fs.width \|\| height<fs.height \|\| italics<fs.italics);
	}

	/* im not sure this is a very unique key.. */
	int fontSize::createKey() const {
	return ((width+10) * (height+20) * (italics+250));
	}

	#ifdef USE_ALLEGRO5
	freetype::freetype(const Filesystem::AbsolutePath & path, const int x, const int y):
	alive(5, 5),
	path(path),
	width(x),
	height(y),
	original_size(x){
	if (instances == 0){
	al_init_font_addon();
	al_init_ttf_addon();
	}
	instances += 1;

	fonts[width].memory = al_load_font(path.path().c_str(), width, 0);
	fonts[width].video = al_load_font(path.path().c_str(), width, 0);
	}

	freetype::~freetype(){
	for (std::map<int, FontUse>::iterator it = fonts.begin(); it != fonts.end(); it++){
	FontUse & font = it->second;
	al_destroy_font(font.memory);
	al_destroy_font(font.video);
	}

	instances -= 1;
	if (instances == 0){
	al_shutdown_font_addon();
	}
	}

	ALLEGRO_FONT * freetype::currentMemoryFont() const {
	std::map<int, FontUse>::const_iterator find = fonts.find(width);
	if (find == fonts.end()){
	throw Exception("inconsistency error");
	}
	return find->second.memory;
	}

	ALLEGRO_FONT * freetype::currentVideoFont() const {
	std::map<int, FontUse>::const_iterator find = fonts.find(width);
	if (find == fonts.end()){
	throw Exception("inconsistency error");
	}
	return find->second.video;
	}

	int freetype::getHeight(const std::string & str) const {
	Util::Thread::ScopedLock locked(lock);
	/* sort of a hack but we need to set the display to the screen. with
	* allegro5 the screen buffer will be the actual screen so no allocation
	* will occur.
	*/
	// al_set_target_bitmap(alive.getData().getBitmap());
	ALLEGRO_BITMAP * target = al_get_target_bitmap();
	al_set_target_bitmap(NULL);
	int height = al_get_font_line_height(currentMemoryFont());
	al_set_target_bitmap(target);
	return height;
	}

	int freetype::getLength(const std::string & text) const {
	Util::Thread::ScopedLock locked(lock);
	// al_set_target_bitmap(alive.getData().getBitmap());
	ALLEGRO_BITMAP * target = al_get_target_bitmap();
	al_set_target_bitmap(NULL);
	int width = al_get_text_width(currentMemoryFont(), text.c_str());
	al_set_target_bitmap(target);
	return width;
	}

	void freetype::setSize(unsigned int w, unsigned int h){
	Util::Thread::ScopedLock locked(lock);
	width = w;
	height = h;
	if (fonts.find(width) == fonts.end()){
	fonts[width].memory = al_load_font(path.path().c_str(), width, 0);
	fonts[width].video = al_load_font(path.path().c_str(), width, 0);
	}
	}

	void freetype::getSize(int * w, int * h) const {
	Util::Thread::ScopedLock locked(lock);
	*w = width;
	*h = height;
	}

	void freetype::render(int x, int y, const Graphics::Color & color, const Graphics::Bitmap & bmp, ftAlign alignment, const std::string & text, int marker, ...){
	Util::Thread::ScopedLock locked(lock);
	std::ostringstream str;

	/* use vsnprintf/Util::limitPrintf here? */

	// Get extra arguments
	va_list ap;
	va_start(ap, marker);
	for(unsigned int i = 0; i<text.length();++i) {
	if (text[i] == '%') {
	if(text[i+1]=='s') {
	str << va_arg(ap, char *);
	++i;
	} else if(text[i+1]=='d'\|\|text[i+1]=='i') {
	str << va_arg(ap, signed int);
	++i;
	} else if(text[i+1]=='c') {
	str << (char)va_arg(ap, int);
	++i;
	} else str << text[i];
	} else {
	str << text[i];
	}
	}
	va_end(ap);

	std::string fixedText(str.str());
	al_set_target_bitmap(bmp.getData()->getBitmap());
	+ al_set_blender(ALLEGRO_ADD, ALLEGRO_ALPHA, ALLEGRO_INVERSE_ALPHA);

	/* for setting the blend state and whatnot */
	bmp.startDrawing();
	al_draw_text(currentVideoFont(), bmp.blendColor(color), x, y, 0, fixedText.c_str());
	bmp.endDrawing();
	}
	#else
	//! Constructor
	freetype::freetype(const Filesystem::AbsolutePath & str, const int x, const int y ):
	face(NULL){
	//Load library
	if (!ftLibrary){
	FT_Init_FreeType(&ftLibrary);
	}
	instances += 1;
	faceLoaded = kerning = false;
	currentIndex = 0;
	currentFilename = "";
	faceName = "";
	// currentChar = new character;
	systemName = "";
	internalFix = false;

	this->load(str, 0, x, y );
	}

	//! Destructor
	freetype::~freetype(){

	//if(face!=NULL)FT_Done_Face(face);
	if (faceLoaded && face != NULL){
	FT_Done_Face(face);
	face = NULL;
	}

	instances -= 1;
	if (instances == 0){
	FT_Done_FreeType(ftLibrary);
	ftLibrary = NULL;
	}

	destroyGlyphIndex();

	/*
	if ( currentChar ){
	delete currentChar;
	}
	*/
	}

	void freetype::destroyGlyphIndex(){
	for (std::map<int, std::map<signed long, character*> >::iterator i1 = fontTable.begin(); i1 != fontTable.end(); i1++){
	std::map<signed long, character> & characters = (i1).second;
	for (std::map<signed long, character*>::iterator i2 = characters.begin(); i2 != characters.end(); i2++){
	character * character = (*i2).second;
	delete character;
	}
	}
	}

	// Extract glyph
	character * freetype::extractGlyph(signed long unicode){
	int w, h, ew;
	character * tempChar = new character();

	// Translate it according to the given italics
	double italics = (double)(size.italics)*GLYPH_PI/180;

	FT_Matrix matrix;
	matrix.xx = 0x10000L;
	matrix.xy = (FT_Fixed)( sin( italics ) * (GLYPH_SQRT2*0x10000L) );
	matrix.yx = 0;
	matrix.yy = 0x10000L;
	FT_Set_Transform( face, &matrix, 0 );

	FT_Load_Char(face, unicode, FT_LOAD_TARGET_NORMAL \| FT_LOAD_RENDER \| FT_LOAD_FORCE_AUTOHINT);

	w = face->glyph->bitmap.width;
	h = face->glyph->bitmap.rows;
	ew = 0;
	if (!w)ew = 1;
	if (!h)h = 1;

	tempChar->width = (w + ew);
	tempChar->height = h;

	tempChar->rows = face->glyph->bitmap.rows;
	tempChar->grays = face->glyph->bitmap.num_grays;
	tempChar->pitch = face->glyph->bitmap.pitch;
	tempChar->line = new unsigned char[tempChar->rows * tempChar->pitch];
	memcpy(tempChar->line, face->glyph->bitmap.buffer, tempChar->rows * tempChar->pitch);

	tempChar->left = face->glyph->bitmap_left;
	tempChar->top = face->glyph->bitmap_top;
	tempChar->right = face->glyph->advance.x >> 6;
	tempChar->unicode = unicode;

	tempChar->length = ((w + ew)+face->glyph->advance.x) >> 6;

	return tempChar;
	}

	// Create single index
	void freetype::createIndex(){
	std::map<int, std::map<signed long, character*> >::iterator p;
	p = fontTable.find(size.createKey());
	if (p == fontTable.end()){
	FT_Set_Pixel_Sizes(face, size.width, size.height);
	FT_UInt glyphIndex;
	FT_ULong unicode = FT_Get_First_Char(face, &glyphIndex);
	std::map<signed long, character*> tempMap;
	while (glyphIndex != 0){
	tempMap.insert(std::make_pair(unicode, extractGlyph(unicode)));
	unicode = FT_Get_Next_Char(face, unicode, &glyphIndex);
	}

	fontTable.insert(std::make_pair(size.createKey(), tempMap));
	}

	if (fontTable.find(size.createKey()) == fontTable.end()){
	printf("ftalleg: inconsistency error\n");
	throw std::exception();
	}
	}

	/*
	pixeler getPutPixel(){
	switch( get_color_depth() ){
	case 8 : return _putpixel;
	case 15 : return _putpixel15;
	case 16 : return _putpixel16;
	case 24 : return _putpixel24;
	case 32 : return _putpixel32;
	default : return putpixel;
	}
	}
	*/

	void drawOneCharacter(const character * tempChar, int & x1, int & y1, FT_UInt sizeHeight, const Graphics::Bitmap & bitmap, const Graphics::Color & color){
	unsigned char * line = tempChar->line;
	int colorRed = Graphics::getRed(color);
	int colorGreen = Graphics::getGreen(color);
	int colorBlue = Graphics::getBlue(color);

	/* cache the last color, there is a good chance it will be reused */
	unsigned char lastData = -1;
	short lastGrays = -1;
	Graphics::Color black = Graphics::makeColor(0, 0, 0);
	Graphics::Color lastColor = black;

	for (int y = 0; y < tempChar->rows; y++){
	unsigned char * buffer = line;
	for (int x = 0; x < tempChar->width; x++){
	Graphics::Color finalColor = black;
	unsigned char current = *buffer;
	buffer++;
	if (current == lastData && lastGrays == tempChar->grays){
	finalColor = lastColor;
	} else {
	Graphics::Color col = fixColor(current, tempChar->grays);

	int red = Graphics::getRed(col);
	int green = Graphics::getGreen(col);
	int blue = Graphics::getBlue(col);

	if ((red < 50) \|\|
	(green < 50) \|\|
	(blue < 50)){
	continue;
	}

	red = red * colorRed / 255;
	green = green * colorGreen / 255;
	blue = blue * colorBlue / 255;

	finalColor = Graphics::makeColor(red, green, blue);
	lastData = current;
	lastColor = finalColor;
	lastGrays = tempChar->grays;
	}

	//col.alpha= col.alpha * color.alpha / 255;
	// putpixel(bitmap,x1+tempChar.left+x,y1 - tempChar.top+y + size.height,makecol(red,blue,green));
	/* dangerous! putter is probably one of the _putpixel* routines so if x or y are off the bitmap
	* you will get a segfault
	*/
	// putter(bitmap,x1+tempChar.left+x,y1 - tempChar.top+y + size.height,makecol(red,blue,green));
	// putter = 0;
	int finalX = x1+tempChar->left+x;
	int finalY = y1 - tempChar->top + y + sizeHeight;
	bitmap.putPixelNormal(finalX, finalY, finalColor);
	}
	line += tempChar->pitch;
	}
	x1 += tempChar->right;
	}

	// Render a character from the lookup table
	void freetype::drawCharacter(signed long unicode, int &x1, int &y1, const Graphics::Bitmap & bitmap, const Graphics::Color &color){

	// pixeler putter = getPutPixel();

	std::map<int, std::map<signed long, character*> >::iterator ft;
	ft = fontTable.find(size.createKey());
	if (ft != fontTable.end()){
	std::map<signed long, character*>::iterator p;
	p = (ft->second).find(unicode);
	if (p != ft->second.end()){
	const character * tempChar = p->second;
	drawOneCharacter(tempChar, x1, y1, size.height, bitmap, color);
	}
	}
	}

	//! Load font from memory
	bool freetype::load(const unsigned char *memoryFont, unsigned int length, int index, unsigned int width, unsigned int height) {
	if(!FT_New_Memory_Face(ftLibrary,memoryFont, length,index,&face)) {
	currentFilename = "memoryFont";
	currentIndex = index;
	faceLoaded = true;
	size.italics = 0;
	setSize(width, height);
	if (FT_HAS_GLYPH_NAMES(face)){
	char buff[1024];
	if(!FT_Get_Glyph_Name(face, currentIndex,buff, sizeof(buff))){
	faceName = currentFilename;
	}
	else faceName = std::string(buff);
	} else {
	faceName = currentFilename;
	}
	if(FT_HAS_KERNING(face))kerning=true;
	else kerning = false;
	} else {
	faceLoaded=false;
	std::cout << "Load system font failed\n";
	}

	return faceLoaded;
	}

	//! Load font from file
	bool freetype::load(const Filesystem::AbsolutePath & filename, int index, unsigned int width, unsigned int height){
	FT_Error error = FT_New_Face(ftLibrary, filename.path().c_str(), index, &face);
	if (error == 0){
	currentFilename = filename.path();
	currentIndex = index;
	faceLoaded = true;
	size.italics = 0;
	setSize(width, height);
	if (FT_HAS_GLYPH_NAMES(face)){
	char buff[1024];
	if (!FT_Get_Glyph_Name(face, currentIndex, buff, sizeof(buff))) {
	faceName = currentFilename;
	} else {
	faceName = std::string(buff);
	}
	} else {
	faceName = currentFilename;
	}

	kerning = FT_HAS_KERNING(face);
	} else {
	faceLoaded=false;
	}

	return faceLoaded;
	}

	/* utf8 decoding */
	static long decodeUnicode(const std::string & input, unsigned int * position){
	unsigned char byte1 = (unsigned char) input[*position];
	/* one byte - ascii */
	if (byte1 >> 7 == 0){
	return byte1;
	}

	if (byte1 >> 5 == 6){
	*position += 1;
	unsigned char byte2 = (unsigned char) input[*position];
	int top = byte1 & 31;
	int bottom = byte2 & 63;
	return (top << 6) + bottom;
	}

	if (byte1 >> 4 == 14){
	*position += 1;
	unsigned char byte2 = (unsigned char) input[*position];
	*position += 1;
	unsigned char byte3 = (unsigned char) input[*position];
	int top4 = byte1 & 15;
	int middle6 = byte2 & 63;
	int bottom6 = byte3 & 63;
	return (top4 << (6+6)) + (middle6 << 6) + bottom6;
	}

	if (byte1 >> 3 == 30){
	*position += 1;
	unsigned char byte2 = (unsigned char) input[*position];
	*position += 1;
	unsigned char byte3 = (unsigned char) input[*position];
	*position += 1;
	unsigned char byte4 = (unsigned char) input[*position];
	int unit1 = byte1 & 7;
	int unit2 = byte2 & 63;
	int unit3 = byte3 & 63;
	int unit4 = byte4 & 63;
	return (unit1 << 18) + (unit2 << 12) + (unit3 << 6) + unit4;
	}

	return 0;
	}

	//! Get text length
	int freetype::getLength(const std::string & text) {
	Util::Thread::ScopedLock locked(lock);
	int length=0;
	std::map<int, std::map<signed long, character*> >::iterator ft;
	ft = fontTable.find(size.createKey());
	if (ft != fontTable.end()){
	for (unsigned int i = 0; i < text.length(); i++) {
	std::map<signed long, character*>::iterator p;
	signed long unicode = decodeUnicode(text, &i);
	p = (ft->second).find(unicode);
	if (p != (ft->second).end()){
	if (p != fontTable[size.createKey()].end()){
	length += (p->second)->length;
	}
	}
	}
	}
	return length;
	}

	//! Render font to a bitmap
	void freetype::render(int x, int y, const Graphics::Color & color, const Graphics::Bitmap & bmp, ftAlign alignment, const std::string & text, int marker ...) {
	if (faceLoaded){
	int rend_x = 0;
	int rend_y = 0;
	std::ostringstream str;

	/* use vsnprintf/Util::limitPrintf here? */

	// Get extra arguments
	va_list ap;
	va_start(ap, marker);
	for(unsigned int i = 0; i<text.length();++i) {
	if (text[i] == '%') {
	if(text[i+1]=='s') {
	str << va_arg(ap, char *);
	++i;
	} else if(text[i+1]=='d'\|\|text[i+1]=='i') {
	str << va_arg(ap, signed int);
	++i;
	} else if(text[i+1]=='c') {
	str << (char)va_arg(ap, int);
	++i;
	} else str << text[i];
	} else {
	str << text[i];
	}
	}
	va_end(ap);

	std::string fixedText(str.str());
	switch (alignment) {
	case ftLeft:
	rend_x = x;
	rend_y = y;
	break;
	case ftCenter:
	rend_x = x - getLength(fixedText)/2;
	rend_y = y;
	break;
	case ftRight:
	rend_x = x - getLength(fixedText);
	rend_y = y;
	break;
	default:
	rend_x = x;
	rend_y = y;
	break;
	}

	int previous = 0;
	int next = 0;
	for (unsigned int i = 0; i<fixedText.length(); i++){
	long unicode = decodeUnicode(fixedText, &i);
	if (kerning && previous && next){
	next = FT_Get_Char_Index(face, unicode);
	FT_Vector delta;
	FT_Get_Kerning(face, previous, next, FT_KERNING_DEFAULT, &delta);
	rend_x += delta.x >> 6;
	previous = next;
	}
	drawCharacter(unicode, rend_x, rend_y, bmp, color);
	}
	}
	}

	int freetype::calculateMaximumHeight(){
	Util::Thread::ScopedLock locked(lock);
	/* uhh, comment out the printf's ?? */
	std::map<int, std::map<signed long, character*> >::iterator ft;
	ft = fontTable.find(size.createKey());
	int top = 0;
	long code = 0;
	if ( ft != fontTable.end() ){
	std::map<signed long, character*>::iterator p;
	std::map< signed long, character* > & map = ft->second;
	for ( p = map.begin(); p != map.end(); p++ ){
	const character * ch = p->second;
	printf( "%c( %ld ). top = %d. rows = %d. total = %d\n", (char) ch->unicode, ch->unicode, ch->top, ch->rows, ch->top + ch->rows );
	if ( ch->top + ch->rows > top ){
	code = ch->unicode;
	top = ch->top + ch->rows;
	}
	}
	}
	printf( "Largest letter = %ld\n", code );
	return top;
	}

	int freetype::height(long code) const {
	Util::Thread::ScopedLock locked(lock);
	std::map<int, std::map<signed long, character*> >::const_iterator ft;
	ft = fontTable.find(size.createKey());
	if (ft != fontTable.end()){
	std::map<signed long, character*>::const_iterator p;
	p = (ft->second).find( code );
	if ( p != (ft->second).end() ){
	const character * temp = p->second;
	// printf( "%c top = %d rows = %d\n", (char) code, temp.top, temp.rows );
	return temp->top + temp->rows;
	}
	} else {
	throw Exception("Internal inconsistency");
	}

	return 0;
	}

	int freetype::calculateHeight( const std::string & str ) const {
	int max = 0;
	for ( unsigned int i = 0; i < str.length(); i++ ){
	int q = height( str[ i ] );
	// printf( "Height of %c is %d\n", str[ i ], q );
	if ( q > max ){
	max = q;
	}
	}

	return max;
	}

	//! Set size
	void freetype::setSize( unsigned int w, unsigned int h){
	Util::Thread::ScopedLock locked(lock);
	if ( w != size.width \|\| h != size.height ){
	if (internalFix)return;
	if (w<=0 \|\| h<=0)return;
	size.width = w;
	size.height = h;
	createIndex();
	// maximumHeight = calculateMaximumHeight();
	}
	}

	//! Set italics
	void freetype::setItalics(int i){
	Util::Thread::ScopedLock locked(lock);
	if(internalFix)return;
	if(i<-45)i=(-45);
	else if(i>45)i=45;
	size.italics = i;
	createIndex();
	}

	void freetype::getSize(int * w, int * h) const {
	*w = size.width;
	*h = size.height;
	}

	//! Get Width
	int freetype::getWidth() const {
	return size.width;
	}

	//! Get Height
	int freetype::getHeight( const std::string & str ) const {
	// return size.height;
	return calculateHeight(str);
	}

	//! Get Italics
	int freetype::getItalics(){
	return size.italics;
	}
	#endif
	}

	#endif /* FONT_BASE_CPP */
	diff --git a/util/gui/context-box.cpp b/util/gui/context-box.cpp
	index 5eb838ae..90701bf9 100644
	--- a/util/gui/context-box.cpp
	+++ b/util/gui/context-box.cpp
	@@ -1,454 +1,454 @@
	#include "util/bitmap.h"
	#include "util/trans-bitmap.h"

	#include "context-box.h"
	#include "util/font.h"
	#include <math.h>

	static const double FONT_SPACER = 1.3;
	static const int GradientMax = 50;

	static Graphics::Color selectedGradientStart(){
	static Graphics::Color color = Graphics::makeColor(19, 167, 168);
	return color;
	}

	static Graphics::Color selectedGradientEnd(){
	static Graphics::Color color = Graphics::makeColor(27, 237, 239);
	return color;
	}

	using namespace std;

	namespace Gui{

	Effects::Gradient standardGradient(){
	Effects::Gradient standard(GradientMax, selectedGradientStart(), selectedGradientEnd());
	return standard;
	}

	ContextItem::ContextItem(const ContextBox & parent):
	parent(parent){
	}

	ContextItem::~ContextItem(){
	}

	bool ContextItem::isAdjustable(){
	return false;
	}
	int ContextItem::getLeftColor(){
	return 0;
	}
	int ContextItem::getRightColor(){
	return 0;
	}

	void ContextItem::draw(int x, int y, const Graphics::Bitmap & where, const Font & font, int distance) const {
	if (distance == 0){
	Graphics::Bitmap::transBlender(0, 0, 0, parent.getFadeAlpha());
	font.printf(x, y, parent.getSelectedColor(), where.translucent(), getName(), 0);
	} else {
	int alpha = parent.getFadeAlpha() - fabs((double) distance) * 35;
	if (alpha < 0){
	alpha = 0;
	}
	Graphics::Bitmap::transBlender(0, 0, 0, alpha);
	font.printf(x, y, Graphics::makeColor(255, 255, 255), where.translucent(), getName(), 0);
	}
	}

	int ContextItem::size(const Font & font) const {
	return font.textLength(getName().c_str());
	}

	ContextBox::ContextBox():
	fadeState(NotActive),
	/*
	fontWidth(0),
	fontHeight(0),
	*/
	fadeSpeed(12),
	fadeAlpha(0),
	cursorCenter(0),
	cursorLocation(0),
	scrollWait(4),
	selectedGradient(standardGradient()),
	useGradient(true),
	renderOnlyText(false){
	}
	ContextBox::ContextBox( const ContextBox & copy ):
	fadeState(NotActive),
	selectedGradient(standardGradient()),
	renderOnlyText(false){
	this->list = copy.list;
	// this->context = copy.context;
	/*
	this->font = copy.font;
	this->fontWidth = copy.fontWidth;
	this->fontHeight = copy.fontHeight;
	*/
	this->fadeSpeed = copy.fadeSpeed;
	this->fadeAlpha = copy.fadeAlpha;
	this->cursorCenter = copy.cursorCenter;
	this->cursorLocation = copy.cursorLocation;
	this->scrollWait = copy.scrollWait;
	this->useGradient = copy.useGradient;
	this->renderOnlyText = copy.renderOnlyText;
	}
	ContextBox::~ContextBox(){
	}
	ContextBox & ContextBox::operator=( const ContextBox & copy){
	this->fadeState = NotActive;
	this->list = copy.list;
	// this->context = copy.context;
	/*
	this->font = copy.font;
	this->fontWidth = copy.fontWidth;
	this->fontHeight = copy.fontHeight;
	*/
	this->fadeSpeed = copy.fadeSpeed;
	this->fadeAlpha = copy.fadeAlpha;
	this->cursorCenter = copy.cursorCenter;
	this->cursorLocation = copy.cursorLocation;
	this->scrollWait = copy.scrollWait;
	this->useGradient = copy.useGradient;
	this->renderOnlyText = copy.renderOnlyText;
	return *this;
	}

	void ContextBox::act(const Font & font){
	// update board
	board.act(font);

	// Calculate text info
	// calculateText(font);
	list.act();

	// do fade
	doFade();

	// Update gradient
	selectedGradient.update();
	}

	void ContextBox::render(const Graphics::Bitmap & work){
	}

	void ContextBox::render(const Graphics::Bitmap & work, const Font & font){
	if (!renderOnlyText){
	board.render(work);
	}
	drawText(work, font);
	}

	bool ContextBox::next(const Font & font){
	if (fadeState == FadeOut){
	return false;
	}

	list.next();

	/*
	cursorLocation += (int)(font.getHeight()/FONT_SPACER);

	if (current < context.size()-1){
	current++;
	} else {
	current = 0;
	}
	*/
	return true;
	}

	bool ContextBox::previous(const Font & font){
	if (fadeState == FadeOut){
	return false;
	}

	list.previous();

	/*
	cursorLocation -= (int)(font.getHeight()/FONT_SPACER);

	if (current > 0){
	current--;
	} else {
	current = context.size()-1;
	}
	*/
	return true;
	}

	Graphics::Color ContextBox::getSelectedColor() const {
	return useGradient ? selectedGradient.current() : selectedGradientStart();
	}

	void ContextBox::adjustLeft(){
	}

	void ContextBox::adjustRight(){
	}

	void ContextBox::open(){
	// Set the fade stuff
	fadeState = FadeIn;
	//board.position = position;
	board.location = location;
	board.transforms = transforms;
	board.colors = colors;
	board.open();
	fadeAlpha = 0;
	cursorLocation = 0;
	}

	void ContextBox::close(){
	fadeState = FadeOut;
	board.close();
	fadeAlpha = 255;
	cursorLocation = 480;
	}


	void ContextBox::doFade(){
	switch ( fadeState ){
	case FadeIn: {
	if (fadeAlpha < 255){
	fadeAlpha += (fadeSpeed+2);
	}

	if (fadeAlpha >= 255){
	fadeAlpha = 255;
	if (board.isActive()){
	fadeState = Active;
	}
	}
	break;
	}
	case FadeOut: {
	if (fadeAlpha > 0){
	fadeAlpha -= (fadeSpeed+2);
	}

	if (fadeAlpha <= 0){
	fadeAlpha = 0;
	if (!board.isActive()){
	fadeState = NotActive;
	}
	}
	break;
	}
	case Active:
	case NotActive:
	default:
	break;
	}
	}

	void ContextBox::calculateText(const Font & vFont){
	/*
	if (context.empty()){
	return;
	}

	// const Font & vFont = Font::getFont(font, fontWidth, fontHeight);

	cursorCenter = (location.getY() + (int)location.getHeight()/2) - vFont.getHeight()/2;//(position.y + (int)position.height/2) - vFont.getHeight()/2;

	if (cursorLocation == cursorCenter){
	scrollWait = 4;
	} else {
	if (scrollWait <= 0){
	cursorLocation = (cursorLocation + cursorCenter)/2;
	scrollWait = 4;
	} else {
	scrollWait--;
	}
	}
	*/
	}

	/* draws the text, fading the items according to the distance from the
	* current selection.
	*/
	void ContextBox::doDraw(int x, int y, int middle_x, int min_y, int max_y, const Font & font, int current, int selected, const Graphics::Bitmap & area, int direction){
	#if 0
	while (y < max_y && y > min_y){
	int pick = current;
	while (pick < 0){
	pick += context.size();
	}
	pick = pick % context.size();

	ContextItem * option = context[pick];
	const int startx = middle_x - font.textLength(option->getName().c_str())/2;

	/* draw current selection, make it glow */
	if (current == selected){
	Graphics::Bitmap::transBlender(0, 0, 0, fadeAlpha);
	Graphics::TranslucentBitmap translucent(area);
	const int color = useGradient ? selectedGradient.current() : selectedGradientStart();
	font.printf(x + startx, y, color, translucent, option->getName(), 0 );
	if (option->isAdjustable()){
	const int triangleSize = 14;
	int cx = startx - 15;
	int cy = (int)(y + (font.getHeight()/FONT_SPACER) / 2 + 2);

	/* do the triangles need to be translucent? */
	translucent.equilateralTriangle(cx, cy, 180, triangleSize, option->getLeftColor());

	cx = (x + startx + font.textLength(option->getName().c_str()))+15;
	translucent.equilateralTriangle(cx, cy, 0, triangleSize, option->getRightColor());
	}
	} else {
	/* draw some other item, and fade it */
	int count = (int) fabs((double) current - (double) selected);
	/* TODO: maybe scale by the number of total items instead of using 35 */
	int textAlpha = fadeAlpha - (count * 35);
	if (textAlpha < 0){
	textAlpha = 0;
	}
	Graphics::Bitmap::transBlender(0, 0, 0, textAlpha);
	const int color = Graphics::makeColor(255,255,255);
	font.printf(x + startx, y, color, area.translucent(), option->getName(), 0);
	}

	if (context.size() == 1){
	return;
	}

	current += direction;
	y += direction * font.getHeight() / FONT_SPACER;
	}
	#endif
	}

	void ContextBox::setList(const std::vector<Util::ReferenceCount<ContextItem> > & list){
	this->list.clearItems();
	for (vector<Util::ReferenceCount<ContextItem> >::const_iterator it = list.begin(); it != list.end(); it++){
	const Util::ReferenceCount<ContextItem> & item = *it;
	this->list.addItem(item.convert<ScrollItem>());
	}
	}

	void ContextBox::addItem(const Util::ReferenceCount<ContextItem> & item){
	this->list.addItem(item.convert<ScrollItem>());
	}

	void ContextBox::drawText(const Graphics::Bitmap & bmp, const Font & font){
	/*
	if (context.empty()){
	return;
	}
	*/
	// const Font & vFont = Font::getFont(font, fontWidth, fontHeight);
	const int x1 = board.getArea().getX()+(int)(board.getTransforms().getRadius()/2);
	const int y1 = board.getArea().getY()+2;//(board.getArea().radius/2);
	const int x2 = board.getArea().getX2()-(int)(board.getTransforms().getRadius()/2);
	const int y2 = board.getArea().getY2()-2;//(board.getArea().radius/2);

	Graphics::Bitmap area(bmp, x1, y1, x2 - x1, y2 - y1);

	- int min_y = location.getX() - font.getHeight() - y1;
	- int max_y = location.getX2() + font.getHeight() - y1;
	+ // int min_y = location.getX() - font.getHeight() - y1;
	+ // int max_y = location.getX2() + font.getHeight() - y1;

	list.render(area, font);

	#if 0
	/* draw from the current selection down */
	doDraw(0, cursorLocation - y1, area.getWidth() / 2, min_y, max_y, font, current, current, area, 1);

	/* draw above the current selection */
	doDraw(0, cursorLocation - y1 - font.getHeight() / FONT_SPACER, area.getWidth() / 2, min_y, max_y, font, current - 1, current, area, -1);
	#endif

	#if 0
	int currentOption = current;
	int count = 0;
	/* draw the current selection and everything below it */
	while (locationY < location.getX2() + vFont.getHeight()){
	const int startx = (location.getWidth()/2)-(vFont.textLength(context[currentOption]->getName().c_str())/2);
	if (count == 0){
	Graphics::Bitmap::transBlender(0, 0, 0, fadeAlpha);
	Graphics::TranslucentBitmap translucent(area);
	// Bitmap::drawingMode( Bitmap::MODE_TRANS );
	const int color = useGradient ? selectedGradient.current() : selectedGradientStart();
	vFont.printf(location.getX() + startx - x1, locationY - y1, color, translucent, context[currentOption]->getName(), 0 );
	if (context[currentOption]->isAdjustable()){
	const int triangleSize = 14;
	int cx = (location.getX() + startx) - 15;
	int cy = (int)(locationY + (vFont.getHeight()/FONT_SPACER) / 2 + 2);

	/*
	int cx1 = cx + triangleSize / 2;
	int cy1 = cy - triangleSize / 2;
	int cx2 = cx - triangleSize;
	int cy2 = cy;
	int cx3 = cx + triangleSize / 2;
	int cy3 = cy + triangleSize / 2;
	*/

	/* do the triangles need to be translucent? */
	// translucent.triangle(cx1, cy1, cx2, cy2, cx3, cy3, context[currentOption]->getLeftColor());
	translucent.equilateralTriangle(cx, cy, 180, triangleSize, context[currentOption]->getLeftColor());

	cx = (location.getX()+startx + vFont.textLength(context[currentOption]->getName().c_str()))+15;
	translucent.equilateralTriangle(cx, cy, 0, triangleSize, context[currentOption]->getLeftColor());
	// translucent.triangle( cx - triangleSize / 2, cy - triangleSize / 2, cx + triangleSize, cy, cx - triangleSize / 2, cy + triangleSize / 2, context[currentOption]->getRightColor() );
	}
	// Bitmap::drawingMode(Bitmap::MODE_SOLID);
	} else {
	int textAlpha = fadeAlpha - (count * 35);
	if (textAlpha < 0){
	textAlpha = 0;
	}
	Graphics::Bitmap::transBlender(0, 0, 0, textAlpha);
	// Bitmap::drawingMode( Bitmap::MODE_TRANS );
	const int color = Graphics::makeColor(255,255,255);
	vFont.printf(location.getX() + startx - x1, locationY - y1, color, area.translucent(), context[currentOption]->getName(), 0 );
	// Bitmap::drawingMode( Bitmap::MODE_SOLID );
	}
	if (context.size() == 1){
	// area.setClipRect(0, 0, bmp.getWidth(), bmp.getHeight());
	return;
	}
	currentOption++;
	if (currentOption == (int)context.size()){
	currentOption = 0;
	}
	locationY += (int)(vFont.getHeight()/FONT_SPACER);
	count++;
	/*if (context.size() < 2 && count == 2){
	break;
	}*/
	}
	locationY = cursorLocation - (int)(vFont.getHeight()/FONT_SPACER);
	currentOption = current;
	currentOption--;
	count = 0;

	/* this draws the stuff above the current selection */
	while (locationY > location.getX() - vFont.getHeight()){
	if (currentOption < 0){
	currentOption = context.size()-1;
	}
	const int startx = (location.getWidth()/2)-(vFont.textLength(context[currentOption]->getName().c_str())/2);
	int textAlpha = fadeAlpha - (count * 35);
	if (textAlpha < 0){
	textAlpha = 0;
	}
	Graphics::Bitmap::transBlender(0, 0, 0, textAlpha);
	const int color = Graphics::makeColor(255,255,255);
	vFont.printf(location.getX() + startx - x1, locationY - y1, color, area.translucent(), context[currentOption]->getName(), 0 );
	currentOption--;
	locationY -= (int)(vFont.getHeight()/FONT_SPACER);
	count++;
	/*if (context.size() < 2 && count == 1){
	break;
	}*/
	}
	// bmp.setClipRect(0, 0, bmp.getWidth(), bmp.getHeight());
	#endif
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jun 11, 10:45 AM (3 w, 5 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 68511
Default Alt Text: (93 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions