X-Git-Url: https://eleni.mutantstargoat.com/git/?p=winnie;a=blobdiff_plain;f=src%2Ffbdev%2Fgfx.cc;h=d0a81788b3431eb3067ceb778189b599b67311bf;hp=422312c43211dd9c9279d63a414ccd0866759033;hb=5984d5479693fd7519674a5bc40ebf804f8d0a46;hpb=ed66dbc4e6c017dad675a83dbcd7619b1b5d1e7d

diff --git a/src/fbdev/gfx.cc b/src/fbdev/gfx.cc
index 422312c..d0a8178 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>
@@ -16,53 +17,61 @@
 
 #define FRAMEBUFFER_SIZE(xsz, ysz, bpp) ((xsz) * (ysz) * (bpp) / CHAR_BIT)
 
-static unsigned char *framebuffer;
-static int dev_fd = -1;
+struct Graphics {
+	unsigned char *framebuffer;
+	int dev_fd;
+	Rect screen_rect;
+	Rect clipping_rect;
+	int color_depth;
+	Pixmap *pixmap;
+};
 
-static Rect screen_rect;
-
-static int color_depth; // bits per pixel
-
-static Pixmap *pixmap;
+static Graphics *gfx;
 
 bool init_gfx()
 {
-	if((dev_fd = open("/dev/fb0", O_RDWR)) == -1) {
+	gfx->dev_fd = -1;
+
+	if((gfx->dev_fd = open("/dev/fb0", O_RDWR)) == -1) {
 		fprintf(stderr, "Cannot open /dev/fb0 : %s\n", strerror(errno));
 		return false;
 	}
 
 	fb_var_screeninfo sinfo;
-	if(ioctl(dev_fd, FBIOGET_VSCREENINFO, &sinfo) == -1) {
-		close(dev_fd);
-		dev_fd = -1;
+	if(ioctl(gfx->dev_fd, FBIOGET_VSCREENINFO, &sinfo) == -1) {
+		close(gfx->dev_fd);
+		gfx->dev_fd = -1;
 		fprintf(stderr, "Unable to get screen info : %s\n", strerror(errno));
 		return false;
 	}
 
+	if(!(gfx = (Graphics*)malloc(sizeof *gfx))) {
+		return false;
+	}
+
 	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);
-	framebuffer = (unsigned char*)mmap(0, sz, PROT_READ | PROT_WRITE, MAP_SHARED, dev_fd, 0);
+	int sz = FRAMEBUFFER_SIZE(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth);
+	gfx->framebuffer = (unsigned char*)mmap(0, sz, PROT_READ | PROT_WRITE, MAP_SHARED, gfx->dev_fd, 0);
 
-	if(framebuffer == (void*)-1) {
-		close(dev_fd);
-		dev_fd = -1;
+	if(gfx->framebuffer == (void*)-1) {
+		close(gfx->dev_fd);
+		gfx->dev_fd = -1;
 		fprintf(stderr, "Cannot map the framebuffer to memory : %s\n", strerror(errno));
 		return false;
 	}
 
 // TODO: uncomment when I find how to use intelfb instead of i915 GRRRR.-	
 	fb_vblank vblank;
-	if(ioctl(dev_fd, FBIOGET_VBLANK, &vblank) == -1) {
+	if(ioctl(gfx->dev_fd, FBIOGET_VBLANK, &vblank) == -1) {
 //		fprintf(stderr, "FBIOGET_VBLANK error: %s\n", strerror(errno));
 	}
 /*	
@@ -73,10 +82,10 @@ bool init_gfx()
 	}
 */
 
-	pixmap = new Pixmap;
-	pixmap->width = screen_rect.width;
-	pixmap->height = screen_rect.height;
-	pixmap->pixels = framebuffer;
+	gfx->pixmap = new Pixmap;
+	gfx->pixmap->width = gfx->screen_rect.width;
+	gfx->pixmap->height = gfx->screen_rect.height;
+	gfx->pixmap->pixels = gfx->framebuffer;
 
 	return true;
 }
@@ -85,45 +94,56 @@ void destroy_gfx()
 {
 	clear_screen(0, 0, 0);
 
-	if(dev_fd != -1) {
-		close(dev_fd);
+	if(gfx->dev_fd != -1) {
+		close(gfx->dev_fd);
 	}
 
-	dev_fd = -1;
+	gfx->dev_fd = -1;
 
-	munmap(framebuffer, FRAMEBUFFER_SIZE(screen_rect.width, screen_rect.height, color_depth));
-	framebuffer = 0;
+	munmap(gfx->framebuffer, FRAMEBUFFER_SIZE(gfx->screen_rect.width, gfx->screen_rect.height, gfx->color_depth));
+	gfx->framebuffer = 0;
 
-	pixmap->pixels = 0;
+	gfx->pixmap->pixels = 0;
+
+	free(gfx);
 }
 
 unsigned char *get_framebuffer()
 {
-	return framebuffer;
+	return gfx->framebuffer;
 }
 
 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)
 {
 	fb_cursor curs;
 	curs.enable = visible ? 1 : 0;
 
-	if(ioctl(dev_fd, FBIO_CURSOR, &curs) == -1) {
+	if(ioctl(gfx->dev_fd, FBIO_CURSOR, &curs) == -1) {
 		fprintf(stderr, "Cannot toggle cursor visibility : %s\n", strerror(errno));
 	}
 }
@@ -135,7 +155,7 @@ void gfx_update()
 void wait_vsync()
 {
 	unsigned long arg = 0;
-	if(ioctl(dev_fd, FBIO_WAITFORVSYNC, &arg) == -1) {
+	if(ioctl(gfx->dev_fd, FBIO_WAITFORVSYNC, &arg) == -1) {
 //		printf("ioctl error %s\n", strerror(errno));
 	}
 }