X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=3165e314001dd32ccb042365c40fa999477a2f55;hb=1442212ba0ff24b868dd29facc2278a26c8a9a18;hp=0abb3e32c60382fa1c6631174aeff3093b5ac574;hpb=ecc362e702b77d5c1334656e6f4dc9b17abcb767;p=dosdemo

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 0abb3e3..3165e31 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -3,22 +3,25 @@
 #include <limits.h>
 #include <SDL/SDL.h>
 #include "demo.h"
+#include "tinyfps.h"
+#include "timer.h"
+#include "cfgopt.h"
 
 static void handle_event(SDL_Event *ev);
+static void toggle_fullscreen(void);
 
 static int quit;
-static long start_time;
 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,10 +31,12 @@ 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;
 	}
+	vmem_front = vmem_back = fb_pixels;
 
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER);
 	if(!(fbsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, sdl_flags))) {
@@ -48,7 +53,7 @@ int main(int argc, char **argv)
 		SDL_Quit();
 		return 1;
 	}
-	start_time = SDL_GetTicks();
+	reset_timer();
 
 	while(!quit) {
 		SDL_Event ev;
@@ -57,15 +62,16 @@ int main(int argc, char **argv)
 			if(quit) goto break_evloop;
 		}
 
-		time_msec = SDL_GetTicks() - start_time;
+		time_msec = get_msec();
 		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;
@@ -73,12 +79,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)) {
@@ -98,6 +104,21 @@ void demo_quit(void)
 	quit = 1;
 }
 
+void wait_vsync(void)
+{
+	unsigned long start = SDL_GetTicks();
+	unsigned long until = (start | 0xf) + 1;
+	while(SDL_GetTicks() <= until);
+}
+
+void swap_buffers(void *pixels)
+{
+	/* do nothing, all pointers point to the same buffer */
+	if(opt.vsync) {
+		wait_vsync();
+	}
+}
+
 static void handle_event(SDL_Event *ev)
 {
 	switch(ev->type) {
@@ -107,10 +128,44 @@ static void handle_event(SDL_Event *ev)
 
 	case SDL_KEYDOWN:
 	case SDL_KEYUP:
+		if(ev->key.keysym.sym == SDLK_RETURN && (SDL_GetModState() & KMOD_ALT) &&
+				ev->key.state == SDL_PRESSED) {
+			toggle_fullscreen();
+			break;
+		}
 		demo_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED ? 1 : 0);
 		break;
 
+	case SDL_MOUSEMOTION:
+		mouse_x = ev->motion.x / fbscale;
+		mouse_y = ev->motion.y / fbscale;
+		break;
+
+	case SDL_MOUSEBUTTONDOWN:
+		mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT);
+		if(0) {
+	case SDL_MOUSEBUTTONUP:
+			mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT));
+		}
+		mouse_x = ev->button.x / fbscale;
+		mouse_y = ev->button.y / fbscale;
+		break;
+
 	default:
 		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;
+}