diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index 4ec610a32710c8bb15062c62ea12b2175bda018c..f5198c78e83d68ec012b149b28124439112cf824 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -875,6 +875,7 @@ Hotkeys.AppleKeypadSubtract="- (Keypad)" Hotkeys.AppleKeypadDecimal=". (Keypad)" Hotkeys.AppleKeypadEqual="= (Keypad)" Hotkeys.MouseButton="Mouse %1" +Hotkeys.Escape="Esc" # audio hotkeys Mute="Mute" diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 15f025b71cd327c21b1dd1f90390b9d7bb23b8a6..93680d63f52c2de46c8d9dfd8823f3a5348315ce 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -2037,6 +2037,7 @@ void OBSBasic::InitHotkeys() t.apple_keypad_decimal = Str("Hotkeys.AppleKeypadDecimal"); t.apple_keypad_equal = Str("Hotkeys.AppleKeypadEqual"); t.mouse_num = Str("Hotkeys.MouseButton"); + t.escape = Str("Hotkeys.Escape"); obs_hotkeys_set_translations(&t); obs_hotkeys_set_audio_hotkeys_translations(Str("Mute"), Str("Unmute"), diff --git a/libobs/obs-hotkey.c b/libobs/obs-hotkey.c index b150d29751a8ecfb2551cabfded4df3eb29d65d8..d31076ef1855fdd5274379e377ee9757a3278c4a 100644 --- a/libobs/obs-hotkey.c +++ b/libobs/obs-hotkey.c @@ -1479,6 +1479,7 @@ void obs_hotkeys_set_translations_s( ADD_TRANSLATION(OBS_KEY_META, meta); ADD_TRANSLATION(OBS_KEY_MENU, menu); ADD_TRANSLATION(OBS_KEY_SPACE, space); + ADD_TRANSLATION(OBS_KEY_ESCAPE, escape); #ifdef __APPLE__ const char *numpad_str = t.apple_keypad_num; ADD_TRANSLATION(OBS_KEY_NUMSLASH, apple_keypad_divide); diff --git a/libobs/obs-hotkey.h b/libobs/obs-hotkey.h index 4e4a86ab6052657d3c09415365329ebf15a8aeea..74a047fa602957905ad58909f7f4ef08e5adf1ca 100644 --- a/libobs/obs-hotkey.h +++ b/libobs/obs-hotkey.h @@ -126,6 +126,7 @@ struct obs_hotkeys_translations { const char *apple_keypad_decimal; const char *apple_keypad_equal; const char *mouse_num; /* For example, "Mouse %1" */ + const char *escape; }; /* This function is an optional way to provide translations for specific keys diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c index 355b832e4d5aba0071782e537ba2d2aca14dfa47..e3786f887e39e13944a55f5b0643c7a05abb9e0a 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c @@ -1114,6 +1114,8 @@ void obs_key_to_str(obs_key_t key, struct dstr *dstr) case OBS_KEY_NUMCOMMA: return translate_key(key, "Numpad ,"); case OBS_KEY_NUMPERIOD: return translate_key(key, "Numpad ."); case OBS_KEY_NUMSLASH: return translate_key(key, "Numpad /"); + case OBS_KEY_SPACE: return translate_key(key, "Space"); + case OBS_KEY_ESCAPE: return translate_key(key, "Escape"); default:; }