e_device: move e_device

move e_device files from inputmgr to core

Change-Id: Idece13b3e877f6adefa97796b9a2fbf82befcb04

diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
index c092213fa69058dc57ae34fd06e54576167df768..c19cd1033f0bd04b0710d48615421a430df164e4 100644 (file)
--- a/src/bin/Makefile.mk
+++ b/src/bin/Makefile.mk
@@ -155,6 +155,7 @@ src/bin/core/e_view_client.c \
 src/bin/core/e_view_edje.c \
 src/bin/core/e_view_event.c \
 src/bin/core/e_view_layout.c \
+src/bin/core/e_device.c \
 src/bin/server/e_compositor.c \
 src/bin/server/e_comp_wl.c \
 src/bin/server/e_comp_wl_data.c \
@@ -247,7 +248,6 @@ src/bin/inputmgr/e_input_device.c \
 src/bin/inputmgr/e_input_evdev.c \
 src/bin/inputmgr/e_input_seat.c \
 src/bin/inputmgr/e_input_thread_client.c \
-src/bin/inputmgr/e_device.c \
 src/bin/inputmgr/ecore_device_ex.c \
 src/bin/inputmgr/e_devicemgr_keyboard_grab.c \
 src/bin/inputmgr/e_devicemgr_relative_motion_grab.c \

diff --git a/src/bin/core/e_device.c b/src/bin/core/e_device.c
new file mode 100644 (file)
index 0000000..99027ac
--- /dev/null
+++ b/src/bin/core/e_device.c
@@ -0,0 +1,98 @@
+#include "e_device_intern.h"
+
+typedef struct {
+    gchar *source; // just sample
+} E_DevicePrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(E_Device, e_device, G_TYPE_OBJECT);
+
+static GList *_dev_list = NULL;
+
+static void
+e_device_class_init(E_DeviceClass *klass)
+{
+
+}
+
+static void
+e_device_init(E_Device *self)
+{
+
+}
+
+EINTERN E_Device *
+e_device_new(void)
+{
+   E_Device *dev;
+   dev = g_object_new(TYPE_E_DEVICE, NULL);
+
+   _dev_list = g_list_append (_dev_list, dev);
+
+   return dev;
+}
+
+EINTERN void
+e_device_name_set(E_Device *dev, const char *name)
+{
+   g_object_set_data_full(G_OBJECT(dev), "name", g_strdup(name), g_free);
+}
+
+E_API const gchar *
+e_device_name_get(const E_Device *dev)
+{
+   return g_object_get_data(G_OBJECT(dev), "name");
+}
+
+EINTERN void
+e_device_class_set(E_Device *dev, Ecore_Device_Class device_class)
+{
+   g_object_set_data(G_OBJECT(dev), "class", GINT_TO_POINTER(device_class));
+}
+
+E_API Ecore_Device_Class
+e_device_class_get(const E_Device *dev)
+{
+   return (Ecore_Device_Class)GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dev), "class"));
+}
+
+E_API void
+e_device_subclass_set(E_Device *dev, Ecore_Device_Subclass subclass)
+{
+   g_object_set_data(G_OBJECT(dev), "subclass", GINT_TO_POINTER(subclass));
+}
+
+E_API Ecore_Device_Subclass
+e_device_subclass_get(const E_Device *dev)
+{
+   return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dev), "subclass"));
+}
+
+EINTERN void
+e_device_identifier_set(E_Device *dev, const char *identifier)
+{
+   g_object_set_data_full(G_OBJECT(dev), "identifier", g_strdup(identifier), g_free);
+}
+
+E_API const gchar *
+e_device_identifier_get(const E_Device *dev)
+{
+   return g_object_get_data(G_OBJECT(dev), "identifier");
+}
+
+EINTERN void
+e_device_seatname_set(E_Device *dev, const char *seatname)
+{
+   g_object_set_data_full(G_OBJECT(dev), "seatname", g_strdup(seatname), g_free);
+}
+
+E_API const gchar *
+e_device_seatname_get(const E_Device *dev)
+{
+   return g_object_get_data(G_OBJECT(dev), "seatname");
+}
+
+E_API const GList *
+e_device_list_get(void)
+{
+   return _dev_list;
+}

