e_input: make an internal header

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

Change-Id: I5b3fa4e09e261efd30277934e87597b0de10749b

diff --git a/src/bin/e_client.c b/src/bin/e_client.c
index 2b76949..a8c7106 100644 (file)
--- a/src/bin/e_client.c
+++ b/src/bin/e_client.c
@@ -9,6 +9,7 @@
 #include "e_comp_wl_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_intern.h"
+#include "e_input_intern.h"
 
 #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec)))
 

diff --git a/src/bin/e_comp_screen.c b/src/bin/e_comp_screen.c
index 90efe78..9034c74 100644 (file)
--- a/src/bin/e_comp_screen.c
+++ b/src/bin/e_comp_screen.c
@@ -9,6 +9,7 @@
 #include "e_explicit_sync_intern.h"
 #include "e_comp_wl_tizen_hwc_intern.h"
 #include "e_comp_intern.h"
+#include "e_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 c04e093..6fc55d6 100644 (file)
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -22,6 +22,7 @@
 #include "e_comp_wl_tbm_intern.h"
 #include "e_comp_wl_viewport_intern.h"
 #include "e_comp_intern.h"
+#include "e_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_input.c b/src/bin/e_comp_wl_input.c
index 8bb64f0..1e50b42 100644 (file)
--- a/src/bin/e_comp_wl_input.c
+++ b/src/bin/e_comp_wl_input.c
@@ -3,6 +3,7 @@
 #include "e_comp_wl_input_intern.h"
 #include "e_utils_intern.h"
 #include "e_comp_wl_intern.h"
+#include "e_input_intern.h"
 
 #include <sys/mman.h>
 #include <pixman.h>

diff --git a/src/bin/e_devicemgr_block.c b/src/bin/e_devicemgr_block.c
index a26e3b0..c90d1a3 100644 (file)
--- a/src/bin/e_devicemgr_block.c
+++ b/src/bin/e_devicemgr_block.c
@@ -1,4 +1,5 @@
 #include "e_devicemgr_private.h"
+#include "e_input_intern.h"
 
 static void _e_devicemgr_block_client_cb_destroy(struct wl_listener *l, void *data);
 

diff --git a/src/bin/e_devicemgr_inputgen.c b/src/bin/e_devicemgr_inputgen.c
index 4acac26..6a7e05d 100644 (file)
--- a/src/bin/e_devicemgr_inputgen.c
+++ b/src/bin/e_devicemgr_inputgen.c
@@ -1,4 +1,7 @@
 #include "e_devicemgr_private.h"
+#include "e_input_intern.h"
+
+#include <glib.h>
 
 static Ecore_Device_Class
 _e_devicemgr_inputgen_class_to_ecore_device_class(unsigned int clas)

diff --git a/src/bin/e_devicemgr_keyboard_grab.c b/src/bin/e_devicemgr_keyboard_grab.c
index 7b99239..656a5be 100644 (file)
--- a/src/bin/e_devicemgr_keyboard_grab.c
+++ b/src/bin/e_devicemgr_keyboard_grab.c
@@ -1,4 +1,5 @@
 #include "e_devicemgr_private.h"
+#include "e_input_intern.h"
 #include "e_comp_wl_intern.h"
 
 static void _e_devicemgr_keyboard_grab_client_cb_destroy(struct wl_listener *l, void *data);

diff --git a/src/bin/e_devicemgr_wl.c b/src/bin/e_devicemgr_wl.c
index 22a1fab..5e829a3 100644 (file)
--- a/src/bin/e_devicemgr_wl.c
+++ b/src/bin/e_devicemgr_wl.c
@@ -1,4 +1,5 @@
 #include "e_devicemgr_private.h"
+#include "e_input_intern.h"
 #include "e_comp_wl_intern.h"
 
 #ifdef HAVE_CYNARA

diff --git a/src/bin/e_info_server.c b/src/bin/e_info_server.c
index f904301..f0bbe3b 100644 (file)
--- a/src/bin/e_info_server.c
+++ b/src/bin/e_info_server.c
@@ -15,6 +15,7 @@
 #include "e_comp_wl_tbm_intern.h"
 #include "e_comp_intern.h"
 #include "e_config_intern.h"
+#include "e_input_intern.h"
 
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

diff --git a/src/bin/e_input.c b/src/bin/e_input.c
index b7ba803..687788f 100644 (file)
--- a/src/bin/e_input.c
+++ b/src/bin/e_input.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 #include "e_input_private.h"
 #include "e_comp_screen_intern.h"
 #include "e_comp_wl_input_intern.h"

