From eabdfd987b727e6bf2379bcad3cd2856d35de9d1 Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 19 Jan 2024 19:20:03 +0900 Subject: [PATCH] e_grabinput: make an internal header Move the internal resources and the function declaration to the internal header Change-Id: Id7ca34bb79d6f5ba3b4225e3519d4242ef127d14 --- src/bin/Makefile.mk | 1 - src/bin/e_comp.c | 1 + src/bin/e_comp_wl.c | 1 + src/bin/e_dnd.c | 1 + src/bin/e_grabinput.c | 1 + src/bin/e_grabinput.h | 26 -------------------------- src/bin/e_grabinput_intern.h | 23 +++++++++++++++++++++++ src/bin/e_includes.h | 1 - src/bin/e_main.c | 1 + 9 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 src/bin/e_grabinput.h create mode 100644 src/bin/e_grabinput_intern.h diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index b81cd36dfd..97be5170cc 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -43,7 +43,6 @@ src/bin/e_env.h \ src/bin/e_eom.h \ src/bin/e_focus_policy_iface.h \ src/bin/e_focus.h \ -src/bin/e_grabinput.h \ src/bin/e.h \ src/bin/e_hints.h \ src/bin/e_includes.h \ diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index d400d6e649..0cd0da0614 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -10,6 +10,7 @@ #include "e_hwc_intern.h" #include "e_hwc_window_intern.h" #include "e_hwc_windows_intern.h" +#include "e_grabinput_intern.h" #include #include "services/e_service_quickpanel.h" diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c index e88253e062..612a8c114f 100644 --- a/src/bin/e_comp_wl.c +++ b/src/bin/e_comp_wl.c @@ -27,6 +27,7 @@ #include "e_error_intern.h" #include "e_pointer_intern.h" #include "e_presentation_time_intern.h" +#include "e_grabinput_intern.h" #include #include diff --git a/src/bin/e_dnd.c b/src/bin/e_dnd.c index 1ccdfe9da3..3058dbe31c 100644 --- a/src/bin/e_dnd.c +++ b/src/bin/e_dnd.c @@ -1,5 +1,6 @@ #include "e.h" #include "e_comp_wl_data_intern.h" +#include "e_grabinput_intern.h" struct _E_Drag_Hook { diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index a49db04ebf..b4db144f3e 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -1,4 +1,5 @@ #include "e.h" +#include "e_grabinput_intern.h" /* local subsystem functions */ static void _e_grabinput_focus(Ecore_Window win, E_Focus_Method method); diff --git a/src/bin/e_grabinput.h b/src/bin/e_grabinput.h deleted file mode 100644 index 52a1b38cfd..0000000000 --- a/src/bin/e_grabinput.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifdef E_TYPEDEFS - -typedef enum _E_Focus_Method -{ - E_FOCUS_METHOD_NO_INPUT, - E_FOCUS_METHOD_LOCALLY_ACTIVE, - E_FOCUS_METHOD_GLOBALLY_ACTIVE, - E_FOCUS_METHOD_PASSIVE -} E_Focus_Method; - -#else -#ifndef E_GRABINPUT_H -#define E_GRABINPUT_H - -EINTERN int e_grabinput_init(void); -EINTERN int e_grabinput_shutdown(void); -EINTERN int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win); -EINTERN void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win); -EINTERN void e_grabinput_focus(Ecore_Window win, E_Focus_Method method); -EINTERN double e_grabinput_last_focus_time_get(void); -EINTERN Ecore_Window e_grabinput_last_focus_win_get(void); -EINTERN Ecore_Window e_grabinput_key_win_get(void); -EINTERN Ecore_Window e_grabinput_mouse_win_get(void); - -#endif -#endif diff --git a/src/bin/e_grabinput_intern.h b/src/bin/e_grabinput_intern.h new file mode 100644 index 0000000000..3134473ba3 --- /dev/null +++ b/src/bin/e_grabinput_intern.h @@ -0,0 +1,23 @@ +#ifndef E_GRABINPUT_INTERN_H +#define E_GRABINPUT_INTERN_H + +typedef enum _E_Focus_Method +{ + E_FOCUS_METHOD_NO_INPUT, + E_FOCUS_METHOD_LOCALLY_ACTIVE, + E_FOCUS_METHOD_GLOBALLY_ACTIVE, + E_FOCUS_METHOD_PASSIVE +} E_Focus_Method; + +EINTERN int e_grabinput_init(void); +EINTERN int e_grabinput_shutdown(void); + +EINTERN int e_grabinput_get(Ecore_Window mouse_win, int confine_mouse, Ecore_Window key_win); +EINTERN void e_grabinput_release(Ecore_Window mouse_win, Ecore_Window key_win); +EINTERN void e_grabinput_focus(Ecore_Window win, E_Focus_Method method); +EINTERN double e_grabinput_last_focus_time_get(void); +EINTERN Ecore_Window e_grabinput_last_focus_win_get(void); +EINTERN Ecore_Window e_grabinput_key_win_get(void); +EINTERN Ecore_Window e_grabinput_mouse_win_get(void); + +#endif diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index 3ad3f720f0..b3b0bfc90d 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -19,7 +19,6 @@ #include "e_info_server.h" #include "e_info_server_input.h" #include "e_prefix.h" -#include "e_grabinput.h" #include "e_screensaver.h" #include "e_dpms.h" #include "e_eom.h" diff --git a/src/bin/e_main.c b/src/bin/e_main.c index b3f4bbc577..a7b8c9846f 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -24,6 +24,7 @@ #include "e_mouse_intern.h" #include "e_module_intern.h" #include "e_magnifier_intern.h" +#include "e_grabinput_intern.h" #ifdef __linux__ # include -- 2.34.1