From cfff01f846a3e473d2b32f1097883ddf1c26cd6d Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sat, 22 Jan 2005 17:41:33 +0000
Subject: [PATCH] fix parsing of the keycode table

---
 BasiliskII/src/SDL/video_sdl.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/BasiliskII/src/SDL/video_sdl.cpp b/BasiliskII/src/SDL/video_sdl.cpp
index 5567e2d0..748243e0 100644
--- a/BasiliskII/src/SDL/video_sdl.cpp
+++ b/BasiliskII/src/SDL/video_sdl.cpp
@@ -806,6 +806,7 @@ static void keycode_init(void)
 		SDL_VideoDriverName(video_driver, sizeof(video_driver));
 		bool video_driver_found = false;
 		char line[256];
+		int n_keys = 0;
 		while (fgets(line, sizeof(line) - 1, f)) {
 			// Read line
 			int len = strlen(line);
@@ -818,15 +819,16 @@ static void keycode_init(void)
 				continue;
 
 			if (video_driver_found) {
-				// Skip aliases
+				// Skip aliases as long as we have read keycodes yet
+				// Otherwise, it's another mapping and we have to stop
 				static const char sdl_str[] = "sdl";
-				if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0)
+				if (strncmp(line, sdl_str, sizeof(sdl_str) - 1) == 0 && n_keys == 0)
 					continue;
 
 				// Read keycode
 				int x_code, mac_code;
 				if (sscanf(line, "%d %d", &x_code, &mac_code) == 2)
-					keycode_table[x_code & 0xff] = mac_code;
+					keycode_table[x_code & 0xff] = mac_code, n_keys++;
 				else
 					break;
 			} else {
@@ -851,6 +853,8 @@ static void keycode_init(void)
 			WarningAlert(str);
 			return;
 		}
+
+		D(bug("Using SDL/%s keycodes table, %d key mappings\n", video_driver, n_keys));
 	}
 }