Sprinter/mame
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UWP: keyboard scancodes start at 1 (nw)

Browse Source 
Also thread synchronization which will be needed later when we have multiple windows (nw)
This commit is contained in:
Brad Hughes 2016-11-17 09:59:29 -05:00
parent 3bc03384b1
commit 0fb4fe79f8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osd/modules/input/input_uwp.cpp
View File

@ -215,6 +215,7 @@ private ref class UwpKeyboardDevice : public UwpInputDevice
private: private:
keyboard_state keyboard; keyboard_state keyboard;
Platform::Agile<CoreWindow> m_coreWindow; Platform::Agile<CoreWindow> m_coreWindow;
std::mutex m_state_lock;
internal: internal:
UwpKeyboardDevice(Platform::Agile<CoreWindow> coreWindow, running_machine& machine, char *name, const char *id, input_module &module) UwpKeyboardDevice(Platform::Agile<CoreWindow> coreWindow, running_machine& machine, char *name, const char *id, input_module &module)
@ -229,6 +230,7 @@ internal:
void Reset() override void Reset() override
{ {
std::lock_guard<std::mutex> scope_lock(m_state_lock);
memset(&keyboard, 0, sizeof(keyboard)); memset(&keyboard, 0, sizeof(keyboard));
} }
@ -236,8 +238,8 @@ internal:
{ {
keyboard_trans_table &table = keyboard_trans_table::instance(); keyboard_trans_table &table = keyboard_trans_table::instance();
// populate it // populate it indexed by the scancode
for (int keynum = 0; keynum < MAX_KEYS; keynum++) for (int keynum = KEY_UNKNOWN + 1; keynum < MAX_KEYS; keynum++)
{ {
input_item_id itemid = table.map_di_scancode_to_itemid(keynum); input_item_id itemid = table.map_di_scancode_to_itemid(keynum);
const char *keyname = table.ui_label_for_mame_key(itemid); const char *keyname = table.ui_label_for_mame_key(itemid);
@ -256,6 +258,7 @@ internal:
void OnKeyDown(CoreWindow^ win, KeyEventArgs^ args) void OnKeyDown(CoreWindow^ win, KeyEventArgs^ args)
{ {
std::lock_guard<std::mutex> scope_lock(m_state_lock);
CorePhysicalKeyStatus status = args->KeyStatus; CorePhysicalKeyStatus status = args->KeyStatus;
int discancode = (status.ScanCode & 0x7f) | (status.IsExtendedKey ? 0x80 : 0x00); int discancode = (status.ScanCode & 0x7f) | (status.IsExtendedKey ? 0x80 : 0x00);
keyboard.state[discancode] = 0x80; keyboard.state[discancode] = 0x80;
@ -263,6 +266,7 @@ internal:
void OnKeyUp(CoreWindow^ win, KeyEventArgs^ args) void OnKeyUp(CoreWindow^ win, KeyEventArgs^ args)
{ {
std::lock_guard<std::mutex> scope_lock(m_state_lock);
CorePhysicalKeyStatus status = args->KeyStatus; CorePhysicalKeyStatus status = args->KeyStatus;
int discancode = (status.ScanCode & 0x7f) | (status.IsExtendedKey ? 0x80 : 0x00); int discancode = (status.ScanCode & 0x7f) | (status.IsExtendedKey ? 0x80 : 0x00);
keyboard.state[discancode] = 0; keyboard.state[discancode] = 0;