Skip to content

Commit

Permalink
Client: modify mouse event
Browse files Browse the repository at this point in the history
  • Loading branch information
@KangLin
KangLin committed Jul 31, 2024
1 parent b39a58b commit 590ffa1
Show file tree
Hide file tree
Showing 10 changed files with 119 additions and 117 deletions.
40 changes: 20 additions & 20 deletions Client/Connect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,20 @@ int CConnect::SetViewer(CFrmViewer *pView, bool bDirectConnection)
* it may block the thread, which will cause the keyboard and mouse events to be delayed.
* So here use Qt::DirectConnection
*/
check = connect(m_pView, SIGNAL(sigMousePressEvent(Qt::MouseButtons, QPoint)),
this, SLOT(slotMousePressEvent(Qt::MouseButtons, QPoint)),
check = connect(m_pView, SIGNAL(sigMousePressEvent(QMouseEvent*, QPoint)),
this, SLOT(slotMousePressEvent(QMouseEvent*, QPoint)),
Qt::DirectConnection);
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigMouseReleaseEvent(Qt::MouseButton, QPoint)),
this, SLOT(slotMouseReleaseEvent(Qt::MouseButton, QPoint)),
check = connect(m_pView, SIGNAL(sigMouseReleaseEvent(QMouseEvent*, QPoint)),
this, SLOT(slotMouseReleaseEvent(QMouseEvent*, QPoint)),
Qt::DirectConnection);
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigMouseMoveEvent(Qt::MouseButtons, QPoint)),
this, SLOT(slotMouseMoveEvent(Qt::MouseButtons, QPoint)),
check = connect(m_pView, SIGNAL(sigMouseMoveEvent(QMouseEvent*, QPoint)),
this, SLOT(slotMouseMoveEvent(QMouseEvent*, QPoint)),
Qt::DirectConnection);
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigWheelEvent(Qt::MouseButtons, QPoint, QPoint)),
this, SLOT(slotWheelEvent(Qt::MouseButtons, QPoint, QPoint)),
check = connect(m_pView, SIGNAL(sigWheelEvent(QWheelEvent*, QPoint)),
this, SLOT(slotWheelEvent(QWheelEvent*, QPoint)),
Qt::DirectConnection);
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigKeyPressEvent(int, Qt::KeyboardModifiers)),
Expand All @@ -165,17 +165,17 @@ int CConnect::SetViewer(CFrmViewer *pView, bool bDirectConnection)
Qt::DirectConnection);
Q_ASSERT(check);
} else {
check = connect(m_pView, SIGNAL(sigMousePressEvent(Qt::MouseButtons, QPoint)),
this, SLOT(slotMousePressEvent(Qt::MouseButtons, QPoint)));
check = connect(m_pView, SIGNAL(sigMousePressEvent(QMouseEvent*, QPoint)),
this, SLOT(slotMousePressEvent(QMouseEvent*, QPoint)));
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigMouseReleaseEvent(Qt::MouseButton, QPoint)),
this, SLOT(slotMouseReleaseEvent(Qt::MouseButton, QPoint)));
check = connect(m_pView, SIGNAL(sigMouseReleaseEvent(QMouseEvent*, QPoint)),
this, SLOT(slotMouseReleaseEvent(QMouseEvent*, QPoint)));
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigMouseMoveEvent(Qt::MouseButtons, QPoint)),
this, SLOT(slotMouseMoveEvent(Qt::MouseButtons, QPoint)));
check = connect(m_pView, SIGNAL(sigMouseMoveEvent(QMouseEvent*, QPoint)),
this, SLOT(slotMouseMoveEvent(QMouseEvent*, QPoint)));
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigWheelEvent(Qt::MouseButtons, QPoint, QPoint)),
this, SLOT(slotWheelEvent(Qt::MouseButtons, QPoint, QPoint)));
check = connect(m_pView, SIGNAL(sigWheelEvent(QWheelEvent*, QPoint)),
this, SLOT(slotWheelEvent(QWheelEvent*, QPoint)));
Q_ASSERT(check);
check = connect(m_pView, SIGNAL(sigKeyPressEvent(int, Qt::KeyboardModifiers)),
this, SLOT(slotKeyPressEvent(int, Qt::KeyboardModifiers)));
Expand Down Expand Up @@ -242,22 +242,22 @@ int CConnect::OnProcess()
return 0;
}