diff --git a/src/bin/e_input.h b/src/bin/e_input.h
index f9ae920..6e1646f 100644 (file)
--- a/src/bin/e_input.h
+++ b/src/bin/e_input.h
@@ -7,15 +7,12 @@ typedef struct _E_Input E_Input;
 #ifndef E_INPUT_H
 #define E_INPUT_H
 
-#define E_INPUT_TYPE (int)0xE0b0beaf
-
-#define E_INPUT_REQUEST_SERVER ((void *)0x1)
+#include <e_input_event.h>
 
 #include <xkbcommon/xkbcommon.h>
-#include <glib.h>
 
-#include "e_device.h"
-#include "e_input_event.h"
+#define E_INPUT_TYPE (int)0xE0b0beaf
+#define E_INPUT_REQUEST_SERVER ((void *)0x1)
 
 EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
 EINTERN extern int E_EVENT_INPUT_ENABLED;
@@ -95,92 +92,21 @@ struct _E_Input_Device
    unsigned int server_blocked;
 };
 
-EINTERN int e_input_init(Ecore_Evas *ee);
-EINTERN int e_input_shutdown(void);
-EINTERN const char *e_input_base_dir_get(void);
-EINTERN Eina_Bool e_input_thread_enabled_get(void);
-EINTERN E_Input *e_input_get(void);
-EINTERN Ecore_Evas *e_input_ecore_evas_get(E_Input *ei);
-
-EINTERN E_Input_Device *e_input_device_open(void);
-EINTERN Eina_Bool e_input_device_close(E_Input_Device *dev);
-EINTERN void e_input_device_keyboard_cached_context_set(struct xkb_context *ctx);
-EINTERN void e_input_device_keyboard_cached_keymap_set(struct xkb_keymap *map);
-EINTERN Eina_Bool e_input_device_input_backend_create(E_Input_Device *dev, E_Input_Libinput_Backend backend);
-EINTERN Eina_Bool e_input_device_input_create_libinput_udev(E_Input_Device *dev);
-EINTERN Eina_Bool e_input_device_input_create_libinput_path(E_Input_Device *dev);
-EINTERN void e_input_device_window_set(E_Input_Device *dev, Ecore_Window window);
-EINTERN void e_input_device_pointer_xy_get(E_Input_Device *dev, int *x, int *y);
-EINTERN Eina_Bool e_input_device_pointer_left_handed_set(E_Input_Device *dev, Eina_Bool left_handed);
-EINTERN Eina_Bool e_input_device_pointer_rotation_set(E_Input_Device *dev, int rotation);
-EINTERN Eina_Bool e_input_device_touch_rotation_set(E_Input_Device *dev, unsigned int rotation);
-EINTERN void e_input_device_rotation_set(E_Input_Device *dev, unsigned int rotation);
-EINTERN Eina_Bool e_input_device_touch_transformation_set(E_Input_Device *dev, int offset_x, int offset_y, int w, int h);
-
-EINTERN Eina_Bool e_input_enable_input(E_Input_Backend *input);
-EINTERN void e_input_disable_input(E_Input_Backend *input);
-
-EINTERN void e_input_evdev_axis_size_set(E_Input_Evdev *edev, int w, int h);
-EINTERN const char *e_input_evdev_sysname_get(E_Input_Evdev *evdev);
-EINTERN Eina_Bool e_input_evdev_key_remap_enable(E_Input_Evdev *edev, Eina_Bool enable);
-EINTERN Eina_Bool e_input_evdev_key_remap_set(E_Input_Evdev *edev, int *from_keys, int *to_keys, int num);
-EINTERN Eina_Bool e_input_evdev_touch_calibration_set(E_Input_Evdev *edev, float matrix[6]);
-EINTERN Eina_Bool e_input_evdev_mouse_accel_speed_set(E_Input_Evdev *edev, double speed);
-EINTERN unsigned int e_input_evdev_touch_pressed_get(E_Input_Evdev *edev);
-
 E_API const Eina_List *e_input_devices_get(void);
