Adapt tcore window/clipboard to tizen-core-wl 0.1.34 and harden init

JSUYA · JSUYA · commit 70d310b950eb · 2026-06-15T14:23:58.000+09:00
tizen_core_wl_get_connected_display() was removed in tizen-core-wl 0.1.34.
The clipboard view-mode path now opens its own display connection via
display_create()/display_connect() (display cache shares the same core,
so it is equivalent), tracks ownership, and disconnects/destroys/shuts
down the connection it owns. This also fixes a pre-existing leak on that
path.

Fix several robustness issues surfaced in review:
- TizenClipboard::SendData(): loop write() to handle partial writes and
  EINTR instead of dropping clipboard data on short writes.
- CreateWindow(): check tizen_core_wl_display_sync()/get_event() return
  values and bail out instead of proceeding with an invalid event handle.
- UpdateFlutterCursor(): drop the TV_PROFILE branch that called the seat
  cursor setters with a null seat handle.
- Route all event-listener registration through an AddEventListener()
  helper that checks the return value and stores the handle, removing the
  reused-listener variable that could double-push a stale handle on
  failure.

Verified: builds for arm/arm64 Tizen 11 (--use-tcore) and runs on a
Tizen 11 arm64 device (window creation, input, and listeners confirmed
via dlog).
diff --git a/flutter/shell/platform/tizen/tizen_clipboard.cc b/flutter/shell/platform/tizen/tizen_clipboard.cc
@@ -6,6 +6,9 @@
 
 #include <unistd.h>
 
+#include <cerrno>
+#include <cstring>
+
 #include "flutter/shell/platform/tizen/logger.h"
 #include "flutter/shell/platform/tizen/tizen_window.h"
 
@@ -31,11 +34,22 @@ TizenClipboard::TizenClipboard(TizenViewBase* view) {
         static_cast<tizen_core_wl_window_h>(window->GetNativeHandle());
     tizen_core_wl_window_get_display(tcore_window, &display_);
   } else {
-    // TODO(jsuya): tizen_core_wl_get_connected_display() will be deprecated.
-    tizen_core_wl_get_connected_display(nullptr, &display_);
+    if (tizen_core_wl_init() != TIZEN_CORE_WL_ERROR_NONE ||
+        tizen_core_wl_display_create(&display_) != TIZEN_CORE_WL_ERROR_NONE ||
+        tizen_core_wl_display_connect(display_, nullptr) !=
+            TIZEN_CORE_WL_ERROR_NONE) {
+      FT_LOG(Error) << "Failed to connect display for clipboard.";
+      display_ = nullptr;
+      return;
+    }
+    owns_display_ = true;
   }
 
