e_comp_wl_input: make an internal header

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

Change-Id: I1f8941b6e98cfa2f2c7f8f2006c42653b3d9ebed

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 5cc952cb85eb86891c4763ecaec24b76fd23efc0..fc08a05c47f379c8e40c9857c59febe50eed9935 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -4,6 +4,7 @@
 #include "e_scale_intern.h"
 #include "e_comp_canvas_intern.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_input_intern.h"
 
 #include "Eeze.h"
 #include <tizen-extension-server-protocol.h>

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 85a13bee30079f9f9fcf6266e6808bb8e7f48281..609d216c353e7c0d26cc067fe619a11223b05d02 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -11,6 +11,7 @@
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_capture_intern.h"
 #include "e_comp_wl_data_intern.h"
+#include "e_comp_wl_input_intern.h"
 
 #include <tizen-extension-server-protocol.h>
 #include <relative-pointer-unstable-v1-server-protocol.h>

diff --git a/src/bin/e_comp_wl_data.c b/src/bin/e_comp_wl_data.c
index b53919b193b52d3eed8d9c89d16da4091454c587..ff41109b10a704d61c528299a5aba1b9eeee45a4 100644 (file)
--- a/src/bin/e_comp_wl_data.c
+++ b/src/bin/e_comp_wl_data.c
@@ -1,6 +1,7 @@
 #define EXECUTIVE_MODE_ENABLED
 #include "e.h"
 #include "e_comp_wl_data_intern.h"
+#include "e_comp_wl_input_intern.h"
 #include "e_comp_canvas_intern.h"
 
 typedef struct {

diff --git a/src/bin/e_comp_wl_input.c b/src/bin/e_comp_wl_input.c
index 51e9025ab5f243e1e3172c6d7720566aa9365b09..2e9e738400acd48711a2ea77777892085875529f 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -1,5 +1,6 @@
 #define EXECUTIVE_MODE_ENABLED
 #include "e.h"
+#include "e_comp_wl_input_intern.h"
 #include "e_utils_intern.h"
 
 #include <sys/mman.h>

diff --git a/src/bin/e_comp_wl_input.h b/src/bin/e_comp_wl_input.h
index cf892105184276244e55878a270ad7414ab13e80..93dc39daaa9ae5e7922a7e9a8c63c3be2a071cbb 100644 (file)
--- a/src/bin/e_comp_wl_input.h
+++ b/src/bin/e_comp_wl_input.h
@@ -1,50 +1,24 @@
 #ifdef E_TYPEDEFS
-#else
-# ifndef E_COMP_WL_INPUT_H
-#  define E_COMP_WL_INPUT_H
 
 E_API extern int E_EVENT_TEXT_INPUT_PANEL_VISIBILITY_CHANGE;
 
 typedef struct _E_Event_Text_Input_Panel_Visibility_Change E_Event_Text_Input_Panel_Visibility_Change;
 
+#else
+#ifndef E_COMP_WL_INPUT_H
+#define E_COMP_WL_INPUT_H
+
 struct _E_Event_Text_Input_Panel_Visibility_Change
 {
    Eina_Bool visible;
 };
 
-EINTERN Eina_Bool e_comp_wl_input_init(void);
-EINTERN void e_comp_wl_input_shutdown(void);
-EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res);
-EINTERN Eina_Bool e_comp_wl_input_relative_pointer_check(struct wl_resource *res);
-EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
-EINTERN Eina_Bool e_comp_wl_input_touch_check(struct wl_resource *res);
-
-EINTERN Eina_Bool e_comp_wl_input_keyboard_modifiers_serialize(void);
-EINTERN void e_comp_wl_input_keyboard_modifiers_update(void);
-EINTERN void e_comp_wl_input_keyboard_state_update(uint32_t keycode, Eina_Bool pressed);
-EINTERN void e_comp_wl_input_keyboard_enter_send(E_Client *client);
-
-EINTERN void e_comp_wl_input_pointer_enabled_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_input_keyboard_enabled_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_input_touch_enabled_set(Eina_Bool enabled);
-EINTERN void e_comp_wl_input_seat_caps_set(unsigned int caps);
-
-E_API Eina_Bool e_comp_wl_input_keymap_cache_file_use_get(void);
+E_API Eina_Bool         e_comp_wl_input_keymap_cache_file_use_get(void);
 E_API Eina_Stringshare *e_comp_wl_input_keymap_path_get(struct xkb_rule_names names);
-EINTERN struct xkb_keymap *e_comp_wl_input_keymap_compile(struct xkb_context *ctx, struct xkb_rule_names names, char **keymap_path);
-E_API void e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *layout, const char *variant, const char *options, struct xkb_context *dflt_ctx, struct xkb_keymap *dflt_map);
-
-EINTERN const char *e_comp_wl_input_keymap_default_rules_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_model_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_layout_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_variant_get(void);
-EINTERN const char *e_comp_wl_input_keymap_default_options_get(void);
-
-E_API void e_comp_wl_input_keyboard_repeat_set(int delay, int rate);
-
-E_API int e_comp_wl_input_keymap_keyname_to_keycode(const char * name);
-EINTERN char *e_comp_wl_input_keymap_keycode_to_keyname(int keycode);
+E_API void              e_comp_wl_input_keymap_set(const char *rules, const char *model, const char *layout, const char *variant, const char *options, struct xkb_context *dflt_ctx, struct xkb_keymap *dflt_map);
+E_API int               e_comp_wl_input_keymap_keyname_to_keycode(const char * name);
 
