Implement touch events support for Windows on Host side (based on Chr…

…omium code).
dchapyshev · Jun 7, 2024 · a398a0c · a398a0c
1 parent cd0ac63
commit a398a0c
Show file tree

Hide file tree

Showing 24 changed files with 619 additions and 3 deletions.
diff --git a/source/host/CMakeLists.txt b/source/host/CMakeLists.txt
@@ -153,6 +153,9 @@ if (WIN32)
         win/rdp_client_window.h
         win/sas_injector.cc
         win/sas_injector.h
+        win/touch_injector.cc
+        win/touch_injector.h
+        win/touch_injector_defines.h
         win/updater_launcher.cc
         win/updater_launcher.h)
 endif()

diff --git a/source/host/client_session_desktop.cc b/source/host/client_session_desktop.cc
@@ -216,6 +216,18 @@ void ClientSessionDesktop::onReceived(uint8_t /* channel_id */, const base::Byte
             LOG(LS_ERROR) << "Key event for non-desktop-manage session";
         }
     }
+    else if (incoming_message_->has_touch_event())
+    {
+        if (sessionType() == proto::SESSION_TYPE_DESKTOP_MANAGE)
+        {
+            desktop_session_proxy_->injectTouchEvent(incoming_message_->touch_event());
+            stat_counter_.addTouchEvent();
+        }
+        else
+        {
+            LOG(LS_ERROR) << "Touch event for non-desktop-manage session";
+        }
+    }
     else if (incoming_message_->has_text_event())
     {
         if (sessionType() == proto::SESSION_TYPE_DESKTOP_MANAGE)

diff --git a/source/host/desktop_session.h b/source/host/desktop_session.h
@@ -84,6 +84,7 @@ class DesktopSession
     virtual void injectKeyEvent(const proto::KeyEvent& event) = 0;
     virtual void injectTextEvent(const proto::TextEvent& event) = 0;
     virtual void injectMouseEvent(const proto::MouseEvent& event) = 0;
+    virtual void injectTouchEvent(const proto::TouchEvent& event) = 0;
     virtual void injectClipboardEvent(const proto::ClipboardEvent& event) = 0;
 
     static const char* controlActionToString(proto::internal::DesktopControl::Action action);

diff --git a/source/host/desktop_session_agent.cc b/source/host/desktop_session_agent.cc
@@ -174,6 +174,17 @@ void DesktopSessionAgent::onIpcMessageReceived(const base::ByteArray& buffer)
             LOG(LS_ERROR) << "Input injector NOT initialized";
         }
     }
+    else if (incoming_message_->has_touch_event())
+    {
+        if (input_injector_)
+        {
+            input_injector_->injectTouchEvent(incoming_message_->touch_event());
+        }
+        else
+        {
+            LOG(LS_ERROR) << "Input injector NOT initialized";
+        }
+    }
     else if (incoming_message_->has_text_event())
     {
         if (input_injector_)

diff --git a/source/host/desktop_session_fake.cc b/source/host/desktop_session_fake.cc
@@ -134,6 +134,11 @@ void DesktopSessionFake::injectMouseEvent(const proto::MouseEvent& /* event */)
     // Nothing
 }
 
+void DesktopSessionFake::injectTouchEvent(const proto::TouchEvent& /* event */)
+{
+    // Nothing
+}
+
 //--------------------------------------------------------------------------------------------------
 void DesktopSessionFake::injectClipboardEvent(const proto::ClipboardEvent& /* event */)
 {

diff --git a/source/host/desktop_session_fake.h b/source/host/desktop_session_fake.h
@@ -45,6 +45,7 @@ class DesktopSessionFake final : public DesktopSession
     void injectKeyEvent(const proto::KeyEvent& event) final;
     void injectTextEvent(const proto::TextEvent& event) final;
     void injectMouseEvent(const proto::MouseEvent& event) final;
+    void injectTouchEvent(const proto::TouchEvent& event) final;
     void injectClipboardEvent(const proto::ClipboardEvent& event) final;
 
 private:

diff --git a/source/host/desktop_session_ipc.cc b/source/host/desktop_session_ipc.cc
@@ -225,6 +225,14 @@ void DesktopSessionIpc::injectMouseEvent(const proto::MouseEvent& event)
     channel_->send(serializer_.serialize(*outgoing_message_));
 }
 