void CConnect::slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta)
void CConnect::slotWheelEvent(QWheelEvent *, QPoint pos)
{
qDebug(log) << "Need to implement CConnect::slotWheelEvent";
}

void CConnect::slotMouseMoveEvent(Qt::MouseButtons, QPoint)
void CConnect::slotMouseMoveEvent(QMouseEvent *, QPoint)
{
qDebug(log) << "Need to implement CConnect::slotMouseMoveEvent";
}

void CConnect::slotMousePressEvent(Qt::MouseButtons, QPoint)
void CConnect::slotMousePressEvent(QMouseEvent *, QPoint)
{
qDebug(log) << "Need to implement CConnect::slotMousePressEvent";
}

void CConnect::slotMouseReleaseEvent(Qt::MouseButton, QPoint)
void CConnect::slotMouseReleaseEvent(QMouseEvent *, QPoint)
{
qDebug(log) << "Need to implement CConnect::slotMouseReleaseEvent";
}
Expand Down
8 changes: 4 additions & 4 deletions Client/Connect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,10 +284,10 @@ protected Q_SLOTS:
void sigBlockShowWidget(const QString& className, int &nRet, void* pContext);

public Q_SLOTS:
virtual void slotMousePressEvent(Qt::MouseButtons, QPoint);
virtual void slotMouseReleaseEvent(Qt::MouseButton, QPoint);
virtual void slotMouseMoveEvent(Qt::MouseButtons, QPoint);
virtual void slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta);
virtual void slotMousePressEvent(QMouseEvent*, QPoint);
virtual void slotMouseReleaseEvent(QMouseEvent*, QPoint);
virtual void slotMouseMoveEvent(QMouseEvent*, QPoint);
virtual void slotWheelEvent(QWheelEvent*, QPoint pos);
virtual void slotKeyPressEvent(int key, Qt::KeyboardModifiers modifiers);
virtual void slotKeyReleaseEvent(int key, Qt::KeyboardModifiers modifiers);

Expand Down
16 changes: 11 additions & 5 deletions Client/FrmViewer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@ void CFrmViewer::mousePressEvent(QMouseEvent *event)
#endif

if(TranslationMousePoint(pos, pos)) return;
// event->buttons() 产生事件时，按键的状态
// event->button() 触发当前事件的按键
//qDebug(log) << "CFrmViewer::mousePressEvent" << event->button() << event->buttons() << pos;
emit sigMousePressEvent(event->buttons(), QPoint(pos.x(), pos.y()));
emit sigMousePressEvent(event, QPoint(pos.x(), pos.y()));
event->accept();
}

Expand All @@ -188,8 +190,10 @@ void CFrmViewer::mouseReleaseEvent(QMouseEvent *event)
event->pos();
#endif
if(TranslationMousePoint(pos, pos)) return;
// event->buttons() 产生事件时，按键的状态
// event->button() 触发当前事件的按键
//qDebug(log) << "CFrmViewer::mouseReleaseEvent" << event->button() << event->buttons() << pos;
emit sigMouseReleaseEvent(event->button(), QPoint(pos.x(), pos.y()));
emit sigMouseReleaseEvent(event, QPoint(pos.x(), pos.y()));
event->accept();
}

Expand All @@ -202,9 +206,10 @@ void CFrmViewer::mouseMoveEvent(QMouseEvent *event)
event->pos();
#endif
if(TranslationMousePoint(pos, pos)) return;
// event->buttons() 产生事件时，按键的状态
// event->button() 触发当前事件的按键
//qDebug(log) << "CFrmViewer::mouseMoveEvent" << event->button() << event->buttons() << pos;
emit sigMouseMoveEvent(event->buttons(), QPoint(pos.x(), pos.y()));
emit sigMouseMoveEvent(event);
emit sigMouseMoveEvent(event, QPoint(pos.x(), pos.y()));
event->accept();
}

