[retro-gtk] retro-core: Merge retro_core_key_event() into on_key_event()



commit 1baea04313a0417548388242ae0678c4cb83400b
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Sat Feb 22 18:00:36 2020 +0500

    retro-core: Merge retro_core_key_event() into on_key_event()

 retro-gtk/retro-core.c | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/retro-gtk/retro-core.c b/retro-gtk/retro-core.c
index 610f6e9..8b475e8 100644
--- a/retro-gtk/retro-core.c
+++ b/retro-gtk/retro-core.c
@@ -634,10 +634,10 @@ exit_cb (RetroRunnerProcess *process,
 }
 
 static gboolean
-retro_core_key_event (RetroCore   *self,
-                      GdkEventKey *event)
+on_key_event (GtkWidget   *widget,
+              GdkEventKey *event,
+              RetroCore   *self)
 {
-
   gboolean pressed;
   RetroKeyboardKey retro_key;
   RetroKeyboardModifierKey retro_modifier_key;
@@ -645,9 +645,6 @@ retro_core_key_event (RetroCore   *self,
   g_autoptr(GError) error = NULL;
   IpcRunner *proxy;
 
-  g_return_val_if_fail (RETRO_IS_CORE (self), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
   if (!retro_core_get_is_initiated (self))
     return FALSE;
 
@@ -665,18 +662,6 @@ retro_core_key_event (RetroCore   *self,
   return FALSE;
 }
 
-static gboolean
-on_key_event (GtkWidget   *widget,
-              GdkEventKey *event,
-              gpointer     self)
-{
-  g_return_val_if_fail (RETRO_IS_CORE (self), FALSE);
-  g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-
-  return retro_core_key_event (RETRO_CORE (self), event);
-}
-
 /* Public */
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]