-E_API Eina_Bool e_input_device_pointer_warp(E_Input_Device *dev, int x, int y);
-E_API Eina_Bool e_input_device_mouse_accel_speed_set(E_Input_Device *dev, double speed);
-
-EINTERN const char *e_input_evdev_name_get(E_Input_Evdev *evdev);
-EINTERN Eina_List *e_input_seat_evdev_list_get(E_Input_Seat *seat);
-EINTERN int e_input_evdev_wheel_click_angle_get(E_Input_Evdev *dev);
-EINTERN Ecore_Device *e_input_evdev_get_ecore_device(const char *path, Ecore_Device_Class clas);
-EINTERN E_Device *e_input_evdev_get_e_device(const char *path, Ecore_Device_Class clas);
-
-EINTERN unsigned int e_input_device_touch_pressed_get(E_Input_Device *dev);
-EINTERN Eina_Bool e_input_device_keyboard_remap_set(E_Input_Device *dev, int *from_keys, int *to_keys, int num);
+E_API Eina_Bool        e_input_device_pointer_warp(E_Input_Device *dev, int x, int y);
+E_API Eina_Bool        e_input_device_mouse_accel_speed_set(E_Input_Device *dev, double speed);
+E_API Eina_Bool        e_input_device_mouse_accel_enable_set(const char *device_name, Eina_Bool enable);
 
 E_API unsigned int e_input_touch_max_count_get();
-EINTERN void e_input_touch_max_count_set(unsigned int max_count);
-
-EINTERN Eina_Bool e_input_device_block(E_Input_Device *dev, unsigned int type, void *client);
-EINTERN Eina_Bool e_input_device_unblock(E_Input_Device *dev, void *client);
-EINTERN Eina_Bool e_input_device_output_name_set(E_Input_Device *dev, const char *input, const char *output);
-EINTERN const char *e_input_device_output_name_get(E_Input_Device *dev, const char *input);
-
-EINTERN Eina_Bool e_input_device_seat_name_set(E_Input_Device *dev, const char *input, const char *seat_name);
 
 E_API E_Input_Hook *e_input_hook_add(E_Input_Hook_Point hookpoint, E_Input_Hook_Cb func, const void *data);
-E_API void e_input_hook_del(E_Input_Hook *ch);
+E_API void          e_input_hook_del(E_Input_Hook *ch);
 
 E_API Eina_Bool e_input_thread_mode_get();
-E_API E_Input_Event_Source *e_input_event_source_get();
-EINTERN void e_input_create_event_source(E_Input_Backend *input);
-
-EINTERN Eina_Bool e_input_relative_motion_handler_set(e_input_relative_motion_cb handler);
-EINTERN e_input_relative_motion_cb e_input_relative_motion_handler_get(void);
-
-EINTERN Eina_Bool e_input_keyboard_grab_key_handler_set(e_input_keyboard_grab_key_cb handler);
-EINTERN e_input_keyboard_grab_key_cb e_input_keyboard_grab_key_handler_get(void);
-
-EINTERN Eina_Bool e_input_device_subtype_set(E_Input_Device *dev, const char *input, const char *subtype);
-
-E_API Eina_Bool e_input_device_mouse_accel_enable_set(const char *device_name, Eina_Bool enable);
+E_API pid_t     e_input_thread_id_get();
 
-EINTERN void e_input_flush_keyboard_share_events(void);
-
-E_API pid_t e_input_thread_id_get();
-EINTERN void e_input_thread_id_set(pid_t tid);
-
-E_API pid_t e_input_main_thread_id_get();
-EINTERN void e_input_main_thread_id_set(pid_t tid);
-
-EINTERN void e_input_boost_lock(GMutex *mutex);
-EINTERN void e_input_boost_unlock(GMutex *mutex);
-
-EINTERN void e_input_thread_run(E_Input_Backend *input);
-EINTERN Eina_Bool e_input_libinput_context_create(E_Input_Backend *input);
+E_API pid_t                 e_input_main_thread_id_get();
+E_API E_Input_Event_Source *e_input_event_source_get();
 
 #endif
 #endif

diff --git a/src/bin/e_input_device.c b/src/bin/e_input_device.c
index 17edcd6..090d550 100644 (file)
--- a/src/bin/e_input_device.c
+++ b/src/bin/e_input_device.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 #include "e_input_private.h"
 #include "e_comp_screen_intern.h"
 

diff --git a/src/bin/e_input_evdev.c b/src/bin/e_input_evdev.c
index c21c356..b2d7af8 100644 (file)
--- a/src/bin/e_input_evdev.c
+++ b/src/bin/e_input_evdev.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 #include "e_input_private.h"
 #include "e_device.h"
 #include "e_keyrouter_private.h"

diff --git a/src/bin/e_input_inputs.c b/src/bin/e_input_inputs.c
index 8238006..6298b76 100644 (file)
--- a/src/bin/e_input_inputs.c
+++ b/src/bin/e_input_inputs.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 #include "e_input_private.h"
 #include "e_input_event.h"
 #include "e_keyrouter.h"