Expand All @@ -217,7 +222,8 @@ void CFrmViewer::wheelEvent(QWheelEvent *event)
event->pos();
#endif
if(TranslationMousePoint(pos, pos)) return;
emit sigWheelEvent(event->buttons(), QPoint(pos.x(), pos.y()), event->angleDelta());
//qDebug(log) << "CFrmViewer::wheelEvent" << event->buttons() << event->angleDelta() << pos;
emit sigWheelEvent(event, QPoint(pos.x(), pos.y()));
event->accept();
}

Expand Down
11 changes: 5 additions & 6 deletions Client/FrmViewer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,13 @@ public Q_SLOTS:
void slotSystemCombination();

Q_SIGNALS:
void sigMousePressEvent(Qt::MouseButtons, QPoint);
void sigMouseReleaseEvent(Qt::MouseButton, QPoint);
void sigMouseMoveEvent(Qt::MouseButtons buttons, QPoint pos);
void sigMouseMoveEvent(QMouseEvent *event);
void sigWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta);
void sigMousePressEvent(QMouseEvent* event, QPoint pos);
void sigMouseReleaseEvent(QMouseEvent* event, QPoint pos);
void sigMouseMoveEvent(QMouseEvent* event, QPoint pos);
void sigWheelEvent(QWheelEvent *event, QPoint pos);
void sigKeyPressEvent(int key, Qt::KeyboardModifiers modify);
void sigKeyReleaseEvent(int key, Qt::KeyboardModifiers modify);

// Please use CConnecter::sigServerName
void sigServerName(const QString &szName);

Expand Down
30 changes: 15 additions & 15 deletions Plugins/FreeRDP/Client/ConnectFreeRDP.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1524,14 +1524,14 @@ bool CConnectFreeRDP::SendMouseEvent(UINT16 flags, QPoint pos)
return true;
}

void CConnectFreeRDP::slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta)
void CConnectFreeRDP::slotWheelEvent(QWheelEvent *event, QPoint pos)
{
//qDebug(log) << "CConnectFreeRDP::slotWheelEvent" << buttons << pos;
//qDebug(log) << "CConnectFreeRDP::slotWheelEvent" << event->buttons() << pos;
if(!m_pContext) return;
if(m_pParameter && m_pParameter->GetOnlyView()) return;

UINT16 flags = 0;
QPoint p = angleDelta;
QPoint p = event->angleDelta();
if(p.y() > 0)
{
flags |= PTR_FLAGS_WHEEL | p.y();
Expand Down Expand Up @@ -1563,47 +1563,47 @@ void CConnectFreeRDP::slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoin
}

// https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-rdpbcgr/2c1ced34-340a-46cd-be6e-fc8cab7c3b17
void CConnectFreeRDP::slotMouseMoveEvent(Qt::MouseButtons buttons, QPoint pos)
void CConnectFreeRDP::slotMouseMoveEvent(QMouseEvent *event, QPoint pos)
{
//qDebug(log) << "CConnectFreeRDP::slotMouseMoveEvent" << buttons << pos;
//qDebug(log) << "CConnectFreeRDP::slotMouseMoveEvent" << event->buttons() << event->button() << pos;
if(!m_pContext) return;
if(m_pParameter && m_pParameter->GetOnlyView()) return;
UINT16 flags = PTR_FLAGS_MOVE;
SendMouseEvent(flags, pos);
}

void CConnectFreeRDP::slotMousePressEvent(Qt::MouseButtons buttons, QPoint pos)
void CConnectFreeRDP::slotMousePressEvent(QMouseEvent *event, QPoint pos)
{
//qDebug(log) << "CConnectFreeRDP::slotMousePressEvent" << buttons << pos;
//qDebug(log) << "CConnectFreeRDP::slotMousePressEvent" << event->buttons() << event->button() << pos;
if(!m_pContext) return;
if(m_pParameter && m_pParameter->GetOnlyView()) return;
UINT16 flags = PTR_FLAGS_DOWN;
if(buttons & Qt::MouseButton::LeftButton)
if(event->button() & Qt::MouseButton::LeftButton)
{
flags |= PTR_FLAGS_BUTTON1;
} else if(buttons & Qt::MouseButton::RightButton)
} else if(event->button() & Qt::MouseButton::RightButton)
{
flags |= PTR_FLAGS_BUTTON2;
} else if(buttons & Qt::MouseButton::MiddleButton)
} else if(event->button() & Qt::MouseButton::MiddleButton)
{
flags |= PTR_FLAGS_BUTTON3;
}
SendMouseEvent(flags, pos);
}

