Sync with core fb6985416

Author: lijy91

packages/cnativeapi/cxx_impl

@@ -2137,41 +2137,27 @@ class CNativeApiBindings {
       _native_application_remove_listenerPtr.asFunction<bool Function(int)>();
 
   /// Creates a Display instance; release it with native_display_free().
-  int native_display_create() {
-    return _native_display_create();
+  int native_display_create(ffi.Pointer<ffi.Void> display) {
+    return _native_display_create(display);
   }
 
   late final _native_display_createPtr =
-      _lookup<ffi.NativeFunction<native_display_t Function()>>(
-        'native_display_create',
-      );
-  late final _native_display_create = _native_display_createPtr
-      .asFunction<int Function()>();
-
-  /// Creates a Display instance; release it with native_display_free().
-  int native_display_create_with_display(ffi.Pointer<ffi.Void> display) {
-    return _native_display_create_with_display(display);
-  }
-
-  late final _native_display_create_with_displayPtr =
       _lookup<
         ffi.NativeFunction<native_display_t Function(ffi.Pointer<ffi.Void>)>
-      >('native_display_create_with_display');
-  late final _native_display_create_with_display =
-      _native_display_create_with_displayPtr
-          .asFunction<int Function(ffi.Pointer<ffi.Void>)>();
+      >('native_display_create');
+  late final _native_display_create = _native_display_createPtr
+      .asFunction<int Function(ffi.Pointer<ffi.Void>)>();
 
-  /// Caller owns the returned string; free it with free_c_str().
-  ffi.Pointer<ffi.Char> native_display_get_id(int display) {
+  int native_display_get_id(int display) {
     return _native_display_get_id(display);
   }
 
   late final _native_display_get_idPtr =
       _lookup<
-        ffi.NativeFunction<ffi.Pointer<ffi.Char> Function(native_display_t)>
+        ffi.NativeFunction<native_display_id_t Function(native_display_t)>
       >('native_display_get_id');
   late final _native_display_get_id = _native_display_get_idPtr
-      .asFunction<ffi.Pointer<ffi.Char> Function(int)>();
+      .asFunction<int Function(int)>();
 
   /// Caller owns the returned string; free it with free_c_str().
   ffi.Pointer<ffi.Char> native_display_get_name(int display) {
@@ -5015,22 +5001,10 @@ final class native_display_event_t extends ffi.Struct {
 
   @native_display_t()
   external int display;
-
-  external UnnamedUnion5 data;
-}
-
-final class UnnamedUnion5 extends ffi.Union {
-  external UnnamedStruct10 changed;
-}
-
-final class UnnamedStruct10 extends ffi.Struct {
-  @native_display_t()
-  external int old_display;
-
-  @native_display_t()
-  external int new_display;
 }
 
+typedef native_display_id_t = ffi.UnsignedInt;
+typedef Dartnative_display_id_t = int;
 typedef native_display_event_callback_t =
     ffi.Pointer<ffi.NativeFunction<native_display_event_callback_tFunction>>;
 typedef native_display_event_callback_tFunction =
@@ -5214,17 +5188,17 @@ final class native_shortcut_event_t extends ffi.Struct {
 
   external ffi.Pointer<ffi.Char> accelerator;
 
-  external UnnamedUnion6 data;
+  external UnnamedUnion5 data;
 }
 
 typedef native_shortcut_id_t = ffi.UnsignedInt;
 typedef Dartnative_shortcut_id_t = int;
 
-final class UnnamedUnion6 extends ffi.Union {
-  external UnnamedStruct11 registration_failed;
+final class UnnamedUnion5 extends ffi.Union {
+  external UnnamedStruct10 registration_failed;
 }
 
-final class UnnamedStruct11 extends ffi.Struct {
+final class UnnamedStruct10 extends ffi.Struct {
   external ffi.Pointer<ffi.Char> error_message;
 }
 
@@ -5329,31 +5303,31 @@ final class native_tray_icon_event_t extends ffi.Struct {
   @ffi.UnsignedInt()
   external int type;
 
-  external UnnamedUnion7 data;
+  external UnnamedUnion6 data;
 }
 
-final class UnnamedUnion7 extends ffi.Union {
-  external UnnamedStruct12 clicked;
+final class UnnamedUnion6 extends ffi.Union {
+  external UnnamedStruct11 clicked;
 
-  external UnnamedStruct13 right_clicked;
+  external UnnamedStruct12 right_clicked;
 
-  external UnnamedStruct14 double_clicked;
+  external UnnamedStruct13 double_clicked;
 }
 
-final class UnnamedStruct12 extends ffi.Struct {
+final class UnnamedStruct11 extends ffi.Struct {
   @native_tray_icon_id_t()
   external int tray_icon_id;
 }
 
 typedef native_tray_icon_id_t = ffi.UnsignedInt;
 typedef Dartnative_tray_icon_id_t = int;
 
-final class UnnamedStruct13 extends ffi.Struct {
+final class UnnamedStruct12 extends ffi.Struct {
   @native_tray_icon_id_t()
   external int tray_icon_id;
 }
 
-final class UnnamedStruct14 extends ffi.Struct {
+final class UnnamedStruct13 extends ffi.Struct {
   @native_tray_icon_id_t()
   external int tray_icon_id;
 }

packages/cnativeapi/lib/src/bindings_generated.dart

@@ -13,6 +13,8 @@ import 'foundation/geometry.dart';
 
 final _bindings = c.cnativeApiBindings;
 
+typedef DisplayId = int;
+
 enum DisplayOrientation {
   portrait(0),
   landscape(90),
@@ -47,7 +49,7 @@ sealed class DisplayEvent {
       return DisplayRemovedEvent(display: Display.borrowed(raw.display));
     }
     if (raw.type == c.native_display_event_type_t.NATIVE_DISPLAY_EVENT_TYPE_CHANGED.value) {
-      return DisplayChangedEvent(display: Display.borrowed(raw.display), oldDisplay: Display.borrowed(raw.data.changed.old_display), newDisplay: Display.borrowed(raw.data.changed.new_display));
+      return DisplayChangedEvent(display: Display.borrowed(raw.display));
     }
     return null;
   }
@@ -66,11 +68,9 @@ final class DisplayRemovedEvent extends DisplayEvent {
 }
 
 final class DisplayChangedEvent extends DisplayEvent {
-  const DisplayChangedEvent({required this.display, required this.oldDisplay, required this.newDisplay, });
+  const DisplayChangedEvent({required this.display, });
 
   final Display display;
-  final Display oldDisplay;
-  final Display newDisplay;
 }
 
 class Display {
@@ -97,25 +97,14 @@ class Display {
   }
 
   /// Creates a new `Display`; returns null if the native side failed.
-  static Display? create() {
-    final handle = _bindings.native_display_create();
-    if (handle == 0) return null;
-    return Display.fromHandle(handle);
-  }
-
-  /// Creates a new `Display`; returns null if the native side failed.
-  static Display? createWithDisplay(ffi.Pointer<ffi.Void> display) {
-    final handle = _bindings.native_display_create_with_display(display);
+  static Display? create(ffi.Pointer<ffi.Void> display) {
+    final handle = _bindings.native_display_create(display);
     if (handle == 0) return null;
     return Display.fromHandle(handle);
   }
 
-  String? get id {
-    final resultPointer = _bindings.native_display_get_id(nativeHandle);
-    if (resultPointer == ffi.nullptr) return null;
-    final result = resultPointer.cast<pkg_ffi.Utf8>().toDartString();
-    _bindings.free_c_str(resultPointer);
-    return result;
+  DisplayId get id {
+    return _bindings.native_display_get_id(nativeHandle);
   }
 
   String? get name {