e_input_thread_client: remove the e_input_thread_client.h file

Change-Id: I43df814bd7de2aeba3efd874628b427f30d883e3

diff --git a/src/bin/inputmgr/e_input_thread_client_intern.h b/src/bin/inputmgr/e_input_thread_client_intern.h
index de26ee5298a1e4c7035ed936218048f206501a95..6f7888a3ddf95dfe9aa20f5d15b4ec467e4c0834 100644 (file)
--- a/src/bin/inputmgr/e_input_thread_client_intern.h
+++ b/src/bin/inputmgr/e_input_thread_client_intern.h
@@ -79,6 +79,28 @@ EINTERN void e_input_thread_client_input_region_append(E_Input_Thread_Client *ec
 EINTERN void e_input_thread_client_input_region_clear(E_Input_Thread_Client *ec);
 EINTERN void e_input_thread_client_surface_set(E_Input_Thread_Client *ec, struct wl_resource *surface);
 
+E_API Eina_Bool e_input_thread_client_video_mode_get(E_Input_Thread_Client *ec);
+E_API Eina_Bool e_input_thread_client_visible_get(E_Input_Thread_Client *ec);
+E_API E_Visibility e_input_thread_client_visibility_get(E_Input_Thread_Client *ec);
+E_API Eina_Bool e_input_thread_client_cursor_mode_get(E_Input_Thread_Client *ec);
+
+E_API Eina_Stringshare *e_input_thread_client_icccm_name_get(E_Input_Thread_Client *ec);
+E_API Eina_Stringshare *e_input_thread_client_netwm_name_get(E_Input_Thread_Client *ec);
+E_API Eina_Stringshare *e_input_thread_client_icccm_title_get(E_Input_Thread_Client *ec);
+E_API Eina_Stringshare *e_input_thread_client_util_name_get(E_Input_Thread_Client *ec);
+
+E_API E_Input_Thread_Client *e_input_thread_client_above_get(E_Input_Thread_Client *ec);
+E_API E_Input_Thread_Client *e_input_thread_client_below_get(E_Input_Thread_Client *ec);
+E_API E_Input_Thread_Client *e_input_thread_client_bottom_get();
+E_API E_Input_Thread_Client *e_input_thread_client_top_get();
+E_API E_Input_Thread_Client *e_input_thread_client_focused_get();
+
+E_API void e_input_thread_client_geometry_get(E_Input_Thread_Client *ec, int *x, int *y, int *w, int *h);
+E_API void e_input_thread_client_input_region_get(E_Input_Thread_Client *ec, GList **region);
+
+E_API E_Input_Thread_Client *e_input_thread_client_from_surface_resource(struct wl_resource *surface_resource);
+E_API struct wl_resource *e_input_thread_client_wl_resource_get(E_Input_Thread_Client *ec);
+
 EINTERN E_Input_Thread_Client * e_input_thread_client_get(E_Client *ec);
 
 EINTERN Eina_Bool e_input_thread_check_client_cloning_needed();

diff --git a/src/bin/server/e_comp_wl.c b/src/bin/server/e_comp_wl.c
index 2206c3e92f9d1c479a006c2728eafa1f95565694..dcbb8c49b6763d3fa0defe1e543026e79db362e6 100644 (file)
--- a/src/bin/server/e_comp_wl.c
+++ b/src/bin/server/e_comp_wl.c
@@ -40,7 +40,6 @@
 #include "e_comp_input_intern.h"
 #include "e_blur_intern.h"
 #include "e_input_thread_client_intern.h"
-#include "e_input_thread_client.h"
 #include "e_display_intern.h"
 #include "e_devicemgr_wl_intern.h"
 #include "e_view_client_intern.h"

diff --git a/src/bin/server/e_comp_wl_input_thread.c b/src/bin/server/e_comp_wl_input_thread.c
index 629e7a1aeca301a8e373774b80a89e83abe37068..e159e98b8f353f7ae14c51ee6d2d27513754ee4a 100644 (file)
--- a/src/bin/server/e_comp_wl_input_thread.c
+++ b/src/bin/server/e_comp_wl_input_thread.c
@@ -4,7 +4,6 @@
 #include "e_comp_wl_input_intern.h"
 #include "e_input_event_intern.h"
 #include "e_input_thread_client_intern.h"
-#include "e_input_thread_client.h"
 #include "e_pointer_intern.h"
 #include "e_input_backend_intern.h"
 #include "e_seat_intern.h"

diff --git a/src/include/e_includes.h b/src/include/e_includes.h
index 7bb03b5ffa1eafe6a53d52dd09142efde7e4e6ca..daed27e04e5f4a084f5880ee4563c5a7d6a74ee2 100644 (file)
--- a/src/include/e_includes.h
+++ b/src/include/e_includes.h
@@ -53,5 +53,4 @@
 #include "e_desk_area.h"
 #include "e_comp_wl_capture.h"
 #include "e_map.h"
-#include "e_input_thread_client.h"
 #include "e_blur_video_capture.h"

diff --git a/src/include/e_input_thread_client.h b/src/include/e_input_thread_client.h
deleted file mode 100644 (file)
index fa7a6e8..0000000
--- a/src/include/e_input_thread_client.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef E_INPUT_THREAD_CLIENT_H
-#define E_INPUT_THREAD_CLIENT_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <e_types.h>
-
-typedef struct _E_Input_Thread_Client E_Input_Thread_Client;
-
-E_API Eina_Bool e_input_thread_client_video_mode_get(E_Input_Thread_Client *ec);
-E_API Eina_Bool e_input_thread_client_visible_get(E_Input_Thread_Client *ec);
-E_API E_Visibility e_input_thread_client_visibility_get(E_Input_Thread_Client *ec);
-E_API Eina_Bool e_input_thread_client_cursor_mode_get(E_Input_Thread_Client *ec);
-
-E_API Eina_Stringshare *e_input_thread_client_icccm_name_get(E_Input_Thread_Client *ec);
-E_API Eina_Stringshare *e_input_thread_client_netwm_name_get(E_Input_Thread_Client *ec);
-E_API Eina_Stringshare *e_input_thread_client_icccm_title_get(E_Input_Thread_Client *ec);
-E_API Eina_Stringshare *e_input_thread_client_util_name_get(E_Input_Thread_Client *ec);
-
-E_API E_Input_Thread_Client *e_input_thread_client_above_get(E_Input_Thread_Client *ec);
-E_API E_Input_Thread_Client *e_input_thread_client_below_get(E_Input_Thread_Client *ec);
-E_API E_Input_Thread_Client *e_input_thread_client_bottom_get();
-E_API E_Input_Thread_Client *e_input_thread_client_top_get();
-E_API E_Input_Thread_Client *e_input_thread_client_focused_get();
-
-E_API void e_input_thread_client_geometry_get(E_Input_Thread_Client *ec, int *x, int *y, int *w, int *h);
-E_API void e_input_thread_client_input_region_get(E_Input_Thread_Client *ec, GList **region);
-
-E_API E_Input_Thread_Client *e_input_thread_client_from_surface_resource(struct wl_resource *surface_resource);
-E_API struct wl_resource *e_input_thread_client_wl_resource_get(E_Input_Thread_Client *ec);
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif

diff --git a/src/include/meson.build b/src/include/meson.build
index 68446de72207db5f7dbd48111f689897786eaf8c..953aca5f6e5ff757e3cb6df429e8912ec318ac8a 100644 (file)
--- a/src/include/meson.build
+++ b/src/include/meson.build
@@ -63,7 +63,6 @@ install_headers([
   'e_input_event.h',
   'e_device.h',
   'e_types.h',
-  'e_input_thread_client.h',
   'e_canvas.h',
   'e_view.h',
   'e_view_rect.h',