[CRD iOS] Trackpad Input Mode

remoting/ios/client_gestures.mm

 // Copyright 2017 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.
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #import "remoting/ios/client_gestures.h"
 
 #import "remoting/ios/key_input.h"
 #import "remoting/ios/session/remoting_client.h"
 
 #include "base/logging.h"
 #include "remoting/client/ui/gesture_interpreter.h"
 
+remoting::GestureInterpreter::GestureState toGestureState(
+    UIGestureRecognizerState state) {
+  switch (state) {
+    case UIGestureRecognizerStateBegan:
+      return remoting::GestureInterpreter::GESTURE_BEGAN;
+    case UIGestureRecognizerStateChanged:
+      return remoting::GestureInterpreter::GESTURE_CHANGED;
+    default:
+      return remoting::GestureInterpreter::GESTURE_ENDED;
+  }
+}
+
 @implementation ClientGestures
 
 - (instancetype)initWithView:(UIView*)view client:(RemotingClient*)client {
   _view = view;
   _client = client;
 
   _inputScheme = HostInputSchemeTouch;
 
   _longPressRecognizer = [[UILongPressGestureRecognizer alloc]
       initWithTarget:self
@@ skipping 91 matching lines @@
 // Integreation with the original implementation will be done with the app
 // is able to run to the point of interaction and debugging can happen.
 // I would prefer to leave this here rather than deleting because it is close
 // to the implementation that will be used client gestures integration.
 // This is a new class that was derived from the original source which had
 // the implementation mixed in with the host controller and was a huge mess.
 
 // Resize the view of the desktop - Zoom in/out.  This can occur during a Pan.
 - (IBAction)pinchGestureTriggered:(UIPinchGestureRecognizer*)sender {
   // LOG_TRACE(INFO) << "pinchGestureTriggered";
-  if ([sender state] == UIGestureRecognizerStateChanged) {
-    CGPoint pivot = [sender locationInView:_view];
-    _client.gestureInterpreter->Pinch(pivot.x, pivot.y, sender.scale);
+  CGPoint pivot = [sender locationInView:_view];
+  _client.gestureInterpreter->Zoom(pivot.x, pivot.y, sender.scale,
+                                   toGestureState([sender state]));
 
-    sender.scale = 1.0;  // reset scale so next iteration is a relative ratio
-  }
+  sender.scale = 1.0;  // reset scale so next iteration is a relative ratio
 }
 
 - (IBAction)tapGestureTriggered:(UITapGestureRecognizer*)sender {
   CGPoint touchPoint = [sender locationInView:_view];
   _client.gestureInterpreter->Tap(touchPoint.x, touchPoint.y);
 }
 
 // Change position of scene.  This can occur during a pinch or long press.
 // Or perform a Mouse Wheel Scroll.
 - (IBAction)panGestureTriggered:(UIPanGestureRecognizer*)sender {
@@ skipping 123 matching lines @@
   _client.gestureInterpreter->Scroll(scrollPoint.x, scrollPoint.y,
                                      translation.x, translation.y);
 
   // Reset translation so next iteration is relative
   [sender setTranslation:CGPointZero inView:_view];
 }
 
 // Click-Drag mouse operation.  This can occur during a Pan.
 - (IBAction)longPressGestureTriggered:(UILongPressGestureRecognizer*)sender {
   CGPoint touchPoint = [sender locationInView:_view];
-  remoting::GestureInterpreter::GestureState state;
-  switch ([sender state]) {
-    case UIGestureRecognizerStateBegan:
-      state = remoting::GestureInterpreter::GESTURE_BEGAN;
-      break;
-    case UIGestureRecognizerStateChanged:
-      state = remoting::GestureInterpreter::GESTURE_CHANGED;
-      break;
-    default:
-      state = remoting::GestureInterpreter::GESTURE_ENDED;
-  }
-  _client.gestureInterpreter->LongPress(touchPoint.x, touchPoint.y, state);
+  _client.gestureInterpreter->Drag(touchPoint.x, touchPoint.y,
+                                   toGestureState([sender state]));
 
   // LOG_TRACE(INFO) << "longPressGestureTriggered";
   // if ([sender state] == UIGestureRecognizerStateBegan) {
   //   if (_inputScheme == HostInputSchemeTouch) {
   //     CGPoint touchPoint = [sender locationInView:self.view];
   //     [_scene setMouseLocationFromLocationInView:touchPoint];
   //   }
   //   [_clientToHostProxy mouseAction:_scene.mousePosition
   //                        wheelDelta:webrtc::DesktopVector(0, 0)
   //                       whichButton:1
@@ skipping 101 matching lines @@
       otherGestureRecognizer == _edgeGesture) {
     return YES;
   }
   // TODO(nicholss): If we return NO here, it dismisses the other reconizers.
   // As we add more types of reconizers, they need to be accounted for in the
   // above logic.
   return NO;
 }
 
 @end