X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Ffbdev%2Fgfx.cc;h=e4527b0c04998b2198c294ecec0d48e3261d6812;hb=906b341b177e5947710107eceb9ab2e4ee09528c;hp=00e18815c67b6190fc7780dc82d477f71b53055d;hpb=6dc42c0e7292d6d94de640ddd7de3ee5c808e9c2;p=winnie

diff --git a/src/fbdev/gfx.cc b/src/fbdev/gfx.cc
index 00e1881..e4527b0 100644
--- a/src/fbdev/gfx.cc
+++ b/src/fbdev/gfx.cc
@@ -7,6 +7,7 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#include <sys/time.h>
 #include <unistd.h>
 
 #include <linux/fb.h>
@@ -54,6 +55,20 @@ bool init_gfx()
 		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) {
+		fprintf(stderr, "FBIOGET_VBLANK error: %s\n", strerror(errno));
+	}
+	else {
+		printf("flags: %x\n", vblank.flags);
+		printf("count: %d\n", vblank.count);
+		printf("beam position: %d, %d\n", vblank.hcount, vblank.vcount);
+	}
+*/
+
 	return true;
 }
 
@@ -95,12 +110,22 @@ void fill_rect(const Rect &rect, int r, int g, int b)
 {
 	Rect drect = rect;
 
-	if(drect.x < 0) {
-		drect.x = 0;
+	if(drect.x < screen_rect.x) {
+		drect.width -= screen_rect.x - drect.x;
+		drect.x = screen_rect.x;
+	}
+
+	if(drect.y < screen_rect.y) {
+		drect.height -= screen_rect.y - drect.y;
+		drect.y = screen_rect.y;
 	}
 
-	if(drect.y < 0) {
-		drect.y = 0;
+	if(drect.x + drect.width >= screen_rect.x + screen_rect.width) {
+		drect.width = screen_rect.width - drect.x;
+	}
+
+	if(drect.y + drect.height >= screen_rect.y + screen_rect.height) {
+		drect.height = screen_rect.height - drect.y;
 	}
 
 	unsigned char *fb = framebuffer + (drect.x + screen_rect.width * drect.y) * 4;
@@ -223,4 +248,12 @@ void gfx_update()
 {
 }
 
+void wait_vsync()
+{
+	unsigned long arg = 0;
+	if(ioctl(dev_fd, FBIO_WAITFORVSYNC, &arg) == -1) {
+//		printf("ioctl error %s\n", strerror(errno));
+	}
+}
+
 #endif // WINNIE_FBDEV