Refactor key event handling (#291)

* Removes platform dependencies from all SendKeyEvent methods. * Adds methods related to composing a text to the FlutterView and TextInputChannel. * Transfers the key event filter role to TizenInputMethodContext. * Adds filter methods for each event type to TizenInputMethodContext. * Removes the concept of selection mode for text input. Signed-off-by: Boram Bae <boram21.bae@samsung.com>
flutter-tizen · Jun 2, 2022 · e534a7c · e534a7c
1 parent cf2f9f1
commit e534a7c
Show file tree

Hide file tree

Showing 24 changed files with 439 additions and 294 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,13 +41,6 @@ jobs:
           path: src/flutter
           fetch-depth: 0
 
-      - uses: actions/cache@v2
-        with:
-          path: src/out/${{ env.OUTPUT_NAME }}
-          key: out-build-${{ env.OUTPUT_NAME }}-${{ github.sha }}
-          restore-keys: |
-            out-build-${{ env.OUTPUT_NAME }}-
-
       - name: gclient sync
         run: |
           src/flutter/ci/tizen/gclient-prepare-sync.sh --reduce-deps --shallow-sync
@@ -202,13 +195,6 @@ jobs:
         with:
           path: src/flutter
 
-      - uses: actions/cache@v2
-        with:
-          path: src/out/${{ env.OUTPUT_NAME }}
-          key: out-macos-build-${{ env.OUTPUT_NAME }}-${{ github.sha }}
-          restore-keys: |
-            out-macos-build-${{ env.OUTPUT_NAME }}-
-
       - name: install depot_tools
         run: |
           git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git

diff --git a/shell/platform/tizen/BUILD.gn b/shell/platform/tizen/BUILD.gn
@@ -65,6 +65,8 @@ config("rootstrap_include_dirs") {
     "$custom_sysroot/usr/include/ecore-con-1",
     "$custom_sysroot/usr/include/ecore-evas-1",
     "$custom_sysroot/usr/include/ecore-file-1",
+    "$custom_sysroot/usr/include/ecore-imf-evas-1",
+    "$custom_sysroot/usr/include/ecore-input-evas-1",
     "$custom_sysroot/usr/include/edje-1",
     "$custom_sysroot/usr/include/eet-1",
     "$custom_sysroot/usr/include/efl-1/interfaces",
@@ -150,6 +152,7 @@ template("embedder") {
       "dlog",
       "ecore",
       "ecore_imf",
+      "ecore_imf_evas",
       "ecore_input",
       "efl-extension",
       "eina",

diff --git a/shell/platform/tizen/channels/key_event_channel.cc b/shell/platform/tizen/channels/key_event_channel.cc
@@ -254,11 +254,14 @@ KeyEventChannel::KeyEventChannel(BinaryMessenger* messenger)
 
 KeyEventChannel::~KeyEventChannel() {}
 
-void KeyEventChannel::SendKeyEvent(Ecore_Event_Key* key,
-                                   bool is_down,
-                                   std::function<void(bool)> callback) {
-  uint32_t scan_code = key->keycode;
-  auto iter1 = kSymbolToScanCode.find(key->key);
+void KeyEventChannel::SendKey(const char* key,
+                              const char* string,
+                              const char* compose,
+                              uint32_t modifiers,
+                              uint32_t scan_code,
+                              bool is_down,
+                              std::function<void(bool)> callback) {
+  auto iter1 = kSymbolToScanCode.find(key);
   if (iter1 != kSymbolToScanCode.end()) {
     scan_code = iter1->second;
   }
@@ -269,16 +272,16 @@ void KeyEventChannel::SendKeyEvent(Ecore_Event_Key* key,
     key_code = iter2->second;
   }
 
-  int modifiers = 0;
+  int gtk_modifiers = 0;
   for (auto element : kEcoreModifierToGtkModifier) {
-    if (element.first & key->modifiers) {
-      modifiers |= element.second;
+    if (element.first & modifiers) {
+      gtk_modifiers |= element.second;
     }
   }
 
   uint32_t unicode_scalar_values = 0;
-  if (key->compose) {
-    unicode_scalar_values = Utf8ToUtf32CodePoint(key->compose);
+  if (compose) {
+    unicode_scalar_values = Utf8ToUtf32CodePoint(compose);
   }
 
   rapidjson::Document event(rapidjson::kObjectType);
@@ -288,7 +291,7 @@ void KeyEventChannel::SendKeyEvent(Ecore_Event_Key* key,
   event.AddMember(kUnicodeScalarValuesKey, unicode_scalar_values, allocator);
   event.AddMember(kKeyCodeKey, key_code, allocator);
   event.AddMember(kScanCodeKey, scan_code, allocator);
-  event.AddMember(kModifiersKey, modifiers, allocator);
+  event.AddMember(kModifiersKey, gtk_modifiers, allocator);
   if (is_down) {
     event.AddMember(kTypeKey, kKeyDown, allocator);
   } else {

diff --git a/shell/platform/tizen/channels/key_event_channel.h b/shell/platform/tizen/channels/key_event_channel.h
@@ -5,8 +5,6 @@
 #ifndef EMBEDDER_KEY_EVENT_CHANNEL_H_
 #define EMBEDDER_KEY_EVENT_CHANNEL_H_
 
-#include <Ecore_Input.h>
-
 #include <memory>
 
 #include "flutter/shell/platform/common/client_wrapper/include/flutter/basic_message_channel.h"
@@ -20,9 +18,13 @@ class KeyEventChannel {
   explicit KeyEventChannel(BinaryMessenger* messenger);
   virtual ~KeyEventChannel();
 
-  void SendKeyEvent(Ecore_Event_Key* event,
-                    bool is_down,
-                    std::function<void(bool)> callback);
+  void SendKey(const char* key,
+               const char* string,
+               const char* compose,
+               uint32_t modifiers,
+               uint32_t scan_code,
+               bool is_down,
+               std::function<void(bool)> callback);
 
  private:
   std::unique_ptr<BasicMessageChannel<rapidjson::Document>> channel_;

diff --git a/shell/platform/tizen/channels/platform_view_channel.cc b/shell/platform/tizen/channels/platform_view_channel.cc
@@ -79,14 +79,15 @@ void PlatformViewChannel::ClearViewFactories() {
   view_factories_.clear();
 }
 
-void PlatformViewChannel::SendKeyEvent(Ecore_Event_Key* event, bool is_down) {
+void PlatformViewChannel::SendKey(const char* key,
+                                  const char* string,
+                                  const char* compose,
+                                  uint32_t modifiers,
+                                  uint32_t scan_code,
+                                  bool is_down) {
   PlatformView* view = FindFocusedView();
   if (view) {
-    if (is_down) {
-      view->DispatchKeyDownEvent(event);
-    } else {
-      view->DispatchKeyUpEvent(event);
-    }
+    view->SendKey(key, string, compose, modifiers, scan_code, is_down);
   }
 }
 

diff --git a/shell/platform/tizen/channels/platform_view_channel.h b/shell/platform/tizen/channels/platform_view_channel.h
@@ -5,8 +5,6 @@
 #ifndef EMBEDDER_PLATFORM_VIEW_CHANNEL_H_
 #define EMBEDDER_PLATFORM_VIEW_CHANNEL_H_
 
-#include <Ecore_Input.h>
-
 #include <map>
 #include <memory>
 #include <string>
@@ -30,7 +28,12 @@ class PlatformViewChannel {
     return view_factories_;
   }
 
-  void SendKeyEvent(Ecore_Event_Key* event, bool is_down);
+  void SendKey(const char* key,
+               const char* string,
+               const char* compose,
+               uint32_t modifiers,
+               uint32_t scan_code,
+               bool is_down);
 
  private:
   PlatformView* FindViewById(int view_id);