+//--------------------------------------------------------------------------------------------------
+void DesktopSessionIpc::injectTouchEvent(const proto::TouchEvent &event)
+{
+    outgoing_message_->Clear();
+    outgoing_message_->mutable_touch_event()->CopyFrom(event);
+    channel_->send(serializer_.serialize(*outgoing_message_));
+}
+
 //--------------------------------------------------------------------------------------------------
 void DesktopSessionIpc::injectClipboardEvent(const proto::ClipboardEvent& event)
 {

diff --git a/source/host/desktop_session_ipc.h b/source/host/desktop_session_ipc.h
@@ -46,6 +46,7 @@ class DesktopSessionIpc final
     void injectKeyEvent(const proto::KeyEvent& event) final;
     void injectTextEvent(const proto::TextEvent& event) final;
     void injectMouseEvent(const proto::MouseEvent& event) final;
+    void injectTouchEvent(const proto::TouchEvent& event) final;
     void injectClipboardEvent(const proto::ClipboardEvent& event) final;
 
 protected:

diff --git a/source/host/desktop_session_proxy.cc b/source/host/desktop_session_proxy.cc
@@ -211,6 +211,16 @@ void DesktopSessionProxy::injectMouseEvent(const proto::MouseEvent& event)
         desktop_session_->injectMouseEvent(event);
 }
 
+//--------------------------------------------------------------------------------------------------
+void DesktopSessionProxy::injectTouchEvent(const proto::TouchEvent &event)
+{
+    if (is_mouse_locked_ || is_paused_)
+        return;
+
+    if (desktop_session_)
+        desktop_session_->injectTouchEvent(event);
+}
+
 //--------------------------------------------------------------------------------------------------
 void DesktopSessionProxy::injectClipboardEvent(const proto::ClipboardEvent& event)
 {

diff --git a/source/host/desktop_session_proxy.h b/source/host/desktop_session_proxy.h
@@ -45,6 +45,7 @@ class DesktopSessionProxy final : public base::enable_shared_from_this<DesktopSe
     void injectKeyEvent(const proto::KeyEvent& event);
     void injectTextEvent(const proto::TextEvent& event);
     void injectMouseEvent(const proto::MouseEvent& event);
+    void injectTouchEvent(const proto::TouchEvent& event);
     void injectClipboardEvent(const proto::ClipboardEvent& event);
 
     bool isMouseLocked() const { return is_mouse_locked_; }

diff --git a/source/host/input_injector.h b/source/host/input_injector.h
@@ -35,6 +35,7 @@ class InputInjector
     virtual void injectKeyEvent(const proto::KeyEvent& event) = 0;
     virtual void injectTextEvent(const proto::TextEvent& event) = 0;
     virtual void injectMouseEvent(const proto::MouseEvent& event) = 0;
+    virtual void injectTouchEvent(const proto::TouchEvent& event) = 0;
 };
 
 } // namespace host

diff --git a/source/host/input_injector_mac.h b/source/host/input_injector_mac.h
@@ -34,6 +34,7 @@ class InputInjectorMac final : public InputInjector
     void setBlockInput(bool enable) final;
     void injectKeyEvent(const proto::KeyEvent& event) final;
     void injectMouseEvent(const proto::MouseEvent& event) final;
+    void injectTouchEvent(const proto::TouchEvent& event) final;
 
 private:
     DISALLOW_COPY_AND_ASSIGN(InputInjectorMac);

diff --git a/source/host/input_injector_mac.mm b/source/host/input_injector_mac.mm
@@ -52,4 +52,10 @@
     NOTIMPLEMENTED();
 }
 
+//--------------------------------------------------------------------------------------------------
+void InputInjectorX11::injectTouchEvent(const proto::TouchEvent& /* event */)
+{
+    NOTIMPLEMENTED();
+}
+
 } // namespace host
diff --git a/source/host/input_injector_win.cc b/source/host/input_injector_win.cc
@@ -23,6 +23,7 @@
 #include "base/strings/unicode.h"
 #include "common/keycode_converter.h"
 #include "host/win/sas_injector.h"
+#include "host/win/touch_injector.h"
 
 #include <Windows.h>
 
@@ -100,6 +101,7 @@ void sendKeyboardUnicodeChar(WORD unicode_char, DWORD flags)
 
 //--------------------------------------------------------------------------------------------------
 InputInjectorWin::InputInjectorWin()
