FreeRDP::Rail: add CRailManageWindows

KangLin · Dec 26, 2024 · ff122c2 · ff122c2
1 parent 19580e6
commit ff122c2
Show file tree

Hide file tree

Showing 9 changed files with 542 additions and 460 deletions.
diff --git a/Client/ConnectDesktop.h b/Client/ConnectDesktop.h
@@ -70,9 +70,9 @@ public Q_SLOTS:
      */
     virtual void slotClipBoardChanged() = 0;
 
-private:
-    int SetConnecter(CConnecter* pConnecter);
-    Q_INVOKABLE int SetViewer(CFrmViewer* pView, bool bDirectConnection);
+protected:
+    virtual int SetConnecter(CConnecter* pConnecter);
+    virtual int SetViewer(CFrmViewer* pView, bool bDirectConnection);
 
 Q_SIGNALS:
     void sigSetDesktopSize(int width, int height);

diff --git a/Plugins/FreeRDP/Client/CMakeLists.txt b/Plugins/FreeRDP/Client/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(FreeRDP_SOURCE_FILES
     DlgDesktopSize.cpp
     Rail.cpp
     RailWindow.cpp
+    RailManageWindows.cpp
     )
 
 SET(FreeRDP_HEADER_FILES
@@ -36,6 +37,7 @@ SET(FreeRDP_HEADER_FILES
     DlgDesktopSize.h
     Rail.h
     RailWindow.h
+    RailManageWindows.h
     )
 
 SET(FreeRDP_UI_FILES

diff --git a/Plugins/FreeRDP/Client/ConnectFreeRDP.cpp b/Plugins/FreeRDP/Client/ConnectFreeRDP.cpp
@@ -1667,6 +1667,34 @@ BOOL CConnectFreeRDP::cb_keyboard_set_ime_status(
     return TRUE;
 }
 
+int CConnectFreeRDP::SetConnecter(CConnecter *pConnecter)
+{
+    bool check = false;
+    CConnecterFreeRDP* pConnecterFreeRDP
+        = qobject_cast<CConnecterFreeRDP*>(pConnecter);
+    if(pConnecterFreeRDP) {
+        check = connect(
+            this, SIGNAL(sigRailWindow(const WINDOW_ORDER_INFO*,
+                                 const WINDOW_STATE_ORDER*)),
+            &pConnecterFreeRDP->m_RailManageWindows,
+            SLOT(slotWindow(const WINDOW_ORDER_INFO*,
+                                  const WINDOW_STATE_ORDER*)));
+        Q_ASSERT(check);
+        check = connect(
+            this,
+            SIGNAL(sigWindowDelete(const WINDOW_ORDER_INFO *),
+                   &pConnecterFreeRDP->m_RailManageWindows,
+                   SLOT(slotWindowDelete(const WINDOW_ORDER_INFO*));
+        Q_ASSERT(check);
+    }
+    return CConnectDesktop::SetConnecter(pConnecter);
+}
+
+int CConnectFreeRDP::SetViewer(CFrmViewer *pView, bool bDirectConnection)
+{
+    return CConnectDesktop::SetViewer(pView, bDirectConnection);
+}
+
 int CConnectFreeRDP::WakeUp()
 {
     //qDebug(log) << Q_FUNC_INFO;

diff --git a/Plugins/FreeRDP/Client/ConnectFreeRDP.h b/Plugins/FreeRDP/Client/ConnectFreeRDP.h
@@ -135,6 +135,8 @@ public Q_SLOTS:
     virtual void slotClipBoardChanged() override;
 
 protected:
+    virtual int SetConnecter(CConnecter* pConnecter);
+    virtual int SetViewer(CFrmViewer* pView, bool bDirectConnection);
     virtual void mousePressEvent(QMouseEvent* event) override;
     virtual void mouseReleaseEvent(QMouseEvent* event) override;
     virtual void mouseMoveEvent(QMouseEvent* event) override;
@@ -165,17 +167,21 @@ public Q_SLOTS:
 
     CClipboardFreeRDP m_ClipBoard;
 
-    CRail* m_pRail;
-    friend class CRail;
-    int InitRemoteApp();
-
     HANDLE m_writeEvent;
 
 #ifdef HAVE_LIBSSH
     CSSHTunnelThread* m_pThread;
 #endif
 private Q_SLOTS:
     void slotConnectProxyServer(QString szHost, quint16 nPort);
+
+    CRail* m_pRail;
+    friend class CRail;
+    int InitRemoteApp();
+Q_SIGNALS:
+    void sigRailWindow(const WINDOW_ORDER_INFO *orderInfo,
+                   const WINDOW_STATE_ORDER *windowState);
+    void sigWindowDelete(const WINDOW_ORDER_INFO *orderInfo);
 };
 
 #endif // CCONNECTFREERDP_H
diff --git a/Plugins/FreeRDP/Client/ConnecterFreeRDP.h b/Plugins/FreeRDP/Client/ConnecterFreeRDP.h
@@ -6,6 +6,8 @@
 #include "ConnecterThread.h"
 #include "ParameterFreeRDP.h"
 
+#include "RailManageWindows.h"
+
 class CConnecterFreeRDP : public CConnecterThread
 {
     Q_OBJECT
@@ -17,7 +19,7 @@ class CConnecterFreeRDP : public CConnecterThread
     virtual qint16 Version() override;
     virtual int Initial() override;
     virtual int Clean() override;
-    
+
 protected:
     virtual QDialog *OnOpenDialogSettings(QWidget *parent) override;
 
@@ -27,6 +29,11 @@ class CConnecterFreeRDP : public CConnecterThread
     //! [Initialize parameter]
     CParameterFreeRDP m_ParameterFreeRdp;
     //! [Initialize parameter]
+
+private:
+    CRailManageWindows m_RailManageWindows;
+    friend class CConnectFreeRDP;
+
 };
 
 #endif // CCONNECTERFREERDP_H