diff --git a/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp b/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp index c550e51..dc13ead 100644 --- a/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp +++ b/QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp @@ -73,10 +73,10 @@ void InputConvertGame::keyEvent(const QKeyEvent *from, const QSize& frameSize, c // 处理特殊按键：可以在按键映射和普通映射间切换的按键 if (m_needSwitchGameAgain && KeyMap::KMT_CLICK == node.type - && node.click.switchMap) { + && node.data.click.switchMap) { updateSize(frameSize, showSize); // Qt::Key_Tab Qt::Key_M for PUBG mobile - processKeyClick(node.click.keyNode.pos, false, node.click.switchMap, from); + processKeyClick(node.data.click.keyNode.pos, false, node.data.click.switchMap, from); return; } @@ -93,13 +93,13 @@ void InputConvertGame::keyEvent(const QKeyEvent *from, const QSize& frameSize, c return; // 处理普通按键 case KeyMap::KMT_CLICK: - processKeyClick(node.click.keyNode.pos, false, node.click.switchMap, from); + processKeyClick(node.data.click.keyNode.pos, false, node.data.click.switchMap, from); return; case KeyMap::KMT_CLICK_TWICE: - processKeyClick(node.clickTwice.keyNode.pos, true, false, from); + processKeyClick(node.data.clickTwice.keyNode.pos, true, false, from); return; case KeyMap::KMT_DRAG: - processKeyDrag(node.drag.startPos, node.drag.endPos, from); + processKeyDrag(node.data.drag.keyNode.pos, node.data.drag.keyNode.extendPos, from); return; default: break; @@ -115,7 +115,7 @@ void InputConvertGame::loadKeyMap(const QString &json) if (m_keyMap.isValidMouseMoveMap()) { m_ctrlMouseMove.valid = true; m_ctrlMouseMove.touching = false; - m_ctrlMouseMove.startPosRel = m_keyMap.getMouseMoveMap().startPos; + m_ctrlMouseMove.startPosRel = m_keyMap.getMouseMoveMap().data.mouseMove.startPos; m_ctrlMouseMove.startPosPixel = calcFrameAbsolutePos(m_ctrlMouseMove.startPosRel); } if(m_keyMap.isValidSteerWheelMap()){ @@ -222,11 +222,11 @@ void InputConvertGame::processSteerWheel(const KeyMap::KeyMapNode &node, const Q int key = from->key(); bool flag = from->type() == QEvent::KeyPress; // identify keys - if(key == node.steerWheel.up.key){ + if(key == node.data.steerWheel.up.key){ m_ctrlSteerWheel.pressedUp = flag; - }else if(key == node.steerWheel.right.key){ + }else if(key == node.data.steerWheel.right.key){ m_ctrlSteerWheel.pressedRight = flag; - }else if(key == node.steerWheel.down.key){ + }else if(key == node.data.steerWheel.down.key){ m_ctrlSteerWheel.pressedDown = flag; }else{ // left m_ctrlSteerWheel.pressedLeft = flag; @@ -235,36 +235,36 @@ void InputConvertGame::processSteerWheel(const KeyMap::KeyMapNode &node, const Q int nPressed = 0; if(m_ctrlSteerWheel.pressedUp){ ++nPressed; - offset.ry() -= node.steerWheel.up.offset; + offset.ry() -= node.data.steerWheel.up.extendOffset; } if(m_ctrlSteerWheel.pressedRight){ ++nPressed; - offset.rx() += node.steerWheel.right.offset; + offset.rx() += node.data.steerWheel.right.extendOffset; } if(m_ctrlSteerWheel.pressedDown){ ++nPressed; - offset.ry() += node.steerWheel.down.offset; + offset.ry() += node.data.steerWheel.down.extendOffset; } if(m_ctrlSteerWheel.pressedLeft){ ++nPressed; - offset.rx() -= node.steerWheel.left.offset; + offset.rx() -= node.data.steerWheel.left.extendOffset; } // action //qDebug()<key())<<"-"<type()<<"-"<key(); id = attachTouchID(m_ctrlSteerWheel.touchKey); - sendTouchDownEvent(id, node.steerWheel.centerPos); + sendTouchDownEvent(id, node.data.steerWheel.centerPos); }else{ id = getTouchID(m_ctrlSteerWheel.touchKey); } - sendTouchMoveEvent(id, node.steerWheel.centerPos + offset); + sendTouchMoveEvent(id, node.data.steerWheel.centerPos + offset); } m_ctrlSteerWheel.lastOffset = offset; return; @@ -319,9 +319,9 @@ bool InputConvertGame::processMouseClick(const QMouseEvent *from) if (QEvent::MouseButtonPress == from->type() || QEvent::MouseButtonDblClick == from->type()) { int id = attachTouchID(from->button()); - sendTouchDownEvent(id, node.click.keyNode.pos); + sendTouchDownEvent(id, node.data.click.keyNode.pos); } else if (QEvent::MouseButtonRelease == from->type()) { - sendTouchUpEvent(getTouchID(from->button()), node.click.keyNode.pos); + sendTouchUpEvent(getTouchID(from->button()), node.data.click.keyNode.pos); detachTouchID(from->button()); } else { return false; @@ -346,7 +346,7 @@ bool InputConvertGame::processMouseMove(const QMouseEvent *from) mouseMoveStopTouch(); mouseMoveStartTouch(from); } - offset /= m_keyMap.getMouseMoveMap().speedRatio; + offset /= m_keyMap.getMouseMoveMap().data.mouseMove.speedRatio; m_ctrlMouseMove.lastPosRel = m_ctrlMouseMove.startPosRel + offset; mouseMoveMovingTouch(m_ctrlMouseMove.lastPosRel); } else { diff --git a/QtScrcpy/device/controller/inputconvert/keymap/keymap.cpp b/QtScrcpy/device/controller/inputconvert/keymap/keymap.cpp index ce1dd84..68faf39 100644 --- a/QtScrcpy/device/controller/inputconvert/keymap/keymap.cpp +++ b/QtScrcpy/device/controller/inputconvert/keymap/keymap.cpp @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -40,51 +39,57 @@ void KeyMap::loadKeyMap(const QString &json) QJsonParseError jsonError; QJsonDocument jsonDoc; QJsonObject rootObj; + QPair switchKey; jsonDoc = QJsonDocument::fromJson(json.toUtf8(), &jsonError); - if(jsonError.error != QJsonParseError::NoError) - { + if(jsonError.error != QJsonParseError::NoError) { errorString = QString("json error: %1").arg(jsonError.errorString()); goto parseError; } // switchKey rootObj = jsonDoc.object(); - if (rootObj.contains("switchKey") && rootObj.value("switchKey").isString()) { - QPair p = getItemKey(rootObj, "switchKey"); - if(p.first == AT_INVALID){ - errorString = QString("json error: switchKey invalid"); - goto parseError; - } - m_switchType = p.first; - m_switchKey = p.second; - } else { + + if (!checkItemString(rootObj, "switchKey")) { errorString = QString("json error: no find switchKey"); goto parseError; } + switchKey = getItemKey(rootObj, "switchKey"); + if(switchKey.first == AT_INVALID) { + errorString = QString("json error: switchKey invalid"); + goto parseError; + } + + m_switchKey.type = switchKey.first; + m_switchKey.key= switchKey.second; + // mouseMoveMap - if (rootObj.contains("mouseMoveMap") && rootObj.value("mouseMoveMap").isObject()) { - QJsonObject mouseMoveMap = rootObj.value("mouseMoveMap").toObject(); - if (mouseMoveMap.contains("speedRatio") && mouseMoveMap.value("speedRatio").isDouble()) { - m_mouseMoveMap.speedRatio = mouseMoveMap.value("speedRatio").toInt(); - } else { + if (checkItemObject(rootObj, "mouseMoveMap")) { + QJsonObject mouseMoveMap = getItemObject(rootObj, "mouseMoveMap"); + KeyMapNode keyMapNode; + keyMapNode.type = KMT_MOUSE_MOVE; + + if (!checkItemDouble(mouseMoveMap, "speedRatio")) { errorString = QString("json error: mouseMoveMap on find speedRatio"); goto parseError; } - if (mouseMoveMap.contains("startPos") && mouseMoveMap.value("startPos").isObject()) { - QJsonObject startPos = mouseMoveMap.value("startPos").toObject(); - if (startPos.contains("x") && startPos.value("x").isDouble()) { - m_mouseMoveMap.startPos.setX(startPos.value("x").toDouble()); - } - if (startPos.contains("y") && startPos.value("y").isDouble()) { - m_mouseMoveMap.startPos.setY(startPos.value("y").toDouble()); - } - } else { + keyMapNode.data.mouseMove.speedRatio = static_cast(getItemDouble(mouseMoveMap, "speedRatio")); + + if (!checkItemObject(mouseMoveMap, "startPos")) { errorString = QString("json error: mouseMoveMap on find startPos"); goto parseError; } + QJsonObject startPos = mouseMoveMap.value("startPos").toObject(); + if (checkItemDouble(startPos, "x")) { + keyMapNode.data.mouseMove.startPos.setX(getItemDouble(startPos, "x")); + } + if (checkItemDouble(startPos, "y")) { + keyMapNode.data.mouseMove.startPos.setY(getItemDouble(startPos, "y")); + } + m_idxMouseMove = m_keyMapNodes.size(); + m_keyMapNodes.push_back(keyMapNode); } // keyMapNodes @@ -103,7 +108,7 @@ void KeyMap::loadKeyMap(const QString &json) goto parseError; } - KeyMap::KeyMapType type = getItemType(node, "type"); + KeyMap::KeyMapType type = getItemKeyMapType(node, "type"); switch (type) { case KeyMap::KMT_CLICK: { @@ -113,16 +118,16 @@ void KeyMap::loadKeyMap(const QString &json) break; } QPair key = getItemKey(node, "key"); - if(key.first == AT_INVALID){ + if (key.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("key").toString(); break; } KeyMapNode keyMapNode; keyMapNode.type = type; - keyMapNode.click.keyNode.type = key.first; - keyMapNode.click.keyNode.key = key.second; - keyMapNode.click.keyNode.pos = getItemPos(node, "pos"); - keyMapNode.click.switchMap = getItemSwitchMap(node, "switchMap"); + keyMapNode.data.click.keyNode.type = key.first; + keyMapNode.data.click.keyNode.key = key.second; + keyMapNode.data.click.keyNode.pos = getItemPos(node, "pos"); + keyMapNode.data.click.switchMap = getItemBool(node, "switchMap"); m_keyMapNodes.push_back(keyMapNode); } break; @@ -135,23 +140,23 @@ void KeyMap::loadKeyMap(const QString &json) } QPair key = getItemKey(node, "key"); - if(key.first == AT_INVALID){ + if (key.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("key").toString(); break; } KeyMapNode keyMapNode; keyMapNode.type = type; - keyMapNode.click.keyNode.type = key.first; - keyMapNode.click.keyNode.key = key.second; - keyMapNode.click.keyNode.pos = getItemPos(node, "pos"); - keyMapNode.click.switchMap = getItemSwitchMap(node, "switchMap"); + keyMapNode.data.click.keyNode.type = key.first; + keyMapNode.data.click.keyNode.key = key.second; + keyMapNode.data.click.keyNode.pos = getItemPos(node, "pos"); + keyMapNode.data.click.switchMap = getItemBool(node, "switchMap"); m_keyMapNodes.push_back(keyMapNode); } break; case KeyMap::KMT_STEER_WHEEL: { // safe check - if(!checkForSteerWhell(node)){ + if (!checkForSteerWhell(node)) { qWarning() << "json error: keyMapNodes node format error"; break; } @@ -159,33 +164,40 @@ void KeyMap::loadKeyMap(const QString &json) QPair rightKey = getItemKey(node, "rightKey"); QPair upKey = getItemKey(node, "upKey"); QPair downKey = getItemKey(node, "downKey"); - if(leftKey.first == AT_INVALID || rightKey.first == AT_INVALID - || upKey.first == AT_INVALID || downKey.first == AT_INVALID) - { - if(leftKey.first == AT_INVALID) + if (leftKey.first == AT_INVALID || rightKey.first == AT_INVALID + || upKey.first == AT_INVALID || downKey.first == AT_INVALID) { + if (leftKey.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("leftKey").toString(); - if(rightKey.first == AT_INVALID) + } + if (rightKey.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("rightKey").toString(); - if(upKey.first == AT_INVALID) + } + if (upKey.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("upKey").toString(); - if(downKey.first == AT_INVALID) + } + if (downKey.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("downKey").toString(); + } break; } KeyMapNode keyMapNode; keyMapNode.type = type; - keyMapNode.steerWheel.left = { leftKey.first, leftKey.second, - getItemNumber(node, "leftOffset") }; - keyMapNode.steerWheel.right = { rightKey.first, rightKey.second, - getItemNumber(node, "rightOffset") }; - keyMapNode.steerWheel.up = { upKey.first, upKey.second, - getItemNumber(node, "upOffset") }; - keyMapNode.steerWheel.down = { downKey.first, downKey.second, - getItemNumber(node, "downOffset") }; + keyMapNode.data.steerWheel.left = { leftKey.first, leftKey.second, + QPointF(0, 0), QPointF(0, 0), + getItemDouble(node, "leftOffset") }; + keyMapNode.data.steerWheel.right = { rightKey.first, rightKey.second, + QPointF(0, 0), QPointF(0, 0), + getItemDouble(node, "rightOffset") }; + keyMapNode.data.steerWheel.up = { upKey.first, upKey.second, + QPointF(0, 0), QPointF(0, 0), + getItemDouble(node, "upOffset") }; + keyMapNode.data.steerWheel.down = { downKey.first, downKey.second, + QPointF(0, 0), QPointF(0, 0), + getItemDouble(node, "downOffset") }; - keyMapNode.steerWheel.centerPos = getItemPos(node, "centerPos"); + keyMapNode.data.steerWheel.centerPos = getItemPos(node, "centerPos"); m_idxSteerWheel = m_keyMapNodes.size(); m_keyMapNodes.push_back(keyMapNode); } @@ -193,22 +205,22 @@ void KeyMap::loadKeyMap(const QString &json) case KeyMap::KMT_DRAG: { // safe check - if(!checkForDrag(node)){ + if (!checkForDrag(node)) { qWarning() << "json error: keyMapNodes node format error"; break; } QPair key = getItemKey(node, "key"); - if(key.first == AT_INVALID){ + if (key.first == AT_INVALID) { qWarning() << "json error: keyMapNodes node invalid key: " << node.value("key").toString(); break; } KeyMapNode keyMapNode; keyMapNode.type = type; - keyMapNode.drag.type = key.first; - keyMapNode.drag.key = key.second; - keyMapNode.drag.startPos = getItemPos(node, "startPos"); - keyMapNode.drag.endPos = getItemPos(node, "endPos"); + keyMapNode.data.drag.keyNode.type = key.first; + keyMapNode.data.drag.keyNode.key = key.second; + keyMapNode.data.drag.keyNode.pos = getItemPos(node, "startPos"); + keyMapNode.data.drag.keyNode.extendPos = getItemPos(node, "endPos"); m_keyMapNodes.push_back(keyMapNode); break; } @@ -220,7 +232,7 @@ void KeyMap::loadKeyMap(const QString &json) } // this must be called after m_keyMapNodes is stable makeReverseMap(); - qWarning() << "Script updated."; + qInfo() << "Script updated."; parseError: if (!errorString.isEmpty()) { @@ -231,45 +243,41 @@ parseError: const KeyMap::KeyMapNode& KeyMap::getKeyMapNode(int key) { - auto p = rmapKey.value(key, &m_invalidNode); - if(p == &m_invalidNode) - return *rmapMouse.value(key, &m_invalidNode); + auto p = m_rmapKey.value(key, &m_invalidNode); + if (p == &m_invalidNode) { + return *m_rmapMouse.value(key, &m_invalidNode); + } return *p; } const KeyMap::KeyMapNode& KeyMap::getKeyMapNodeKey(int key) { - return *rmapKey.value(key, &m_invalidNode); + return *m_rmapKey.value(key, &m_invalidNode); } const KeyMap::KeyMapNode& KeyMap::getKeyMapNodeMouse(int key) { - return *rmapMouse.value(key, &m_invalidNode); + return *m_rmapMouse.value(key, &m_invalidNode); } bool KeyMap::isSwitchOnKeyboard() { - return m_switchType == AT_KEY; + return m_switchKey.type == AT_KEY; } int KeyMap::getSwitchKey() { - return m_switchKey; + return m_switchKey.key; } -const KeyMap::MouseMoveMap& KeyMap::getMouseMoveMap() +const KeyMap::KeyMapNode& KeyMap::getMouseMoveMap() { - return m_mouseMoveMap; -} - -const KeyMap::KeyMapNode& KeyMap::getSteerWheelMap() -{ - return m_keyMapNodes[m_idxSteerWheel]; + return m_keyMapNodes[m_idxMouseMove]; } bool KeyMap::isValidMouseMoveMap() { - return !m_mouseMoveMap.startPos.isNull(); + return m_idxMouseMove != -1; } bool KeyMap::isValidSteerWheelMap() @@ -279,39 +287,39 @@ bool KeyMap::isValidSteerWheelMap() void KeyMap::makeReverseMap() { - rmapKey.clear(); - rmapMouse.clear(); - for(int i = 0 ;i < m_keyMapNodes.size(); ++i) { + m_rmapKey.clear(); + m_rmapMouse.clear(); + for (int i = 0 ; i < m_keyMapNodes.size(); ++i) { auto& node = m_keyMapNodes[i]; switch (node.type) { case KMT_CLICK: { - QMultiHash& m = node.click.keyNode.type == AT_KEY ? rmapKey : rmapMouse; - m.insert(node.click.keyNode.key, &node); + QMultiHash& m = node.data.click.keyNode.type == AT_KEY ? m_rmapKey : m_rmapMouse; + m.insert(node.data.click.keyNode.key, &node); } break; case KMT_CLICK_TWICE: { - QMultiHash& m = node.clickTwice.keyNode.type == AT_KEY ? rmapKey : rmapMouse; - m.insert(node.clickTwice.keyNode.key, &node); + QMultiHash& m = node.data.clickTwice.keyNode.type == AT_KEY ? m_rmapKey : m_rmapMouse; + m.insert(node.data.clickTwice.keyNode.key, &node); } break; case KMT_STEER_WHEEL: { - QMultiHash& ml = node.steerWheel.left.type == AT_KEY ? rmapKey : rmapMouse; - ml.insert(node.steerWheel.left.key, &node); - QMultiHash& mr = node.steerWheel.right.type == AT_KEY ? rmapKey : rmapMouse; - mr.insert(node.steerWheel.right.key, &node); - QMultiHash& mu = node.steerWheel.up.type == AT_KEY ? rmapKey : rmapMouse; - mu.insert(node.steerWheel.up.key, &node); - QMultiHash& md = node.steerWheel.down.type == AT_KEY ? rmapKey : rmapMouse; - md.insert(node.steerWheel.down.key, &node); + QMultiHash& ml = node.data.steerWheel.left.type == AT_KEY ? m_rmapKey : m_rmapMouse; + ml.insert(node.data.steerWheel.left.key, &node); + QMultiHash& mr = node.data.steerWheel.right.type == AT_KEY ? m_rmapKey : m_rmapMouse; + mr.insert(node.data.steerWheel.right.key, &node); + QMultiHash& mu = node.data.steerWheel.up.type == AT_KEY ? m_rmapKey : m_rmapMouse; + mu.insert(node.data.steerWheel.up.key, &node); + QMultiHash& md = node.data.steerWheel.down.type == AT_KEY ? m_rmapKey : m_rmapMouse; + md.insert(node.data.steerWheel.down.key, &node); } break; case KMT_DRAG: { - QMultiHash& m = node.drag.type == AT_KEY ? rmapKey : rmapMouse; - m.insert(node.drag.key, &node); + QMultiHash& m = node.data.drag.keyNode.type == AT_KEY ? m_rmapKey : m_rmapMouse; + m.insert(node.data.drag.keyNode.key, &node); } break; default: @@ -320,51 +328,24 @@ void KeyMap::makeReverseMap() } } -// ---- check and get of json item ---- - -bool KeyMap::checkItemKey(const QJsonObject& node, const QString& name) +QString KeyMap::getItemString(const QJsonObject &node, const QString &name) { - return node.contains(name) && node.value(name).isString(); + return node.value(name).toString(); } -bool KeyMap::checkItemPos(const QJsonObject& node, const QString& name) +double KeyMap::getItemDouble(const QJsonObject& node, const QString& name) { - if(node.contains(name) && node.value(name).isObject()){ - QJsonObject pos = node.value(name).toObject(); - return pos.contains("x") && pos.value("x").isDouble() - && pos.contains("y") && pos.value("y").isDouble(); - } - return false; + return node.value(name).toDouble(); } -bool KeyMap::checkItemDouble(const QJsonObject& node, const QString& name) +bool KeyMap::getItemBool(const QJsonObject& node, const QString& name) { - return node.contains(name) && node.value(name).isDouble(); + return node.value(name).toBool(false); } -bool KeyMap::checkItemSwitchMap(const QJsonObject& node, const QString& name) +QJsonObject KeyMap::getItemObject(const QJsonObject &node, const QString &name) { - return !node.contains(name) || node.value(name).isBool(); -} - -KeyMap::KeyMapType KeyMap::getItemType(const QJsonObject& node, const QString& name) -{ - QString value = node.value(name).toString(); - return static_cast(m_metaEnumKeyMapType.keyToValue(value.toStdString().c_str())); -} - -QPair KeyMap::getItemKey(const QJsonObject& node, const QString& name) -{ - QString value = node.value(name).toString(); - int key = m_metaEnumKey.keyToValue(value.toStdString().c_str()); - int btn = m_metaEnumMouseButtons.keyToValue(value.toStdString().c_str()); - if(key == -1 && btn == -1){ - return {AT_INVALID, -1}; - }else if(key != -1){ - return {AT_KEY, key}; - }else{ - return {AT_MOUSE, btn}; - } + return node.value(name).toObject(); } QPointF KeyMap::getItemPos(const QJsonObject& node, const QString& name) @@ -373,23 +354,60 @@ QPointF KeyMap::getItemPos(const QJsonObject& node, const QString& name) return QPointF(pos.value("x").toDouble(), pos.value("y").toDouble()); } -double KeyMap::getItemNumber(const QJsonObject& node, const QString& name) +QPair KeyMap::getItemKey(const QJsonObject& node, const QString& name) { - return node.value(name).toDouble(); + QString value = getItemString(node, name); + int key = m_metaEnumKey.keyToValue(value.toStdString().c_str()); + int btn = m_metaEnumMouseButtons.keyToValue(value.toStdString().c_str()); + if (key == -1 && btn == -1) { + return {AT_INVALID, -1}; + } else if (key != -1) { + return {AT_KEY, key}; + } else { + return {AT_MOUSE, btn}; + } } -bool KeyMap::getItemSwitchMap(const QJsonObject& node, const QString& name) +KeyMap::KeyMapType KeyMap::getItemKeyMapType(const QJsonObject& node, const QString& name) { - return node.value(name).toBool(false); + QString value = getItemString(node, name); + return static_cast(m_metaEnumKeyMapType.keyToValue(value.toStdString().c_str())); } +bool KeyMap::checkItemString(const QJsonObject& node, const QString& name) +{ + return node.contains(name) && node.value(name).isString(); +} -// ---- check for key-map node ---- +bool KeyMap::checkItemDouble(const QJsonObject& node, const QString& name) +{ + return node.contains(name) && node.value(name).isDouble(); +} + +bool KeyMap::checkItemBool(const QJsonObject& node, const QString& name) +{ + return !node.contains(name) || node.value(name).isBool(); +} + +bool KeyMap::checkItemObject(const QJsonObject &node, const QString &name) +{ + return !node.contains(name) || node.value(name).isObject(); +} + +bool KeyMap::checkItemPos(const QJsonObject& node, const QString& name) +{ + if (node.contains(name) && node.value(name).isObject()) { + QJsonObject pos = node.value(name).toObject(); + return pos.contains("x") && pos.value("x").isDouble() + && pos.contains("y") && pos.value("y").isDouble(); + } + return false; +} bool KeyMap::checkForClick(const QJsonObject& node) { - return checkItemKey(node, "key") && checkItemPos(node, "pos") - && checkItemSwitchMap(node, "switchMap"); + return checkItemString(node, "key") && checkItemPos(node, "pos") + && checkItemBool(node, "switchMap"); } bool KeyMap::checkForClickDouble(const QJsonObject& node) @@ -399,8 +417,8 @@ bool KeyMap::checkForClickDouble(const QJsonObject& node) bool KeyMap::checkForSteerWhell(const QJsonObject& node) { - return checkItemKey(node, "leftKey") && checkItemKey(node, "rightKey") - && checkItemKey(node, "upKey") && checkItemKey(node, "downKey") + return checkItemString(node, "leftKey") && checkItemString(node, "rightKey") + && checkItemString(node, "upKey") && checkItemString(node, "downKey") && checkItemDouble(node, "leftOffset") && checkItemDouble(node, "rightOffset") && checkItemDouble(node, "upOffset") && checkItemDouble(node, "downOffset") && checkItemPos(node, "centerPos"); @@ -408,8 +426,7 @@ bool KeyMap::checkForSteerWhell(const QJsonObject& node) bool KeyMap::checkForDrag(const QJsonObject& node) { - return checkItemKey(node, "key") - && checkItemPos(node, "startPos") && checkItemPos(node, "endPos") - && checkItemSwitchMap(node, "switchMap"); + return checkItemString(node, "key") + && checkItemPos(node, "startPos") && checkItemPos(node, "endPos"); } diff --git a/QtScrcpy/device/controller/inputconvert/keymap/keymap.h b/QtScrcpy/device/controller/inputconvert/keymap/keymap.h index bfcd83f..dd607aa 100644 --- a/QtScrcpy/device/controller/inputconvert/keymap/keymap.h +++ b/QtScrcpy/device/controller/inputconvert/keymap/keymap.h @@ -7,8 +7,7 @@ #include #include #include - -class QJsonObject; +#include class KeyMap : public QObject { @@ -20,6 +19,7 @@ public: KMT_CLICK_TWICE, KMT_STEER_WHEEL, KMT_DRAG, + KMT_MOUSE_MOVE }; Q_ENUM(KeyMapType) @@ -33,12 +33,14 @@ public: struct KeyNode { ActionType type = AT_INVALID; int key = Qt::Key_unknown; - QPointF pos = QPointF(0, 0); + QPointF pos = QPointF(0, 0); // normal key + QPointF extendPos = QPointF(0, 0); // for drag + double extendOffset = 0.0; // for steerWheel }; struct KeyMapNode { KeyMapType type = KMT_INVALID; - union { + union DATA { struct { KeyNode keyNode; bool switchMap = false; @@ -48,29 +50,22 @@ public: } clickTwice; struct { QPointF centerPos = {0.0, 0.0}; - struct DirInfo{ - ActionType type = AT_KEY; // keyboard/mouse - int key = Qt::Key_unknown; // key/button - double offset = 0.0; - }; - DirInfo left, right, up, down; + KeyNode left, right, up, down; } steerWheel; struct { - ActionType type = AT_KEY; - int key = Qt::Key_unknown; - QPointF startPos = QPointF(0, 0); - QPointF endPos = QPointF(0, 0); + KeyNode keyNode; } drag; - }; + struct { + QPointF startPos = {0.0, 0.0}; + int speedRatio = 1; + } mouseMove; + DATA() {} + ~DATA() {} + } data; KeyMapNode() {} ~KeyMapNode() {} }; - struct MouseMoveMap { - QPointF startPos = {0.0, 0.0}; - int speedRatio = 1; - }; - KeyMap(QObject *parent = Q_NULLPTR); virtual ~KeyMap(); @@ -83,8 +78,7 @@ public: bool isValidMouseMoveMap(); bool isValidSteerWheelMap(); - const MouseMoveMap& getMouseMoveMap(); - const KeyMapNode& getSteerWheelMap(); + const KeyMap::KeyMapNode& getMouseMoveMap(); static const QString& getKeyMapPath(); @@ -92,41 +86,50 @@ private: // set up the reverse map from key/event event to keyMapNode void makeReverseMap(); - // parse json of the mapping script - bool checkItemKey(const QJsonObject& node, const QString& name="key"); - bool checkItemPos(const QJsonObject& node, const QString& name="pos"); + // safe check for base + bool checkItemString(const QJsonObject& node, const QString& name); bool checkItemDouble(const QJsonObject& node, const QString& name); - bool checkItemSwitchMap(const QJsonObject& node, const QString& name="switchMap"); + bool checkItemBool(const QJsonObject& node, const QString& name); + bool checkItemObject(const QJsonObject& node, const QString& name); + bool checkItemPos(const QJsonObject& node, const QString& name); - KeyMapType getItemType(const QJsonObject& node, const QString& name="type"); - QPair getItemKey(const QJsonObject& node, const QString& name="key"); - QPointF getItemPos(const QJsonObject& node, const QString& name="pos"); - double getItemNumber(const QJsonObject& node, const QString& name); - bool getItemSwitchMap(const QJsonObject& node, const QString& name="switchMap"); - -private: + // safe check for KeyMapNode bool checkForClick(const QJsonObject& node); bool checkForClickDouble(const QJsonObject& node); bool checkForSteerWhell(const QJsonObject& node); bool checkForDrag(const QJsonObject& node); + // get keymap from json object + QString getItemString(const QJsonObject& node, const QString& name); + double getItemDouble(const QJsonObject& node, const QString& name); + bool getItemBool(const QJsonObject& node, const QString& name); + QJsonObject getItemObject(const QJsonObject& node, const QString& name); + QPointF getItemPos(const QJsonObject& node, const QString& name); + QPair getItemKey(const QJsonObject& node, const QString& name); + KeyMapType getItemKeyMapType(const QJsonObject& node, const QString& name); + private: - QVector m_keyMapNodes; - KeyMapNode m_invalidNode; - ActionType m_switchType = AT_KEY; - int m_switchKey = Qt::Key_QuoteLeft; - MouseMoveMap m_mouseMoveMap; static QString s_keyMapPath; + QVector m_keyMapNodes; + KeyNode m_switchKey = { AT_KEY, Qt::Key_QuoteLeft }; + + // just for return + KeyMapNode m_invalidNode; + + // steer wheel index int m_idxSteerWheel = -1; + // mouse move index + int m_idxMouseMove = -1; + // mapping of key/mouse event name to index QMetaEnum m_metaEnumKey = QMetaEnum::fromType(); QMetaEnum m_metaEnumMouseButtons = QMetaEnum::fromType(); QMetaEnum m_metaEnumKeyMapType = QMetaEnum::fromType(); // reverse map of key/mouse event - QMultiHash rmapKey; - QMultiHash rmapMouse; + QMultiHash m_rmapKey; + QMultiHash m_rmapMouse; }; #endif // KEYMAP_H