From 946f4bb77d02252b28006509bd0c3d617060b3cf Mon Sep 17 00:00:00 2001 From: kanjitalk755 Date: Sat, 21 Mar 2020 19:48:58 +0900 Subject: [PATCH] BII/SS common: read keycodes, if failed, read BasiliskII_keycodes --- BasiliskII/src/SDL/video_sdl2.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/BasiliskII/src/SDL/video_sdl2.cpp b/BasiliskII/src/SDL/video_sdl2.cpp index 090417f5..03c55d68 100644 --- a/BasiliskII/src/SDL/video_sdl2.cpp +++ b/BasiliskII/src/SDL/video_sdl2.cpp @@ -90,19 +90,13 @@ enum { static int display_type = DISPLAY_WINDOW; // See enum above #endif -#ifdef SHEEPSHAVER -#define PREFIX "" -#else -#define PREFIX "BasiliskII_" -#endif - // Constants -#ifdef WIN32 -const char KEYCODE_FILE_NAME[] = PREFIX "keycodes"; -#elif __MACOSX__ -const char KEYCODE_FILE_NAME[] = PREFIX "keycodes"; +#if defined(__MACOSX__) || defined(WIN32) +const char KEYCODE_FILE_NAME[] = "keycodes"; +const char KEYCODE_FILE_NAME2[] = "BasiliskII_keycodes"; #else const char KEYCODE_FILE_NAME[] = DATADIR "/keycodes"; +const char KEYCODE_FILE_NAME[] = DATADIR "/BasiliskII_keycodes"; #endif @@ -1207,6 +1201,7 @@ static void keycode_init(void) // Open keycode table FILE *f = fopen(kc_path && *kc_path ? kc_path : KEYCODE_FILE_NAME, "r"); + if (f == NULL) f = fopen(KEYCODE_FILE_NAME2, "r"); if (f == NULL) { char str[256]; snprintf(str, sizeof(str), GetString(STR_KEYCODE_FILE_WARN), kc_path ? kc_path : KEYCODE_FILE_NAME, strerror(errno));