feat: optimize process mouse move

1. revert process mouse move
2. optimize process mouse move
3. fix grabCursor bug

QtScrcpy/device/controller/controller.cpp

@@ -39,7 +39,10 @@ void Controller::postControlMsg(ControlMsg *controlMsg)
 void Controller::test(QRect rc)
 {
     ControlMsg* controlMsg = new ControlMsg(ControlMsg::CMT_INJECT_TOUCH);
-    controlMsg->setInjectTouchMsgData(POINTER_ID_MOUSE, AMOTION_EVENT_ACTION_DOWN, AMOTION_EVENT_BUTTON_PRIMARY, rc, 1.0f);
+    controlMsg->setInjectTouchMsgData(POINTER_ID_MOUSE,
+                                      AMOTION_EVENT_ACTION_DOWN,
+                                      AMOTION_EVENT_BUTTON_PRIMARY,
+                                      rc, 1.0f);
     postControlMsg(controlMsg);
 }
 
@@ -192,7 +195,7 @@ void Controller::keyEvent(const QKeyEvent *from, const QSize &frameSize, const Q
 
 bool Controller::event(QEvent *event)
 {
-    if (event && event->type() == ControlMsg::Control) {
+    if (event && static_cast<ControlMsg::Type>(event->type()) == ControlMsg::Control) {
         ControlMsg* controlMsg = dynamic_cast<ControlMsg*>(event);
         if (controlMsg) {
             sendControl(controlMsg->serializeData());
@@ -209,7 +212,7 @@ bool Controller::sendControl(const QByteArray &buffer)
     }
     qint32 len = 0;
     if (m_controlSocket) {
-        len = m_controlSocket->write(buffer.data(), buffer.length());
+        len = static_cast<qint32>(m_controlSocket->write(buffer.data(), buffer.length()));
     }
     return len == buffer.length() ? true : false;
 }

QtScrcpy/device/controller/inputconvert/inputconvertgame.cpp

@@ -112,24 +112,18 @@ void InputConvertGame::keyEvent(const QKeyEvent *from, const QSize& frameSize, c
 void InputConvertGame::loadKeyMap(const QString &json)
 {
     m_keyMap.loadKeyMap(json);
-    if (m_keyMap.isValidMouseMoveMap()) {
-        m_ctrlMouseMove.valid = true;
-        m_ctrlMouseMove.touching = false;
-        m_ctrlMouseMove.startPosRel = m_keyMap.getMouseMoveMap().data.mouseMove.startPos;
-        m_ctrlMouseMove.startPosPixel = calcFrameAbsolutePos(m_ctrlMouseMove.startPosRel);
-    }
-    if(m_keyMap.isValidSteerWheelMap()){
-        m_ctrlMouseMove.touching = false;
-    }
 }
 
 void InputConvertGame::updateSize(const QSize &frameSize, const QSize &showSize)
 {
+    if (showSize != m_showSize) {
+        if (m_gameMap) {
+            // show size change, resize grab cursor
+            emit grabCursor(true);
+        }
+    }
     m_frameSize = frameSize;
     m_showSize = showSize;
-    if(m_ctrlMouseMove.valid){
-        m_ctrlMouseMove.startPosPixel = calcScreenAbsolutePos(m_ctrlMouseMove.startPosRel);
-    }
 }
 
 void InputConvertGame::sendTouchDownEvent(int id, QPointF pos)
@@ -158,7 +152,11 @@ void InputConvertGame::sendTouchEvent(int id, QPointF pos, AndroidMotioneventAct
     if (!controlMsg) {
         return;
     }
-    controlMsg->setInjectTouchMsgData(id, action, (AndroidMotioneventButtons)0, QRect(calcFrameAbsolutePos(pos).toPoint(), m_frameSize), 1.0f);
+    controlMsg->setInjectTouchMsgData(static_cast<quint64>(id),
+                                      action,
+                                      static_cast<AndroidMotioneventButtons>(0),
+                                      QRect(calcFrameAbsolutePos(pos).toPoint(),m_frameSize),
+                                      1.0f);
     sendControlMsg(controlMsg);
 }
 
@@ -180,25 +178,20 @@ QPointF InputConvertGame::calcScreenAbsolutePos(QPointF relativePos)
 
 int InputConvertGame::attachTouchID(int key)
 {
-    //QMetaEnum map = QMetaEnum::fromType<Qt::Key>();
     for (int i = 0; i < MULTI_TOUCH_MAX_NUM; i++) {
-        if (0 == multiTouchID[i]) {
+        if (0 == m_multiTouchID[i]) {
-            multiTouchID[i] = key;
+            m_multiTouchID[i] = key;
-            //qDebug() << "attach "<<key<<" ("<<map.valueToKey(key)<<") as "<<i;
             return i;
         }
     }
-    //qDebug() << "attach "<<key<<" ("<<map.valueToKey(key)<<") failed ";
     return -1;
 }
 
 void InputConvertGame::detachTouchID(int key)
 {
-    //QMetaEnum map = QMetaEnum::fromType<Qt::Key>();
     for (int i = 0; i < MULTI_TOUCH_MAX_NUM; i++) {
-        if (key == multiTouchID[i]) {
+        if (key == m_multiTouchID[i]) {
-            multiTouchID[i] = 0;
+            m_multiTouchID[i] = 0;
-            //qDebug() << "detach "<<key<<" ("<<map.valueToKey(key)<<") from "<<i;
             return;
         }
     }
@@ -207,7 +200,7 @@ void InputConvertGame::detachTouchID(int key)
 int InputConvertGame::getTouchID(int key)
 {
     for (int i = 0; i < MULTI_TOUCH_MAX_NUM; i++) {
-        if (key == multiTouchID[i]) {
+        if (key == m_multiTouchID[i]) {
             return i;
         }
     }
@@ -338,30 +331,61 @@ bool InputConvertGame::processMouseMove(const QMouseEvent *from)
     if (QEvent::MouseMove != from->type()) {
         return false;
     }
-    if (m_ctrlMouseMove.touching) {
-        QPointF mousePos = from->localPos();
-        mousePos.rx() /= m_showSize.width();
-        mousePos.ry() /= m_showSize.height();
-        QPointF offset = mousePos - m_ctrlMouseMove.startPosRel;
-        //qDebug()<<from->localPos()<<" - "<<m_mouseMoveLastConverPos<<" - "<<offset<<" - "<<offset.manhattanLength();
 
-        if(mousePos.x()<0.05 || mousePos.x()>0.95 || mousePos.y()<0.05 || mousePos.y()>0.95) {
+    if (checkCursorPos(from)) {
-            //qDebug()<<"reset";
+        m_ctrlMouseMove.lastPos = QPointF(0.0, 0.0);
+        return true;
+    }
+
+    if (!m_ctrlMouseMove.lastPos.isNull()) {
+        QPointF distance = from->localPos() - m_ctrlMouseMove.lastPos;
+        distance /= m_keyMap.getMouseMoveMap().data.mouseMove.speedRatio;
+
+        mouseMoveStartTouch(from);
+        startMouseMoveTimer();
+
+        m_ctrlMouseMove.lastConverPos.setX(m_ctrlMouseMove.lastConverPos.x() + distance.x() / m_showSize.width());
+        m_ctrlMouseMove.lastConverPos.setY(m_ctrlMouseMove.lastConverPos.y() + distance.y() / m_showSize.height());
+
+        if (m_ctrlMouseMove.lastConverPos.x() < 0.1
+                || m_ctrlMouseMove.lastConverPos.x() > 0.8
+                || m_ctrlMouseMove.lastConverPos.y() < 0.1
+                || m_ctrlMouseMove.lastConverPos.y() > 0.8) {
             mouseMoveStopTouch();
             mouseMoveStartTouch(from);
         }
-        offset /= m_keyMap.getMouseMoveMap().data.mouseMove.speedRatio;
+
-        m_ctrlMouseMove.lastPosRel = m_ctrlMouseMove.startPosRel + offset;
+        sendTouchMoveEvent(getTouchID(Qt::ExtraButton24), m_ctrlMouseMove.lastConverPos);
-        mouseMoveMovingTouch(m_ctrlMouseMove.lastPosRel);
-    } else {
-        m_ctrlMouseMove.touching = true;
-        mouseMoveStartTouch(from);
-        int left = from->globalX() - from->x();
-        int top = from->globalY() - from->y();
     }
+    m_ctrlMouseMove.lastPos = from->localPos();
     return true;
 }
 
+bool InputConvertGame::checkCursorPos(const QMouseEvent *from)
+{
+    bool moveCursor = false;
+    QPoint pos = from->pos();
+    if (pos.x() < CURSOR_POS_CHECK) {
+        pos.setX(m_showSize.width() - CURSOR_POS_CHECK);
+        moveCursor = true;
+    } else if (pos.x() > m_showSize.width() - CURSOR_POS_CHECK) {
+        pos.setX(CURSOR_POS_CHECK);
+        moveCursor = true;
+    } else if (pos.y() < CURSOR_POS_CHECK) {
+        pos.setY(m_showSize.height() - CURSOR_POS_CHECK);
+        moveCursor = true;
+    } else if (pos.y() > m_showSize.height() - CURSOR_POS_CHECK) {
+        pos.setY(CURSOR_POS_CHECK);
+        moveCursor = true;
+    }
+
+    if (moveCursor) {
+        moveCursorTo(from, pos);
+    }
+
+    return moveCursor;
+}
+
 void InputConvertGame::moveCursorTo(const QMouseEvent *from, const QPoint &localPosPixel)
 {
     QPoint posOffset = from->pos() - localPosPixel;
@@ -373,37 +397,36 @@ void InputConvertGame::moveCursorTo(const QMouseEvent *from, const QPoint &local
 
 void InputConvertGame::mouseMoveStartTouch(const QMouseEvent* from)
 {
-    moveCursorTo(from, m_ctrlMouseMove.startPosPixel.toPoint());
+    Q_UNUSED(from)
-    int id = attachTouchID(m_ctrlMouseMove.touchKey);
+    if (!m_ctrlMouseMove.touching) {
-    sendTouchDownEvent(id, m_ctrlMouseMove.startPosRel);
+        QPointF mouseMoveStartPos = m_keyMap.getMouseMoveMap().data.mouseMove.startPos;
-    m_ctrlMouseMove.lastPosRel = m_ctrlMouseMove.startPosRel;
+        int id = attachTouchID(Qt::ExtraButton24);
+        sendTouchDownEvent(id, mouseMoveStartPos);
+        m_ctrlMouseMove.lastConverPos = mouseMoveStartPos;
         m_ctrlMouseMove.touching = true;
-}
+    }
-
-void InputConvertGame::mouseMoveMovingTouch(const QPointF& target)
-{
-    sendTouchMoveEvent(getTouchID(m_ctrlMouseMove.touchKey), target);
 }
 
 void InputConvertGame::mouseMoveStopTouch()
 {
-    int id = getTouchID(m_ctrlMouseMove.touchKey);
+    if (m_ctrlMouseMove.touching) {
-    sendTouchUpEvent(id, m_ctrlMouseMove.lastPosRel);
+        sendTouchUpEvent(getTouchID(Qt::ExtraButton24), m_ctrlMouseMove.lastConverPos);
-    detachTouchID(m_ctrlMouseMove.touchKey);
+        detachTouchID(Qt::ExtraButton24);
         m_ctrlMouseMove.touching = false;
+    }
 }
 
 void InputConvertGame::startMouseMoveTimer()
 {
     stopMouseMoveTimer();
-    m_mouseMoveTimer = startTimer(1000);
+    m_ctrlMouseMove.timer = startTimer(1000);
 }
 
 void InputConvertGame::stopMouseMoveTimer()
 {
-    if (0 != m_mouseMoveTimer) {
+    if (0 != m_ctrlMouseMove.timer) {
-        killTimer(m_mouseMoveTimer);
+        killTimer(m_ctrlMouseMove.timer);
-        m_mouseMoveTimer = 0;
+        m_ctrlMouseMove.timer = 0;
     }
 }
 
@@ -412,11 +435,11 @@ bool InputConvertGame::switchGameMap()
     m_gameMap = !m_gameMap;
     emit grabCursor(m_gameMap);
     if (m_gameMap) {
-        #ifdef QT_NO_DEBUG
+#ifdef QT_NO_DEBUG
         QGuiApplication::setOverrideCursor(QCursor(Qt::BlankCursor));
-        #else
+#else
         QGuiApplication::setOverrideCursor(QCursor(Qt::CrossCursor));
-        #endif
+#endif
     } else {
         if(m_ctrlMouseMove.touching)
             mouseMoveStopTouch();
@@ -427,7 +450,7 @@ bool InputConvertGame::switchGameMap()
 
 void InputConvertGame::timerEvent(QTimerEvent *event)
 {
-    if (m_mouseMoveTimer == event->timerId()) {
+    if (m_ctrlMouseMove.timer == event->timerId()) {
         stopMouseMoveTimer();
         mouseMoveStopTouch();
     }

QtScrcpy/device/controller/inputconvert/inputconvertgame.h

@@ -48,13 +48,12 @@ protected:
     bool processMouseMove(const QMouseEvent* from);
     void moveCursorTo(const QMouseEvent* from, const QPoint& localPosPixel);
     void mouseMoveStartTouch(const QMouseEvent* from);
-    void mouseMoveMovingTouch(const QPointF& target);
     void mouseMoveStopTouch();
-
     void startMouseMoveTimer();
     void stopMouseMoveTimer();
 
     bool switchGameMap();
+    bool checkCursorPos(const QMouseEvent *from);
 
 protected:
     void timerEvent(QTimerEvent *event);
@@ -63,8 +62,9 @@ private:
     QSize m_frameSize;
     QSize m_showSize;
     bool m_gameMap = false;
-
+    bool m_needSwitchGameAgain = false;
-    int multiTouchID[MULTI_TOUCH_MAX_NUM] = { 0 };
+    int m_multiTouchID[MULTI_TOUCH_MAX_NUM] = { 0 };
+    KeyMap m_keyMap;
 
     // steer wheel
     struct {
@@ -79,21 +79,12 @@ private:
     } m_ctrlSteerWheel;
 
     // mouse move
-    struct{
+    struct {
-        bool valid = false;
+        QPointF lastConverPos;
+        QPointF lastPos = {0.0, 0.0};
         bool touching = false;
-        const int touchKey = Qt::ExtraButton24;
+        int timer = 0;
-        QPointF startPosRel; // in [0, 1)
-        QPointF startPosPixel; // in [0, size)
-        QPointF lastPosRel;
-        //QPointF lastPosPixel;
     } m_ctrlMouseMove;
-
-    int m_mouseMoveTimer = 0;
-
-    bool m_needSwitchGameAgain = false;
-
-    KeyMap m_keyMap;
 };
 
 #endif // INPUTCONVERTGAME_H

QtScrcpy/device/ui/toolform.cpp

@@ -69,11 +69,13 @@ void ToolForm::mouseMoveEvent(QMouseEvent *event)
 
 void ToolForm::showEvent(QShowEvent *event)
 {
+    Q_UNUSED(event)
     qDebug() << "show event";
 }
 
 void ToolForm::hideEvent(QHideEvent *event)
 {
+    Q_UNUSED(event)
     qDebug() << "hide event";
 }
 

QtScrcpy/device/ui/videoform.cpp

@@ -349,7 +349,6 @@ void VideoForm::keyPressEvent(QKeyEvent *event)
         return;
     }
 
-    //qDebug() << "keyPressEvent" << event->isAutoRepeat();
     m_controller->keyEvent(event, ui->videoWidget->frameSize(), ui->videoWidget->size());
 }
 
@@ -358,7 +357,6 @@ void VideoForm::keyReleaseEvent(QKeyEvent *event)
     if (!m_controller) {
         return;
     }
-    //qDebug() << "keyReleaseEvent" << event->isAutoRepeat();
     m_controller->keyEvent(event, ui->videoWidget->frameSize(), ui->videoWidget->size());
 }