e_keyrouter_conf: make e_keyrouter_conf_intern header file

move all e_keyrouter_conf resources to e_keyrouter_conf files

Change-Id: Ib46d7d8cd48ee191a83db8f90a09cf0c9110eb4e

diff --git a/src/bin/inputmgr/e_keyrouter_conf.c b/src/bin/inputmgr/e_keyrouter_conf.c
index 0b35d8bd28ab779aab9f6b0bdcebbd74e1fea590..edee9ec28f4b276026b622965f9ae655724ee2f7 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_conf.c
+++ b/src/bin/inputmgr/e_keyrouter_conf.c
@@ -1,4 +1,4 @@
-#include "e_keyrouter_intern.h"
+#include "e_keyrouter_conf_intern.h"
 #include "e_config_intern.h"
 
 void
@@ -31,7 +31,7 @@ e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig)
 
    if (!kconfig->conf)
      {
-        KLWRN("Failed to find module.keyrouter config file.");
+        WRN("Failed to find module.keyrouter config file.");
      }
 }
 

diff --git a/src/bin/inputmgr/e_keyrouter_conf_intern.h b/src/bin/inputmgr/e_keyrouter_conf_intern.h
new file mode 100644 (file)
index 0000000..8988189
--- /dev/null
+++ b/src/bin/inputmgr/e_keyrouter_conf_intern.h
@@ -0,0 +1,37 @@
+#ifndef E_KEYROUTER_CONF_INTERN_H
+#define E_KEYROUTER_CONF_INTERN_H
+
+#include "e_intern.h"
+
+typedef struct _E_Keyrouter_Conf_Edd    E_Keyrouter_Conf_Edd;
+typedef struct _E_Keyrouter_Config_Data E_Keyrouter_Config_Data;
+typedef struct _E_Keyrouter_Tizen_HWKey E_Keyrouter_Tizen_HWKey;
+
+struct _E_Keyrouter_Conf_Edd
+{
+   int num_keycode;                   // The numbers of keyrouted keycodes defined by xkb-tizen-data
+   int max_keycode;                   // The max value of keycodes
+   int pictureoff_disabled;           // To disable picture_off feature.
+   Eina_List *KeyList;                // The list of routed key data: E_Keyrouter_Tizen_HWKey
+};
+
+struct _E_Keyrouter_Config_Data
+{
+   E_Config_DD *conf_edd;
+   E_Config_DD *conf_hwkeys_edd;
+   E_Keyrouter_Conf_Edd *conf;
+};
+
+struct _E_Keyrouter_Tizen_HWKey
+{
+   char *name;
+   int keycode;
+   int no_privcheck;
+   int repeat;
+};
+
+EINTERN void e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig);
+EINTERN void e_keyrouter_conf_deinit(E_Keyrouter_Config_Data *kconfig);
+
+#endif
+

diff --git a/src/bin/inputmgr/e_keyrouter_intern.h b/src/bin/inputmgr/e_keyrouter_intern.h
index f9fb6ab551705891314d76d75419c6f947922048..99df20a4eb84a5acf100b8e895f8efc1f848377a 100644 (file)
--- a/src/bin/inputmgr/e_keyrouter_intern.h
+++ b/src/bin/inputmgr/e_keyrouter_intern.h
@@ -5,6 +5,7 @@
 #include "e_keyrouter.h"
 #include "e_input_event_intern.h"
 #include "e_device_intern.h"
+#include "e_keyrouter_conf_intern.h"
 
 #define CHECK_ERR(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return;
 #define CHECK_ERR_VAL(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return val;
@@ -24,14 +25,9 @@ typedef unsigned long Time;
 typedef struct _E_Keyrouter  E_Keyrouter;
 typedef struct _E_Keyrouter* E_KeyrouterPtr;
 
-typedef struct _E_Keyrouter_Conf_Edd    E_Keyrouter_Conf_Edd;
-typedef struct _E_Keyrouter_Config_Data E_Keyrouter_Config_Data;
-
 typedef struct _E_Keyrouter_Grab_Request   E_Keyrouter_Grab_Request;
 typedef struct _E_Keyrouter_Ungrab_Request E_Keyrouter_Ungrab_Request;
 
-typedef struct _E_Keyrouter_Tizen_HWKey E_Keyrouter_Tizen_HWKey;
-
 typedef struct _E_Keyrouter_Registered_Window_Info E_Keyrouter_Registered_Window_Info;
 
 typedef enum {
@@ -44,21 +40,6 @@ typedef enum {
   PICTURE_OFF,
 } E_KEYROUTER_MODE;
 
-struct _E_Keyrouter_Conf_Edd
-{
-   int num_keycode;                   // The numbers of keyrouted keycodes defined by xkb-tizen-data
-   int max_keycode;                   // The max value of keycodes
-   int pictureoff_disabled;           // To disable picture_off feature.
-   Eina_List *KeyList;                // The list of routed key data: E_Keyrouter_Tizen_HWKey
-};
-
-struct _E_Keyrouter_Config_Data
-{
-   E_Config_DD *conf_edd;
-   E_Config_DD *conf_hwkeys_edd;
-   E_Keyrouter_Conf_Edd *conf;
-};
-
 struct _E_Keyrouter
 {
    Ecore_Event_Filter *ef_handler;
@@ -107,14 +88,6 @@ struct _E_Keyrouter_Registered_Window_Info
    Eina_List *keys;
 };
 
-struct _E_Keyrouter_Tizen_HWKey
-{
-   char *name;
-   int keycode;
-   int no_privcheck;
-   int repeat;
-};
-
 extern E_API E_KeyrouterPtr krt;
 
 EINTERN int e_keyrouter_init(void);
@@ -131,9 +104,6 @@ EINTERN char               *e_keyrouter_util_cmd_get_from_pid(int pid);
 EINTERN char               *e_keyrouter_util_process_name_get_from_cmd(char *cmd);
 EINTERN const char         *e_keyrouter_util_mode_to_string(uint32_t mode);
 
-EINTERN void e_keyrouter_conf_init(E_Keyrouter_Config_Data *kconfig);
-EINTERN void e_keyrouter_conf_deinit(E_Keyrouter_Config_Data *kconfig);
-
 EINTERN int e_keyrouter_keygrab_set(struct wl_client *client, struct wl_resource *surface, int key, int mode);
 EINTERN int e_keyrouter_keygrab_unset(struct wl_client *client, struct wl_resource *surface, int key);