libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 07:59:42 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

UWP: Handle key presses while ALT is held down (#15680)

Browse Source 
Also release held keys when unfousing the window (properly handle ALT+Tab on desktop)
UWP input event code cleanup
This commit is contained in:
Bernhard Schelling 2023-09-19 22:09:58 +09:00 committed by GitHub
parent c3a18e0469
commit f33f5e2b87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
uwp/uwp_main.cpp
View File

@ -159,7 +159,6 @@ const struct rarch_key_map rarch_key_map_uwp[] = {
{ (unsigned int)VirtualKey::RightControl, RETROK_RCTRL },
{ (unsigned int)VirtualKey::LeftMenu, RETROK_LALT },
{ (unsigned int)VirtualKey::RightMenu, RETROK_RALT },
//key { VK_RETURN, RETROK_KP_ENTER },
{ (unsigned int)VirtualKey::CapitalLock, RETROK_CAPSLOCK },
{ VK_OEM_1, RETROK_SEMICOLON },
{ VK_OEM_PLUS, RETROK_EQUALS },
@ -306,12 +305,6 @@ void App::SetWindow(CoreWindow^ window)
window->Closed +=
ref new TypedEventHandler<CoreWindow^, CoreWindowEventArgs^>(this, &App::OnWindowClosed);
window->KeyDown +=
ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &App::OnKey);
window->KeyUp +=
ref new TypedEventHandler<CoreWindow^, KeyEventArgs^>(this, &App::OnKey);
window->PointerPressed +=
ref new TypedEventHandler<CoreWindow^, PointerEventArgs^>(this, &App::OnPointer);
@ -577,11 +570,32 @@ void App::OnVisibilityChanged(CoreWindow^ sender, VisibilityChangedEventArgs^ ar
void App::OnWindowActivated(CoreWindow^ sender, WindowActivatedEventArgs^ args)
{
m_windowFocused = args->WindowActivationState != CoreWindowActivationState::Deactivated;
if (!m_windowFocused)
{
/* When deactivating the window, send key up events for anything still held down */
for (rarch_key_map it : rarch_key_map_uwp)
{
if ((sender->GetKeyState((VirtualKey)it.sym) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down)
input_keyboard_event(false, it.rk, 0, 0, RETRO_DEVICE_KEYBOARD);
}
}
}
bool App::GetKey(CoreWindow^ window, VirtualKey vkey, bool down, bool extended, unsigned& keycode, uint16_t& mod)
void App::OnAcceleratorKey(CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args)
{
if (args->EventType != CoreAcceleratorKeyEventType::KeyDown && args->EventType != CoreAcceleratorKeyEventType::KeyUp &&
args->EventType != CoreAcceleratorKeyEventType::SystemKeyDown && args->EventType != CoreAcceleratorKeyEventType::SystemKeyUp)
return;
/* Unlike CoreWindow::KeyDown/KeyUp events, this callback gets called for all keys including
* F10, Alt and any keys pressed in addition to while Alt is being held down. */
bool down = !args->KeyStatus.IsKeyReleased;
bool extended = args->KeyStatus.IsExtendedKey;
VirtualKey vkey = args->VirtualKey;
CoreWindow^ window = CoreWindow::GetForCurrentThread();
/* Some keys we need to specify via the extended flag */
unsigned keycode = RETROK_UNKNOWN;
if (vkey == VirtualKey::Enter)
keycode = (extended ? RETROK_KP_ENTER : RETROK_RETURN);
else if (vkey == VirtualKey::Control)
@ -604,17 +618,14 @@ bool App::GetKey(CoreWindow^ window, VirtualKey vkey, bool down, bool extended,
had_right_down = down;
keycode = RETROK_RSHIFT;
}
else
return false;
}
else
{
keycode = input_keymaps_translate_keysym_to_rk((unsigned)vkey);
if (keycode == RETROK_UNKNOWN)
return false;
}
mod = 0;
if (keycode == RETROK_UNKNOWN)
return;
uint16_t mod = 0;
if ((window->GetKeyState(VirtualKey::Shift) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down)
mod |= RETROKMOD_SHIFT;
if ((window->GetKeyState(VirtualKey::Control) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down)
@ -629,35 +640,7 @@ bool App::GetKey(CoreWindow^ window, VirtualKey vkey, bool down, bool extended,
(window->GetKeyState(VirtualKey::RightWindows) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down)
mod |= RETROKMOD_META;
return true;
}
void App::OnKey(CoreWindow^ sender, KeyEventArgs^ args)
{
bool down = !args->KeyStatus.IsKeyReleased;
unsigned keycode;
uint16_t mod;
if (GetKey(sender, args->VirtualKey, down, args->KeyStatus.IsExtendedKey, keycode, mod))
input_keyboard_event(down, keycode, 0, mod, RETRO_DEVICE_KEYBOARD);
}
void App::OnAcceleratorKey(CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args)
{
if (args->EventType == CoreAcceleratorKeyEventType::KeyDown || args->EventType == CoreAcceleratorKeyEventType::KeyUp ||
args->EventType == CoreAcceleratorKeyEventType::SystemKeyDown || args->EventType == CoreAcceleratorKeyEventType::SystemKeyUp)
{
/* This callback is called for all keys but we're only interested in the Alt keys which don't call OnKey */
VirtualKey vkey = args->VirtualKey;
if (vkey == VirtualKey::Menu || vkey == VirtualKey::LeftMenu || vkey == VirtualKey::RightMenu)
{
CoreWindow^ window = CoreWindow::GetForCurrentThread();
bool down = !args->KeyStatus.IsKeyReleased;
unsigned keycode;
uint16_t mod;
if (GetKey(window, vkey, down, args->KeyStatus.IsExtendedKey, keycode, mod))
input_keyboard_event(down, keycode, 0, mod, RETRO_DEVICE_KEYBOARD);
}
}
input_keyboard_event(down, keycode, 0, mod, RETRO_DEVICE_KEYBOARD);
}
void App::OnPointer(CoreWindow^ sender, PointerEventArgs^ args)

2
uwp/uwp_main.h
View File

@ -46,7 +46,6 @@ namespace RetroArchUWP
void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
void OnWindowClosed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CoreWindowEventArgs^ args);
void OnWindowActivated(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::WindowActivatedEventArgs^ args);
void OnKey(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
void OnAcceleratorKey(Windows::UI::Core::CoreDispatcher^ sender, Windows::UI::Core::AcceleratorKeyEventArgs^ args);
void OnPointer(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
@ -75,7 +74,6 @@ namespace RetroArchUWP
Platform::String^ m_launchOnExit;
bool m_launchOnExitShutdown;
void ParseProtocolArgs(Windows::ApplicationModel::Activation::IActivatedEventArgs^ args, int *argc, std::vector<char*> *argv, std::vector<std::string> *argvTmp);
bool GetKey(Windows::UI::Core::CoreWindow^ window, Windows::System::VirtualKey vkey, bool down, bool extended, unsigned& keycode, uint16_t& mod);
static App^ m_instance;
};
}