-  tizen_core_wl_display_get_event(display_, &tcore_wl_event_);
+  if (tizen_core_wl_display_get_event(display_, &tcore_wl_event_) !=
+      TIZEN_CORE_WL_ERROR_NONE) {
+    FT_LOG(Error) << "Failed to get event handle for clipboard.";
+    return;
+  }
 
   tizen_core_wl_event_add_listener(
       tcore_wl_event_, TIZEN_CORE_WL_EVENT_DATA_SOURCE_SEND,
@@ -63,6 +77,12 @@ TizenClipboard::~TizenClipboard() {
   if (receive_listener_) {
     tizen_core_wl_event_remove_listener(tcore_wl_event_, receive_listener_);
   }
+
+  if (owns_display_ && display_) {
+    tizen_core_wl_display_disconnect(display_);
+    tizen_core_wl_display_destroy(display_);
+    tizen_core_wl_shutdown();
+  }
 }
 
 void TizenClipboard::SendData(void* event) {
@@ -101,7 +121,20 @@ void TizenClipboard::SendData(void* event) {
     return;
   }
 
-  write(fd, data_.c_str(), data_.length());
+  const char* buffer = data_.c_str();
+  size_t remaining = data_.length();
+  while (remaining > 0) {
+    ssize_t written = write(fd, buffer, remaining);
+    if (written < 0) {
+      if (errno == EINTR) {
+        continue;
+      }
+      FT_LOG(Error) << "Failed to write clipboard data: " << strerror(errno);
+      break;
+    }
+    buffer += written;
+    remaining -= written;
+  }
   close(fd);
 }
 
diff --git a/flutter/shell/platform/tizen/tizen_clipboard.h b/flutter/shell/platform/tizen/tizen_clipboard.h
@@ -42,6 +42,7 @@ class TizenClipboard {
 #ifdef USE_TCORE_WL
   tizen_core_wl_data_offer_h selection_offer_ = nullptr;
   tizen_core_wl_display_h display_ = nullptr;
+  bool owns_display_ = false;
   tizen_core_event_h tcore_wl_event_ = nullptr;
   tizen_core_wl_event_listener_h send_listener_ = nullptr;
   tizen_core_wl_event_listener_h receive_listener_ = nullptr;
diff --git a/flutter/shell/platform/tizen/tizen_window_tcore_wl.cc b/flutter/shell/platform/tizen/tizen_window_tcore_wl.cc
@@ -211,9 +211,17 @@ bool TizenWindowTcoreWl::CreateWindow(void* window_handle) {
   tizen_core_wl_display_private_get_wl_display(tcore_wl_display_,
                                                &wl2_display_);
 
-  tizen_core_wl_display_sync(tcore_wl_display_);
+  if (tizen_core_wl_display_sync(tcore_wl_display_) !=
+      TIZEN_CORE_WL_ERROR_NONE) {
+    FT_LOG(Error) << "Failed to sync tizen core wl display.";
+    return false;
+  }
 
-  tizen_core_wl_display_get_event(tcore_wl_display_, &tcore_wl_event_);
+  if (tizen_core_wl_display_get_event(tcore_wl_display_, &tcore_wl_event_) !=
+      TIZEN_CORE_WL_ERROR_NONE) {
+    FT_LOG(Error) << "Could not get tizen core wl event handle.";
+    return false;
+  }
 
   int32_t width = 0, height = 0;
   GList* output_list = nullptr;
@@ -439,12 +447,21 @@ void TizenWindowTcoreWl::ShowUnsupportedToast() {
 }
 #endif
 
-void TizenWindowTcoreWl::RegisterEventHandlers() {
+void TizenWindowTcoreWl::AddEventListener(tizen_core_wl_event_type_e type,
+                                          tizen_core_wl_event_cb callback) {
   tizen_core_wl_event_listener_h listener = nullptr;
+  if (tizen_core_wl_event_add_listener(tcore_wl_event_, type, callback, this,
+                                       &listener) != TIZEN_CORE_WL_ERROR_NONE) {
+    FT_LOG(Error) << "Failed to add tizen core wl event listener.";
+    return;
+  }
+  tcore_event_listeners_.push_back(listener);
+}
 
+void TizenWindowTcoreWl::RegisterEventHandlers() {
   // Window rotation event.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_WINDOW_ROTATION,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_WINDOW_ROTATION,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
         if (self->view_delegate_) {
@@ -467,14 +484,12 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
                 self->tcore_wl_window_, degree);
           }
         }
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 
   // Window configure event.
   if (!is_vulkan_) {
-    tizen_core_wl_event_add_listener(
-        tcore_wl_event_, TIZEN_CORE_WL_EVENT_WINDOW_CONFIGURE_COMPLETE,
+    AddEventListener(
+        TIZEN_CORE_WL_EVENT_WINDOW_CONFIGURE_COMPLETE,
         [](void* event, tizen_core_wl_event_type_e type, void* data) {
           auto* self = static_cast<TizenWindowTcoreWl*>(data);
           if (self->view_delegate_) {
@@ -494,14 +509,12 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
               self->view_delegate_->OnResize(x, y, w, h);
             }
           }
-        },
-        this, &listener);
-    tcore_event_listeners_.push_back(listener);
+        });
   }
 
   // Mouse button down.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_MOUSE_BUTTON_DOWN,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_MOUSE_BUTTON_DOWN,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
 #ifdef TV_PROFILE
@@ -543,13 +556,11 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
                 touch_id);
           }
         }
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 
   // Mouse button up.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_MOUSE_BUTTON_UP,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_MOUSE_BUTTON_UP,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
         if (self->view_delegate_) {
@@ -572,13 +583,11 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
                 touch_id);
           }
         }
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 
   // Mouse move.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_MOUSE_MOVE,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_MOUSE_MOVE,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
         if (self->view_delegate_) {
@@ -599,13 +608,11 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
                 touch_id);
           }
         }
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 
   // Mouse wheel.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_MOUSE_WHEEL,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_MOUSE_WHEEL,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
         if (self->view_delegate_) {
@@ -634,13 +641,11 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
                                            kFlutterPointerDeviceKindMouse, 0);
           }
         }
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 
   // Key down.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_KEY_DOWN,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_KEY_DOWN,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
         if (!self->view_delegate_) {
@@ -689,13 +694,11 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
         free(keysymbol);
         free(compose);
         free(dev_identifier);
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 
   // Key up.
-  tizen_core_wl_event_add_listener(
-      tcore_wl_event_, TIZEN_CORE_WL_EVENT_KEY_UP,
+  AddEventListener(
+      TIZEN_CORE_WL_EVENT_KEY_UP,
       [](void* event, tizen_core_wl_event_type_e type, void* data) {
         auto* self = static_cast<TizenWindowTcoreWl*>(data);
         if (!self->view_delegate_) {
@@ -733,9 +736,7 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
         free(keyname);
         free(keysymbol);
         free(compose);
-      },
-      this, &listener);
-  tcore_event_listeners_.push_back(listener);
+      });
 }
 
 void TizenWindowTcoreWl::UnregisterEventHandlers() {
@@ -910,8 +911,7 @@ void TizenWindowTcoreWl::UpdateFlutterCursor(const std::string& kind) {
                                         kTcoreWlInputCursorThemeName);
     tizen_core_wl_seat_set_cursor_name(default_seat, cursor_name.c_str());
   } else {
-    tizen_core_wl_seat_set_cursor_theme(default_seat, "default");
-    tizen_core_wl_seat_set_cursor_name(default_seat, "left_ptr");
+    FT_LOG(Error) << "Failed to get default seat; cannot update cursor.";
   }
 #else
   tizen_core_wl_seat_h default_seat = nullptr;
diff --git a/flutter/shell/platform/tizen/tizen_window_tcore_wl.h b/flutter/shell/platform/tizen/tizen_window_tcore_wl.h
@@ -83,6 +83,9 @@ class TizenWindowTcoreWl : public TizenWindow {
 
   void RegisterEventHandlers();
 
+  void AddEventListener(tizen_core_wl_event_type_e type,
+                        tizen_core_wl_event_cb callback);
+
   void UnregisterEventHandlers();
 
   void SetNotificationLevel(int level);
