e_input: move the symbols to internal header

Change-Id: I74a98c1a72ee75a905126038c02962d6943593e8

diff --git a/src/bin/inputmgr/e_input.c b/src/bin/inputmgr/e_input.c
index 3235be4c44a19832cdc8680ebd3bcf903335aa06..ed42a73bcd8f0ecff2dccfe38e6ae38d48df8561 100644 (file)
--- a/src/bin/inputmgr/e_input.c
+++ b/src/bin/inputmgr/e_input.c
@@ -446,7 +446,7 @@ EINTERN void e_input_thread_input_id_set(pid_t tid)
    _e_input_thread_error = ret;
 }
 
-E_API pid_t e_input_main_thread_id_get()
+EINTERN pid_t e_input_main_thread_id_get()
 {
    return _e_input_main_thread_id;
 }

diff --git a/src/bin/inputmgr/e_input_device.c b/src/bin/inputmgr/e_input_device.c
index 18b421a2b46db88963a51317aadc60e1c7657065..c576ca1fefe1114313c111fe25e7facb6e33224f 100644 (file)
--- a/src/bin/inputmgr/e_input_device.c
+++ b/src/bin/inputmgr/e_input_device.c
@@ -1145,7 +1145,7 @@ e_input_device_keyboard_has_key(E_Input_Device *dev, const char *device_path, ui
    return ret;
 }
 
-E_API Eina_Bool
+EINTERN Eina_Bool
 e_input_device_is_virtual(E_Input_Device *dev, const char *device_path, Ecore_Device_Class clas)
 {
    Eina_Bool ret = EINA_FALSE;

diff --git a/src/bin/inputmgr/e_input_device_intern.h b/src/bin/inputmgr/e_input_device_intern.h
index 92bf4a5609ee1ae6d6c502a4c8ec39515457f28e..12ccbdaea4a78bd468211268085f31b15b876104 100644 (file)
--- a/src/bin/inputmgr/e_input_device_intern.h
+++ b/src/bin/inputmgr/e_input_device_intern.h
@@ -56,4 +56,6 @@ EINTERN void            e_input_device_output_changed(E_Input_Device *dev);
 EINTERN struct xkb_context *e_input_device_cached_context_get(enum xkb_context_flags flags);
 EINTERN struct xkb_keymap  *e_input_device_cached_keymap_get(struct xkb_context *ctx, const struct xkb_rule_names *names, enum xkb_keymap_compile_flags flags);
 
+EINTERN Eina_Bool       e_input_device_is_virtual(E_Input_Device *dev, const char *device_path, Ecore_Device_Class clas);
+
 #endif

diff --git a/src/bin/inputmgr/e_input_intern.h b/src/bin/inputmgr/e_input_intern.h
index f2b89c6b70b16b4c23ef5c49503c7ff35f3286c7..6ad5331d7df221ce1e3848b92fcdc84d3a2e26a4 100644 (file)
--- a/src/bin/inputmgr/e_input_intern.h
+++ b/src/bin/inputmgr/e_input_intern.h
@@ -3,17 +3,25 @@
 
 #include "e_intern.h"
 #include "e_input.h"
-#include "e_device_intern.h"
 
 #include <libinput.h>
 #include <Ecore_Evas.h>
 
+#define E_INPUT_TYPE (int)0xE0b0beaf
+#define E_INPUT_REQUEST_SERVER ((void *)0x1)
+
 typedef struct _E_Input E_Input;
 
 typedef void (*e_input_relative_motion_cb)(double dx[2], double dy[2], uint64_t time_us);
 typedef void (*e_input_keyboard_grab_key_cb)(uint32_t keycode, uint32_t state, uint32_t timestamp, void *dev);
 typedef void (*E_Input_Thread_Safe_Call_Cb)(void *data);
 
+typedef enum _E_Input_Libinput_Backend
+{
+   E_INPUT_LIBINPUT_BACKEND_UDEV = 1,
+   E_INPUT_LIBINPUT_BACKEND_PATH
+} E_Input_Libinput_Backend;
+
 struct _E_Input
 {
    Ecore_Window window;
@@ -41,6 +49,7 @@ struct _E_Input_Hook
 EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
 EINTERN extern int E_EVENT_INPUT_ENABLED;
 EINTERN extern int E_EVENT_INPUT_DISABLED;
+EINTERN extern int E_EVENT_INPUT_TOUCH_FRAME;
 
 EINTERN int e_input_init(Ecore_Evas *ee);
 EINTERN int e_input_shutdown(void);
@@ -58,6 +67,7 @@ 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 pid_t     e_input_main_thread_id_get();
 EINTERN Eina_Bool e_input_thread_enabled_get(void);
 EINTERN void      e_input_thread_main_id_set(pid_t tid);
 EINTERN void      e_input_thread_input_id_set(pid_t tid);

diff --git a/src/bin/windowmgr/e_dnd.c b/src/bin/windowmgr/e_dnd.c
index b28076a587bb6261e2cf29d09df247f659374d2f..1dd3f821a180566cf8d34f4dd6f9152161798272 100644 (file)
--- a/src/bin/windowmgr/e_dnd.c
+++ b/src/bin/windowmgr/e_dnd.c
@@ -13,6 +13,7 @@
 #include "e_pointer_intern.h"
 #include "e_devicemgr_intern.h"
 #include "e_client_intern.h"
+#include "e_input_device_intern.h"
 
 #include "services/e_service_kvm_intern.h"
 

diff --git a/src/include/e_input.h b/src/include/e_input.h
index 4adde978cc206ebaff2e57a0e67bb22153bce504..f0d05fb91f35b556f1bafe7eca2a350cd4d0d90e 100644 (file)
--- a/src/include/e_input.h
+++ b/src/include/e_input.h
@@ -11,11 +11,8 @@ extern "C" {
 
 #include <xkbcommon/xkbcommon.h>
 
-#define E_INPUT_TYPE (int)0xE0b0beaf
-#define E_INPUT_REQUEST_SERVER ((void *)0x1)
-
 typedef struct _E_Input_Device E_Input_Device;
-typedef void E_Input_Thread_Info;
+typedef void   E_Input_Thread_Info;
 
 typedef enum _E_Input_Hook_Point
 {
@@ -35,30 +32,17 @@ typedef enum _E_Input_Seat_Capabilities
    E_INPUT_SEAT_TOUCH = (1 << 2),
 } E_Input_Seat_Capabilities;
 
-typedef enum _E_Input_Libinput_Backend
-{
-   E_INPUT_LIBINPUT_BACKEND_UDEV = 1,
-   E_INPUT_LIBINPUT_BACKEND_PATH
-} E_Input_Libinput_Backend;
-
-EINTERN extern int E_INPUT_EVENT_SEAT_ADD;
-EINTERN extern int E_EVENT_INPUT_ENABLED;
-EINTERN extern int E_EVENT_INPUT_DISABLED;
-EINTERN extern int E_EVENT_INPUT_TOUCH_FRAME;
-
 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);
 E_API Eina_Bool        e_input_device_mouse_accel_enable_set(const char *device_name, Eina_Bool enable);
 E_API Eina_Bool        e_input_device_keyboard_has_key(E_Input_Device *dev, const char *device_path, uint32_t code);
-E_API Eina_Bool        e_input_device_is_virtual(E_Input_Device *dev, const char *device_path, Ecore_Device_Class clas);
 
 E_API unsigned int e_input_touch_max_count_get();
 
 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 Eina_Bool e_input_thread_mode_get();
 E_API pid_t     e_input_thread_id_get();
 
 E_API pid_t                 e_input_main_thread_id_get();