Refactoring: keyboard plugin code (sony#96)

Author: Hidenori Matsubayashi

cmake/build.cmake

@@ -103,7 +103,7 @@ add_executable(${TARGET}
   src/flutter/shell/platform/linux_embedded/external_texture_gl.cc
   src/flutter/shell/platform/linux_embedded/flutter_linuxes_texture_registrar.cc
   src/flutter/shell/platform/linux_embedded/plugin/key_event_plugin.cc
-  src/flutter/shell/platform/linux_embedded/plugin/key_event_plugin_glfw_util.cc
+  src/flutter/shell/platform/linux_embedded/plugin/keyboard_glfw_util.cc
   src/flutter/shell/platform/linux_embedded/plugin/text_input_plugin.cc
   src/flutter/shell/platform/linux_embedded/plugin/platform_plugin.cc
   src/flutter/shell/platform/linux_embedded/plugin/mouse_cursor_plugin.cc

src/flutter/shell/platform/linux_embedded/plugin/key_event_plugin.cc

@@ -14,7 +14,7 @@
 
 #include "flutter/shell/platform/common/json_message_codec.h"
 #include "flutter/shell/platform/linux_embedded/logger.h"
-#include "flutter/shell/platform/linux_embedded/plugin/key_event_plugin_glfw_util.h"
+#include "flutter/shell/platform/linux_embedded/plugin/keyboard_glfw_util.h"
 #include "flutter/shell/platform/linux_embedded/window_binding_handler_delegate.h"
 
 namespace flutter {
@@ -83,17 +83,22 @@ uint32_t KeyeventPlugin::GetCodePoint(uint32_t keycode) {
 
 bool KeyeventPlugin::IsTextInputSuppressed(uint32_t code_point) {
   if (code_point) {
-    auto mods = GetGlfwModifiers(xkb_mods_mask_);
-    return (mods & (GLFW_MOD_CONTROL | GLFW_MOD_ALT));
+    auto ctrl_key_index =
+        xkb_keymap_mod_get_index(xkb_keymap_, XKB_MOD_NAME_CTRL);
+    auto alt_key_index =
+        xkb_keymap_mod_get_index(xkb_keymap_, XKB_MOD_NAME_ALT);
+
+    return (xkb_mods_mask_ & ((1 << ctrl_key_index) | (1 << alt_key_index))) !=
+           0;
   }
   return false;
 }
 
 void KeyeventPlugin::OnKey(uint32_t keycode, uint32_t state) {
 #if defined(DISPLAY_BACKEND_TYPE_WAYLAND)
   auto unicode = GetCodePoint(keycode);
-  auto mods = GetGlfwModifiers(xkb_mods_mask_);
-  auto keyscancode = GetGlfwKeyScancode(keycode);
+  auto mods = GetGlfwModifiers(xkb_keymap_, xkb_mods_mask_);
+  auto keyscancode = GetGlfwKeycode(keycode);
   SendKeyEvent(keyscancode, unicode, mods, state);
 #else
   // We cannot get notifications of modifier keys when we use the DRM backend.