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

Updated hot key to gamepad binding logic for Qt GUI.

This commit is contained in:
mjbudd77 2021-06-13 22:00:45 -04:00
parent f6f868671e
commit 49735af561
3 changed files with 64 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/drivers/Qt/GamePadConf.cpp
View File

@ -1944,16 +1944,32 @@ void GamePadFuncConfigDialog::changeKeySeq0(void)
if ( ret == QDialog::Accepted )
{
printf("Accepted Hot Key: %i\n", hkd.getSelHotKey() );
k->hk[0] = hkd.getSelHotKey();
}
else
{
printf("Rejected Hot Key\n");
}
hotkey_t *hkp;
char keyName[128];
hk[0]->setCaptureState(true);
hk[0]->setStyleSheet("background-color: green; color: white;");
//printf("Accepted Hot Key: %i\n", hkd.getSelHotKey() );
k->hk[0] = hkd.getSelHotKey();
hkp = &Hotkeys[ k->hk[0] ];
hkp->getString(keyName);
k->keySeq[0].key = hkp->qkey.value;
k->keySeq[0].modifier = hkp->qkey.modifier;
k->keySeq[0].name.assign(hkp->getConfigName());
if ( keySeqLbl[0] )
{
keySeqLbl[0]->setText( tr(hkp->getConfigName()) );
}
}
//else
//{
// printf("Rejected Hot Key\n");
//}
//hk[0]->setCaptureState(true);
//hk[0]->setStyleSheet("background-color: green; color: white;");
}
//----------------------------------------------------
void GamePadFuncConfigDialog::changeKeySeq1(void)
@ -1965,16 +1981,32 @@ void GamePadFuncConfigDialog::changeKeySeq1(void)
if ( ret == QDialog::Accepted )
{
printf("Accepted Hot Key: %i\n", hkd.getSelHotKey() );
k->hk[1] = hkd.getSelHotKey();
}
else
{
printf("Rejected Hot Key\n");
}
hotkey_t *hkp;
char keyName[128];
hk[1]->setCaptureState(true);
hk[1]->setStyleSheet("background-color: green; color: white;");
//printf("Accepted Hot Key: %i\n", hkd.getSelHotKey() );
k->hk[1] = hkd.getSelHotKey();
hkp = &Hotkeys[ k->hk[1] ];
hkp->getString(keyName);
k->keySeq[1].key = hkp->qkey.value;
k->keySeq[1].modifier = hkp->qkey.modifier;
k->keySeq[1].name.assign(keyName);
if ( keySeqLbl[1] )
{
keySeqLbl[1]->setText( tr(hkp->getConfigName()) );
}
}
//else
//{
// printf("Rejected Hot Key\n");
//}
//hk[1]->setCaptureState(true);
//hk[1]->setStyleSheet("background-color: green; color: white;");
}
//----------------------------------------------------
void GamePadFuncConfigDialog::clearButton0(void)

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

@ -200,6 +200,8 @@ hotkey_t::hotkey_t(void)
{
sdl.value = 0;
sdl.modifier = 0;
qkey.value = 0;
qkey.modifier = 0;
prevState = 0;
shortcut = nullptr;
act = nullptr;
@ -253,6 +255,9 @@ void hotkey_t::conv2SDL(void)
if (shortcut == nullptr)
return;
qkey.value = (Qt::Key)(shortcut->key()[0] & 0x01FFFFFF);
qkey.modifier = (Qt::KeyboardModifier)(shortcut->key()[0] & 0xFE000000);
SDL_Keycode k = convQtKey2SDLKeyCode((Qt::Key)(shortcut->key()[0] & 0x01FFFFFF));
SDL_Keymod m = convQtKey2SDLModifier((Qt::KeyboardModifier)(shortcut->key()[0] & 0xFE000000));
@ -477,7 +482,7 @@ void gamepad_function_key_t::sendKeyPressEvent(int idx)
{
QShortcut *s = Hotkeys[ hk[idx] ].getShortcut();
if ( s )
if ( s && s->isEnabled() )
{
emit s->activated();
hasShortcut = true;

8
src/drivers/Qt/input.h
View File

@ -61,6 +61,8 @@ class hotkey_t
const char *getConfigName(void);
QShortcut *getShortcut(void);
QKeySequence getKeySeq(void){ return keySeq; };
// Member variables
struct
{
@ -68,6 +70,12 @@ class hotkey_t
int modifier;
} sdl;
struct
{
int value;
int modifier;
} qkey;
char prevState;
private: