diff --git a/Source/Plugins/Plugin_PadSimple/Src/DirectInputBase.cpp b/Source/Plugins/Plugin_PadSimple/Src/DirectInputBase.cpp index 734c3b31d7..9c2c7741f0 100644 --- a/Source/Plugins/Plugin_PadSimple/Src/DirectInputBase.cpp +++ b/Source/Plugins/Plugin_PadSimple/Src/DirectInputBase.cpp @@ -29,32 +29,45 @@ DInput::~DInput() Free(); } -void DInput::DIKToString(unsigned int keycode, char *keyStr) { - HKL layout = GetKeyboardLayout(0); - BYTE kbstate[256]; - +void DInput::DIKToString(unsigned int keycode, char *keyStr) +{ switch(keycode) { case DIK_RETURN: - sprintf(keyStr, "ENTER"); + sprintf(keyStr, "Enter"); break; case DIK_UP: - sprintf(keyStr, "UP"); + sprintf(keyStr, "Up"); break; case DIK_DOWN: - sprintf(keyStr, "DOWN"); + sprintf(keyStr, "Down"); break; case DIK_LEFT: - sprintf(keyStr, "LEFT"); + sprintf(keyStr, "Left"); break; case DIK_RIGHT: - sprintf(keyStr, "RIGHT"); + sprintf(keyStr, "Right"); + break; + case DIK_HOME: + strcpy(keyStr, "Home"); + break; + case DIK_END: + strcpy(keyStr, "End"); + break; + case DIK_INSERT: + strcpy(keyStr, "Ins"); + break; + case DIK_DELETE: + strcpy(keyStr, "Del"); + break; + case DIK_PGUP: + strcpy(keyStr, "PgUp"); + break; + case DIK_PGDN: + strcpy(keyStr, "PgDn"); + break; + default: + GetKeyNameText(keycode << 16, keyStr, 64); break; - default: - GetKeyboardState(kbstate); - UINT vk = MapVirtualKeyEx(keycode, 1, layout); - ToAsciiEx(vk, keycode, kbstate, (LPWORD)keyStr, 0, layout); - - keyStr[0] = toupper(keyStr[0]); } } @@ -86,7 +99,6 @@ HRESULT DInput::Init(HWND hWnd) return(S_OK); } - void DInput::Free() { if (g_pKeyboard) @@ -103,7 +115,6 @@ void DInput::Free() } } - // Desc: Read the input device's state when in immediate mode and display it. HRESULT DInput::Read() { @@ -143,5 +154,3 @@ HRESULT DInput::Read() return(S_OK); } - -