X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fsdl%2Fgfx.cc;h=cd1a4a6dde592968f2ecaf88ced80536801338e9;hb=e4076629a736e957739c31cd20bbbbb70327023b;hp=aec9663a853f8eb1cf8c2762fe692236762926b0;hpb=52044efd7717f4b02bd463c9a26f83c9a41953ea;p=winnie

diff --git a/src/sdl/gfx.cc b/src/sdl/gfx.cc
index aec9663..cd1a4a6 100644
--- a/src/sdl/gfx.cc
+++ b/src/sdl/gfx.cc
@@ -2,14 +2,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <SDL/SDL.h>
+
 #include "gfx.h"
+#include "shalloc.h"
 
 static SDL_Surface *fbsurf;
 
-static Rect screen_rect = {0, 0, 1024, 768};
-static int color_depth = 32; // bits per pixel
+struct Graphics {
+	Rect screen_rect;
+	Rect clipping_rect;
+	int color_depth; // bits per pixel
+	Pixmap *pixmap;
+};
 
-static Pixmap *pixmap;
+static Graphics *gfx;
 
 bool init_gfx()
 {
@@ -18,168 +24,161 @@ bool init_gfx()
 		return false;
 	}
 
-	if(!(fbsurf = SDL_SetVideoMode(screen_rect.width, screen_rect.height, color_depth, 0))) {
-		fprintf(stderr, "failed to set video mode\n");
+	if(!(gfx = (Graphics*)sh_malloc(sizeof *gfx))) {
+		return false;
+	}
+
+	Rect scr_rect = {0, 0, 1024, 768};
+	gfx->screen_rect = scr_rect;
+	gfx->color_depth = 32;
+
+	if(!(fbsurf = SDL_SetVideoMode(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth, 0))) {
+		fprintf(stderr, "Failed to set video mode\n");
 		return false;
 	}
 	SDL_ShowCursor(0);
 
-	pixmap = new Pixmap;
+	if(!(gfx->pixmap = (Pixmap*)sh_malloc(sizeof(Pixmap)))) {
+		fprintf(stderr, "Failed to allocate pixmap.\n");
+		return false;
+	}
+
+	gfx->pixmap->width = gfx->screen_rect.width;
+	gfx->pixmap->height = gfx->screen_rect.height;
 
-	pixmap->width = screen_rect.width;
-	pixmap->height = screen_rect.height;
+	int fbsize = gfx->pixmap->width * gfx->pixmap->height * gfx->color_depth / 8;
+	if(!(gfx->pixmap->pixels = (unsigned char*)sh_malloc(fbsize))) {
+		fprintf(stderr, "failed to allocate the pixmap framebuffer.\n");
+		return false;
+	}
 
-	pixmap->pixels = (unsigned char*)fbsurf->pixels;
+	set_clipping_rect(gfx->screen_rect);
 
 	return true;
 }
 
 void destroy_gfx()
 {
-	pixmap->pixels = 0;
-	delete pixmap;
+	sh_free(gfx->pixmap->pixels);
+	gfx->pixmap->pixels = 0;
+	sh_free(gfx->pixmap);
+	sh_free(gfx);
 	SDL_Quit();
 }
 
 unsigned char *get_framebuffer()
 {
-	return (unsigned char*)fbsurf->pixels;
+	return gfx->pixmap->pixels;
 }
 
 Pixmap *get_framebuffer_pixmap()
 {
-	return pixmap;
+	return gfx->pixmap;
 }
 
 Rect get_screen_size()
 {
-	return screen_rect;
+	return gfx->screen_rect;
 }
 
 int get_color_depth()
 {
-	return color_depth;
+	return gfx->color_depth;
 }
 