void CConnectFreeRDP::slotMouseReleaseEvent(Qt::MouseButton button, QPoint pos)
void CConnectFreeRDP::slotMouseReleaseEvent(QMouseEvent *event, QPoint pos)
{
//qDebug(log) << "CConnectFreeRDP::slotMouseReleaseEvent" << button << pos;
//qDebug(log) << "CConnectFreeRDP::slotMouseReleaseEvent" << event->buttons() << event->button() << pos;
if(!m_pContext) return;
if(m_pParameter && m_pParameter->GetOnlyView()) return;
UINT16 flags = 0;
if(button & Qt::MouseButton::LeftButton)
if(event->button() & Qt::MouseButton::LeftButton)
{
flags |= PTR_FLAGS_BUTTON1;
} else if(button & Qt::MouseButton::MiddleButton)
} else if(event->button() & Qt::MouseButton::MiddleButton)
{
flags |= PTR_FLAGS_BUTTON3;
} else if(button & Qt::MouseButton::RightButton)
} else if(event->button() & Qt::MouseButton::RightButton)
{
flags |= PTR_FLAGS_BUTTON2;
}
Expand Down
8 changes: 4 additions & 4 deletions Plugins/FreeRDP/Client/ConnectFreeRDP.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,10 @@ public Q_SLOTS:
virtual void slotClipBoardChanged() override;

public Q_SLOTS:
virtual void slotMousePressEvent(Qt::MouseButtons buttons, QPoint pos) override;
virtual void slotMouseReleaseEvent(Qt::MouseButton button, QPoint pos) override;
virtual void slotMouseMoveEvent(Qt::MouseButtons buttons, QPoint pos) override;
virtual void slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta) override;
virtual void slotMousePressEvent(QMouseEvent* event, QPoint pos) override;
virtual void slotMouseReleaseEvent(QMouseEvent* event, QPoint pos) override;
virtual void slotMouseMoveEvent(QMouseEvent* event, QPoint pos) override;
virtual void slotWheelEvent(QWheelEvent* event, QPoint pos) override;
virtual void slotKeyPressEvent(int key, Qt::KeyboardModifiers modifiers) override;
virtual void slotKeyReleaseEvent(int key, Qt::KeyboardModifiers modifiers) override;

Expand Down
51 changes: 22 additions & 29 deletions Plugins/LibVNCServer/Client/ConnectLibVNCServer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -466,74 +466,67 @@ void CConnectLibVNCServer::cb_got_cursor_shape(rfbClient *client,
}
}

void CConnectLibVNCServer::slotMousePressEvent(Qt::MouseButtons buttons, QPoint pos)
void CConnectLibVNCServer::slotMousePressEvent(QMouseEvent *event, QPoint pos)
{
if(!m_pClient) return;
if(m_pPara && m_pPara->GetOnlyView()) return;
//qDebug(log) << "CConnectLibVnc::slotMousePressEvent" << e->button() << e->buttons();
unsigned char mask = 0;
if(buttons & Qt::MouseButton::LeftButton)
if(event->button() & Qt::MouseButton::LeftButton)
mask |= 0x1;
if(buttons & Qt::MouseButton::MiddleButton)
if(event->button() & Qt::MouseButton::MiddleButton)
mask |= 0x2;
if(buttons & Qt::MouseButton::RightButton)
if(event->button() & Qt::MouseButton::RightButton)
mask |= 0x4;

SendPointerEvent(m_pClient, pos.x(), pos.y(), mask);
}

