libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 06:39:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGI: Revert revert the keyboard handling changes

Browse Source 
It seems the issues on AmigaOS aren't actually caused by the new
code. Reverting the revert.
This commit is contained in:
Martin Kiewitz 2016-02-01 15:02:52 +01:00
parent cf5133742c
commit 14f338e2dd
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/agi/keyboard.cpp
View File

@ -136,7 +136,6 @@ void AgiEngine::processEvents() {
}
key = event.kbd.ascii;
#if 0
if (event.kbd.keycode >= Common::KEYCODE_KP0 && event.kbd.keycode <= Common::KEYCODE_KP9) {
if (!(event.kbd.flags & Common::KBD_NUM)) {
// HACK: Num-Lock not enabled
@ -145,13 +144,8 @@ void AgiEngine::processEvents() {
key = 0;
}
}
#endif
// FIXME: Checking .ascii this way seems to cause issues on at least AmigaOS
// See bug #7009. For detailed information see engines/sci/event.cpp, EventManager::getScummVMEvent().
// For now we are using the same code as in SCI to make it work.
// Needs to get fixed in SDL backend / SDL itself.
//if ((key) && (key <= 0xFF)) {
if ((key) && (!(event.kbd.keycode & 0xFF00))) {
if ((key) && (key <= 0xFF)) {
// No special key, directly accept it
// Is ISO-8859-1, we need lower 128 characters only, which is plain ASCII, so no mapping required
if (Common::isAlpha(key)) {