Don't process key events when the text input is not requested

Author: robert-ancell

shell/platform/linux/fl_text_input_plugin.cc

@@ -288,6 +288,10 @@ FlTextInputPlugin* fl_text_input_plugin_new(FlBinaryMessenger* messenger) {
 gboolean fl_text_input_plugin_filter_keypress(FlTextInputPlugin* self,
                                               GdkEventKey* event) {
   g_return_val_if_fail(FL_IS_TEXT_INPUT_PLUGIN(self), FALSE);
+
+  if (self->client_id == kClientIdUnset)
+    return FALSE;
+
   if (gtk_im_context_filter_keypress(self->im_context, event))
     return TRUE;
 

shell/platform/linux/fl_view.cc

@@ -330,11 +330,11 @@ static gboolean fl_view_motion_notify_event(GtkWidget* widget,
 static gboolean fl_view_key_press_event(GtkWidget* widget, GdkEventKey* event) {
   FlView* self = FL_VIEW(widget);
 
+  fl_key_event_plugin_send_key_event(self->key_event_plugin, event);
+
   if (fl_text_input_plugin_filter_keypress(self->text_input_plugin, event))
     return TRUE;
 
-  fl_key_event_plugin_send_key_event(self->key_event_plugin, event);
-
   return TRUE;
 }
 
@@ -343,11 +343,11 @@ static gboolean fl_view_key_release_event(GtkWidget* widget,
                                           GdkEventKey* event) {
   FlView* self = FL_VIEW(widget);
 
+  fl_key_event_plugin_send_key_event(self->key_event_plugin, event);
+
   if (fl_text_input_plugin_filter_keypress(self->text_input_plugin, event))
     return TRUE;
 
-  fl_key_event_plugin_send_key_event(self->key_event_plugin, event);
-
   return TRUE;
 }