void CConnectLibVNCServer::slotMouseReleaseEvent(Qt::MouseButton button, QPoint pos)
void CConnectLibVNCServer::slotMouseReleaseEvent(QMouseEvent *event, QPoint pos)
{
if(!m_pClient) return;
if(m_pPara && m_pPara->GetOnlyView()) return;
int mask = 0;
if(button & Qt::MouseButton::LeftButton)
mask |= 0x1;
if(button & Qt::MouseButton::MiddleButton)
mask |= 0x2;
if(button & Qt::MouseButton::RightButton)
mask |= 0x4;
SendPointerEvent(m_pClient, pos.x(), pos.y(), mask);
}

void CConnectLibVNCServer::slotMouseMoveEvent(Qt::MouseButtons buttons, QPoint pos)
void CConnectLibVNCServer::slotMouseMoveEvent(QMouseEvent *event, QPoint pos)
{
//qDebug(log) << "CConnectLibVnc::slotMouseMoveEvent" << buttons << pos;
if(!m_pClient) return;
if(m_pPara && m_pPara->GetOnlyView()) return;
int mask = 0;
if(buttons & Qt::MouseButton::LeftButton)
if(event->buttons() & Qt::MouseButton::LeftButton)
mask |= 0x1;
if(buttons & Qt::MouseButton::MiddleButton)
if(event->buttons() & Qt::MouseButton::MiddleButton)
mask |= 0x2;
if(buttons & Qt::MouseButton::RightButton)
if(event->buttons() & Qt::MouseButton::RightButton)
mask |= 0x4;
SendPointerEvent(m_pClient, pos.x(), pos.y(), mask);
}

void CConnectLibVNCServer::slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta)
void CConnectLibVNCServer::slotWheelEvent(QWheelEvent *event, QPoint pos)
{
//qDebug(log) << "CConnectLibVnc::slotWheelEvent" << buttons << pos << angleDelta;
if(!m_pClient) return;
if(m_pPara && m_pPara->GetOnlyView()) return;
int mask = 0;

if(buttons & Qt::MouseButton::LeftButton)
if(event->buttons() & Qt::MouseButton::LeftButton)
mask |= 0x1;
if(buttons & Qt::MouseButton::MiddleButton)
if(event->buttons() & Qt::MouseButton::MiddleButton)
mask |= 0x2;
if(buttons & Qt::MouseButton::RightButton)
if(event->buttons() & Qt::MouseButton::RightButton)
mask |= 0x4;

QPoint p = angleDelta;
if(p.y() > 0)
mask |= 8;
if(p.y() < 0)
mask |= 16;
if(p.x() < 0)
mask |= 32;
if(p.x() > 0)
mask |= 64;
QPoint d = event->angleDelta();
if(d.y() > 0)
mask |= 0x8;
if(d.y() < 0)
mask |= 0x10;
if(d.x() < 0)
mask |= 0x20;
if(d.x() > 0)
mask |= 0x40;

SendPointerEvent(m_pClient, pos.x(), pos.y(), mask);
}
Expand Down
8 changes: 4 additions & 4 deletions Plugins/LibVNCServer/Client/ConnectLibVNCServer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ class CConnectLibVNCServer : public CConnect

public Q_SLOTS:
virtual void slotClipBoardChanged() override;
virtual void slotMousePressEvent(Qt::MouseButtons buttons, QPoint pos) override;
virtual void slotMouseReleaseEvent(Qt::MouseButton button, QPoint pos) override;
virtual void slotMouseMoveEvent(Qt::MouseButtons buttons, QPoint pos) override;
virtual void slotWheelEvent(Qt::MouseButtons buttons, QPoint pos, QPoint angleDelta) override;
virtual void slotMousePressEvent(QMouseEvent* event, QPoint pos) override;
virtual void slotMouseReleaseEvent(QMouseEvent* event, QPoint pos) override;
virtual void slotMouseMoveEvent(QMouseEvent* event, QPoint pos) override;
virtual void slotWheelEvent(QWheelEvent* event, QPoint pos) override;
virtual void slotKeyPressEvent(int key, Qt::KeyboardModifiers modifiers) override;
virtual void slotKeyReleaseEvent(int key, Qt::KeyboardModifiers modifiers) override;

Expand Down
Loading

0 comments on commit 590ffa1

Please sign in to comment.