ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug fix for odd SDL scancode returns in Qt GUI. For issue #464.

This commit is contained in:
mjbudd77 2022-02-23 05:37:23 -05:00
parent d767153531
commit 98f3e57ac2
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/drivers/Qt/input.cpp
View File

@ -1835,17 +1835,29 @@ static ButtConfig fkbmap[0x48] = {
static void UpdateFKB()
{
int x;
//static char lp[0x48];
for (x = 0; x < 0x48; x++)
{
if (DTestButton(&fkbmap[x]))
{
fkbkeys[x] = 1;
//if ( !lp[x] )
//{
// printf("FKB Key %i Down\n", x );
//}
}
else
{
fkbkeys[x] = 0;
//if ( lp[x] )
//{
// printf("FKB Key %i Up\n", x );
//}
}
//lp[x] = fkbkeys[x];
}
}

16
src/drivers/Qt/keyscan.cpp
View File

@ -313,7 +313,6 @@ SDL_Scancode convQtKey2SDLScanCode(Qt::Key q)
case Key_At:
s = SDL_SCANCODE_2;
break;
break;
case Key_A:
s = SDL_SCANCODE_A;
break;
@ -788,7 +787,6 @@ SDL_Keycode convQtKey2SDLKeyCode(Qt::Key q)
case Key_At:
s = SDLK_AT;
break;
break;
case Key_A:
s = SDLK_a;
break;
@ -1082,11 +1080,23 @@ int pushKeyEvent(QKeyEvent *event, int pressDown)
sdlev.key.keysym.scancode = SDL_GetScancodeFromKey(sdlev.key.keysym.sym);
//printf("Native ScanCode: x%08X %i \n", event->nativeScanCode(), event->nativeScanCode() );
//printf("Scancode: 0x%08X %i \n", sdlev.key.keysym.scancode, sdlev.key.keysym.scancode );
// SDL Docs say this code should never happen, but it does...
// so force it to alternative scancode algorithm if it occurs.
if ( (sdlev.key.keysym.scancode == SDL_SCANCODE_NONUSHASH ) ||
(sdlev.key.keysym.scancode == SDL_SCANCODE_NONUSBACKSLASH ) )
{
sdlev.key.keysym.scancode = SDL_SCANCODE_UNKNOWN;
}
if ( sdlev.key.keysym.scancode == SDL_SCANCODE_UNKNOWN )
{ // If scancode is unknown, the key may be dual function via the shift key.
//printf("Scancode: %08X \n", sdlev.key.keysym.scancode );
sdlev.key.keysym.scancode = convQtKey2SDLScanCode( (Qt::Key)event->key() );
//printf("Dual Scancode: 0x%08X %i \n", sdlev.key.keysym.scancode, sdlev.key.keysym.scancode );
}
sdlev.key.keysym.mod = convQtKey2SDLModifier(event->modifiers());