Add touch events to the protocol, the stub layer, and to the client plugin.

remoting/host/input_injector_x11.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/input_injector.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XTest.h>
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
@@ skipping 17 matching lines @@
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 namespace remoting {
 
 namespace {
 
 using protocol::ClipboardEvent;
 using protocol::KeyEvent;
 using protocol::TextEvent;
 using protocol::MouseEvent;
+using protocol::TouchEvent;
 
 bool FindKeycodeForKeySym(Display* display,
                           KeySym key_sym,
                           uint32_t* keycode,
                           uint32_t* modifiers) {
   *keycode = XKeysymToKeycode(display, key_sym);
 
   const uint32_t kModifiersToTry[] = {
     0,
     ShiftMask,
@@ skipping 51 matching lines @@
 
   bool Init();
 
   // Clipboard stub interface.
   void InjectClipboardEvent(const ClipboardEvent& event) override;
 
   // InputStub interface.
   void InjectKeyEvent(const KeyEvent& event) override;
   void InjectTextEvent(const TextEvent& event) override;
   void InjectMouseEvent(const MouseEvent& event) override;
+  void InjectTouchEvent(const TouchEvent& event) override;
 
   // InputInjector interface.
   void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override;
 
  private:
   // The actual implementation resides in InputInjectorX11::Core class.
   class Core : public base::RefCountedThreadSafe<Core> {
    public:
     explicit Core(scoped_refptr<base::SingleThreadTaskRunner> task_runner);
 
     bool Init();
 
     // Mirrors the ClipboardStub interface.
     void InjectClipboardEvent(const ClipboardEvent& event);
 
     // Mirrors the InputStub interface.
     void InjectKeyEvent(const KeyEvent& event);
     void InjectTextEvent(const TextEvent& event);
     void InjectMouseEvent(const MouseEvent& event);
+    void InjectTouchEvent(const TouchEvent& event);
 
     // Mirrors the InputInjector interface.
     void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard);
 
     void Stop();
 
    private:
     friend class base::RefCountedThreadSafe<Core>;
     virtual ~Core();
 
@@ skipping 74 matching lines @@
 }
 
 void InputInjectorX11::InjectTextEvent(const TextEvent& event) {
   core_->InjectTextEvent(event);
 }
 
 void InputInjectorX11::InjectMouseEvent(const MouseEvent& event) {
   core_->InjectMouseEvent(event);
 }
 
+void InputInjectorX11::InjectTouchEvent(const TouchEvent& event) {
+  core_->InjectTouchEvent(event);
+}
+
 void InputInjectorX11::Start(
     scoped_ptr<protocol::ClipboardStub> client_clipboard) {
   core_->Start(client_clipboard.Pass());
 }
 
 InputInjectorX11::Core::Core(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner)
     : task_runner_(task_runner),
       latest_mouse_position_(-1, -1),
       wheel_ticks_x_(0.0f),
@@ skipping 120 matching lines @@
 
     XTestFakeKeyEvent(display_, keycode, True, CurrentTime);
     XTestFakeKeyEvent(display_, keycode, False, CurrentTime);
 
     XkbLockModifiers(display_, XkbUseCoreKbd, modifiers, 0);
   }
 
   XFlush(display_);
 }
 
+void InputInjectorX11::Core::InjectTouchEvent(const TouchEvent& event) {
+  NOTIMPLEMENTED() << "Raw touch event injection not implemented.";

[Wez, 2015/01/21 03:08:37]

nit: Why does this one get a message and the others not? :P

[Rintaro Kuroiwa, 2015/01/28 01:12:29]

Oh I wanted to get Win, Mac, and CroS building and forgot that I put a message
for X11. For consistency, I'll add comments to Mac, Win, and CrOS and remove
InputInjectorX11::Core::InjectTouchEvent.

+  return;

[Wez, 2015/01/21 03:08:37]

?

[Rintaro Kuroiwa, 2015/01/28 01:12:29]

Not sure why I did this :P

+}
+
 InputInjectorX11::Core::~Core() {
   CHECK(pressed_keys_.empty());
 }
 
 void InputInjectorX11::Core::InitClipboard() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   clipboard_ = Clipboard::Create();
 }
 
 bool InputInjectorX11::Core::IsAutoRepeatEnabled() {
@@ skipping 255 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
   scoped_ptr<InputInjectorX11> injector(
       new InputInjectorX11(main_task_runner));
   if (!injector->Init())
     return nullptr;
   return injector.Pass();
 }
 
 }  // namespace remoting