From 200fc56a4ac787d74475f434ebb20558f46708c9 Mon Sep 17 00:00:00 2001
From: dignow <linlong1265@gmail.com>
Date: Sun, 6 Aug 2023 14:00:48 +0800
Subject: [PATCH] tmp commit

Signed-off-by: dignow <linlong1265@gmail.com>
---
 flutter/lib/models/input_model.dart  | 74 +++++++++++++++++-----------
 libs/hbb_common/protos/message.proto | 20 ++++++++
 2 files changed, 64 insertions(+), 30 deletions(-)

diff --git a/flutter/lib/models/input_model.dart b/flutter/lib/models/input_model.dart
index 6b50aa37f..eeaa1a441 100644
--- a/flutter/lib/models/input_model.dart
+++ b/flutter/lib/models/input_model.dart
@@ -592,17 +592,52 @@ class InputModel {
         return;
     }
     evt['type'] = type;
+
+    final pos = handlePointerDevicePos(
+      x,
+      y,
+      isMove,
+      type,
+      onExit: onExit,
+      buttons: evt['buttons'],
+    );
+    if (pos == null) {
+      return;
+    }
+    evt['x'] = '${pos.x}}';
+    evt['y'] = '${pos.y}';
+
+    Map<int, String> mapButtons = {
+      kPrimaryMouseButton: 'left',
+      kSecondaryMouseButton: 'right',
+      kMiddleMouseButton: 'wheel',
+      kBackMouseButton: 'back',
+      kForwardMouseButton: 'forward'
+    };
+    evt['buttons'] = mapButtons[evt['buttons']] ?? '';
+
+    bind.sessionSendMouse(sessionId: sessionId, msg: json.encode(evt));
+  }
+
+  Point? handlePointerDevicePos(
+    double x,
+    double y,
+    bool isMove,
+    String evtType, {
+    bool onExit = false,
+    int buttons = kPrimaryMouseButton,
+  }) {
     y -= CanvasModel.topToEdge;
     x -= CanvasModel.leftToEdge;
     final canvasModel = parent.target!.canvasModel;
-    final nearThr = 3;
-    var nearRight = (canvasModel.size.width - x) < nearThr;
-    var nearBottom = (canvasModel.size.height - y) < nearThr;
-
     final ffiModel = parent.target!.ffiModel;
     if (isMove) {
       canvasModel.moveDesktopMouse(x, y);
     }
+
+    final nearThr = 3;
+    var nearRight = (canvasModel.size.width - x) < nearThr;
+    var nearBottom = (canvasModel.size.height - y) < nearThr;
     final d = ffiModel.display;
     final imageWidth = d.width * canvasModel.scale;
     final imageHeight = d.height * canvasModel.scale;
@@ -650,7 +685,7 @@ class InputModel {
     } catch (e) {
       debugPrintStack(
           label: 'canvasModel.scale value ${canvasModel.scale}, $e');
-      return;
+      return null;
     }
 
     int minX = d.x.toInt();
@@ -661,38 +696,17 @@ class InputModel {
     evtY = trySetNearestRange(evtY, minY, maxY, 5);
     if (evtX < minX || evtY < minY || evtX > maxX || evtY > maxY) {
       // If left mouse up, no early return.
-      if (evt['buttons'] != kPrimaryMouseButton || type != 'up') {
-        return;
+      if (buttons != kPrimaryMouseButton || evtType != 'up') {
+        return null;
       }
     }
 
-    if (type != '') {
+    if (evtType != '') {
       evtX = 0;
       evtY = 0;
     }
 
-    evt['x'] = '$evtX';
-    evt['y'] = '$evtY';
-    var buttons = '';
-    switch (evt['buttons']) {
-      case kPrimaryMouseButton:
-        buttons = 'left';
-        break;
-      case kSecondaryMouseButton:
-        buttons = 'right';
-        break;
-      case kMiddleMouseButton:
-        buttons = 'wheel';
-        break;
-      case kBackMouseButton:
-        buttons = 'back';
-        break;
-      case kForwardMouseButton:
-        buttons = 'forward';
-        break;
-    }
-    evt['buttons'] = buttons;
-    bind.sessionSendMouse(sessionId: sessionId, msg: json.encode(evt));
+    return Point(evtX, evtY);
   }
 
   /// Web only
diff --git a/libs/hbb_common/protos/message.proto b/libs/hbb_common/protos/message.proto
index e6862bc80..82206cbf2 100644
--- a/libs/hbb_common/protos/message.proto
+++ b/libs/hbb_common/protos/message.proto
@@ -118,9 +118,29 @@ message TouchScaleUpdate {
   int32 scale = 1;
 }
 
+message TouchPanStart {
+  int32 x = 1;
+  int32 y = 2;
+}
+
+message TouchPanUpdate {
+  // The delta x position relative to the previous position.
+  int32 x = 1;
+  // The delta y position relative to the previous position.
+  int32 y = 2;
+}
+
+message TouchPanEnd {
+  int32 x = 1;
+  int32 y = 2;
+}
+
 message TouchEvent {
   oneof union {
     TouchScaleUpdate scale_update = 1;
+    TouchPanStart pan_start = 2;
+    TouchPanUpdate pan_update = 3;
+    TouchPanEnd pan_end = 4;
   }
 }