Macintosh-Tools
/
macemu
mirror of https://github.com/kanjitalk755/macemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swap_opt_cmd assumes false if keycodes file used

This commit is contained in:
kanjitalk755 2021-06-30 11:25:05 +09:00
parent cce0ed4c87
commit 90edd35246
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
BasiliskII/src/SDL/video_sdl2.cpp
View File

@ -2055,19 +2055,13 @@ static bool is_hotkey_down(SDL_Keysym const & ks)
(cmd_down || (ks.mod & KMOD_GUI) || !(hotkey & 4));
}
static int modify_opt_cmd(int code) {
static bool swap_opt_cmd() {
static bool f, c;
if (!f) {
f = true;
c = PrefsFindBool("swap_opt_cmd");
}
if (c) {
switch (code) {
case 0x37: return 0x3a;
case 0x3a: return 0x37;
}
}
return code;
return c;
}
/*
@ -2144,8 +2138,8 @@ static int kc_decode(SDL_Keysym const & ks, bool key_down)
case SDLK_RCTRL: return 0x36;
case SDLK_LSHIFT: return 0x38;
case SDLK_RSHIFT: return 0x38;
case SDLK_LALT: case SDLK_RALT: return 0x3a;
case SDLK_LGUI: case SDLK_RGUI: return 0x37;
case SDLK_LALT: case SDLK_RALT: return swap_opt_cmd() ? 0x37 : 0x3a;
case SDLK_LGUI: case SDLK_RGUI: return swap_opt_cmd() ? 0x3a : 0x37;
case SDLK_MENU: return 0x32;
case SDLK_CAPSLOCK: return 0x39;
case SDLK_NUMLOCKCLEAR: return 0x47;
@ -2356,7 +2350,6 @@ static void handle_events(void)
code = event2keycode(event.key, true);
if (code >= 0) {
if (!emul_suspended) {
code = modify_opt_cmd(code);
#ifdef __MACOSX__
ADBKeyDown(code);
#else
@ -2367,9 +2360,9 @@ static void handle_events(void)
#endif
if (code == 0x36)
ctrl_down = true;
if (code == 0x3a)
if (code == (swap_opt_cmd() ? 0x37 : 0x3a))
opt_down = true;
if (code == 0x37)
if (code == (swap_opt_cmd() ? 0x3a : 0x37))
cmd_down = true;
} else {
@ -2386,7 +2379,6 @@ static void handle_events(void)
if (code == CODE_INVALID)
code = event2keycode(event.key, false);
if (code >= 0) {
code = modify_opt_cmd(code);
#ifdef __MACOSX__
ADBKeyUp(code);
#else
@ -2395,9 +2387,9 @@ static void handle_events(void)
#endif
if (code == 0x36)
ctrl_down = false;
if (code == 0x3a)
if (code == (swap_opt_cmd() ? 0x37 : 0x3a))
opt_down = false;
if (code == 0x37)
if (code == (swap_opt_cmd() ? 0x3a : 0x37))
cmd_down = false;
}
break;