From 58dd6a617d89545016686807fcb51f3852a3a712 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 19 Jan 2024 11:47:06 +0900 Subject: [PATCH] e_devicemgr: make an internal header Move the internal resources and the function declaration to the internal header Change-Id: Ia2fe9a4989543de30e256ace9d851e240ff60d3e --- src/bin/Makefile.mk | 1 - src/bin/e_devicemgr.c | 3 ++- src/bin/e_devicemgr.h | 32 ----------------------------- src/bin/e_devicemgr_block.c | 1 + src/bin/e_devicemgr_conf.c | 1 + src/bin/e_devicemgr_input.c | 2 ++ src/bin/e_devicemgr_inputgen.c | 2 ++ src/bin/e_devicemgr_intern.h | 38 +++++++++++++++++++++++++++++++++++ src/bin/e_devicemgr_keyboard_grab.c | 1 + src/bin/e_devicemgr_private.h | 2 -- src/bin/e_devicemgr_wl.c | 1 + src/bin/e_input_evdev.c | 2 +- src/bin/e_input_inputs.c | 1 + src/bin/e_main.c | 1 + src/bin/e_test_helper.c | 1 + src/bin/services/e_service_launcher.c | 1 + 16 files changed, 53 insertions(+), 37 deletions(-) create mode 100644 src/bin/e_devicemgr_intern.h diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 23b5885..6504979 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -120,7 +120,6 @@ src/bin/e_gesture.h \ src/bin/e_input.h \ src/bin/e_dbus_conn.h \ src/bin/e_devicemgr.h \ -src/bin/e_devicemgr_private.h \ src/bin/e_msg.h \ src/bin/e_foreign.h \ src/bin/e_foreign_private.h \ diff --git a/src/bin/e_devicemgr.c b/src/bin/e_devicemgr.c index c613d07..8cdf1d0 100644 --- a/src/bin/e_devicemgr.c +++ b/src/bin/e_devicemgr.c @@ -1,4 +1,5 @@ -//#include "e.h" +#include "e.h" +#include "e_devicemgr_intern.h" #include "e_devicemgr_private.h" E_API E_Devicemgr *e_devicemgr; diff --git a/src/bin/e_devicemgr.h b/src/bin/e_devicemgr.h index 42a3b47..ca41af8 100644 --- a/src/bin/e_devicemgr.h +++ b/src/bin/e_devicemgr.h @@ -1,14 +1,5 @@ #ifdef E_TYPEDEFS -typedef enum _E_Devicemgr_Intercept_Hook_Point -{ - E_DEVICEMGR_INTERCEPT_HOOK_DETENT, - E_DEVICEMGR_INTERCEPT_HOOK_LAST -} E_Devicemgr_Intercept_Hook_Point; - -typedef Eina_Bool (*E_Devicemgr_Intercept_Hook_Cb) (void *data, int point, void *event); -typedef struct _E_Devicemgr_Intercept_Hook E_Devicemgr_Intercept_Hook; - typedef struct _E_Devicemgr_Conf_Edd E_Devicemgr_Conf_Edd; typedef struct _E_Devicemgr_Config_Data E_Devicemgr_Config_Data; typedef struct _E_Devicemgr_Wl_Data E_Devicemgr_Wl_Data; @@ -96,33 +87,10 @@ struct _E_Devicemgr } keyboard_grab; }; -struct _E_Devicemgr_Intercept_Hook -{ - EINA_INLIST; - E_Devicemgr_Intercept_Hook_Point hookpoint; - E_Devicemgr_Intercept_Hook_Cb func; - void *data; - unsigned char delete_me : 1; -}; - -EINTERN E_Devicemgr_Intercept_Hook *e_devicemgr_intercept_hook_add(E_Devicemgr_Intercept_Hook_Point hookpoint, E_Devicemgr_Intercept_Hook_Cb func, const void *data); -EINTERN void e_devicemgr_intercept_hook_del(E_Devicemgr_Intercept_Hook *ch); -EINTERN Eina_Bool e_devicemgr_intercept_hook_call(E_Devicemgr_Intercept_Hook_Point hookpoint, void *event); E_API Eina_Bool e_devicemgr_is_blocking_event(Ecore_Device_Class clas); -EINTERN int e_devicemgr_inputgen_key_event_add(const char *key, Eina_Bool pressed, char *identifier); - -EINTERN int e_devicemgr_init(void); -EINTERN int e_devicemgr_shutdown(void); - -EINTERN Eina_Bool e_devicemgr_detent_is_detent(const char *name); - -EINTERN Eina_Bool e_devicemgr_block_internal_add(Ecore_Device_Class clas, Eina_Bool all_clas, uint32_t duration, E_Devicemgr_Block_Expire_Cb cb_func, void *cb_data); -EINTERN Eina_Bool e_devicemgr_block_internal_remove(E_Devicemgr_Block_Expire_Cb cb_func, void *cb_data); E_API Eina_Bool e_devicemgr_block_reset(void); -EINTERN Eina_Bool e_devicemgr_keyboard_grab_subtype_is_grabbed(Ecore_Device_Subclass subclas); - #endif #endif diff --git a/src/bin/e_devicemgr_block.c b/src/bin/e_devicemgr_block.c index c90d1a3..662d360 100644 --- a/src/bin/e_devicemgr_block.c +++ b/src/bin/e_devicemgr_block.c @@ -1,3 +1,4 @@ +#include "e.h" #include "e_devicemgr_private.h" #include "e_input_intern.h" diff --git a/src/bin/e_devicemgr_conf.c b/src/bin/e_devicemgr_conf.c index e3050dc..8edf2f2 100644 --- a/src/bin/e_devicemgr_conf.c +++ b/src/bin/e_devicemgr_conf.c @@ -1,3 +1,4 @@ +#include "e.h" #include "e_devicemgr_private.h" #define E_DEVICEMGR_INPUT_DFLT_BACK_KEYCODE 166 diff --git a/src/bin/e_devicemgr_input.c b/src/bin/e_devicemgr_input.c index 26053be..3029b5d 100644 --- a/src/bin/e_devicemgr_input.c +++ b/src/bin/e_devicemgr_input.c @@ -1,3 +1,5 @@ +#include "e.h" +#include "e_devicemgr_intern.h" #include "e_devicemgr_private.h" #include "e_input_event.h" #include "e_comp_wl_intern.h" diff --git a/src/bin/e_devicemgr_inputgen.c b/src/bin/e_devicemgr_inputgen.c index 6a7e05d..07145b5 100644 --- a/src/bin/e_devicemgr_inputgen.c +++ b/src/bin/e_devicemgr_inputgen.c @@ -1,3 +1,5 @@ +#include "e.h" +#include "e_devicemgr_intern.h" #include "e_devicemgr_private.h" #include "e_input_intern.h" diff --git a/src/bin/e_devicemgr_intern.h b/src/bin/e_devicemgr_intern.h new file mode 100644 index 0000000..5fa11a6 --- /dev/null +++ b/src/bin/e_devicemgr_intern.h @@ -0,0 +1,38 @@ +#ifndef E_DEVICEMGR_INTERN_H +#define E_DEVICEMGR_INTERN_H + +typedef Eina_Bool (*E_Devicemgr_Intercept_Hook_Cb) (void *data, int point, void *event); +typedef struct _E_Devicemgr_Intercept_Hook E_Devicemgr_Intercept_Hook; + +typedef enum _E_Devicemgr_Intercept_Hook_Point +{ + E_DEVICEMGR_INTERCEPT_HOOK_DETENT, + E_DEVICEMGR_INTERCEPT_HOOK_LAST +} E_Devicemgr_Intercept_Hook_Point; + +struct _E_Devicemgr_Intercept_Hook +{ + EINA_INLIST; + E_Devicemgr_Intercept_Hook_Point hookpoint; + E_Devicemgr_Intercept_Hook_Cb func; + void *data; + unsigned char delete_me : 1; +}; + +EINTERN int e_devicemgr_init(void); +EINTERN int e_devicemgr_shutdown(void); + +EINTERN E_Devicemgr_Intercept_Hook *e_devicemgr_intercept_hook_add(E_Devicemgr_Intercept_Hook_Point hookpoint, E_Devicemgr_Intercept_Hook_Cb func, const void *data); +EINTERN void e_devicemgr_intercept_hook_del(E_Devicemgr_Intercept_Hook *ch); +EINTERN Eina_Bool e_devicemgr_intercept_hook_call(E_Devicemgr_Intercept_Hook_Point hookpoint, void *event); + +EINTERN int e_devicemgr_inputgen_key_event_add(const char *key, Eina_Bool pressed, char *identifier); + +EINTERN Eina_Bool e_devicemgr_detent_is_detent(const char *name); + +EINTERN Eina_Bool e_devicemgr_block_internal_add(Ecore_Device_Class clas, Eina_Bool all_clas, uint32_t duration, E_Devicemgr_Block_Expire_Cb cb_func, void *cb_data); +EINTERN Eina_Bool e_devicemgr_block_internal_remove(E_Devicemgr_Block_Expire_Cb cb_func, void *cb_data); + +EINTERN Eina_Bool e_devicemgr_keyboard_grab_subtype_is_grabbed(Ecore_Device_Subclass subclas); + +#endif diff --git a/src/bin/e_devicemgr_keyboard_grab.c b/src/bin/e_devicemgr_keyboard_grab.c index 656a5be..db1568b 100644 --- a/src/bin/e_devicemgr_keyboard_grab.c +++ b/src/bin/e_devicemgr_keyboard_grab.c @@ -1,3 +1,4 @@ +#include "e.h" #include "e_devicemgr_private.h" #include "e_input_intern.h" #include "e_comp_wl_intern.h" diff --git a/src/bin/e_devicemgr_private.h b/src/bin/e_devicemgr_private.h index 6cf0418..b9f974f 100644 --- a/src/bin/e_devicemgr_private.h +++ b/src/bin/e_devicemgr_private.h @@ -1,5 +1,3 @@ -#include "e.h" -#include "e_devicemgr.h" #ifdef HAVE_CYNARA #include #include diff --git a/src/bin/e_devicemgr_wl.c b/src/bin/e_devicemgr_wl.c index 5e829a3..75a5391 100644 --- a/src/bin/e_devicemgr_wl.c +++ b/src/bin/e_devicemgr_wl.c @@ -1,3 +1,4 @@ +#include "e.h" #include "e_devicemgr_private.h" #include "e_input_intern.h" #include "e_comp_wl_intern.h" diff --git a/src/bin/e_input_evdev.c b/src/bin/e_input_evdev.c index caa3602..6bcabd7 100644 --- a/src/bin/e_input_evdev.c +++ b/src/bin/e_input_evdev.c @@ -4,7 +4,7 @@ #include "e_device_intern.h" #include "e_keyrouter_private.h" #include "e_input_event.h" -#include "e_devicemgr.h" +#include "e_devicemgr_intern.h" #include "e_comp_screen_intern.h" #include diff --git a/src/bin/e_input_inputs.c b/src/bin/e_input_inputs.c index 64201c2..8f96e1d 100644 --- a/src/bin/e_input_inputs.c +++ b/src/bin/e_input_inputs.c @@ -1,4 +1,5 @@ #include "e.h" +#include "e_devicemgr_intern.h" #include "e_input_intern.h" #include "e_input_private.h" #include "e_input_event_intern.h" diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 94b0802..f0b5ac2 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -16,6 +16,7 @@ #include "e_keyrouter_intern.h" #include "e_info_server_intern.h" #include "e_icon_intern.h" +#include "e_devicemgr_intern.h" #ifdef __linux__ # include diff --git a/src/bin/e_test_helper.c b/src/bin/e_test_helper.c index 388b264..4b5bf89 100644 --- a/src/bin/e_test_helper.c +++ b/src/bin/e_test_helper.c @@ -3,6 +3,7 @@ #include "e_policy_wl.h" #include "e_comp_canvas_intern.h" #include "e_comp_intern.h" +#include "e_devicemgr_intern.h" #define BUS "org.enlightenment.wm" #define PATH "/org/enlightenment/wm" diff --git a/src/bin/services/e_service_launcher.c b/src/bin/services/e_service_launcher.c index 74b7bb7..2aae503 100644 --- a/src/bin/services/e_service_launcher.c +++ b/src/bin/services/e_service_launcher.c @@ -3,6 +3,7 @@ #include "services/e_service_launcher.h" #include "e_comp_wl_rsm_intern.h" #include "e_comp_wl_tbm_intern.h" +#include "e_devicemgr_intern.h" #include #include -- 2.7.4