X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=src%2Fsdl%2Fmain.c;h=08bddf800c070078f748ddc239221107299fd20d;hp=b9ed60414ed694cae33553dca2a4e33d58046c77;hb=7cffbf057545fb303ad8f53e432ef42f7708e16d;hpb=9ecf7c26db456b3cef34a7d6d79ffb164cad17c5

diff --git a/src/sdl/main.c b/src/sdl/main.c
index b9ed604..08bddf8 100644
--- a/src/sdl/main.c
+++ b/src/sdl/main.c
@@ -16,6 +16,8 @@ static void toggle_fullscreen(void);
 static int handle_sball_event(sball_event *ev);
 static void recalc_sball_matrix(float *xform);
 
+static int sdlkey_to_demokey(int sdlkey, unsigned int mod);
+
 
 static int quit;
 static SDL_Surface *fbsurf;
@@ -31,9 +33,8 @@ static quat_t rot = {0, 0, 0, 1};
 
 int main(int argc, char **argv)
 {
-	int s, i, j;
+	int s;
 	char *env;
-	unsigned short *sptr, *dptr;
 
 	if((env = getenv("FBSCALE")) && (s = atoi(env))) {
 		fbscale = s;
@@ -43,17 +44,21 @@ int main(int argc, char **argv)
 	xsz = fb_width * fbscale;
 	ysz = fb_height * fbscale;
 
+	/* now start_loadscr sets up fb_pixels to the space used by the loading image,
+	 * so no need to allocate another framebuffer
+	 */
+#if 0
 	/* 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;
+#endif
 
 	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);
+		/*free(fb_pixels);*/
 		SDL_Quit();
 		return 1;
 	}
@@ -62,10 +67,11 @@ int main(int argc, char **argv)
 
 	time_msec = 0;
 	if(demo_init(argc, argv) == -1) {
-		free(fb_pixels);
+		/*free(fb_pixels);*/
 		SDL_Quit();
 		return 1;
 	}
+	vmem = fb_pixels;
 
 	if(opt.sball && sball_init() == 0) {
 		use_sball = 1;
@@ -91,33 +97,6 @@ int main(int argc, char **argv)
 
 		time_msec = get_msec();
 		demo_draw();
-		drawFps(fb_pixels);
-
-		if(SDL_MUSTLOCK(fbsurf)) {
-			SDL_LockSurface(fbsurf);
-		}
-
-		sptr = fb_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;
-				unsigned short pixel = *sptr++;
-
-				for(y=0; y<fbscale; y++) {
-					for(x=0; x<fbscale; x++) {
-						dptr[y * fbsurf->w + x] = pixel;
-					}
-				}
-				dptr += fbscale;
-			}
-			dptr += (fbsurf->w - fb_width) * fbscale;
-		}
-
-		if(SDL_MUSTLOCK(fbsurf)) {
-			SDL_UnlockSurface(fbsurf);
-		}
-		SDL_Flip(fbsurf);
 	}
 
 break_evloop:
@@ -140,10 +119,40 @@ void wait_vsync(void)
 
 void swap_buffers(void *pixels)
 {
-	/* do nothing, all pointers point to the same buffer */
+	int i, j;
+	unsigned short *sptr, *dptr;
+
+	demo_post_draw(pixels ? pixels : fb_pixels);
+
 	if(opt.vsync) {
 		wait_vsync();
 	}
+
+	if(SDL_MUSTLOCK(fbsurf)) {
+		SDL_LockSurface(fbsurf);
+	}
+
+	sptr = fb_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;
+			unsigned short pixel = *sptr++;
+
+			for(y=0; y<fbscale; y++) {
+				for(x=0; x<fbscale; x++) {
+					dptr[y * fbsurf->w + x] = pixel;
+				}
+			}
+			dptr += fbscale;
+		}
+		dptr += (fbsurf->w - fb_width) * fbscale;
+	}
+
+	if(SDL_MUSTLOCK(fbsurf)) {
+		SDL_UnlockSurface(fbsurf);
+	}
+	SDL_Flip(fbsurf);
 }
 
 static int bnmask(int sdlbn)
@@ -163,6 +172,8 @@ static int bnmask(int sdlbn)
 
 static void handle_event(SDL_Event *ev)
 {
+	int key;
+
 	switch(ev->type) {
 	case SDL_QUIT:
 		quit = 1;
@@ -175,7 +186,8 @@ static void handle_event(SDL_Event *ev)
 			toggle_fullscreen();
 			break;
 		}
-		demo_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED ? 1 : 0);
+		key = sdlkey_to_demokey(ev->key.keysym.sym, ev->key.keysym.mod);
+		demo_keyboard(key, ev->key.state == SDL_PRESSED ? 1 : 0);
 		break;
 
 	case SDL_MOUSEMOTION:
@@ -252,10 +264,37 @@ static int handle_sball_event(sball_event *ev)
 	return 0;
 }
 
-void recalc_sball_matrix(float *xform)
+static void recalc_sball_matrix(float *xform)
 {
 	quat_to_mat(xform, rot);
 	xform[12] = pos.x;
 	xform[13] = pos.y;
 	xform[14] = pos.z;
 }
+
+#define SSORG	'\''
+#define SSEND	'`'
+static char symshift[] = {
+	'"', 0, 0, 0, 0, '<', '_', '>', '?',
+	')', '!', '@', '#', '$', '%', '^', '&', '*', '(',
+	0, ':', 0, '+', 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	'{', '|', '}', 0, 0, '~'
+};
+
+
+static int sdlkey_to_demokey(int sdlkey, unsigned int mod)
+{
+	if(sdlkey < 128) {
+		if(mod & (KMOD_SHIFT)) {
+			if(sdlkey >= 'a' && sdlkey <= 'z') {
+				sdlkey = toupper(sdlkey);
+			} else if(sdlkey >= SSORG && sdlkey <= SSEND) {
+				sdlkey = symshift[sdlkey - SSORG];
+			}
+		}
+		return sdlkey;
+	}
+	if(sdlkey < 256) return 0;
+	return sdlkey - 128;
+}