+E_API void      e_comp_wl_input_keyboard_repeat_set(int delay, int rate);
 E_API Eina_Bool e_comp_wl_input_pointer_constraint_activated_get(void);
 
 # endif

diff --git a/src/bin/e_comp_wl_input_intern.h b/src/bin/e_comp_wl_input_intern.h
new file mode 100644 (file)
index 0000000..ccdbaaa
--- /dev/null
+++ b/src/bin/e_comp_wl_input_intern.h
@@ -0,0 +1,31 @@
+#ifndef E_COMP_WL_INPUT_INTERN_H
+#define E_COMP_WL_INPUT_INTERN_H
+
+EINTERN Eina_Bool e_comp_wl_input_init(void);
+EINTERN void e_comp_wl_input_shutdown(void);
+EINTERN Eina_Bool e_comp_wl_input_pointer_check(struct wl_resource *res);
+EINTERN Eina_Bool e_comp_wl_input_relative_pointer_check(struct wl_resource *res);
+EINTERN Eina_Bool e_comp_wl_input_keyboard_check(struct wl_resource *res);
+EINTERN Eina_Bool e_comp_wl_input_touch_check(struct wl_resource *res);
+
+EINTERN Eina_Bool e_comp_wl_input_keyboard_modifiers_serialize(void);
+EINTERN void e_comp_wl_input_keyboard_modifiers_update(void);
+EINTERN void e_comp_wl_input_keyboard_state_update(uint32_t keycode, Eina_Bool pressed);
+EINTERN void e_comp_wl_input_keyboard_enter_send(E_Client *client);
+
+EINTERN void e_comp_wl_input_pointer_enabled_set(Eina_Bool enabled);
+EINTERN void e_comp_wl_input_keyboard_enabled_set(Eina_Bool enabled);
+EINTERN void e_comp_wl_input_touch_enabled_set(Eina_Bool enabled);
+EINTERN void e_comp_wl_input_seat_caps_set(unsigned int caps);
+
+EINTERN struct xkb_keymap *e_comp_wl_input_keymap_compile(struct xkb_context *ctx, struct xkb_rule_names names, char **keymap_path);
+
+EINTERN const char *e_comp_wl_input_keymap_default_rules_get(void);
+EINTERN const char *e_comp_wl_input_keymap_default_model_get(void);
+EINTERN const char *e_comp_wl_input_keymap_default_layout_get(void);
+EINTERN const char *e_comp_wl_input_keymap_default_variant_get(void);
+EINTERN const char *e_comp_wl_input_keymap_default_options_get(void);
+
+EINTERN char *e_comp_wl_input_keymap_keycode_to_keyname(int keycode);
+
+#endif

diff --git a/src/bin/e_input.c b/src/bin/e_input.c
index 5531fad62ef64270f6948f220f46d402aa7dbdfd..f88cdcfe929a6d199d7d06bc5b55a2d96e768845 100644 (file)
--- a/src/bin/e_input.c
+++ b/src/bin/e_input.c
@@ -1,9 +1,9 @@
 #include "e.h"
 #include "e_input_private.h"
 #include "e_comp_screen_intern.h"
+#include "e_comp_wl_input_intern.h"
 
 #include <Ecore_Input_Evas.h>
-
 #include <cpu-boosting.h>
 #include <pthread.h>
 

diff --git a/src/bin/e_keyrouter.c b/src/bin/e_keyrouter.c
index 3353b1eb2ecc4acdb6b176d541b98378e54890e1..5bcfc2a9e43625ea1e4668540d30b367eda70c0b 100644 (file)
--- a/src/bin/e_keyrouter.c
+++ b/src/bin/e_keyrouter.c
@@ -2,6 +2,7 @@
 #include "e_keyrouter.h"
 #include "e_keyrouter_private.h"
 #include "e_input_event.h"
+#include "e_comp_wl_input_intern.h"
 
 #include <glib.h>
 

diff --git a/src/bin/e_keyrouter_events.c b/src/bin/e_keyrouter_events.c
index 260f7549d8e3c323461d6ebb084381075f614692..8a2e86c3cac68c17bb7a6c841d391d9d63f44ff6 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_comp_wl_input_intern.h"
 
 static void _e_keyrouter_send_key_events(int type, Ecore_Event_Key *ev, E_Device *dev);
 static void _e_keyrouter_send_key_events_press(int type, Ecore_Event_Key *ev, E_Device *dev);

diff --git a/src/bin/e_keyrouter_wl.c b/src/bin/e_keyrouter_wl.c
index ced227c19ed2ebda73313d90ae0a27febd357a88..fdc50f30723e9cf1ff7ce72db0a7ef996f49ea75 100644 (file)
--- a/src/bin/e_keyrouter_wl.c
+++ b/src/bin/e_keyrouter_wl.c
@@ -1,4 +1,5 @@
 #include "e_keyrouter_private.h"
+#include "e_comp_wl_input_intern.h"
 
 void
 e_keyrouter_wl_event_surface_send(struct wl_resource *surface, int key, int mode)