Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Move redispatch_event from FlKeyboardViewDelegate to FlKeyboardManager #55941

Merged
robert-ancell merged 1 commit into from
Oct 18, 2024
Merged

Move redispatch_event from FlKeyboardViewDelegate to FlKeyboardManager #55941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions shell/platform/linux/fl_keyboard_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ struct _FlKeyboardManager {

GWeakRef view_delegate;

FlKeyboardManagerRedispatchEventHandler redispatch_handler;
gpointer redispatch_handler_user_data;

FlKeyEmbedderResponder* key_embedder_responder;

FlKeyChannelResponder* key_channel_responder;
Expand Down Expand Up @@ -263,9 +266,16 @@ static void responder_handle_event_callback(bool handled,
view_delegate, fl_keyboard_pending_event_get_event(pending));
if (should_redispatch) {
g_ptr_array_add(self->pending_redispatches, pending);
fl_keyboard_view_delegate_redispatch_event(
view_delegate,
FL_KEY_EVENT(fl_keyboard_pending_event_get_event(pending)));
FlKeyEvent* event = fl_keyboard_pending_event_get_event(pending);
if (self->redispatch_handler != nullptr) {
self->redispatch_handler(event, self->redispatch_handler_user_data);
} else {
GdkEventType event_type =
gdk_event_get_event_type(fl_key_event_get_origin(event));
g_return_if_fail(event_type == GDK_KEY_PRESS ||
event_type == GDK_KEY_RELEASE);
gdk_event_put(fl_key_event_get_origin(event));
}
} else {
g_object_unref(pending);
}
Expand Down Expand Up @@ -506,3 +516,11 @@ void fl_keyboard_manager_notify_layout_changed(FlKeyboardManager* self) {
g_clear_object(&self->derived_layout);
self->derived_layout = fl_keyboard_layout_new();
}

void fl_keyboard_manager_set_redispatch_handler(
FlKeyboardManager* self,
FlKeyboardManagerRedispatchEventHandler redispatch_handler,
gpointer user_data) {
self->redispatch_handler = redispatch_handler;
self->redispatch_handler_user_data = user_data;
}
14 changes: 14 additions & 0 deletions shell/platform/linux/fl_keyboard_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,20 @@ GHashTable* fl_keyboard_manager_get_pressed_state(FlKeyboardManager* manager);
*/
void fl_keyboard_manager_notify_layout_changed(FlKeyboardManager* manager);

typedef void (*FlKeyboardManagerRedispatchEventHandler)(FlKeyEvent* event,
gpointer user_data);

/**
* fl_keyboard_manager_set_redispatch_handler:
* @manager: the #FlKeyboardManager self.
*
* Set the handler for redispatches, for testing purposes only.
*/
void fl_keyboard_manager_set_redispatch_handler(
FlKeyboardManager* manager,
FlKeyboardManagerRedispatchEventHandler redispatch_handler,
gpointer user_data);

G_END_DECLS

#endif // FLUTTER_SHELL_PLATFORM_LINUX_FL_KEYBOARD_MANAGER_H_
Loading