diff --git a/src/bin/e_input_intern.h b/src/bin/e_input_intern.h
new file mode 100644 (file)
index 0000000..002d3c5
--- /dev/null
+++ b/src/bin/e_input_intern.h
@@ -0,0 +1,79 @@
+#ifndef E_INPUT_INTERN_H
+#define E_INPUT_INTERN_H
+
+#include "e_device.h"
+
+EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
+EINTERN extern int E_EVENT_INPUT_ENABLED;
+EINTERN extern int E_EVENT_INPUT_DISABLED;
+
+EINTERN int e_input_init(Ecore_Evas *ee);
+EINTERN int e_input_shutdown(void);
+
+EINTERN const char *e_input_base_dir_get(void);
+EINTERN Eina_Bool   e_input_thread_enabled_get(void);
+EINTERN E_Input    *e_input_get(void);
+EINTERN Ecore_Evas *e_input_ecore_evas_get(E_Input *ei);
+
+EINTERN E_Input_Device *e_input_device_open(void);
+EINTERN Eina_Bool       e_input_device_close(E_Input_Device *dev);
+EINTERN void            e_input_device_keyboard_cached_context_set(struct xkb_context *ctx);
+EINTERN void            e_input_device_keyboard_cached_keymap_set(struct xkb_keymap *map);
+EINTERN Eina_Bool       e_input_device_input_backend_create(E_Input_Device *dev, E_Input_Libinput_Backend backend);
+EINTERN Eina_Bool       e_input_device_input_create_libinput_udev(E_Input_Device *dev);
+EINTERN Eina_Bool       e_input_device_input_create_libinput_path(E_Input_Device *dev);
+EINTERN void            e_input_device_window_set(E_Input_Device *dev, Ecore_Window window);
+EINTERN void            e_input_device_pointer_xy_get(E_Input_Device *dev, int *x, int *y);
+EINTERN Eina_Bool       e_input_device_pointer_left_handed_set(E_Input_Device *dev, Eina_Bool left_handed);
+EINTERN Eina_Bool       e_input_device_pointer_rotation_set(E_Input_Device *dev, int rotation);
+EINTERN Eina_Bool       e_input_device_touch_rotation_set(E_Input_Device *dev, unsigned int rotation);
+EINTERN void            e_input_device_rotation_set(E_Input_Device *dev, unsigned int rotation);
+EINTERN Eina_Bool       e_input_device_touch_transformation_set(E_Input_Device *dev, int offset_x, int offset_y, int w, int h);
+EINTERN unsigned int    e_input_device_touch_pressed_get(E_Input_Device *dev);
+EINTERN Eina_Bool       e_input_device_keyboard_remap_set(E_Input_Device *dev, int *from_keys, int *to_keys, int num);
+EINTERN Eina_Bool       e_input_device_block(E_Input_Device *dev, unsigned int type, void *client);
+EINTERN Eina_Bool       e_input_device_unblock(E_Input_Device *dev, void *client);
+EINTERN Eina_Bool       e_input_device_output_name_set(E_Input_Device *dev, const char *input, const char *output);
+EINTERN const char     *e_input_device_output_name_get(E_Input_Device *dev, const char *input);
+EINTERN Eina_Bool       e_input_device_subtype_set(E_Input_Device *dev, const char *input, const char *subtype);
+
+EINTERN Eina_Bool e_input_device_seat_name_set(E_Input_Device *dev, const char *input, const char *seat_name);
+
+EINTERN Eina_Bool e_input_enable_input(E_Input_Backend *input);
+EINTERN void      e_input_disable_input(E_Input_Backend *input);
+
+EINTERN void          e_input_evdev_axis_size_set(E_Input_Evdev *edev, int w, int h);
+EINTERN const char   *e_input_evdev_sysname_get(E_Input_Evdev *evdev);
+EINTERN Eina_Bool     e_input_evdev_key_remap_enable(E_Input_Evdev *edev, Eina_Bool enable);
+EINTERN Eina_Bool     e_input_evdev_key_remap_set(E_Input_Evdev *edev, int *from_keys, int *to_keys, int num);
+EINTERN Eina_Bool     e_input_evdev_touch_calibration_set(E_Input_Evdev *edev, float matrix[6]);
+EINTERN Eina_Bool     e_input_evdev_mouse_accel_speed_set(E_Input_Evdev *edev, double speed);
+EINTERN unsigned int  e_input_evdev_touch_pressed_get(E_Input_Evdev *edev);
+EINTERN const char   *e_input_evdev_name_get(E_Input_Evdev *evdev);
+EINTERN int           e_input_evdev_wheel_click_angle_get(E_Input_Evdev *dev);
+EINTERN Ecore_Device *e_input_evdev_get_ecore_device(const char *path, Ecore_Device_Class clas);
+EINTERN E_Device     *e_input_evdev_get_e_device(const char *path, Ecore_Device_Class clas);
+
+EINTERN Eina_Bool                  e_input_relative_motion_handler_set(e_input_relative_motion_cb handler);
+EINTERN e_input_relative_motion_cb e_input_relative_motion_handler_get(void);
+
+EINTERN Eina_Bool                    e_input_keyboard_grab_key_handler_set(e_input_keyboard_grab_key_cb handler);
+EINTERN e_input_keyboard_grab_key_cb e_input_keyboard_grab_key_handler_get(void);
+
+
+EINTERN void e_input_touch_max_count_set(unsigned int max_count);
+
+EINTERN Eina_List *e_input_seat_evdev_list_get(E_Input_Seat *seat);
+
+EINTERN void e_input_create_event_source(E_Input_Backend *input);
+EINTERN void e_input_flush_keyboard_share_events(void);
+EINTERN void e_input_main_thread_id_set(pid_t tid);
+EINTERN void e_input_boost_lock(GMutex *mutex);
+EINTERN void e_input_boost_unlock(GMutex *mutex);
+
+EINTERN void e_input_thread_id_set(pid_t tid);
+EINTERN void e_input_thread_run(E_Input_Backend *input);
+
+EINTERN Eina_Bool e_input_libinput_context_create(E_Input_Backend *input);
+
+#endif

