From b14025b4c22bb04742545822f35966e08e2df2ab Mon Sep 17 00:00:00 2001 From: Travis Nickles Date: Tue, 31 Dec 2013 00:20:05 -0600 Subject: [PATCH] Converted preset options in dialogs to use new enum values. --- src/axiseditdialog.cpp | 49 ++++++++++---------- src/dpadeditdialog.cpp | 65 ++++++++++++++------------- src/inputdaemon.cpp | 7 ++- src/joybuttonslot.cpp | 2 +- src/joycontrolstickeditdialog.cpp | 65 ++++++++++++++------------- src/keyboard/virtualkeypushbutton.cpp | 13 +++++- src/qkeydisplaydialog.cpp | 2 +- src/qtx11keymapper.cpp | 2 +- src/xmlconfigreader.cpp | 2 +- src/xmlconfigreader.h | 1 + 10 files changed, 114 insertions(+), 94 deletions(-) diff --git a/src/axiseditdialog.cpp b/src/axiseditdialog.cpp index 5be75fa5..121500b7 100644 --- a/src/axiseditdialog.cpp +++ b/src/axiseditdialog.cpp @@ -6,6 +6,7 @@ #include "buttoneditdialog.h" #include "mousedialog/mouseaxissettingsdialog.h" #include "event.h" +#include "antkeymapper.h" AxisEditDialog::AxisEditDialog(JoyAxis *axis, QWidget *parent) : QDialog(parent, Qt::Window), @@ -137,33 +138,33 @@ void AxisEditDialog::implementPresets(int index) } else if (index == 5) { - nbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("Up"), JoyButtonSlot::JoyKeyboard, this); - pbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("Down"), JoyButtonSlot::JoyKeyboard, this); + nbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Up), JoyButtonSlot::JoyKeyboard, this); + pbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Down), JoyButtonSlot::JoyKeyboard, this); } else if (index == 6) { - nbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("Left"), JoyButtonSlot::JoyKeyboard, this); - pbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("Right"), JoyButtonSlot::JoyKeyboard, this); + nbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Left), JoyButtonSlot::JoyKeyboard, this); + pbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Right), JoyButtonSlot::JoyKeyboard, this); } else if (index == 7) { - nbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("w"), JoyButtonSlot::JoyKeyboard, this); - pbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("s"), JoyButtonSlot::JoyKeyboard, this); + nbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_W), JoyButtonSlot::JoyKeyboard, this); + pbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_S), JoyButtonSlot::JoyKeyboard, this); } else if (index == 8) { - nbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("a"), JoyButtonSlot::JoyKeyboard, this); - pbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("d"), JoyButtonSlot::JoyKeyboard, this); + nbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_A), JoyButtonSlot::JoyKeyboard, this); + pbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_D), JoyButtonSlot::JoyKeyboard, this); } else if (index == 9) { - nbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("KP_8"), JoyButtonSlot::JoyKeyboard, this); - pbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("KP_2"), JoyButtonSlot::JoyKeyboard, this); + nbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8), JoyButtonSlot::JoyKeyboard, this); + pbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2), JoyButtonSlot::JoyKeyboard, this); } else if (index == 10) { - nbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("KP_4"), JoyButtonSlot::JoyKeyboard, this); - pbuttonslot = new JoyButtonSlot(X11KeySymToKeycode("KP_6"), JoyButtonSlot::JoyKeyboard, this); + nbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4), JoyButtonSlot::JoyKeyboard, this); + pbuttonslot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6), JoyButtonSlot::JoyKeyboard, this); } else if (index == 11) { @@ -338,33 +339,33 @@ void AxisEditDialog::selectCurrentPreset() { ui->presetsComboBox->setCurrentIndex(4); } - else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && nslot->getSlotCode() == X11KeySymToKeycode("Up") && - pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && pslot->getSlotCode() == X11KeySymToKeycode("Down")) + else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)nslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Up) && + pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)pslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Down)) { ui->presetsComboBox->setCurrentIndex(5); } - else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && nslot->getSlotCode() == X11KeySymToKeycode("Left") && - pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && pslot->getSlotCode() == X11KeySymToKeycode("Right")) + else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)nslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Left) && + pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)pslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Right)) { ui->presetsComboBox->setCurrentIndex(6); } - else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && nslot->getSlotCode() == X11KeySymToKeycode("w") && - pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && pslot->getSlotCode() == X11KeySymToKeycode("s")) + else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)nslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_W) && + pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)pslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_S)) { ui->presetsComboBox->setCurrentIndex(7); } - else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && nslot->getSlotCode() == X11KeySymToKeycode("a") && - pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && pslot->getSlotCode() == X11KeySymToKeycode("d")) + else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)nslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_A) && + pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)pslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_D)) { ui->presetsComboBox->setCurrentIndex(8); } - else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && nslot->getSlotCode() == X11KeySymToKeycode("KP_8") && - pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && pslot->getSlotCode() == X11KeySymToKeycode("KP_2")) + else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)nslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8) && + pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)pslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2)) { ui->presetsComboBox->setCurrentIndex(9); } - else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && nslot->getSlotCode() == X11KeySymToKeycode("KP_4") && - pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && pslot->getSlotCode() == X11KeySymToKeycode("KP_6")) + else if (nslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)nslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4) && + pslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)pslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6)) { ui->presetsComboBox->setCurrentIndex(10); } diff --git a/src/dpadeditdialog.cpp b/src/dpadeditdialog.cpp index 4817180a..870a04c9 100644 --- a/src/dpadeditdialog.cpp +++ b/src/dpadeditdialog.cpp @@ -5,6 +5,7 @@ #include "ui_dpadeditdialog.h" #include "mousedialog/mousedpadsettingsdialog.h" #include "event.h" +#include "antkeymapper.h" DPadEditDialog::DPadEditDialog(JoyDPad *dpad, QWidget *parent) : QDialog(parent, Qt::Window), @@ -87,40 +88,40 @@ void DPadEditDialog::implementPresets(int index) } else if (index == 5) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Up"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Down"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Left"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Right"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Up), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Down), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Left), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Right), JoyButtonSlot::JoyKeyboard, this); ui->joyModeComboBox->setCurrentIndex(0); } else if (index == 6) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("w"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("s"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("a"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("d"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_W), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_S), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_A), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_D), JoyButtonSlot::JoyKeyboard, this); ui->joyModeComboBox->setCurrentIndex(0); } else if (index == 7) { if (ui->joyModeComboBox->currentIndex() == 0) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_8"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_2"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_4"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_6"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6), JoyButtonSlot::JoyKeyboard, this); } else if (ui->joyModeComboBox->currentIndex() == 1) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_8"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_2"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_4"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_6"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6), JoyButtonSlot::JoyKeyboard, this); - upLeftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_7"), JoyButtonSlot::JoyKeyboard, this); - upRightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_9"), JoyButtonSlot::JoyKeyboard, this); - downLeftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_1"), JoyButtonSlot::JoyKeyboard, this); - downRightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_3"), JoyButtonSlot::JoyKeyboard, this); + upLeftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_7), JoyButtonSlot::JoyKeyboard, this); + upRightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_9), JoyButtonSlot::JoyKeyboard, this); + downLeftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_1), JoyButtonSlot::JoyKeyboard, this); + downRightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_3), JoyButtonSlot::JoyKeyboard, this); } } else if (index == 8) @@ -259,24 +260,24 @@ void DPadEditDialog::selectCurrentPreset() { ui->presetsComboBox->setCurrentIndex(4); } - else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && upslot->getSlotCode() == X11KeySymToKeycode("Up") && - downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && downslot->getSlotCode() == X11KeySymToKeycode("Down") && - leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && leftslot->getSlotCode() == X11KeySymToKeycode("Left") && - rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && rightslot->getSlotCode() == X11KeySymToKeycode("Right")) + else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)upslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Up) && + downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)downslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Down) && + leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)leftslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Left) && + rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)rightslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Right)) { ui->presetsComboBox->setCurrentIndex(5); } - else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && upslot->getSlotCode() == X11KeySymToKeycode("w") && - downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && downslot->getSlotCode() == X11KeySymToKeycode("s") && - leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && leftslot->getSlotCode() == X11KeySymToKeycode("a") && - rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && rightslot->getSlotCode() == X11KeySymToKeycode("d")) + else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)upslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_W) && + downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)downslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_S) && + leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)leftslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_A) && + rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)rightslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_D)) { ui->presetsComboBox->setCurrentIndex(6); } - else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && upslot->getSlotCode() == X11KeySymToKeycode("KP_8") && - downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && downslot->getSlotCode() == X11KeySymToKeycode("KP_2") && - leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && leftslot->getSlotCode() == X11KeySymToKeycode("KP_4") && - rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && rightslot->getSlotCode() == X11KeySymToKeycode("KP_6")) + else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)upslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8) && + downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)downslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2) && + leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)leftslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4) && + rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)rightslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6)) { ui->presetsComboBox->setCurrentIndex(7); } diff --git a/src/inputdaemon.cpp b/src/inputdaemon.cpp index 6e345c09..196590b8 100644 --- a/src/inputdaemon.cpp +++ b/src/inputdaemon.cpp @@ -336,7 +336,6 @@ void InputDaemon::refreshJoystick(InputDevice *joystick) void InputDaemon::quit() { stopped = true; - eventWorker->stop(); // Wait for SDL to finish. Let worker destructor close SDL. // Let InputDaemon destructor close thread instance. @@ -346,10 +345,16 @@ void InputDaemon::quit() QTimer temptime; connect(eventWorker, SIGNAL(finished()), &q, SLOT(quit())); connect(&temptime, SIGNAL(timeout()), &q, SLOT(quit())); + + eventWorker->stop(); temptime.start(1000); q.exec(); temptime.stop(); } + else + { + eventWorker->stop(); + } delete eventWorker; eventWorker = 0; diff --git a/src/joybuttonslot.cpp b/src/joybuttonslot.cpp index 69d18a4f..8c2f38a5 100644 --- a/src/joybuttonslot.cpp +++ b/src/joybuttonslot.cpp @@ -186,7 +186,7 @@ void JoyButtonSlot::readConfig(QXmlStreamReader *xml) { this->setSlotCode(virtualkey); } - else if (this->getSlotCode() > QtKeyMapperBase::nativeKeyPrefix) + else if ((unsigned int)this->getSlotCode() > QtKeyMapperBase::nativeKeyPrefix) { unsigned int temp = this->getSlotCode() - QtKeyMapperBase::nativeKeyPrefix; this->setSlotCode(temp); diff --git a/src/joycontrolstickeditdialog.cpp b/src/joycontrolstickeditdialog.cpp index d2fffe18..72183d34 100644 --- a/src/joycontrolstickeditdialog.cpp +++ b/src/joycontrolstickeditdialog.cpp @@ -5,6 +5,7 @@ #include "ui_joycontrolstickeditdialog.h" #include "mousedialog/mousecontrolsticksettingsdialog.h" #include "event.h" +#include "antkeymapper.h" JoyControlStickEditDialog::JoyControlStickEditDialog(JoyControlStick *stick, QWidget *parent) : QDialog(parent, Qt::Window), @@ -118,40 +119,40 @@ void JoyControlStickEditDialog::implementPresets(int index) } else if (index == 5) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Up"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Down"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Left"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("Right"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Up), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Down), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Left), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_Right), JoyButtonSlot::JoyKeyboard, this); ui->joyModeComboBox->setCurrentIndex(0); } else if (index == 6) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("w"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("s"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("a"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("d"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_W), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_S), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_A), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(Qt::Key_D), JoyButtonSlot::JoyKeyboard, this); ui->joyModeComboBox->setCurrentIndex(0); } else if (index == 7) { if (ui->joyModeComboBox->currentIndex() == 0) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_8"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_2"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_4"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_6"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6), JoyButtonSlot::JoyKeyboard, this); } else if (ui->joyModeComboBox->currentIndex() == 1) { - upButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_8"), JoyButtonSlot::JoyKeyboard, this); - downButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_2"), JoyButtonSlot::JoyKeyboard, this); - leftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_4"), JoyButtonSlot::JoyKeyboard, this); - rightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_6"), JoyButtonSlot::JoyKeyboard, this); + upButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8), JoyButtonSlot::JoyKeyboard, this); + downButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2), JoyButtonSlot::JoyKeyboard, this); + leftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4), JoyButtonSlot::JoyKeyboard, this); + rightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6), JoyButtonSlot::JoyKeyboard, this); - upLeftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_7"), JoyButtonSlot::JoyKeyboard, this); - upRightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_9"), JoyButtonSlot::JoyKeyboard, this); - downLeftButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_1"), JoyButtonSlot::JoyKeyboard, this); - downRightButtonSlot = new JoyButtonSlot(X11KeySymToKeycode("KP_3"), JoyButtonSlot::JoyKeyboard, this); + upLeftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_7), JoyButtonSlot::JoyKeyboard, this); + upRightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_9), JoyButtonSlot::JoyKeyboard, this); + downLeftButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_1), JoyButtonSlot::JoyKeyboard, this); + downRightButtonSlot = new JoyButtonSlot(AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_3), JoyButtonSlot::JoyKeyboard, this); } } else if (index == 8) @@ -306,24 +307,24 @@ void JoyControlStickEditDialog::selectCurrentPreset() { ui->presetsComboBox->setCurrentIndex(4); } - else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && upslot->getSlotCode() == X11KeySymToKeycode("Up") && - downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && downslot->getSlotCode() == X11KeySymToKeycode("Down") && - leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && leftslot->getSlotCode() == X11KeySymToKeycode("Left") && - rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && rightslot->getSlotCode() == X11KeySymToKeycode("Right")) + else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)upslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Up) && + downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)downslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Down) && + leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)leftslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Left) && + rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)rightslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_Right)) { ui->presetsComboBox->setCurrentIndex(5); } - else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && upslot->getSlotCode() == X11KeySymToKeycode("w") && - downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && downslot->getSlotCode() == X11KeySymToKeycode("s") && - leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && leftslot->getSlotCode() == X11KeySymToKeycode("a") && - rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && rightslot->getSlotCode() == X11KeySymToKeycode("d")) + else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)upslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_W) && + downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)downslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_S) && + leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)leftslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_A) && + rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)rightslot->getSlotCode() == AntKeyMapper::returnVirtualKey(Qt::Key_D)) { ui->presetsComboBox->setCurrentIndex(6); } - else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && upslot->getSlotCode() == X11KeySymToKeycode("KP_8") && - downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && downslot->getSlotCode() == X11KeySymToKeycode("KP_2") && - leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && leftslot->getSlotCode() == X11KeySymToKeycode("KP_4") && - rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && rightslot->getSlotCode() == X11KeySymToKeycode("KP_6")) + else if (upslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)upslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_8) && + downslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)downslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_2) && + leftslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)leftslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_4) && + rightslot->getSlotMode() == JoyButtonSlot::JoyKeyboard && (unsigned int)rightslot->getSlotCode() == AntKeyMapper::returnVirtualKey(QtKeyMapperBase::AntKey_KP_6)) { ui->presetsComboBox->setCurrentIndex(7); } diff --git a/src/keyboard/virtualkeypushbutton.cpp b/src/keyboard/virtualkeypushbutton.cpp index 2a0f6ce6..e2c9faff 100644 --- a/src/keyboard/virtualkeypushbutton.cpp +++ b/src/keyboard/virtualkeypushbutton.cpp @@ -3,6 +3,7 @@ #include "virtualkeypushbutton.h" #include +#include QHash VirtualKeyPushButton::knownAliases = QHash (); @@ -21,8 +22,17 @@ VirtualKeyPushButton::VirtualKeyPushButton(JoyButton *button, QString xcodestrin this->button = button; int temp = 0; - if (!xcodestring.isEmpty()) + if (!xcodestring.isEmpty())// && xcodestring.toInt(0, 16) > 0) { + /*int qkey = xcodestring.toInt(0, 16); + if (qkey > QtKeyMapperBase::customKeyPrefix) + { + temp = qkey - QtKeyMapperBase::customKeyPrefix; + } + else + { + temp = AntKeyMapper::returnVirtualKey(qkey); + }*/ temp = X11KeySymToKeycode(xcodestring); } @@ -32,6 +42,7 @@ VirtualKeyPushButton::VirtualKeyPushButton(JoyButton *button, QString xcodestrin this->keycode = temp; #else this->keycode = X11KeyCodeToX11KeySym(temp); + //this->keycode = temp; #endif this->xcodestring = xcodestring; this->displayString = setDisplayString(xcodestring); diff --git a/src/qkeydisplaydialog.cpp b/src/qkeydisplaydialog.cpp index 4b99b1b1..eb947f31 100644 --- a/src/qkeydisplaydialog.cpp +++ b/src/qkeydisplaydialog.cpp @@ -37,7 +37,7 @@ void QKeyDisplayDialog::keyPressEvent(QKeyEvent *event) void QKeyDisplayDialog::keyReleaseEvent(QKeyEvent *event) { - unsigned int scancode = event->nativeScanCode(); + //unsigned int scancode = event->nativeScanCode(); unsigned int virtualkey = event->nativeVirtualKey(); #ifdef Q_OS_WIN unsigned int finalvirtual = WinInfo::correctVirtualKey(scancode, virtualkey); diff --git a/src/qtx11keymapper.cpp b/src/qtx11keymapper.cpp index 96ac4596..c5a66503 100644 --- a/src/qtx11keymapper.cpp +++ b/src/qtx11keymapper.cpp @@ -18,7 +18,7 @@ QtX11KeyMapper::QtX11KeyMapper(QObject *parent) : /* * The following mappings are mainly taken from qkeymapper_x11.cpp. - * There are portions of the mapping are customized to work around + * There are portions of the mapping that are customized to work around * some of the ambiguity introduced with some Qt keys * (XK_Alt_L and XK_Alt_R become Qt::Key_Alt */ diff --git a/src/xmlconfigreader.cpp b/src/xmlconfigreader.cpp index 6c023f70..da9c769c 100644 --- a/src/xmlconfigreader.cpp +++ b/src/xmlconfigreader.cpp @@ -77,7 +77,7 @@ bool XMLConfigReader::read() { xml->raiseError("Root node is not a joystick"); } - else + else if (xml->name() == Joystick::xmlName) { XMLConfigMigration migration(xml); if (migration.requiresMigration()) diff --git a/src/xmlconfigreader.h b/src/xmlconfigreader.h index a15dc0fd..a9f8e4a8 100644 --- a/src/xmlconfigreader.h +++ b/src/xmlconfigreader.h @@ -6,6 +6,7 @@ #include #include "inputdevice.h" +#include "joystick.h" #include "common.h" class XMLConfigReader : public QObject