Merge branch 'windows-console-go-brrr' into 'next'

Fix #178

Closes #178

See merge request STJr/SRB2!1112
This commit is contained in:
James R 2020-10-02 20:23:20 -04:00
commit 94415facfe

View file

@ -560,14 +560,12 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
case VK_TAB: case VK_TAB:
event.data1 = KEY_NULL; event.data1 = KEY_NULL;
break; break;
case VK_SHIFT:
event.data1 = KEY_LSHIFT;
break;
case VK_RETURN: case VK_RETURN:
entering_con_command = false; entering_con_command = false;
/* FALLTHRU */ /* FALLTHRU */
default: default:
event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char //event.data1 = MapVirtualKey(evt.wVirtualKeyCode,2); // convert in to char
event.data1 = evt.uChar.AsciiChar;
} }
if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t)) if (co != INVALID_HANDLE_VALUE && GetFileType(co) == FILE_TYPE_CHAR && GetConsoleMode(co, &t))
{ {
@ -586,18 +584,6 @@ static void Impl_HandleKeyboardConsoleEvent(KEY_EVENT_RECORD evt, HANDLE co)
} }
} }
} }
else
{
event.type = ev_keyup;
switch (evt.wVirtualKeyCode)
{
case VK_SHIFT:
event.data1 = KEY_LSHIFT;
break;
default:
break;
}
}
if (event.data1) D_PostEvent(&event); if (event.data1) D_PostEvent(&event);
} }