-void clear_screen(int r, int g, int b)
+/*void set_clipping_rect(const Rect &rect)
 {
-	fill_rect(screen_rect, r, g, b);
-}
+	gfx->clipping_rect = rect_intersection(rect, gfx->screen_rect);
 
-void fill_rect(const Rect &rect, int r, int g, int b)
-{
-	uint32_t color = ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
-	
 	SDL_Rect sdl_rect;
-	sdl_rect.x = rect.x;
-	sdl_rect.y = rect.y;
-	sdl_rect.w = rect.width;
-	sdl_rect.h = rect.height;
-
-	SDL_FillRect(fbsurf, &sdl_rect, color);
-}
-
-void set_cursor_visibility(bool visible)
-{
-}
-
-void blit(unsigned char *src_img, const Rect &src_rect, unsigned char* dest_img,
-		const Rect &dest_rect, int dest_x, int dest_y)
+	sdl_rect.x = gfx->clipping_rect.x;
+	sdl_rect.y = gfx->clipping_rect.y;
+	sdl_rect.w = gfx->clipping_recvoid fill_rect(const Rect &rect, int r, int g, int b)
 {
-	int width = src_rect.width;
-	int height = src_rect.height;
+	Rect drect = rect;
+	Rect screen_rect = get_screen_size();
 
-	int xoffs = dest_x - dest_rect.x;
-	if(xoffs < 0) {
-		dest_x = dest_rect.x;
-		width += xoffs;
+	if(drect.x < clipping_rect.x) {
+		drect.width -= clipping_rect.x - drect.x;
+		drect.x = clipping_rect.x;
 	}
 
-	int yoffs = dest_y - dest_rect.y;
-	if(yoffs < 0) {
-		dest_y = dest_rect.y;
-		height += yoffs;
+	if(drect.y < clipping_rect.y) {
+		drect.height -= clipping_rect.y - drect.y;
+		drect.y = clipping_rect.y;
 	}
 
-	int xend = dest_x + width;
-	if(xend >= dest_rect.width) {
-		width -= xend - dest_rect.width;
+	if(drect.x + drect.width >= clipping_rect.x + clipping_rect.width) {
+		drect.width = clipping_rect.width + clipping_rect.x - drect.x;
 	}
 
-	int yend = dest_y + height;
-	if(yend >= dest_rect.height) {
-		height -= yend - dest_rect.height;
+	if(drect.y + drect.height >= clipping_rect.y + clipping_rect.height) {
+		drect.height = clipping_rect.height + clipping_rect.y - drect.y;
 	}
 
-	if(width <= 0 || height <= 0) {
-		return;
+	unsigned char *fb = get_framebuffer() + (drect.x + screen_rect.width * drect.y) * 4;
+	for(int i=0; i<drect.height; i++) {
+		for(int j=0; j<drect.width; j++) {
+			fb[j * 4] = b;
+			fb[j * 4 + 1] = g;
+			fb[j * 4 + 2] = r;
+		}
+		fb += screen_rect.width * 4;
 	}
+}
+t.width;
+	sdl_rect.h = gfx->clipping_rect.height;
 
-	unsigned char *sptr = src_img + (src_rect.y * src_rect.width + src_rect.x) * 4;
-	unsigned char *dptr = dest_img + (dest_y * dest_rect.width + dest_x) * 4;
-
-	for(int i=0; i<height; i++) {
-		memcpy(dptr, sptr, width * 4);
-		sptr += src_rect.width * 4;
-		dptr += dest_rect.width * 4;
-	}
+	SDL_SetClipRect(fbsurf, &sdl_rect);
 }
 
-void blit_key(unsigned char *src_img, const Rect &src_rect, unsigned char* dest_img,
-		const Rect &dest_rect, int dest_x, int dest_y, int key_r, int key_g, int key_b)
+const Rect &get_clipping_rect()
 {
-	int width = src_rect.width;
-	int height = src_rect.height;
-
-	int xoffs = dest_x - dest_rect.x;
-	if(xoffs < 0) {
-		dest_x = dest_rect.x;
-		width += xoffs;
-	}
-
-	int yoffs = dest_y - dest_rect.y;
-	if(yoffs < 0) {
-		dest_y = dest_rect.y;
-		height += yoffs;
-	}
+	return gfx->clipping_rect;
+}
 
-	int xend = dest_x + width;
-	if(xend >= dest_rect.width) {
-		width -= xend - dest_rect.width;
-	}
+void clear_screen(int r, int g, int b)
+{
+	fill_rect(gfx->screen_rect, r, g, b);
+}
 
-	int yend = dest_y + height;
-	if(yend >= dest_rect.height) {
-		height -= yend - dest_rect.height;
-	}
+void fill_rect(const Rect &rect, int r, int g, int b)
+{
+	uint32_t color = ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff);
+	
+	SDL_Rect sdl_rect;
+	sdl_rect.x = rect.x;
+	sdl_rect.y = rect.y;
+	sdl_rect.w = rect.width;
+	sdl_rect.h = rect.height;
 
-	if(width <= 0 || height <= 0) {
-		return;
-	}
+	SDL_FillRect(fbsurf, &sdl_rect, color);
+}*/
 
-	unsigned char *sptr = src_img + (src_rect.y * src_rect.width + src_rect.x) * 4;
-	unsigned char *dptr = dest_img + (dest_y * dest_rect.width + dest_x) * 4;
+void set_clipping_rect(const Rect &rect)
+{
+	gfx->clipping_rect = rect_intersection(rect, get_screen_size());
+}
 
-	for(int i=0; i<height; i++) {
-		for(int j=0; j<width; j++) {
-			int r = sptr[j * 4];
-			int g = sptr[j * 4 + 1];
-			int b = sptr[j * 4 + 2];
+const Rect &get_clipping_rect()
+{
+	return gfx->clipping_rect;
+}
 
-			if(r != key_r || g != key_g || b != key_b) {
-				dptr[j * 4] = r;
-				dptr[j * 4 + 1] = g;
-				dptr[j * 4 + 2] = b;
-			}
-		}
 
-		sptr += src_rect.width * 4;
-		dptr += dest_rect.width * 4;
-	}
+void set_cursor_visibility(bool visible)
+{
 }
 
 void gfx_update()
 {
+	if(SDL_MUSTLOCK(fbsurf)) {
+		SDL_LockSurface(fbsurf);
+	}
+	memcpy(fbsurf->pixels, gfx->pixmap->pixels, gfx->pixmap->width * gfx->pixmap->height * (gfx->color_depth / 8));
+	if(SDL_MUSTLOCK(fbsurf)) {
+		SDL_UnlockSurface(fbsurf);
+	}
 	SDL_UpdateRect(fbsurf, 0, 0, 0, 0);
 }