X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=09645aafcd22c1368dd3f116c4537e4416ba2cc8;hb=1723e332319e7732473814dfc168a13d0bafccb4;hp=e5eda65597b3b6501b63651b19f20d8955fce93a;hpb=5d9ec41cc62ebddf5d406511714e561e88884987;p=dosdemo

diff --git a/src/sdl/main.c b/src/sdl/main.c
index e5eda65..09645aa 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -3,8 +3,10 @@
 #include <limits.h>
 #include <SDL/SDL.h>
 #include "demo.h"
+#include "tinyfps.h"
 
 static void handle_event(SDL_Event *ev);
+static void toggle_fullscreen(void);
 
 static int quit;
 static long start_time;
@@ -12,13 +14,13 @@ static SDL_Surface *fbsurf;
 
 static int fbscale = 2;
 static int xsz, ysz;
+static unsigned int sdl_flags = SDL_SWSURFACE;
 
 int main(int argc, char **argv)
 {
 	int s, i, j;
 	char *env;
 	unsigned short *sptr, *dptr;
-	unsigned int sdl_flags = SDL_SWSURFACE;
 
 	if((env = getenv("FBSCALE")) && (s = atoi(env))) {
 		fbscale = s;
@@ -28,7 +30,8 @@ int main(int argc, char **argv)
 	xsz = fb_width * fbscale;
 	ysz = fb_height * fbscale;
 
-	if(!(fb_pixels = malloc(fb_width * fb_height * fb_bpp / CHAR_BIT))) {
+	/* allocate 1 extra row as a guard band, until we fucking fix the rasterizer */
+	if(!(fb_pixels = malloc(fb_width * (fb_height + 1) * fb_bpp / CHAR_BIT))) {
 		fprintf(stderr, "failed to allocate virtual framebuffer\n");
 		return 1;
 	}
@@ -60,13 +63,14 @@ int main(int argc, char **argv)
 
 		time_msec = SDL_GetTicks() - start_time;
 		demo_draw();
+		drawFps(fb_pixels);
 
 		if(SDL_MUSTLOCK(fbsurf)) {
 			SDL_LockSurface(fbsurf);
 		}
 
 		sptr = fb_pixels;
-		dptr = fbsurf->pixels;
+		dptr = (unsigned short*)fbsurf->pixels + (fbsurf->w - xsz) / 2;
 		for(i=0; i<fb_height; i++) {
 			for(j=0; j<fb_width; j++) {
 				int x, y;
@@ -74,12 +78,12 @@ int main(int argc, char **argv)
 
 				for(y=0; y<fbscale; y++) {
 					for(x=0; x<fbscale; x++) {
-						dptr[y * xsz + x] = pixel;
+						dptr[y * fbsurf->w + x] = pixel;
 					}
 				}
 				dptr += fbscale;
 			}
-			dptr += xsz * (fbscale - 1);
+			dptr += (fbsurf->w - fb_width) * fbscale;
 		}
 
 		if(SDL_MUSTLOCK(fbsurf)) {
@@ -113,6 +117,12 @@ static void handle_event(SDL_Event *ev)
 
 	case SDL_KEYDOWN:
 	case SDL_KEYUP:
+		if(ev->key.keysym.sym == 'f') {
+			if(ev->key.state == SDL_PRESSED) {
+				toggle_fullscreen();
+			}
+			break;
+		}
 		demo_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED ? 1 : 0);
 		break;
 
@@ -122,10 +132,10 @@ static void handle_event(SDL_Event *ev)
 		break;
 
 	case SDL_MOUSEBUTTONDOWN:
-		mouse_bmask |= 1 << ev->button.button;
+		mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT);
 		if(0) {
 	case SDL_MOUSEBUTTONUP:
-			mouse_bmask &= ~(1 << ev->button.button);
+			mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT));
 		}
 		mouse_x = ev->button.x / fbscale;
 		mouse_y = ev->button.y / fbscale;
@@ -135,3 +145,17 @@ static void handle_event(SDL_Event *ev)
 		break;
 	}
 }
+
+static void toggle_fullscreen(void)
+{
+	SDL_Surface *newsurf;
+	unsigned int newflags = sdl_flags ^ SDL_FULLSCREEN;
+
+	if(!(newsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, newflags))) {
+		fprintf(stderr, "failed to go %s\n", newflags & SDL_FULLSCREEN ? "fullscreen" : "windowed");
+		return;
+	}
+
+	fbsurf = newsurf;
+	sdl_flags = newflags;
+}