X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosrtxon;a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=e7e161e8e79b2c987f8617132f532c23a51dd2ea;hp=3165e314001dd32ccb042365c40fa999477a2f55;hb=7aa25eddf62c09aca64bd1265344dff9956a387c;hpb=4621a049a4889c5a6845a08e9c0a4d6634ab8556

diff --git a/src/sdl/main.c b/src/sdl/main.c
index 3165e31..e7e161e 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -38,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);
@@ -46,6 +46,7 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	SDL_WM_SetCaption("dosdemo/SDL", 0);
+	SDL_ShowCursor(0);
 
 	time_msec = 0;
 	if(demo_init(argc, argv) == -1) {
@@ -119,6 +120,21 @@ void swap_buffers(void *pixels)
 	}
 }
 
+static int bnmask(int sdlbn)
+{
+	switch(sdlbn) {
+	case SDL_BUTTON_LEFT:
+		return MOUSE_BN_LEFT;
+	case SDL_BUTTON_RIGHT:
+		return MOUSE_BN_RIGHT;
+	case SDL_BUTTON_MIDDLE:
+		return MOUSE_BN_MIDDLE;
+	default:
+		break;
+	}
+	return 0;
+}
+
 static void handle_event(SDL_Event *ev)
 {
 	switch(ev->type) {
@@ -142,10 +158,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;