Implement basic point-and-touch mouse input for Android client

remoting/client/jni/chromoting_jni_instance.cc

 // Copyright 2013 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/client/jni/chromoting_jni_instance.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "remoting/client/audio_player.h"
 #include "remoting/client/jni/chromoting_jni.h"
@@ skipping 57 matching lines @@
   // asynchronous run, since Java might want it back as soon as we return.
   ChromotingJni::GetInstance()->network_task_runner()->PostTask(FROM_HERE,
                                  base::Bind(pin_callback_, pin));
 }
 
 void ChromotingJniInstance::RedrawDesktop() {
   if (!ChromotingJni::GetInstance()->
       display_task_runner()->BelongsToCurrentThread()) {
     ChromotingJni::GetInstance()->display_task_runner()->PostTask(
         FROM_HERE,
-        base::Bind(&ChromotingJniInstance::RedrawDesktop,
-                   this));
+        base::Bind(&ChromotingJniInstance::RedrawDesktop, this));
     return;
   }
 
   ChromotingJni::GetInstance()->RedrawCanvas();
 }
 
+void ChromotingJniInstance::PerformMouseAction(
+    int x,
+    int y,
+    protocol::MouseEvent_MouseButton button) {

[garykac, 2013/07/20 21:25:26]

This should be a MouseEvent so that you have all the mouse event information.

[solb, 2013/07/22 19:13:48]

Since this is being called from the JNI binding in jni_interface.cc, I just
added a boolean pressed flag here to avoid making that binding do anything more
than forwarding the call.

+  if(!ChromotingJni::GetInstance()->
+      network_task_runner()->BelongsToCurrentThread()) {
+    ChromotingJni::GetInstance()->network_task_runner()->PostTask(
+        FROM_HERE,
+        base::Bind(&ChromotingJniInstance::PerformMouseAction,
+                   this,
+                   x,
+                   y,
+                   button));
+    return;
+  }
+
+  protocol::MouseEvent action;
+  action.set_x(x);
+  action.set_y(y);
+  if (button!=protocol::MouseEvent::BUTTON_UNDEFINED) {
+    action.set_button(
+        static_cast<protocol::MouseEvent_MouseButton>(abs(button)));

[garykac, 2013/07/20 21:25:26]

abs(button)...

This whole static_cast ickiness goes away if you use the MouseEvent's button and
button_down values.

[solb, 2013/07/22 19:13:48]

I accomplished this with a boolean flag, as aforementioned.

+    action.set_button_down(button > 0);
+  }
+
+  connection_->input_stub()->InjectMouseEvent(action);
+}
+
 void ChromotingJniInstance::OnConnectionState(
     protocol::ConnectionToHost::State state,
     protocol::ErrorCode error) {
   if (!ChromotingJni::GetInstance()->
       ui_task_runner()->BelongsToCurrentThread()) {
     ChromotingJni::GetInstance()->
         ui_task_runner()->PostTask(
             FROM_HERE,
             base::Bind(&ChromotingJniInstance::OnConnectionState,
                        this,
@@ skipping 10 matching lines @@
 }
 
 void ChromotingJniInstance::SetCapabilities(const std::string& capabilities) {}
 
 void ChromotingJniInstance::SetPairingResponse(
     const protocol::PairingResponse& response) {
   NOTIMPLEMENTED();
 }
 
 protocol::ClipboardStub* ChromotingJniInstance::GetClipboardStub() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return this;
 }
 
 protocol::CursorShapeStub* ChromotingJniInstance::GetCursorShapeStub() {
-  NOTIMPLEMENTED();
-  return NULL;
+  return this;
 }
 
 scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>
     ChromotingJniInstance::GetTokenFetcher(const std::string& host_public_key) {
   // Return null to indicate that third-party authentication is unsupported.
   return scoped_ptr<protocol::ThirdPartyClientAuthenticator::TokenFetcher>();
 }
 
+void ChromotingJniInstance::InjectClipboardEvent(
+    const protocol::ClipboardEvent& event) {
+  NOTIMPLEMENTED();
+}
+
+void ChromotingJniInstance::SetCursorShape(
+    const protocol::CursorShapeInfo& shape) {
+  NOTIMPLEMENTED();
+}
+
 void ChromotingJniInstance::ConnectToHostOnDisplayThread() {
   DCHECK(ChromotingJni::GetInstance()->
       display_task_runner()->BelongsToCurrentThread());
 
   frame_consumer_ = new FrameConsumerProxy(
       ChromotingJni::GetInstance()->display_task_runner());
   view_.reset(new JniFrameConsumer());
   view_weak_factory_.reset(new base::WeakPtrFactory<JniFrameConsumer>(
       view_.get()));
   frame_consumer_->Attach(view_weak_factory_->GetWeakPtr());
@@ skipping 86 matching lines @@
                    pairable,
                    callback));
     return;
   }
 
   pin_callback_ = callback;
   ChromotingJni::GetInstance()->DisplayAuthenticationPrompt();
 }
 
 }  // namespace remoting