+    : touch_injector_(std::make_unique<TouchInjector>())
 {
     LOG(LS_INFO) << "Ctor";
 }
@@ -324,6 +326,12 @@ void InputInjectorWin::injectMouseEvent(const proto::MouseEvent& event)
     last_mouse_mask_ = mask;
 }
 
+//--------------------------------------------------------------------------------------------------
+void InputInjectorWin::injectTouchEvent(const proto::TouchEvent& event)
+{
+    touch_injector_->injectTouchEvent(event);
+}
+
 //--------------------------------------------------------------------------------------------------
 void InputInjectorWin::beforeInput()
 {

diff --git a/source/host/input_injector_win.h b/source/host/input_injector_win.h
@@ -21,10 +21,13 @@
 
 #include "host/input_injector.h"
 
+#include <memory>
 #include <set>
 
 namespace host {
 
+class TouchInjector;
+
 class InputInjectorWin final : public InputInjector
 {
 public:
@@ -37,6 +40,7 @@ class InputInjectorWin final : public InputInjector
     void injectKeyEvent(const proto::KeyEvent& event) final;
     void injectTextEvent(const proto::TextEvent& event) final;
     void injectMouseEvent(const proto::MouseEvent& event) final;
+    void injectTouchEvent(const proto::TouchEvent& event) final;
 
 private:
     void beforeInput();
@@ -50,6 +54,8 @@ class InputInjectorWin final : public InputInjector
     base::Point last_mouse_pos_;
     uint32_t last_mouse_mask_ = 0;
 
+    std::unique_ptr<TouchInjector> touch_injector_;
+
     DISALLOW_COPY_AND_ASSIGN(InputInjectorWin);
 };
 

diff --git a/source/host/input_injector_x11.cc b/source/host/input_injector_x11.cc
@@ -260,6 +260,12 @@ void InputInjectorX11::injectMouseEvent(const proto::MouseEvent& event)
     XFlush(display_);
 }
 
+//--------------------------------------------------------------------------------------------------
+void InputInjectorX11::injectTouchEvent(const proto::TouchEvent& /* event */)
+{
+    NOTIMPLEMENTED();
+}
+
 //--------------------------------------------------------------------------------------------------
 bool InputInjectorX11::init()
 {

diff --git a/source/host/input_injector_x11.h b/source/host/input_injector_x11.h
@@ -42,6 +42,7 @@ class InputInjectorX11 final : public InputInjector
     void injectKeyEvent(const proto::KeyEvent& event) final;
     void injectTextEvent(const proto::TextEvent& event) final;
     void injectMouseEvent(const proto::MouseEvent& event) final;
+    void injectTouchEvent(const proto::TouchEvent& event) final;
 
 private:
     InputInjectorX11();

diff --git a/source/host/stat_counter.cc b/source/host/stat_counter.cc
@@ -78,6 +78,12 @@ void StatCounter::addMouseEvent()
     ++mouse_events_;
 }
 
+//--------------------------------------------------------------------------------------------------
+void StatCounter::addTouchEvent()
+{
+    ++touch_events_;
+}
+
 //--------------------------------------------------------------------------------------------------
 void StatCounter::addVideoError()
 {
@@ -99,7 +105,7 @@ void StatCounter::onTimeout()
     LOG(LS_INFO) << "Clipboard: in=" << incoming_clipboard_events_
                  << " out=" << outgoing_clipboard_events_;
     LOG(LS_INFO) << "Input: keyboard=" << keyboard_events_ << " mouse=" << mouse_events_
-                 << " text=" << text_events_;
+                 << " touch=" << touch_events_ << " text=" << text_events_;
     LOG(LS_INFO) << "Cursor positions: " << cursor_positions_;
 }
 

diff --git a/source/host/stat_counter.h b/source/host/stat_counter.h
@@ -39,6 +39,7 @@ class StatCounter
     void addKeyboardEvent();
     void addTextEvent();
     void addMouseEvent();
+    void addTouchEvent();
     void addVideoError();
     void addCursorPosition();
 
@@ -56,6 +57,7 @@ class StatCounter
     uint64_t keyboard_events_ = 0;
     uint64_t text_events_ = 0;
     uint64_t mouse_events_ = 0;
+    uint64_t touch_events_ = 0;
     uint64_t video_error_count_ = 0;
     uint64_t cursor_positions_ = 0;