e_devicemgr: move the symbols to internal headers

The symbols which are not used by E20 modules move to the internal headers.

Change-Id: Id7012366b659aecafc280b092669ea0b17a2156f

diff --git a/src/bin/inputmgr/e_devicemgr_block_intern.h b/src/bin/inputmgr/e_devicemgr_block_intern.h
index 03b22bf7fb6ce8c56c5b0c3a8fd0957d83cb6b75..3162957daf572aad5f36501ea5bd8190282e011a 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_block_intern.h
+++ b/src/bin/inputmgr/e_devicemgr_block_intern.h
@@ -2,7 +2,7 @@
 #define E_DEVICEMGR_BLOCK_INTERN_H
 
 #include "e_intern.h"
-#include "e_devicemgr.h"
+#include "e_devicemgr_intern.h"
 
 EINTERN int e_devicemgr_block_add(struct wl_client *client, struct wl_resource *resource, uint32_t clas, uint32_t duration);
 EINTERN int e_devicemgr_block_remove(struct wl_client *client);

diff --git a/src/bin/inputmgr/e_devicemgr_conf_intern.h b/src/bin/inputmgr/e_devicemgr_conf_intern.h
index 3928b7e4af4a738c0663176159e0fb9d9cf97bb6..893db575441b00f48e656e0995acbf5b8077d92c 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_conf_intern.h
+++ b/src/bin/inputmgr/e_devicemgr_conf_intern.h
@@ -2,9 +2,11 @@
 #define E_DEVICEMGR_CONF_INTERN_H
 
 #include "e_intern.h"
-#include "e_devicemgr.h"
 #include "e_config_intern.h"
 
+typedef struct _E_Devicemgr_Conf_Edd    E_Devicemgr_Conf_Edd;
+typedef struct _E_Devicemgr_Config_Data E_Devicemgr_Config_Data;
+
 struct _E_Devicemgr_Conf_Edd
 {
    struct

diff --git a/src/bin/inputmgr/e_devicemgr_intern.h b/src/bin/inputmgr/e_devicemgr_intern.h
index f55389db7ff038a192f453b8719965e4adb91d69..595db1b8df6d7e996e60f0107af1abfcaaef156c 100644 (file)
--- a/src/bin/inputmgr/e_devicemgr_intern.h
+++ b/src/bin/inputmgr/e_devicemgr_intern.h
@@ -3,6 +3,30 @@
 
 #include "e_intern.h"
 #include "e_devicemgr.h"
+#include "e_devicemgr_conf_intern.h"
+
+#define E_DEVICEMGR_BOUNDARY_MAX 4
+
+typedef struct _E_Devicemgr_Input_Device_Multi E_Devicemgr_Input_Device_Multi;
+typedef struct _E_Devicemgr_Pointer_Boundary E_Devicemgr_Pointer_Boundary;
+
+typedef void (*E_Devicemgr_Block_Expire_Cb) (void *data);
+
+typedef enum _E_Devicemgr_Boundary
+{
+   E_DEVICEMGR_BOUNDARY_NONE = 0,
+   E_DEVICEMGR_BOUNDARY_TOP,
+   E_DEVICEMGR_BOUNDARY_RIGHT,
+   E_DEVICEMGR_BOUNDARY_BOTTOM,
+   E_DEVICEMGR_BOUNDARY_LEFT
+} E_Devicemgr_Boundary_Type;
+
+struct _E_Devicemgr_Pointer_Boundary
+{
+   struct wl_client *client;
+   E_Client *ec;
+   struct wl_resource *resource;
+};
 
 struct _E_Devicemgr
 {
@@ -67,6 +91,14 @@ struct _E_Devicemgr
    } relative_motion_grab;
 };
 
+struct _E_Devicemgr_Input_Device_Multi
+{
+   double radius_x;
+   double radius_y;
+   double pressure;
+   double angle;
+};
+
 typedef struct _E_Info_Comp_Obj
 {
    unsigned int    obj;            // u

diff --git a/src/include/e_devicemgr.h b/src/include/e_devicemgr.h
index e953f7478c2dc1ef506ac4b3acf83074e9a77571..88696495e38abfe6376d446ba6b3dc01e48715a8 100644 (file)
--- a/src/include/e_devicemgr.h
+++ b/src/include/e_devicemgr.h
@@ -9,13 +9,10 @@ extern "C" {
 
 #include <glib.h>
 
-#define E_DEVICEMGR_BOUNDARY_MAX 4
+typedef struct _E_Devicemgr              E_Devicemgr;
+typedef struct _E_Devicemgr_Input_Device E_Devicemgr_Input_Device;
 
-typedef struct _E_Devicemgr             E_Devicemgr;
-typedef struct _E_Devicemgr_Conf_Edd    E_Devicemgr_Conf_Edd;
-typedef struct _E_Devicemgr_Config_Data E_Devicemgr_Config_Data;
-
-typedef struct _E_Devicemgr_Input_Device
+struct _E_Devicemgr_Input_Device
 {
    Eina_List *resources;
    const char *name;
@@ -23,34 +20,7 @@ typedef struct _E_Devicemgr_Input_Device
    const char *identifier;
    Ecore_Device_Class clas;
    Ecore_Device_Subclass subclas;
-} E_Devicemgr_Input_Device;
-
-typedef struct _E_Devicemgr_Input_Device_Multi
-{
-   double radius_x;
-   double radius_y;
-   double pressure;
-   double angle;
-} E_Devicemgr_Input_Device_Multi;
-
-
-typedef void (*E_Devicemgr_Block_Expire_Cb) (void *data);
-
-typedef struct _E_Devicemgr_Pointer_Boundary
-{
-   struct wl_client *client;
-   E_Client *ec;
-   struct wl_resource *resource;
-} E_Devicemgr_Pointer_Boundary;
-
-typedef enum _E_Devicemgr_Boundary
-{
-   E_DEVICEMGR_BOUNDARY_NONE = 0,
-   E_DEVICEMGR_BOUNDARY_TOP,
-   E_DEVICEMGR_BOUNDARY_RIGHT,
-   E_DEVICEMGR_BOUNDARY_BOTTOM,
-   E_DEVICEMGR_BOUNDARY_LEFT
-} E_Devicemgr_Boundary_Type;
+};
 
 extern E_API E_Devicemgr *e_devicemgr;
 
@@ -60,7 +30,6 @@ E_API int       e_devicemgr_inputgen_key_event_add(const char *key, Eina_Bool pr
 E_API void      e_devicemgr_device_list_lock(void);
 E_API void      e_devicemgr_device_list_unlock(void);
 
-
 ////////////////////////////////////////////////////////////
 // This is for getting/setting internal value of E_Devicemgr
 E_API Eina_List *e_devicemgr_device_list_get(void);