[gnome-games] gamepad: Rename GamepadMappedEvent into GamepadInput

[Adrien Plazas <aplazas src gnome org>]

commit 804fa2a71cbfd3206f76d857b57a358cd3f59ee9
Author: Adrien Plazas <kekun plazas laposte net>
Date:   Sat May 13 21:30:55 2017 +0200

    gamepad: Rename GamepadMappedEvent into GamepadInput
    
    This better reflect the goal of the type and make it shorter.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=782611

 src/Makefile.am                    |    2 +-
 src/gamepad/gamepad-input.c        |   36 ++++++++++++++++++++++++++++++++++++
 src/gamepad/gamepad-input.h        |   24 ++++++++++++++++++++++++
 src/gamepad/gamepad-mapped-event.c |   36 ------------------------------------
 src/gamepad/gamepad-mapped-event.h |   24 ------------------------
 src/gamepad/gamepad-mapping.c      |   28 ++++++++++++++--------------
 src/gamepad/gamepad-mapping.h      |   24 ++++++++++++------------
 src/gamepad/gamepad.c              |    7 +++----
 8 files changed, 90 insertions(+), 91 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 5e78c90..7940691 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,7 +77,7 @@ gnome_games_SOURCES = \
        \
        gamepad/gamepad.c \
        gamepad/gamepad-dpad.c \
-       gamepad/gamepad-mapped-event.c \
+       gamepad/gamepad-input.c \
        gamepad/gamepad-mapping.c \
        gamepad/gamepad-mapping-error.c \
        gamepad/gamepad-mappings-manager.c \
diff --git a/src/gamepad/gamepad-input.c b/src/gamepad/gamepad-input.c
new file mode 100644
index 0000000..4cb8a6b
--- /dev/null
+++ b/src/gamepad/gamepad-input.c
@@ -0,0 +1,36 @@
+// This file is part of GNOME Games. License: GPL-3.0+.
+
+#include "gamepad-input.h"
+
+#include <string.h>
+
+GamesGamepadInput *
+games_gamepad_input_dup (const GamesGamepadInput *self)
+{
+  GamesGamepadInput *dup;
+
+  dup = g_new0 (GamesGamepadInput, 1);
+  memcpy (dup, self, sizeof (GamesGamepadInput));
+
+  return dup;
+}
+
+void
+games_gamepad_input_free (GamesGamepadInput *self)
+{
+  g_free (self);
+}
+
+GType
+games_gamepad_input_get_type (void)
+{
+  static volatile gsize type_id = 0;
+
+  if (g_once_init_enter (&type_id))
+    g_once_init_leave (&type_id,
+                       g_boxed_type_register_static ("GamesGamepadInput",
+                                                     (GBoxedCopyFunc) games_gamepad_input_dup,
+                                                     (GBoxedFreeFunc) games_gamepad_input_free));
+
+  return type_id;
+}
diff --git a/src/gamepad/gamepad-input.h b/src/gamepad/gamepad-input.h
new file mode 100644
index 0000000..c76d7c5
--- /dev/null
+++ b/src/gamepad/gamepad-input.h
@@ -0,0 +1,24 @@
+// This file is part of GNOME Games. License: GPL-3.0+.
+
+#ifndef GAMES_GAMEPAD_INPUT_H
+#define GAMES_GAMEPAD_INPUT_H
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GAMES_TYPE_GAMEPAD_INPUT (games_gamepad_input_get_type ())
+
+typedef struct {
+  guint16 type;
+  guint16 axis;
+  guint16 button;
+} GamesGamepadInput;
+
+GType games_gamepad_input_get_type (void) G_GNUC_CONST;
+GamesGamepadInput *games_gamepad_input_dup (const GamesGamepadInput *self);
+void games_gamepad_input_free (GamesGamepadInput *self);
+
+G_END_DECLS
+
+#endif /* GAMES_GAMEPAD_INPUT_H */
diff --git a/src/gamepad/gamepad-mapping.c b/src/gamepad/gamepad-mapping.c
index 1184578..85807c3 100644
--- a/src/gamepad/gamepad-mapping.c
+++ b/src/gamepad/gamepad-mapping.c
@@ -335,11 +335,11 @@ games_gamepad_mapping_new_from_sdl_string (const gchar  *mapping_string,
 }
 
 void
