X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fsdl%2Fgfx.cc;h=7e098b9e4159fea0d79bc73592378aebe97aadf9;hb=9261ecb0ad85bdf8b21e17b7309ddaeb76a57d96;hp=9b708e006e9d87d665c8b0bad4af171b14b7c3eb;hpb=5984d5479693fd7519674a5bc40ebf804f8d0a46;p=winnie

diff --git a/src/sdl/gfx.cc b/src/sdl/gfx.cc
index 9b708e0..7e098b9 100644
--- a/src/sdl/gfx.cc
+++ b/src/sdl/gfx.cc
@@ -1,11 +1,36 @@
+/*
+winnie - an experimental window system
+
+Copyright (C) 2013 Eleni Maria Stea
+
+This program 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, either version 3 of the License, or
+(at your option) any later version.
+
+This program 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/>.
+
+Author: Eleni Maria Stea <elene.mst@gmail.com>
+*/
+
 #ifdef WINNIE_SDL
 #include <stdio.h>
 #include <stdlib.h>
 #include <SDL/SDL.h>
+
 #include "gfx.h"
+#include "shalloc.h"
+#include "winnie.h"
+
+static SDL_Surface *fbsurf;
 
 struct Graphics {
-	SDL_Surface *fbsurf;
 	Rect screen_rect;
 	Rect clipping_rect;
 	int color_depth; // bits per pixel
@@ -21,24 +46,35 @@ bool init_gfx()
 		return false;
 	}
 
-	if(!(gfx = (Graphics*)malloc(sizeof *gfx))) {
+	if(!(gfx = (Graphics*)sh_malloc(sizeof *gfx))) {
 		return false;
 	}
 
-	Rect scr_rect = {0, 0, 1024, 768};
+	get_subsys()->graphics_offset = (int)((char*)gfx - (char*)get_pool());
+
+	Rect scr_rect(0, 0, 1024, 768);
 	gfx->screen_rect = scr_rect;
 	gfx->color_depth = 32;
 
-	if(!(gfx->fbsurf = SDL_SetVideoMode(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth, 0))) {
-		fprintf(stderr, "failed to set video mode\n");
+	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);
 
-	gfx->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;
-	gfx->pixmap->pixels = (unsigned char*)gfx->fbsurf->pixels;
+
+	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;
+	}
 
 	set_clipping_rect(gfx->screen_rect);
 
@@ -47,15 +83,16 @@ bool init_gfx()
 
 void destroy_gfx()
 {
+	sh_free(gfx->pixmap->pixels);
 	gfx->pixmap->pixels = 0;
-	delete gfx->pixmap;
-	free(gfx);
+	sh_free(gfx->pixmap);
+	sh_free(gfx);
 	SDL_Quit();
 }
 
 unsigned char *get_framebuffer()
 {
-	return (unsigned char*)gfx->fbsurf->pixels;
+	return gfx->pixmap->pixels;
 }
 
 Pixmap *get_framebuffer_pixmap()
@@ -73,50 +110,9 @@ int get_color_depth()
 	return gfx->color_depth;
 }
 
-/*void set_clipping_rect(const Rect &rect)
-{
-	gfx->clipping_rect = rect_intersection(rect, gfx->screen_rect);
-
-	SDL_Rect sdl_rect;
-	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)
+void set_clipping_rect(const Rect &rect)
 {
-	Rect drect = rect;
-	Rect screen_rect = get_screen_size();
-
-	if(drect.x < clipping_rect.x) {
-		drect.width -= clipping_rect.x - drect.x;
-		drect.x = clipping_rect.x;
-	}
-
-	if(drect.y < clipping_rect.y) {
-		drect.height -= clipping_rect.y - drect.y;
-		drect.y = clipping_rect.y;
-	}
-
-	if(drect.x + drect.width >= clipping_rect.x + clipping_rect.width) {
-		drect.width = clipping_rect.width + clipping_rect.x - drect.x;
-	}
-
-	if(drect.y + drect.height >= clipping_rect.y + clipping_rect.height) {
-		drect.height = clipping_rect.height + clipping_rect.y - drect.y;
-	}
-
-	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;
-
-	SDL_SetClipRect(gfx->fbsurf, &sdl_rect);
+	gfx->clipping_rect = rect_intersection(rect, get_screen_size());
 }
 
 const Rect &get_clipping_rect()
@@ -124,46 +120,43 @@ const Rect &get_clipping_rect()
 	return gfx->clipping_rect;
 }
 
-void clear_screen(int r, int g, int b)
+
+void set_cursor_visibility(bool visible)
 {
-	fill_rect(gfx->screen_rect, r, g, b);
 }
 
-void fill_rect(const Rect &rect, int r, int g, int b)
+void gfx_update(const Rect &upd_rect)
 {
-	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(gfx->fbsurf, &sdl_rect, color);
-}*/
+	if(SDL_MUSTLOCK(fbsurf)) {
+		SDL_LockSurface(fbsurf);
+	}
 
-void set_clipping_rect(const Rect &rect)
-{
-	gfx->clipping_rect = rect_intersection(rect, get_screen_size());
-}
+	Rect rect = rect_intersection(upd_rect, gfx->screen_rect);
 
-const Rect &get_clipping_rect()
-{
-	return gfx->clipping_rect;
-}
+	unsigned char *sptr = gfx->pixmap->pixels + (rect.y * gfx->screen_rect.width + rect.x) * 4;
+	unsigned char *dptr = (unsigned char*)fbsurf->pixels + (rect.y * gfx->screen_rect.width + rect.x) * 4;
 
+	for(int i=0; i<rect.height; i++) {
+		memcpy(dptr, sptr, rect.width * 4);
+		sptr += gfx->screen_rect.width * 4;
+		dptr += gfx->screen_rect.width * 4;
+	}
 
-void set_cursor_visibility(bool visible)
-{
+	if(SDL_MUSTLOCK(fbsurf)) {
+		SDL_UnlockSurface(fbsurf);
+	}
+	SDL_UpdateRect(fbsurf, rect.x, rect.y, rect.width, rect.height);
 }
 
-void gfx_update()
+void wait_vsync()
 {
-	SDL_UpdateRect(gfx->fbsurf, 0, 0, 0, 0);
 }
 
-void wait_vsync()
+void get_rgb_order(int *r, int *g, int *b)
 {
+	*r = fbsurf->format->Rshift / 8;
+	*g = fbsurf->format->Gshift / 8;
+	*b = fbsurf->format->Bshift / 8;
 }
 
 #endif // WINNIE_SDL