diff --git a/src/bin/core/e_device_intern.h b/src/bin/core/e_device_intern.h
new file mode 100644 (file)
index 0000000..d844e5a
--- /dev/null
+++ b/src/bin/core/e_device_intern.h
@@ -0,0 +1,13 @@
+#ifndef E_DEVICE_INTERN_H
+#define E_DEVICE_INTERN_H
+
+#include "e_intern.h"
+#include "e_device.h"
+
+EINTERN E_Device             *e_device_new(void);
+EINTERN void                  e_device_name_set(E_Device *dev, const char *name);
+EINTERN void                  e_device_class_set(E_Device *dev, Ecore_Device_Class device_class);
+EINTERN void                  e_device_identifier_set(E_Device *dev, const char *identifier);
+EINTERN void                  e_device_seatname_set(E_Device *dev, const char *seatname);
+
+#endif /* end of include guard: E_DEVICE_INTERN_H */

diff --git a/src/bin/inputmgr/e_device.c b/src/bin/inputmgr/e_device.c
deleted file mode 100644 (file)
index 99027ac..0000000
--- a/src/bin/inputmgr/e_device.c
+++ /dev/null
@@ -1,98 +0,0 @@
-#include "e_device_intern.h"
-
-typedef struct {
-    gchar *source; // just sample
-} E_DevicePrivate;
-
-G_DEFINE_TYPE_WITH_PRIVATE(E_Device, e_device, G_TYPE_OBJECT);
-
-static GList *_dev_list = NULL;
-
-static void
-e_device_class_init(E_DeviceClass *klass)
-{
-
-}
-
-static void
-e_device_init(E_Device *self)
-{
-
-}
-
-EINTERN E_Device *
-e_device_new(void)
-{
-   E_Device *dev;
-   dev = g_object_new(TYPE_E_DEVICE, NULL);
-
-   _dev_list = g_list_append (_dev_list, dev);
-
-   return dev;
-}
-
-EINTERN void
-e_device_name_set(E_Device *dev, const char *name)
-{
-   g_object_set_data_full(G_OBJECT(dev), "name", g_strdup(name), g_free);
-}
-
-E_API const gchar *
-e_device_name_get(const E_Device *dev)
-{
-   return g_object_get_data(G_OBJECT(dev), "name");
-}
-
-EINTERN void
-e_device_class_set(E_Device *dev, Ecore_Device_Class device_class)
-{
-   g_object_set_data(G_OBJECT(dev), "class", GINT_TO_POINTER(device_class));
-}
-
-E_API Ecore_Device_Class
-e_device_class_get(const E_Device *dev)
-{
-   return (Ecore_Device_Class)GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dev), "class"));
-}
-
-E_API void
-e_device_subclass_set(E_Device *dev, Ecore_Device_Subclass subclass)
-{
-   g_object_set_data(G_OBJECT(dev), "subclass", GINT_TO_POINTER(subclass));
-}
-
-E_API Ecore_Device_Subclass
-e_device_subclass_get(const E_Device *dev)
-{
-   return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dev), "subclass"));
-}
-
-EINTERN void
-e_device_identifier_set(E_Device *dev, const char *identifier)
-{
-   g_object_set_data_full(G_OBJECT(dev), "identifier", g_strdup(identifier), g_free);
-}
-
-E_API const gchar *
-e_device_identifier_get(const E_Device *dev)
-{
-   return g_object_get_data(G_OBJECT(dev), "identifier");
-}
-
-EINTERN void
-e_device_seatname_set(E_Device *dev, const char *seatname)
-{
-   g_object_set_data_full(G_OBJECT(dev), "seatname", g_strdup(seatname), g_free);
-}
-
-E_API const gchar *
-e_device_seatname_get(const E_Device *dev)
-{
-   return g_object_get_data(G_OBJECT(dev), "seatname");
-}
-
-E_API const GList *
-e_device_list_get(void)
-{
-   return _dev_list;
-}

diff --git a/src/bin/inputmgr/e_device_intern.h b/src/bin/inputmgr/e_device_intern.h
deleted file mode 100644 (file)
index d844e5a..0000000
--- a/src/bin/inputmgr/e_device_intern.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef E_DEVICE_INTERN_H
-#define E_DEVICE_INTERN_H
-
-#include "e_intern.h"
-#include "e_device.h"
-
-EINTERN E_Device             *e_device_new(void);
-EINTERN void                  e_device_name_set(E_Device *dev, const char *name);
-EINTERN void                  e_device_class_set(E_Device *dev, Ecore_Device_Class device_class);
-EINTERN void                  e_device_identifier_set(E_Device *dev, const char *identifier);
-EINTERN void                  e_device_seatname_set(E_Device *dev, const char *seatname);
-
-#endif /* end of include guard: E_DEVICE_INTERN_H */