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

distinguish left/right Ctrl and Shift

This commit is contained in:
Arisotura 2020-05-19 14:15:11 +02:00
parent 2a7027f794
commit 23cc8c71a2
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/frontend/qt_sdl/InputConfigDialog.cpp
View File

@ -24,6 +24,7 @@
#include "Config.h"
#include "PlatformConfig.h"
#include "main.h"
#include "InputConfigDialog.h"
#include "ui_InputConfigDialog.h"
@ -231,7 +232,9 @@ KeyMapButton::~KeyMapButton()
void KeyMapButton::keyPressEvent(QKeyEvent* event)
{
if (!isChecked()) return QPushButton::keyPressEvent(event);
printf("KEY PRESSED = %08X %08X | %08X %08X %08X | %08X\n", event->key(), event->modifiers(), event->nativeVirtualKey(), event->nativeModifiers(), event->nativeScanCode(), Qt::SHIFT);
printf("KEY PRESSED = %08X %08X | %08X %08X %08X\n", event->key(), event->modifiers(), event->nativeVirtualKey(), event->nativeModifiers(), event->nativeScanCode());
int key = event->key();
bool ismod = (key == Qt::Key_Control ||
key == Qt::Key_Alt ||
@ -247,6 +250,8 @@ printf("KEY PRESSED = %08X %08X | %08X %08X %08X | %08X\n", event->key(), event-
if (!ismod)
key |= event->modifiers();
else if (IsRightModKey(event))
key |= (1<<31);
*mapping = key;
click();
@ -279,14 +284,17 @@ QString KeyMapButton::mappingText()
{
int key = *mapping;
if (key == -1) return "None";
QString isright = (key & (1<<31)) ? "Right " : "Left ";
key &= ~(1<<31);
switch (key)
{
case -1: return "None";
case Qt::Key_Control: return "Ctrl";
case Qt::Key_Control: return isright + "Ctrl";
case Qt::Key_Alt: return "Alt";
case Qt::Key_AltGr: return "AltGr";
case Qt::Key_Shift: return "Shift";
case Qt::Key_Shift: return isright + "Shift";
case Qt::Key_Meta: return "Meta";
}

21
src/frontend/qt_sdl/main.h
View File

@ -23,6 +23,7 @@
#include <QWidget>
#include <QMainWindow>
#include <QImage>
#include <QKeyEvent>
class EmuThread : public QThread
@ -131,4 +132,24 @@ private:
QAction* actInputConfig;
};
// TODO: MacOS version of this!
// distinguish between left and right modifier keys (Ctrl, Alt, Shift)
// Qt provides no real cross-platform way to do this, so here we go
// for Windows and Linux we can distinguish via scancodes (but both
// provide different scancodes)
#ifdef __WIN32__
inline bool IsRightModKey(QKeyEvent* event)
{
quint32 scan = event->nativeScanCode();
return (scan == 0x11D || scan == 0x138 || scan == 0x36);
}
#else
inline bool IsRightModKey(QKeyEvent* event)
{
quint32 scan = event->nativeScanCode();
return (scan == 0x69 || scan == 0x6C || scan == 0x3E);
}
#endif
#endif // MAIN_H