From: SooChan Lim Date: Wed, 11 Jun 2025 11:38:03 +0000 (+0900) Subject: e_devicemgr: move the symbols to internal headers X-Git-Tag: accepted/tizen/unified/20250614.044607~24 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F325682%2F1;p=platform%2Fupstream%2Fenlightenment.git e_devicemgr: move the symbols to internal headers The symbols which are not used by E20 modules move to the internal headers. Change-Id: Id7012366b659aecafc280b092669ea0b17a2156f --- diff --git a/src/bin/inputmgr/e_devicemgr_block_intern.h b/src/bin/inputmgr/e_devicemgr_block_intern.h index 03b22bf7fb..3162957daf 100644 --- a/src/bin/inputmgr/e_devicemgr_block_intern.h +++ b/src/bin/inputmgr/e_devicemgr_block_intern.h @@ -2,7 +2,7 @@ #define E_DEVICEMGR_BLOCK_INTERN_H #include "e_intern.h" -#include "e_devicemgr.h" +#include "e_devicemgr_intern.h" EINTERN int e_devicemgr_block_add(struct wl_client *client, struct wl_resource *resource, uint32_t clas, uint32_t duration); EINTERN int e_devicemgr_block_remove(struct wl_client *client); diff --git a/src/bin/inputmgr/e_devicemgr_conf_intern.h b/src/bin/inputmgr/e_devicemgr_conf_intern.h index 3928b7e4af..893db57544 100644 --- a/src/bin/inputmgr/e_devicemgr_conf_intern.h +++ b/src/bin/inputmgr/e_devicemgr_conf_intern.h @@ -2,9 +2,11 @@ #define E_DEVICEMGR_CONF_INTERN_H #include "e_intern.h" -#include "e_devicemgr.h" #include "e_config_intern.h" +typedef struct _E_Devicemgr_Conf_Edd E_Devicemgr_Conf_Edd; +typedef struct _E_Devicemgr_Config_Data E_Devicemgr_Config_Data; + struct _E_Devicemgr_Conf_Edd { struct diff --git a/src/bin/inputmgr/e_devicemgr_intern.h b/src/bin/inputmgr/e_devicemgr_intern.h index f55389db7f..595db1b8df 100644 --- a/src/bin/inputmgr/e_devicemgr_intern.h +++ b/src/bin/inputmgr/e_devicemgr_intern.h @@ -3,6 +3,30 @@ #include "e_intern.h" #include "e_devicemgr.h" +#include "e_devicemgr_conf_intern.h" + +#define E_DEVICEMGR_BOUNDARY_MAX 4 + +typedef struct _E_Devicemgr_Input_Device_Multi E_Devicemgr_Input_Device_Multi; +typedef struct _E_Devicemgr_Pointer_Boundary E_Devicemgr_Pointer_Boundary; + +typedef void (*E_Devicemgr_Block_Expire_Cb) (void *data); + +typedef enum _E_Devicemgr_Boundary +{ + E_DEVICEMGR_BOUNDARY_NONE = 0, + E_DEVICEMGR_BOUNDARY_TOP, + E_DEVICEMGR_BOUNDARY_RIGHT, + E_DEVICEMGR_BOUNDARY_BOTTOM, + E_DEVICEMGR_BOUNDARY_LEFT +} E_Devicemgr_Boundary_Type; + +struct _E_Devicemgr_Pointer_Boundary +{ + struct wl_client *client; + E_Client *ec; + struct wl_resource *resource; +}; struct _E_Devicemgr { @@ -67,6 +91,14 @@ struct _E_Devicemgr } relative_motion_grab; }; +struct _E_Devicemgr_Input_Device_Multi +{ + double radius_x; + double radius_y; + double pressure; + double angle; +}; + typedef struct _E_Info_Comp_Obj { unsigned int obj; // u diff --git a/src/include/e_devicemgr.h b/src/include/e_devicemgr.h index e953f7478c..88696495e3 100644 --- a/src/include/e_devicemgr.h +++ b/src/include/e_devicemgr.h @@ -9,13 +9,10 @@ extern "C" { #include -#define E_DEVICEMGR_BOUNDARY_MAX 4 +typedef struct _E_Devicemgr E_Devicemgr; +typedef struct _E_Devicemgr_Input_Device E_Devicemgr_Input_Device; -typedef struct _E_Devicemgr E_Devicemgr; -typedef struct _E_Devicemgr_Conf_Edd E_Devicemgr_Conf_Edd; -typedef struct _E_Devicemgr_Config_Data E_Devicemgr_Config_Data; - -typedef struct _E_Devicemgr_Input_Device +struct _E_Devicemgr_Input_Device { Eina_List *resources; const char *name; @@ -23,34 +20,7 @@ typedef struct _E_Devicemgr_Input_Device const char *identifier; Ecore_Device_Class clas; Ecore_Device_Subclass subclas; -} E_Devicemgr_Input_Device; - -typedef struct _E_Devicemgr_Input_Device_Multi -{ - double radius_x; - double radius_y; - double pressure; - double angle; -} E_Devicemgr_Input_Device_Multi; - - -typedef void (*E_Devicemgr_Block_Expire_Cb) (void *data); - -typedef struct _E_Devicemgr_Pointer_Boundary -{ - struct wl_client *client; - E_Client *ec; - struct wl_resource *resource; -} E_Devicemgr_Pointer_Boundary; - -typedef enum _E_Devicemgr_Boundary -{ - E_DEVICEMGR_BOUNDARY_NONE = 0, - E_DEVICEMGR_BOUNDARY_TOP, - E_DEVICEMGR_BOUNDARY_RIGHT, - E_DEVICEMGR_BOUNDARY_BOTTOM, - E_DEVICEMGR_BOUNDARY_LEFT -} E_Devicemgr_Boundary_Type; +}; extern E_API E_Devicemgr *e_devicemgr; @@ -60,7 +30,6 @@ E_API int e_devicemgr_inputgen_key_event_add(const char *key, Eina_Bool pr E_API void e_devicemgr_device_list_lock(void); E_API void e_devicemgr_device_list_unlock(void); - //////////////////////////////////////////////////////////// // This is for getting/setting internal value of E_Devicemgr E_API Eina_List *e_devicemgr_device_list_get(void);