e_keyrouter: make an internal header

Move the internal resources and the function declaration
to the internal header

Change-Id: Ic834a90f1784178e2c0f4d93f9f019001a32686d

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 6fc55d6..ff2ef30 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -23,6 +23,7 @@
 #include "e_comp_wl_viewport_intern.h"
 #include "e_comp_intern.h"
 #include "e_input_intern.h"
+#include "e_keyrouter_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_input_inputs.c b/src/bin/e_input_inputs.c
index dbb855b..64201c2 100644 (file)
--- a/src/bin/e_input_inputs.c
+++ b/src/bin/e_input_inputs.c
@@ -2,7 +2,7 @@
 #include "e_input_intern.h"
 #include "e_input_private.h"
 #include "e_input_event_intern.h"
-#include "e_keyrouter.h"
+#include "e_keyrouter_intern.h"
 #include "e_comp_wl_intern.h"
 
 #include <glib.h>

diff --git a/src/bin/e_keyrouter.h b/src/bin/e_keyrouter.h
index c9b2aa0..2cf4615 100644 (file)
--- a/src/bin/e_keyrouter.h
+++ b/src/bin/e_keyrouter.h
@@ -34,10 +34,6 @@ typedef Eina_Bool (*E_Keyrouter_Intercept_Hook_Cb) (void *data, int type, Ecore_
 
 extern E_API E_Keyrouter_Info e_keyrouter;
 
-extern EINTERN int E_KEYROUTER_EVENT_KEY_LONG;
-extern EINTERN int E_KEYROUTER_EVENT_KEY_COMPOSITION_PRESS;
-extern EINTERN int E_KEYROUTER_EVENT_KEY_COMPOSITION_RELEASE;
-
 struct _E_Keyrouter_Intercept_Hook
 {
    EINA_INLIST;
@@ -126,20 +122,8 @@ struct _E_Keyrouter_Event_Key_Composition
 };
 
 E_API E_Keyrouter_Intercept_Hook *e_keyrouter_intercept_hook_add(E_Keyrouter_Intercept_Hook_Point hookpoint, E_Keyrouter_Intercept_Hook_Cb func, const void *data);
-E_API void e_keyrouter_intercept_hook_del(E_Keyrouter_Intercept_Hook *ch);
-E_API Eina_Bool e_keyrouter_intercept_hook_call(E_Keyrouter_Intercept_Hook_Point hookpoint, int type, Ecore_Event_Key *event);
-
-EINTERN int e_keyrouter_init(void);
-EINTERN int e_keyrouter_shutdown(void);
-
-EINTERN int e_keyrouter_longkey_add(int keycode, double time);
-EINTERN void e_keyrouter_longkey_del(int keycode);
-EINTERN int e_keyrouter_composition_key_add(int *keys, int count);
-EINTERN void e_keyrouter_composition_key_del(int *keys, int count);
-
-EINTERN void e_keyrouter_event_surface_send(E_Client *ec, int key);
-
-EINTERN void e_keyrouter_input_handler_add(void);
+E_API void                        e_keyrouter_intercept_hook_del(E_Keyrouter_Intercept_Hook *ch);
+E_API Eina_Bool                   e_keyrouter_intercept_hook_call(E_Keyrouter_Intercept_Hook_Point hookpoint, int type, Ecore_Event_Key *event);
 
 EAPI void e_keyrouter_keygrab_list_lock();
 EAPI void e_keyrouter_keygrab_list_unlock();

diff --git a/src/bin/e_keyrouter_events.c b/src/bin/e_keyrouter_events.c
index 24724d8..2a24d38 100644 (file)
--- a/src/bin/e_keyrouter_events.c
+++ b/src/bin/e_keyrouter_events.c
@@ -1,4 +1,5 @@
 #include "e_keyrouter_private.h"
+#include "e_keyrouter_intern.h"
 #include "e_comp_wl_input_intern.h"
 #include "e_comp_wl_intern.h"
 

diff --git a/src/bin/e_keyrouter_intern.h b/src/bin/e_keyrouter_intern.h
new file mode 100644 (file)
index 0000000..3f9f315
--- /dev/null
+++ b/src/bin/e_keyrouter_intern.h
@@ -0,0 +1,21 @@
+#ifndef E_KEYROUTER_INTERN_H
+#define E_KEYROUTER_INTERN_H
+
+extern EINTERN int E_KEYROUTER_EVENT_KEY_LONG;
+extern EINTERN int E_KEYROUTER_EVENT_KEY_COMPOSITION_PRESS;
+extern EINTERN int E_KEYROUTER_EVENT_KEY_COMPOSITION_RELEASE;
+
+EINTERN int e_keyrouter_init(void);
+EINTERN int e_keyrouter_shutdown(void);
+
+EINTERN int  e_keyrouter_longkey_add(int keycode, double time);
+EINTERN void e_keyrouter_longkey_del(int keycode);
+
+EINTERN int  e_keyrouter_composition_key_add(int *keys, int count);
+EINTERN void e_keyrouter_composition_key_del(int *keys, int count);
+
+EINTERN void e_keyrouter_event_surface_send(E_Client *ec, int key);
+
+EINTERN void e_keyrouter_input_handler_add(void);
+
+#endif

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index e8b12d3..c7b2a68 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -13,6 +13,7 @@
 #include "e_comp_intern.h"
 #include "e_prefix_intern.h"
 #include "e_config_intern.h"
+#include "e_keyrouter_intern.h"
 
 #ifdef __linux__
 # include <sys/prctl.h>