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

Merge branch 'TASEmulators:master' into master

This commit is contained in:
Cyneprepou4uk 2022-02-25 22:47:47 +03:00 committed by GitHub
parent 6b46061472 187ee9646c
commit 1b2300110f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1812,22 +1812,22 @@ void InitInputInterface()
}
static ButtConfig fkbmap[0x48] = {
MK(SDLK_F1), MK(SDLK_F2), MK(SDLK_F3), MK(SDLK_F4), MK(SDLK_F5), MK(SDLK_F6), MK(SDLK_F7), MK(SDLK_F8),
MK(SDLK_1), MK(SDLK_2), MK(SDLK_3), MK(SDLK_4), MK(SDLK_5), MK(SDLK_6), MK(SDLK_7), MK(SDLK_8), MK(SDLK_9),
MK(SDLK_0),
MK(SDLK_MINUS), MK(SDLK_EQUAL), MK(SDLK_BACKSLASH), MK(SDLK_BACKSPACE),
MK(SDLK_ESCAPE), MK(SDLK_Q), MK(SDLK_W), MK(SDLK_E), MK(SDLK_R), MK(SDLK_T), MK(SDLK_Y), MK(SDLK_U), MK(SDLK_I),
MK(SDLK_O),
MK(SDLK_P), MK(SDLK_GRAVE), MK(SDLK_BRACKET_LEFT), MK(SDLK_ENTER),
MK(SDLK_LEFTCONTROL), MK(SDLK_A), MK(SDLK_S), MK(SDLK_D), MK(SDLK_F), MK(SDLK_G), MK(SDLK_H), MK(SDLK_J),
MK(SDLK_K),
MK(SDLK_L), MK(SDLK_SEMICOLON), MK(SDLK_APOSTROPHE), MK(SDLK_BRACKET_RIGHT), MK(SDLK_INSERT),
MK(SDLK_LEFTSHIFT), MK(SDLK_Z), MK(SDLK_X), MK(SDLK_C), MK(SDLK_V), MK(SDLK_B), MK(SDLK_N), MK(SDLK_M),
MK(SDLK_COMMA),
MK(SDLK_PERIOD), MK(SDLK_SLASH), MK(SDLK_RIGHTALT), MK(SDLK_RIGHTSHIFT), MK(SDLK_LEFTALT),
MK(SDLK_SPACE),
MK(SDLK_DELETE), MK(SDLK_END), MK(SDLK_PAGEDOWN),
MK(SDLK_CURSORUP), MK(SDLK_CURSORLEFT), MK(SDLK_CURSORRIGHT), MK(SDLK_CURSORDOWN)};
/* 0 */ MK(SDLK_F1), MK(SDLK_F2), MK(SDLK_F3), MK(SDLK_F4), MK(SDLK_F5), MK(SDLK_F6), MK(SDLK_F7), MK(SDLK_F8),
/* 8 */ MK(SDLK_1), MK(SDLK_2), MK(SDLK_3), MK(SDLK_4), MK(SDLK_5), MK(SDLK_6), MK(SDLK_7), MK(SDLK_8), MK(SDLK_9),
/* 17 */ MK(SDLK_0),
/* 18 */ MK(SDLK_MINUS), MK(SDLK_EQUAL), MK(SDLK_BACKSLASH), MK(SDLK_BACKSPACE),
/* 22 */ MK(SDLK_ESCAPE), MK(SDLK_Q), MK(SDLK_W), MK(SDLK_E), MK(SDLK_R), MK(SDLK_T), MK(SDLK_Y), MK(SDLK_U), MK(SDLK_I),
/* 31 */ MK(SDLK_O),
/* 32 */ MK(SDLK_P), MK(SDLK_GRAVE), MK(SDLK_BRACKET_LEFT), MK(SDLK_ENTER),
/* 36 */ MK(SDLK_LEFTCONTROL), MK(SDLK_A), MK(SDLK_S), MK(SDLK_D), MK(SDLK_F), MK(SDLK_G), MK(SDLK_H), MK(SDLK_J),
/* 44 */ MK(SDLK_K),
/* 45 */ MK(SDLK_L), MK(SDLK_SEMICOLON), MK(SDLK_APOSTROPHE), MK(SDLK_BRACKET_RIGHT), MK(SDLK_INSERT),
/* 50 */ MK(SDLK_LEFTSHIFT), MK(SDLK_Z), MK(SDLK_X), MK(SDLK_C), MK(SDLK_V), MK(SDLK_B), MK(SDLK_N), MK(SDLK_M),
/* 58 */ MK(SDLK_COMMA),
/* 59 */ MK(SDLK_PERIOD), MK(SDLK_SLASH), MK(SDLK_RIGHTALT), MK(SDLK_RIGHTSHIFT), MK(SDLK_LEFTALT),
/* 64 */ MK(SDLK_SPACE),
/* 65 */ MK(SDLK_DELETE), MK(SDLK_END), MK(SDLK_PAGEDOWN),
/* 68 */ MK(SDLK_CURSORUP), MK(SDLK_CURSORLEFT), MK(SDLK_CURSORRIGHT), MK(SDLK_CURSORDOWN)};
/**
* Update the status of the Family KeyBoard.
@ -1835,15 +1835,42 @@ static ButtConfig fkbmap[0x48] = {
static void UpdateFKB()
{
int x;
char leftShiftDown;
//static char lp[0x48];
leftShiftDown = DTestButton(&fkbmap[50]);
for (x = 0; x < 0x48; x++)
{
fkbkeys[x] = 0;
if ( leftShiftDown && (x == 62) )
{ // Family BASIC appears to not like when both shift keys are pressed at the
// same time. Since Qt key events do not differentiate between left and right
// shift this GUI sets both left and right shift scancodes when a shift modifier
// is detected. So to avoid having the FKB see both shift keys pressed at once,
// always skip the right shift key here if the left key is already detected down.
fkbkeys[x] = 0;
continue;
}
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];
}
}

27
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;
@ -401,9 +400,9 @@ SDL_Scancode convQtKey2SDLScanCode(Qt::Key q)
case Key_BracketRight:
s = SDL_SCANCODE_RIGHTBRACKET;
break;
//case Key_AsciiCircum:
// s = SDL_SCANCODE_UNKNOWN;
//break;
case Key_AsciiCircum:
s = SDL_SCANCODE_6;
break;
case Key_Underscore:
s = SDL_SCANCODE_MINUS;
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,6 +1080,25 @@ 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.
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());
sdlev.key.repeat = 0;