diff --git a/src/bin/e_keyrouter_private.h b/src/bin/e_keyrouter_private.h
index b7b05f1..62717ec 100644 (file)
--- a/src/bin/e_keyrouter_private.h
+++ b/src/bin/e_keyrouter_private.h
@@ -1,12 +1,15 @@
 #include "e.h"
 #include "e_keyrouter.h"
 #include "e_input_event.h"
+#include "e_device.h"
+
 #ifdef HAVE_CYNARA
 #include <cynara-session.h>
 #include <cynara-client.h>
 #include <cynara-creds-socket.h>
 #include <sys/smack.h>
 #endif
+
 #include <tizen-extension-server-protocol.h>
 
 #define CHECK_ERR(val) if (TIZEN_KEYROUTER_ERROR_NONE != val) return;

diff --git a/src/bin/e_mouse.c b/src/bin/e_mouse.c
index 3a747bf..70986f9 100644 (file)
--- a/src/bin/e_mouse.c
+++ b/src/bin/e_mouse.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 
 EINTERN int
 e_mouse_update(void)

diff --git a/src/bin/e_output.c b/src/bin/e_output.c
index 69d6dfc..612f34e 100644 (file)
--- a/src/bin/e_output.c
+++ b/src/bin/e_output.c
@@ -6,6 +6,7 @@
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_wl_tbm_intern.h"
 #include "e_comp_intern.h"
+#include "e_input_intern.h"
 
 #include <device/board-internal.h>
 

diff --git a/src/bin/e_place.c b/src/bin/e_place.c
index 624e8a1..2a0be50 100644 (file)
--- a/src/bin/e_place.c
+++ b/src/bin/e_place.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 
 EINTERN void
 e_place_zone_region_smart_cleanup(E_Zone *zone)

diff --git a/src/bin/e_pointer.c b/src/bin/e_pointer.c
index 12547db..972a810 100644 (file)
--- a/src/bin/e_pointer.c
+++ b/src/bin/e_pointer.c
@@ -1,4 +1,5 @@
 #include "e.h"
+#include "e_input_intern.h"
 
 /* local variables */
 static Eina_List *_ptrs = NULL;

diff --git a/src/bin/e_signals.c b/src/bin/e_signals.c
index 720d9e3..e566475 100644 (file)
--- a/src/bin/e_signals.c
+++ b/src/bin/e_signals.c
@@ -5,6 +5,7 @@
  */
 #include "e.h"
 #include "e_signals_intern.h"
+#include "e_input_intern.h"
 
 #ifdef HAVE_EXECINFO_H
 # include <execinfo.h>

diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c
index 3c007b3..472e018 100644 (file)
--- a/src/bin/e_zone.c
+++ b/src/bin/e_zone.c
@@ -8,6 +8,7 @@
 #include "e_comp_wl_rsm_intern.h"
 #include "e_comp_wl_subsurface_intern.h"
 #include "e_comp_intern.h"
+#include "e_input_intern.h"
 
 #include <libds-tizen/screen.h>