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

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 09645aa..358d774 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -4,12 +4,13 @@
 #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;
@@ -37,7 +38,7 @@ int main(int argc, char **argv)
 	}
 	vmem_front = vmem_back = fb_pixels;
 
-	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER);
+	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE);
 	if(!(fbsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, sdl_flags))) {
 		fprintf(stderr, "failed to set video mode %dx%d %dbpp\n", fb_width, fb_height, fb_bpp);
 		free(fb_pixels);
@@ -52,7 +53,7 @@ int main(int argc, char **argv)
 		SDL_Quit();
 		return 1;
 	}
-	start_time = SDL_GetTicks();
+	reset_timer();
 
 	while(!quit) {
 		SDL_Event ev;
@@ -61,7 +62,7 @@ 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);
 
@@ -103,9 +104,34 @@ 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 int bnmask(int sdlbn)
+{
+	switch(sdlbn) {
+	case SDL_BUTTON_LEFT:
+		return MOUSE_LEFT;
+	case SDL_BUTTON_RIGHT:
+		return MOUSE_RIGHT;
+	case SDL_BUTTON_MIDDLE:
+		return MOUSE_MIDDLE;
+	default:
+		break;
+	}
+	return 0;
 }
 
 static void handle_event(SDL_Event *ev)
@@ -117,10 +143,9 @@ 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();
-			}
+		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);
@@ -132,10 +157,10 @@ static void handle_event(SDL_Event *ev)
 		break;
 
 	case SDL_MOUSEBUTTONDOWN:
-		mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT);
+		mouse_bmask |= bnmask(ev->button.button);
 		if(0) {
 	case SDL_MOUSEBUTTONUP:
-			mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT));
+			mouse_bmask &= ~bnmask(ev->button.button);
 		}
 		mouse_x = ev->button.x / fbscale;
 		mouse_y = ev->button.y / fbscale;