-games_gamepad_mapping_get_dpad_mapping (GamesGamepadMapping     *self,
-                                        gint                     dpad_index,
-                                        gint                     dpad_axis,
-                                        gint                     dpad_value,
-                                        GamesGamepadMappedEvent *event)
+games_gamepad_mapping_get_dpad_mapping (GamesGamepadMapping *self,
+                                        gint                 dpad_index,
+                                        gint                 dpad_axis,
+                                        gint                 dpad_value,
+                                        GamesGamepadInput   *event)
 {
   GamesGamepadDPad *dpad;
   gint dpad_changed_value;
@@ -348,7 +348,7 @@ games_gamepad_mapping_get_dpad_mapping (GamesGamepadMapping     *self,
   g_return_if_fail (self != NULL);
   g_return_if_fail (event != NULL);
 
-  memset (event, 0, sizeof (GamesGamepadMappedEvent));
+  memset (event, 0, sizeof (GamesGamepadInput));
 
   dpad = &g_array_index (self->dpads, GamesGamepadDPad, dpad_index);
   dpad_changed_value = (dpad_value == 0) ?
@@ -374,14 +374,14 @@ games_gamepad_mapping_get_dpad_mapping (GamesGamepadMapping     *self,
 }
 
 void
-games_gamepad_mapping_get_axis_mapping (GamesGamepadMapping     *self,
-                                        gint                     axis_number,
-                                        GamesGamepadMappedEvent *event)
+games_gamepad_mapping_get_axis_mapping (GamesGamepadMapping *self,
+                                        gint                 axis_number,
+                                        GamesGamepadInput   *event)
 {
   g_return_if_fail (self != NULL);
   g_return_if_fail (event != NULL);
 
-  memset (event, 0, sizeof (GamesGamepadMappedEvent));
+  memset (event, 0, sizeof (GamesGamepadInput));
 
   event->type = (axis_number < self->axes->len) ?
     g_array_index (self->axes, input_t, axis_number).type :
@@ -402,14 +402,14 @@ games_gamepad_mapping_get_axis_mapping (GamesGamepadMapping     *self,
 }
 
 void
-games_gamepad_mapping_get_button_mapping (GamesGamepadMapping     *self,
-                                          gint                     button_number,
-                                          GamesGamepadMappedEvent *event)
+games_gamepad_mapping_get_button_mapping (GamesGamepadMapping *self,
+                                          gint                 button_number,
+                                          GamesGamepadInput   *event)
 {
   g_return_if_fail (self != NULL);
   g_return_if_fail (event != NULL);
 
-  memset (event, 0, sizeof (GamesGamepadMappedEvent));
+  memset (event, 0, sizeof (GamesGamepadInput));
 
   event->type = (button_number < self->buttons->len) ?
     g_array_index (self->buttons, input_t, button_number).type :
diff --git a/src/gamepad/gamepad-mapping.h b/src/gamepad/gamepad-mapping.h
index 6e601b5..acc377e 100644
--- a/src/gamepad/gamepad-mapping.h
+++ b/src/gamepad/gamepad-mapping.h
@@ -4,7 +4,7 @@
 #define GAMES_GAMEPAD_MAPPING_H
 
 #include <glib-object.h>
-#include "gamepad-mapped-event.h"
+#include "gamepad-input.h"
 
 G_BEGIN_DECLS
 
@@ -14,17 +14,17 @@ G_DECLARE_FINAL_TYPE (GamesGamepadMapping, games_gamepad_mapping, GAMES, GAMEPAD
 
 GamesGamepadMapping *games_gamepad_mapping_new_from_sdl_string (const gchar  *mapping_string,
                                                                 GError      **error);
-void games_gamepad_mapping_get_dpad_mapping (GamesGamepadMapping     *self,
-                                             gint                     dpad_index,
-                                             gint                     dpad_axis,
-                                             gint                     dpad_value,
-                                             GamesGamepadMappedEvent *result);
-void games_gamepad_mapping_get_axis_mapping (GamesGamepadMapping     *self,
-                                             gint                     axis_number,
-                                             GamesGamepadMappedEvent *result);
-void games_gamepad_mapping_get_button_mapping (GamesGamepadMapping     *self,
-                                               gint                     button_number,
-                                               GamesGamepadMappedEvent *result);
+void games_gamepad_mapping_get_dpad_mapping (GamesGamepadMapping *self,
+                                             gint                 dpad_index,
+                                             gint                 dpad_axis,
+                                             gint                 dpad_value,
+                                             GamesGamepadInput   *result);
+void games_gamepad_mapping_get_axis_mapping (GamesGamepadMapping *self,
+                                             gint                 axis_number,
+                                             GamesGamepadInput   *result);
+void games_gamepad_mapping_get_button_mapping (GamesGamepadMapping *self,
+                                               gint                 button_number,
+                                               GamesGamepadInput   *result);
 
 G_END_DECLS
 
diff --git a/src/gamepad/gamepad.c b/src/gamepad/gamepad.c
index b0414b6..ddbacef 100644
--- a/src/gamepad/gamepad.c
+++ b/src/gamepad/gamepad.c
@@ -35,7 +35,7 @@ on_button_event (GamesRawGamepad         *sender,
                  gpointer                 data)
 {
   GamesGamepad *self;
-  GamesGamepadMappedEvent event;
+  GamesGamepadInput event;
   gboolean value;
 
   self = GAMES_GAMEPAD (data);
@@ -86,7 +86,7 @@ on_axis_event (GamesRawGamepad       *sender,
                gpointer               data)
 {
   GamesGamepad *self;
-  GamesGamepadMappedEvent event;
+  GamesGamepadInput event;
 
   self = GAMES_GAMEPAD (data);
 
@@ -117,7 +117,7 @@ on_hat_event (GamesRawGamepad      *sender,
               gpointer              data)
 {
   GamesGamepad *self;
-  GamesGamepadMappedEvent event;
+  GamesGamepadInput event;
 
   self = GAMES_GAMEPAD (data);
 
@@ -174,7 +174,6 @@ on_event (GamesRawGamepad *sender,
           gpointer         data)
 {
   GamesGamepad *self;
-  GamesGamepadMappedEvent mapped_event;
 
   self = GAMES_GAMEPAD (data);