X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Ffbdev%2Fgfx.cc;h=7ebc656f1b13d29f69dc41be10aa433a721b3a58;hb=e4076629a736e957739c31cd20bbbbb70327023b;hp=422312c43211dd9c9279d63a414ccd0866759033;hpb=59cd3a77c4517e387f4c2e21e8b62a9017370116;p=winnie

diff --git a/src/fbdev/gfx.cc b/src/fbdev/gfx.cc
index 422312c..7ebc656 100644
--- a/src/fbdev/gfx.cc
+++ b/src/fbdev/gfx.cc
@@ -2,6 +2,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <fcntl.h>
@@ -13,20 +14,30 @@
 #include <linux/fb.h>
 
 #include "gfx.h"
+#include "shalloc.h"
 
 #define FRAMEBUFFER_SIZE(xsz, ysz, bpp) ((xsz) * (ysz) * (bpp) / CHAR_BIT)
 
 static unsigned char *framebuffer;
-static int dev_fd = -1;
+static int dev_fd;
 
-static Rect screen_rect;
+struct Graphics {
+	Rect screen_rect;
+	Rect clipping_rect;
+	int color_depth;
+	Pixmap *pixmap;
+};
 
-static int color_depth; // bits per pixel
-
-static Pixmap *pixmap;
+static Graphics *gfx;
 
 bool init_gfx()
 {
+	if(!(gfx = (Graphics*)sh_malloc(sizeof *gfx))) {
+		return false;
+	}
+
+	dev_fd = -1;
+
 	if((dev_fd = open("/dev/fb0", O_RDWR)) == -1) {
 		fprintf(stderr, "Cannot open /dev/fb0 : %s\n", strerror(errno));
 		return false;
@@ -43,14 +54,14 @@ bool init_gfx()
 	printf("width : %d height : %d\n : bpp : %d\n", sinfo.xres, sinfo.yres, sinfo.bits_per_pixel);
 	printf("virtual w: %d virtual h: %d\n", sinfo.xres_virtual, sinfo.yres_virtual);
 
-	screen_rect.x = screen_rect.y = 0;
-	screen_rect.width = sinfo.xres_virtual;
-	screen_rect.height = sinfo.yres_virtual;
-	color_depth = sinfo.bits_per_pixel;
+	gfx->screen_rect.x = gfx->screen_rect.y = 0;
+	gfx->screen_rect.width = sinfo.xres_virtual;
+	gfx->screen_rect.height = sinfo.yres_virtual;
+	gfx->color_depth = sinfo.bits_per_pixel;
 
-	set_clipping_rect(screen_rect);
+	set_clipping_rect(gfx->screen_rect);
 
-	int sz = FRAMEBUFFER_SIZE(screen_rect.width, screen_rect.height, color_depth);
+	int sz = FRAMEBUFFER_SIZE(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth);
 	framebuffer = (unsigned char*)mmap(0, sz, PROT_READ | PROT_WRITE, MAP_SHARED, dev_fd, 0);
 
 	if(framebuffer == (void*)-1) {
@@ -73,10 +84,19 @@ bool init_gfx()
 	}
 */
 
-	pixmap = new Pixmap;
-	pixmap->width = screen_rect.width;
-	pixmap->height = screen_rect.height;
-	pixmap->pixels = framebuffer;
+	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;
+
+	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;
+	}
 
 	return true;
 }
@@ -91,32 +111,44 @@ void destroy_gfx()
 
 	dev_fd = -1;
 
-	munmap(framebuffer, FRAMEBUFFER_SIZE(screen_rect.width, screen_rect.height, color_depth));
+	munmap(framebuffer, FRAMEBUFFER_SIZE(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth));
 	framebuffer = 0;
 
-	pixmap->pixels = 0;
+	sh_free(gfx->pixmap->pixels);
+	gfx->pixmap->pixels = 0;
+	sh_free(gfx->pixmap);
+	sh_free(gfx);
 }
 
 unsigned char *get_framebuffer()
 {
-	return framebuffer;
+	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 set_clipping_rect(const Rect &rect)
+{
+	gfx->clipping_rect = rect_intersection(rect, get_screen_size());
 }
 
+const Rect &get_clipping_rect()
+{
+	return gfx->clipping_rect;
+}
 
 void set_cursor_visibility(bool visible)
 {
@@ -130,6 +162,7 @@ void set_cursor_visibility(bool visible)
 
 void gfx_update()
 {
+	memcpy(framebuffer, gfx->pixmap->pixels, gfx->pixmap->width * gfx->pixmap->height * (gfx->color_depth / 8));
 }
 
 void wait_vsync()