Clamp events before they are sent to EventExecutors.

remoting/host/client_session.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/client_session.h"
 
 #include <algorithm>
 
 #include "base/message_loop_proxy.h"
 #include "remoting/host/capturer.h"
 #include "remoting/proto/event.pb.h"
 
 namespace remoting {
 
 ClientSession::ClientSession(
     EventHandler* event_handler,
     scoped_ptr<protocol::ConnectionToClient> connection,
     protocol::HostEventStub* host_event_stub,
     Capturer* capturer)
     : event_handler_(event_handler),
       connection_(connection.Pass()),
       client_jid_(connection_->session()->jid()),
       host_event_stub_(host_event_stub),
-      input_tracker_(host_event_stub),
+      input_tracker_(host_event_stub_),
       remote_input_filter_(&input_tracker_),
+      mouse_input_filter_(&remote_input_filter_),
       capturer_(capturer) {
   connection_->SetEventHandler(this);
 
   // TODO(sergeyu): Currently ConnectionToClient expects stubs to be
   // set before channels are connected. Make it possible to set stubs
   // later and set them only when connection is authenticated.
   connection_->set_clipboard_stub(this);
   connection_->set_host_stub(this);
   connection_->set_input_stub(this);
 }
@@ skipping 16 matching lines @@
 }
 
 void ClientSession::InjectKeyEvent(const protocol::KeyEvent& event) {
   DCHECK(CalledOnValidThread());
   auth_input_filter_.InjectKeyEvent(event);
 }
 
 void ClientSession::InjectMouseEvent(const protocol::MouseEvent& event) {
   DCHECK(CalledOnValidThread());
 
-  protocol::MouseEvent event_to_inject = event;
-  if (event.has_x() && event.has_y()) {
-    // In case the client sends events with off-screen coordinates, modify
-    // the event to lie within the current screen area.  This is better than
-    // simply discarding the event, which might lose a button-up event at the
-    // end of a drag'n'drop (or cause other related problems).
-    SkIPoint pos(SkIPoint::Make(event.x(), event.y()));
-    const SkISize& screen = capturer_->size_most_recent();
-    pos.setX(std::max(0, std::min(screen.width() - 1, pos.x())));
-    pos.setY(std::max(0, std::min(screen.height() - 1, pos.y())));
-    event_to_inject.set_x(pos.x());
-    event_to_inject.set_y(pos.y());
-  }
-  auth_input_filter_.InjectMouseEvent(event_to_inject);
+  // Ensure that the MouseInputFilter is clamping to the current dimensions.
+  mouse_input_filter_.set_output_size(capturer_->size_most_recent());
+  mouse_input_filter_.set_input_size(capturer_->size_most_recent());

[Wez, 2012/04/27 17:39:51]

I'd like to get rid of the InputStub overrides on ClientSession, which would
currently require deriving a MouseInputClamper that accepts a Capturer to clamp
to.

+
+  auth_input_filter_.InjectMouseEvent(event);
 }
 
 void ClientSession::NotifyClientDimensions(
     const protocol::ClientDimensions& dimensions) {
   // TODO(wez): Use the dimensions, e.g. to resize the host desktop to match.
 }
 
 void ClientSession::OnConnectionAuthenticated(
     protocol::ConnectionToClient* connection) {
   DCHECK(CalledOnValidThread());
@@ skipping 56 matching lines @@
   remote_input_filter_.LocalMouseMoved(mouse_pos);
 }
 
 void ClientSession::SetDisableInputs(bool disable_inputs) {
   DCHECK(CalledOnValidThread());
 
   if (disable_inputs) {
     disable_input_filter_.set_input_stub(NULL);
     input_tracker_.ReleaseAll();
   } else {
-    disable_input_filter_.set_input_stub(&remote_input_filter_);
+    disable_input_filter_.set_input_stub(&mouse_input_filter_);
   }
 }
 
 }  // namespace remoting