Use separate device id for gestures on linux

Author: moffatman

shell/platform/linux/fl_engine.cc

@@ -22,6 +22,10 @@
 // Unique number associated with platform tasks.
 static constexpr size_t kPlatformTaskRunnerIdentifier = 1;
 
+//
+static constexpr int32_t kMousePointerDeviceId = 0;
+static constexpr int32_t kPointerPanZoomDeviceId = 1;
+
 struct _FlEngine {
   GObject parent_instance;
 
@@ -708,11 +712,11 @@ void fl_engine_send_mouse_pointer_event(FlEngine* self,
   fl_event.scroll_delta_y = scroll_delta_y;
   fl_event.device_kind = kFlutterPointerDeviceKindMouse;
   fl_event.buttons = buttons;
+  fl_event.device = kMousePointerDeviceId;
   self->embedder_api.SendPointerEvent(self->engine, &fl_event, 1);
 }
 
 void fl_engine_send_pointer_pan_zoom_event(FlEngine* self,
-                                           int64_t device,
                                            size_t timestamp,
                                            double x,
                                            double y,
@@ -737,7 +741,7 @@ void fl_engine_send_pointer_pan_zoom_event(FlEngine* self,
   fl_event.pan_y = pan_y;
   fl_event.scale = scale;
   fl_event.rotation = rotation;
-  fl_event.device = device;
+  fl_event.device = kPointerPanZoomDeviceId;
   fl_event.device_kind = kFlutterPointerDeviceKindTouch;
   self->embedder_api.SendPointerEvent(self->engine, &fl_event, 1);
 }

shell/platform/linux/fl_engine_private.h

@@ -190,7 +190,6 @@ void fl_engine_send_mouse_pointer_event(FlEngine* engine,
                                         int64_t buttons);
 
 void fl_engine_send_pointer_pan_zoom_event(FlEngine* self,
-                                           int64_t device,
                                            size_t timestamp,
                                            double x,
                                            double y,

shell/platform/linux/fl_engine_test.cc

@@ -102,7 +102,7 @@ TEST(FlEngineTest, PointerPanZoom) {
   g_autoptr(GError) error = nullptr;
   EXPECT_TRUE(fl_engine_start(engine, &error));
   EXPECT_EQ(error, nullptr);
-  fl_engine_send_pointer_pan_zoom_event(engine, 0, 1234567890, 800, 600,
+  fl_engine_send_pointer_pan_zoom_event(engine, 1234567890, 800, 600,
                                         kPanZoomUpdate, 1.5, 2.5, 3.5, 4.5);
 
   EXPECT_TRUE(called);

shell/platform/linux/fl_view.cc

@@ -583,7 +583,7 @@ static gboolean event_box_scroll_event(GtkWidget* widget,
     scroll_delta_y *= -1;
     if (event->is_stop) {
       fl_engine_send_pointer_pan_zoom_event(
-          view->engine, 123123, event->time * kMicrosecondsPerMillisecond,
+          view->engine, event->time * kMicrosecondsPerMillisecond,
           event->x * scale_factor, event->y * scale_factor, kPanZoomEnd,
           view->pan_x, view->pan_y, 0, 0);
       view->pan_started = FALSE;
@@ -592,15 +592,15 @@ static gboolean event_box_scroll_event(GtkWidget* widget,
         view->pan_x = 0;
         view->pan_y = 0;
         fl_engine_send_pointer_pan_zoom_event(
-            view->engine, 123123, event->time * kMicrosecondsPerMillisecond,
+            view->engine, event->time * kMicrosecondsPerMillisecond,
             event->x * scale_factor, event->y * scale_factor, kPanZoomStart, 0,
             0, 0, 0);
         view->pan_started = TRUE;
       }
       view->pan_x += scroll_delta_x;
       view->pan_y += scroll_delta_y;
       fl_engine_send_pointer_pan_zoom_event(
-          view->engine, 123123, event->time * kMicrosecondsPerMillisecond,
+          view->engine, event->time * kMicrosecondsPerMillisecond,
           event->x * scale_factor, event->y * scale_factor, kPanZoomUpdate,
           view->pan_x, view->pan_y, 1, 0);
     }
@@ -697,9 +697,9 @@ static void event_box_gesture_rotation_begin(GtkGestureRotate* gesture,
     view->zoom_rotate_started = true;
     view->scale = 1;
     view->rotation = 0;
-    fl_engine_send_pointer_pan_zoom_event(
-        view->engine, 123123, g_get_real_time(), view->last_x, view->last_y,
-        kPanZoomStart, 0, 0, 0, 0);
+    fl_engine_send_pointer_pan_zoom_event(view->engine, g_get_real_time(),
+                                          view->last_x, view->last_y,
+                                          kPanZoomStart, 0, 0, 0, 0);
   }
 }
 
@@ -709,7 +709,7 @@ static void event_box_gesture_rotation_update(GtkGestureRotate* widget,
                                               FlView* view) {
   view->rotation = rotation;
   fl_engine_send_pointer_pan_zoom_event(
-      view->engine, 123123, g_get_real_time(), view->last_x, view->last_y,
+      view->engine, g_get_real_time(), view->last_x, view->last_y,
       kPanZoomUpdate, 0, 0, view->scale, view->rotation);
 }
 
@@ -718,9 +718,9 @@ static void event_box_gesture_rotation_end(GtkGestureRotate* gesture,
                                            FlView* view) {
   if (view->zoom_rotate_started) {
     view->zoom_rotate_started = false;
-    fl_engine_send_pointer_pan_zoom_event(
-        view->engine, 123123, g_get_real_time(), view->last_x, view->last_y,
-        kPanZoomEnd, 0, 0, 0, 0);
+    fl_engine_send_pointer_pan_zoom_event(view->engine, g_get_real_time(),
+                                          view->last_x, view->last_y,
+                                          kPanZoomEnd, 0, 0, 0, 0);
   }
 }
 
@@ -731,9 +731,9 @@ static void event_box_gesture_zoom_begin(GtkGestureZoom* gesture,
     view->zoom_rotate_started = true;
     view->scale = 1;
     view->rotation = 0;
-    fl_engine_send_pointer_pan_zoom_event(
-        view->engine, 123123, g_get_real_time(), view->last_x, view->last_y,
-        kPanZoomStart, 0, 0, 0, 0);
+    fl_engine_send_pointer_pan_zoom_event(view->engine, g_get_real_time(),
+                                          view->last_x, view->last_y,
+                                          kPanZoomStart, 0, 0, 0, 0);
   }
 }
 
@@ -742,7 +742,7 @@ static void event_box_gesture_zoom_update(GtkGestureZoom* widget,
                                           FlView* view) {
   view->scale = scale;
   fl_engine_send_pointer_pan_zoom_event(
-      view->engine, 123123, g_get_real_time(), view->last_x, view->last_y,
+      view->engine, g_get_real_time(), view->last_x, view->last_y,
       kPanZoomUpdate, 0, 0, view->scale, view->rotation);
 }
 
@@ -751,9 +751,9 @@ static void event_box_gesture_zoom_end(GtkGestureZoom* gesture,
                                        FlView* view) {
   if (view->zoom_rotate_started) {
     view->zoom_rotate_started = false;
-    fl_engine_send_pointer_pan_zoom_event(
-        view->engine, 123123, g_get_real_time(), view->last_x, view->last_y,
-        kPanZoomEnd, 0, 0, 0, 0);
+    fl_engine_send_pointer_pan_zoom_event(view->engine, g_get_real_time(),
+                                          view->last_x, view->last_y,
+                                          kPanZoomEnd, 0, 0, 0, 0);
   }
 }