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

diff --git a/src/fbdev/gfx.cc b/src/fbdev/gfx.cc
index 422312c..1421348 100644
--- a/src/fbdev/gfx.cc
+++ b/src/fbdev/gfx.cc
@@ -1,7 +1,29 @@
+/*
+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_FBDEV
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <fcntl.h>
@@ -13,20 +35,31 @@
 #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 Rect screen_rect;
+static int dev_fd;
+static int rgb_order[3];
 
-static int color_depth; // bits per pixel
+struct Graphics {
+	Rect screen_rect;
+	Rect clipping_rect;
+	int color_depth;
+	Pixmap *pixmap;
+};
 
-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 +76,18 @@ 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;
+
+	rgb_order[0] = sinfo.red.offset / 8;
+	rgb_order[1] = sinfo.green.offset / 8;
+	rgb_order[2] = sinfo.blue.offset / 8;
 
-	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 +110,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;
 }
@@ -84,6 +130,7 @@ bool init_gfx()
 void destroy_gfx()
 {
 	clear_screen(0, 0, 0);
+	gfx_update(gfx->screen_rect);
 
 	if(dev_fd != -1) {
 		close(dev_fd);
@@ -91,32 +138,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)
 {
@@ -128,8 +187,17 @@ void set_cursor_visibility(bool visible)
 	}
 }
 
-void gfx_update()
+void gfx_update(const Rect &upd_rect)
 {
+	Rect rect = rect_intersection(upd_rect, gfx->screen_rect);
+	unsigned char *sptr = gfx->pixmap->pixels + (rect.y * gfx->screen_rect.width + rect.x) * 4;
+	unsigned char *dptr = framebuffer + (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 wait_vsync()
@@ -140,4 +208,11 @@ void wait_vsync()
 	}
 }
 
+void get_rgb_order(int *r, int *g, int *b)
+{
+	*r = rgb_order[0];
+	*g = rgb_order[1];
+	*b = rgb_order[2];
+}
+
 #endif // WINNIE_FBDEV