Continue refactor and format code

Author: RBT22

shell/platform/linux/BUILD.gn

@@ -136,8 +136,6 @@ source_set("flutter_linux_sources") {
     "fl_renderer_headless.cc",
     "fl_scrolling_manager.cc",
     "fl_scrolling_view_delegate.cc",
-    "fl_touch_manager.cc",
-    "fl_touch_view_delegate.cc",
     "fl_settings.cc",
     "fl_settings_handler.cc",
     "fl_settings_portal.cc",
@@ -152,6 +150,8 @@ source_set("flutter_linux_sources") {
     "fl_texture.cc",
     "fl_texture_gl.cc",
     "fl_texture_registrar.cc",
+    "fl_touch_manager.cc",
+    "fl_touch_view_delegate.cc",
     "fl_value.cc",
     "fl_view.cc",
     "fl_view_accessible.cc",

shell/platform/linux/fl_engine.cc

@@ -7,9 +7,6 @@
 #include <gmodule.h>
 
 #include <cstring>
-#include <string>
-#include <unordered_map>
-#include <vector>
 
 #include "flutter/common/constants.h"
 #include "flutter/shell/platform/common/engine_switches.h"
@@ -480,7 +477,8 @@ static void fl_engine_init(FlEngine* self) {
 
   self->texture_registrar = fl_texture_registrar_new(self);
 
-  self->pointer_states = g_hash_table_new_full(g_direct_hash, g_direct_equal, nullptr, nullptr);
+  self->pointer_states =
+      g_hash_table_new_full(g_direct_hash, g_direct_equal, nullptr, nullptr);
 }
 
 FlEngine* fl_engine_new_with_renderer(FlDartProject* project,
@@ -910,7 +908,6 @@ void fl_engine_send_mouse_pointer_event(FlEngine* self,
   self->embedder_api.SendPointerEvent(self->engine, &fl_event, 1);
 }
 
-
 // Set's |event_data|'s phase to either kMove or kHover depending on the current
 // primary mouse button state.
 void SetEventPhaseFromCursorButtonState(FlEngine* self,
@@ -929,59 +926,60 @@ void SetEventPhaseFromCursorButtonState(FlEngine* self,
   }
 }
 
-
-
 void fl_engine_send_pointer_event(FlEngine* self,
-                              FlutterViewId view_id,
-                              const FlutterPointerEvent& event_data){
+                                  FlutterViewId view_id,
+                                  const FlutterPointerEvent& event_data) {
   g_return_if_fail(FL_IS_ENGINE(self));
 
   if (self->engine == nullptr) {
     return;
   }
-  
+
   // Copy the event data to avoid modifying the caller's data.
-  auto event_data_copy = event_data;
+  FlutterPointerEvent event_data_copy = event_data;
 
-// Create a virtual pointer ID that is unique across all device types
+  // Create a virtual pointer ID that is unique across all device types
   // to prevent pointers from clashing in the engine's converter
   // (lib/ui/window/pointer_data_packet_converter.cc)
-  int32_t pointer_id = (static_cast<int32_t>(event_data_copy.device_kind) << 28) | event_data_copy.device;
+  int32_t pointer_id =
+      (static_cast<int32_t>(event_data_copy.device_kind) << 28) |
+      event_data_copy.device;
 
   // Add the pointer state if it doesn't exist.
-  auto state = g_new(PointerState, 1);
-  state->device_kind = event_data_copy.device_kind;
-  state->pointer_id = pointer_id;
-
-  bool added = g_hash_table_insert(self->pointer_states, GINT_TO_POINTER(pointer_id), state);
-  if (!added) {
-    g_free(state);
-    state = static_cast<PointerState*>(g_hash_table_lookup(self->pointer_states, GINT_TO_POINTER(pointer_id)));
-  }
-
-  // Modify the phase based on the cursor button state.
-  if (event_data_copy.phase != FlutterPointerPhase::kRemove) {
-    SetEventPhaseFromCursorButtonState(self, &event_data_copy, state);
+  PointerState* state = static_cast<PointerState*>(
+      g_hash_table_lookup(self->pointer_states, GINT_TO_POINTER(pointer_id)));
+  if (state == nullptr) {
+    state = g_new(PointerState, 1);
+    state->device_kind = event_data_copy.device_kind;
+    state->pointer_id = pointer_id;
+    state->buttons = 0;
+    state->flutter_state_is_down = false;
+    state->flutter_state_is_added = false;
+    g_hash_table_insert(self->pointer_states, GINT_TO_POINTER(pointer_id),
+                        state);
   }
 
-  // Modify the state based on the event.
+  // Modify the button state based on the event's phase.
   if (event_data_copy.phase == FlutterPointerPhase::kDown) {
-    state->buttons |= event_data_copy.buttons;
-    state->flutter_state_is_down = true;
+    state->buttons |=
+        FlutterPointerMouseButtons::kFlutterPointerButtonMousePrimary;
   } else if (event_data_copy.phase == FlutterPointerPhase::kUp) {
-    state->buttons &= ~event_data_copy.buttons;
-    state->flutter_state_is_down = false;
+    state->buttons &=
+        ~FlutterPointerMouseButtons::kFlutterPointerButtonMousePrimary;
+  }
+
+  // Get the real phase based on the current button state.
+  if (event_data_copy.phase != FlutterPointerPhase::kRemove &&
+      event_data_copy.phase != FlutterPointerPhase::kAdd) {
+    SetEventPhaseFromCursorButtonState(self, &event_data_copy, state);
   }
 
   // If sending anything other than an add, and the pointer isn't already added,
   // synthesize an add to satisfy Flutter's expectations about events.
   if (!state->flutter_state_is_added &&
       event_data_copy.phase != FlutterPointerPhase::kAdd) {
-    FlutterPointerEvent event = {};
+    FlutterPointerEvent event = event_data_copy;
     event.phase = FlutterPointerPhase::kAdd;
-    event.x = event_data_copy.x;
-    event.y = event_data_copy.y;
-    event.buttons = 0;
     fl_engine_send_pointer_event(self, view_id, event);
   }
 
@@ -1007,10 +1005,15 @@ void fl_engine_send_pointer_event(FlEngine* self,
 
   self->embedder_api.SendPointerEvent(self->engine, &event, 1);
 
-  if (event_data_copy.phase == FlutterPointerPhase::kAdd) {
+  if (event.phase == FlutterPointerPhase::kAdd) {
     state->flutter_state_is_added = true;
-  } else if (event_data_copy.phase == FlutterPointerPhase::kRemove) {
-    g_hash_table_remove(self->pointer_states, GINT_TO_POINTER(state->pointer_id));
+  } else if (event.phase == FlutterPointerPhase::kDown) {
+    state->flutter_state_is_down = true;
+  } else if (event.phase == FlutterPointerPhase::kUp) {
+    state->flutter_state_is_down = false;
+  } else if (event.phase == FlutterPointerPhase::kRemove) {
+    g_hash_table_remove(self->pointer_states,
+                        GINT_TO_POINTER(state->pointer_id));
   }
 }
 

shell/platform/linux/fl_engine_private.h

@@ -281,9 +281,17 @@ void fl_engine_send_mouse_pointer_event(FlEngine* engine,
                                         double scroll_delta_y,
                                         int64_t buttons);
 
+/**
+ * fl_engine_send_pointer_event:
+ * @engine: an #FlEngine.
+ * @view_id: the view that the event occured on.
+ * @event_data: pointer event data.
+ *
+ * Sends a pointer event to the engine.
+ */
 void fl_engine_send_pointer_event(FlEngine* engine,
-                              FlutterViewId view_id,
-                              const FlutterPointerEvent& event_data);
+                                  FlutterViewId view_id,
+                                  const FlutterPointerEvent& event_data);
 
 /**
  * fl_engine_send_pointer_pan_zoom_event:

shell/platform/linux/fl_renderer.h

@@ -14,7 +14,6 @@
 
 G_BEGIN_DECLS
 
-
 /**
  * FlRendererError:
  * Errors for #FlRenderer objects to set on failures.

shell/platform/linux/fl_touch_manager.cc

@@ -7,7 +7,6 @@
 static const int kMinTouchDeviceId = 0;
 static const int kMaxTouchDeviceId = 128;
 
-
 struct _FlTouchManager {
   GObject parent_instance;
 
@@ -33,16 +32,16 @@ static void fl_touch_manager_class_init(FlTouchManagerClass* klass) {
 
 static void fl_touch_manager_init(FlTouchManager* self) {}
 
-FlTouchManager* fl_touch_manager_new(
-    FlTouchViewDelegate* view_delegate) {
+FlTouchManager* fl_touch_manager_new(FlTouchViewDelegate* view_delegate) {
   g_return_val_if_fail(FL_IS_TOUCH_VIEW_DELEGATE(view_delegate), nullptr);
 
-  FlTouchManager* self = FL_TOUCH_MANAGER(
-      g_object_new(fl_touch_manager_get_type(), nullptr));
+  FlTouchManager* self =
+      FL_TOUCH_MANAGER(g_object_new(fl_touch_manager_get_type(), nullptr));
 
   g_weak_ref_init(&self->view_delegate, view_delegate);
 
-  self->touch_id_generator = new flutter::SequentialIdGenerator(kMinTouchDeviceId, kMaxTouchDeviceId);
+  self->touch_id_generator =
+      new flutter::SequentialIdGenerator(kMinTouchDeviceId, kMaxTouchDeviceId);
 
   return self;
 }
@@ -64,7 +63,7 @@ void fl_touch_manager_handle_touch_event(FlTouchManager* self,
   uint32_t id = reinterpret_cast<long>(seq);
   // generate touch id from unique id
   auto touch_id = self->touch_id_generator->GetGeneratedId(id);
-  
+
   gdouble event_x = 0.0, event_y = 0.0;
   gdk_event_get_coords(reinterpret_cast<GdkEvent*>(event), &event_x, &event_y);
 
@@ -73,7 +72,7 @@ void fl_touch_manager_handle_touch_event(FlTouchManager* self,
 
   GdkEventType touch_event_type =
       gdk_event_get_event_type(reinterpret_cast<GdkEvent*>(event));
-      
+
   FlutterPointerEvent event_data = {};
   event_data.x = x;
   event_data.y = y;
@@ -83,26 +82,22 @@ void fl_touch_manager_handle_touch_event(FlTouchManager* self,
 
   switch (touch_event_type) {
     case GDK_TOUCH_BEGIN:
-      event_data.buttons = FlutterPointerMouseButtons::kFlutterPointerButtonMousePrimary;
       event_data.phase = FlutterPointerPhase::kDown;
       fl_touch_view_delegate_send_pointer_event(view_delegate, event_data);
       break;
     case GDK_TOUCH_UPDATE:
       event_data.phase = FlutterPointerPhase::kMove;
-     fl_touch_view_delegate_send_pointer_event(view_delegate, event_data);
+      fl_touch_view_delegate_send_pointer_event(view_delegate, event_data);
       break;
     case GDK_TOUCH_END:
       event_data.phase = FlutterPointerPhase::kUp;
-      event_data.buttons = FlutterPointerMouseButtons::kFlutterPointerButtonMousePrimary;
-     fl_touch_view_delegate_send_pointer_event(view_delegate, event_data);
-      
+      fl_touch_view_delegate_send_pointer_event(view_delegate, event_data);
+
       event_data.phase = FlutterPointerPhase::kRemove;
-      event_data.buttons = 0;
       fl_touch_view_delegate_send_pointer_event(view_delegate, event_data);
       self->touch_id_generator->ReleaseNumber(id);
       break;
     default:
       break;
   }
 }
-

shell/platform/linux/fl_touch_manager.h

@@ -27,8 +27,7 @@ G_DECLARE_FINAL_TYPE(FlTouchManager,
  *
  * Returns: a new #FlTouchManager.
  */
-FlTouchManager* fl_touch_manager_new(
-    FlTouchViewDelegate* view_delegate);
+FlTouchManager* fl_touch_manager_new(FlTouchViewDelegate* view_delegate);
 
 /**
  * fl_touch_manager_handle_touch_event:
@@ -40,7 +39,6 @@ void fl_touch_manager_handle_touch_event(FlTouchManager* manager,
                                          GdkEventTouch* event,
                                          gint scale_factor);
 
-
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TOUCH_MANAGER_H_

shell/platform/linux/fl_touch_view_delegate.cc

@@ -4,9 +4,7 @@
 
 #include "flutter/shell/platform/linux/fl_touch_view_delegate.h"
 
-G_DEFINE_INTERFACE(FlTouchViewDelegate,
-                   fl_touch_view_delegate,
-                   G_TYPE_OBJECT)
+G_DEFINE_INTERFACE(FlTouchViewDelegate, fl_touch_view_delegate, G_TYPE_OBJECT)
 
 static void fl_touch_view_delegate_default_init(
     FlTouchViewDelegateInterface* iface) {}
@@ -18,6 +16,3 @@ void fl_touch_view_delegate_send_pointer_event(
 
   FL_TOUCH_VIEW_DELEGATE_GET_IFACE(self)->send_pointer_event(self, event_data);
 }
-
-
-

shell/platform/linux/fl_touch_view_delegate.h

@@ -11,8 +11,8 @@
 
 #include "flutter/shell/platform/embedder/embedder.h"
 #include "flutter/shell/platform/linux/fl_key_event.h"
-#include "flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h"
 #include "flutter/shell/platform/linux/fl_renderer.h"
+#include "flutter/shell/platform/linux/public/flutter_linux/fl_binary_messenger.h"
 
 G_BEGIN_DECLS
 
@@ -36,14 +36,12 @@ struct _FlTouchViewDelegateInterface {
 
   void (*send_pointer_event)(FlTouchViewDelegate* delegate,
                              const FlutterPointerEvent& event_data);
-
 };
 
 void fl_touch_view_delegate_send_pointer_event(
     FlTouchViewDelegate* delegate,
     const FlutterPointerEvent& event_data);
 
-
 G_END_DECLS
 
 #endif  // FLUTTER_SHELL_PLATFORM_LINUX_FL_TOUCH_VIEW_DELEGATE_H_