Fix tcore window input handling

Author: JSUYA

flutter/shell/platform/tizen/tizen_input_method_context_tcore.cc

@@ -84,24 +84,27 @@ tizen_core_imf_event_key_h CreateImfKeyEventFromTcoreWlEvent(void* event) {
   tizen_core_wl_event_key_get_keyname(ev, &keyname);
   if (keyname) {
     tizen_core_imf_event_key_set_keyname(imf_key, keyname);
-    tizen_core_imf_event_key_set_key(imf_key, keyname);
-    free(keyname);
   }
 
   char* keysymbol = nullptr;
   tizen_core_wl_event_key_get_keysymbol(ev, &keysymbol);
   if (keysymbol) {
-    tizen_core_imf_event_key_set_string(imf_key, keysymbol);
-    free(keysymbol);
+    tizen_core_imf_event_key_set_key(imf_key, keysymbol);
+  } else if (keyname) {
+    tizen_core_imf_event_key_set_key(imf_key, keyname);
   }
 
   char* compose = nullptr;
   tizen_core_wl_event_key_get_compose(ev, &compose);
   if (compose) {
+    tizen_core_imf_event_key_set_string(imf_key, compose);
     tizen_core_imf_event_key_set_compose(imf_key, compose);
-    free(compose);
   }
 
+  free(keyname);
+  free(keysymbol);
+  free(compose);
+
   unsigned int keycode = 0;
   tizen_core_wl_event_key_get_keycode(ev, &keycode);
   tizen_core_imf_event_key_set_keycode(imf_key, keycode);

flutter/shell/platform/tizen/tizen_window_tcore_wl.cc

@@ -666,6 +666,15 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
         char* dev_identifier = nullptr;
         tizen_core_wl_event_input_base_get_device_identifier(ev,
                                                              &dev_identifier);
+        const char* key = keysymbol ? keysymbol : keyname;
+        if (!key) {
+          FT_LOG(Error) << "Failed to get a key symbol from tcore wl event.";
+          free(keyname);
+          free(keysymbol);
+          free(compose);
+          free(dev_identifier);
+          return;
+        }
 
         bool handled = false;
         if (self->input_method_context_ &&
@@ -682,8 +691,8 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
           // Passing keysymbol as `string` breaks the printable-key fallback
           // in TextInputChannel::HandleKey() for keys whose symbol name is
           // multi-char ("period", "minus", "equal", ...).
-          self->view_delegate_->OnKey(keysymbol, compose, compose, modifiers,
-                                      keycode, dev_identifier, true);
+          self->view_delegate_->OnKey(key, compose, compose, modifiers, keycode,
+                                      dev_identifier, true);
         }
         free(keyname);
         free(keysymbol);
@@ -718,6 +727,14 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
         tizen_core_wl_event_key_get_modifiers(ev, &modifiers);
         unsigned int keycode = 0;
         tizen_core_wl_event_key_get_keycode(ev, &keycode);
+        const char* key = keysymbol ? keysymbol : keyname;
+        if (!key) {
+          FT_LOG(Error) << "Failed to get a key symbol from tcore wl event.";
+          free(keyname);
+          free(keysymbol);
+          free(compose);
+          return;
+        }
 
         bool handled = false;
         if (self->input_method_context_ &&
@@ -727,8 +744,8 @@ void TizenWindowTcoreWl::RegisterEventHandlers() {
         }
         if (!handled) {
           // See key-down handler for the keysymbol vs compose rationale.
-          self->view_delegate_->OnKey(keysymbol, compose, compose, modifiers,
-                                      keycode, nullptr, false);
+          self->view_delegate_->OnKey(key, compose, compose, modifiers, keycode,
+                                      nullptr, false);
         }
         free(keyname);
         free(keysymbol);
@@ -843,17 +860,24 @@ void TizenWindowTcoreWl::SetPreferredOrientations(
 }
 
 void TizenWindowTcoreWl::BindKeys(const std::vector<std::string>& keys) {
+  GList* list = nullptr;
+  std::vector<tizen_core_wl_keygrab_info_h> infos;
   for (const std::string& key : keys) {
     tizen_core_wl_keygrab_info_h info = nullptr;
     tizen_core_wl_keygrab_info_create(key.c_str(),
                                       TIZEN_CORE_WL_KEYGRAB_TOPMOST, &info);
     if (info) {
-      GList* list = g_list_append(nullptr, info);
-      tizen_core_wl_window_set_keygrab_list(tcore_wl_window_, list);
-      g_list_free(list);
-      tizen_core_wl_keygrab_info_destroy(info);
+      list = g_list_append(list, info);
+      infos.push_back(info);
     }
   }
+  if (list) {
+    tizen_core_wl_window_set_keygrab_list(tcore_wl_window_, list);
+    g_list_free(list);
+  }
+  for (tizen_core_wl_keygrab_info_h info : infos) {
+    tizen_core_wl_keygrab_info_destroy(info);
+  }
 }
 
 void TizenWindowTcoreWl::Show() {
@@ -910,8 +934,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) << "Could not get default seat.";
   }
 #else
   tizen_core_wl_seat_h default_seat = nullptr;