From 9e6164cc923ede96f24a985975c4c27876b102dd Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Fri, 12 Jan 2024 16:28:17 +0900 Subject: [PATCH] e_actions: make an internal header Move the internal resources and the function declaration to the internal header. Change-Id: I6ad1ca1a5bd2bf1a3564783f0bd1f4677e44b951 --- src/bin/e_actions.c | 1 + src/bin/e_actions.h | 42 ----------------------------------------- src/bin/e_actions_intern.h | 47 ++++++++++++++++++++++++++++++++++++++++++++++ src/bin/e_bindings.c | 1 + src/bin/e_client.c | 1 + src/bin/e_comp_wl_shell.c | 1 + src/bin/e_main.c | 2 ++ src/bin/e_zone.c | 1 + 8 files changed, 54 insertions(+), 42 deletions(-) create mode 100644 src/bin/e_actions_intern.h diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c index 7f34838..0db21cd 100644 --- a/src/bin/e_actions.c +++ b/src/bin/e_actions.c @@ -1,4 +1,5 @@ #include "e.h" +#include "e_actions_intern.h" #define INITS diff --git a/src/bin/e_actions.h b/src/bin/e_actions.h index b45cb07..fbf272a 100644 --- a/src/bin/e_actions.h +++ b/src/bin/e_actions.h @@ -1,52 +1,10 @@ #ifdef E_TYPEDEFS typedef struct _E_Action E_Action; -typedef struct _E_Action_Description E_Action_Description; -typedef struct _E_Action_Group E_Action_Group; #else #ifndef E_ACTIONS_H #define E_ACTIONS_H -#define E_ACTION_TYPE 0xE0b01010 - -struct _E_Action -{ - E_Object e_obj_inherit; - - const char *name; - struct - { - void (*go)(E_Object *obj, const char *params); - void (*go_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev); - void (*go_wheel)(E_Object *obj, const char *params, E_Binding_Event_Wheel *ev); - void (*go_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev); - void (*go_signal)(E_Object *obj, const char *params, const char *sig, const char *src); - void (*end)(E_Object *obj, const char *params); - void (*end_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev); - void (*end_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev); - } func; -}; - -struct _E_Action_Description -{ - const char *act_name; - const char *act_cmd; - const char *act_params; - const char *param_example; - int editable; -}; - -struct _E_Action_Group -{ - const char *act_grp; - Eina_List *acts; -}; - -EINTERN int e_actions_init(void); -EINTERN int e_actions_shutdown(void); - -EINTERN E_Action *e_action_find(const char *name); - #endif #endif diff --git a/src/bin/e_actions_intern.h b/src/bin/e_actions_intern.h new file mode 100644 index 0000000..a63ad11 --- /dev/null +++ b/src/bin/e_actions_intern.h @@ -0,0 +1,47 @@ +#ifndef E_ACTIONS_INTERN_H +#define E_ACTIONS_INTERN_H + +#define E_ACTION_TYPE 0xE0b01010 + +typedef struct _E_Action_Description E_Action_Description; +typedef struct _E_Action_Group E_Action_Group; + +struct _E_Action +{ + E_Object e_obj_inherit; + + const char *name; + struct + { + void (*go)(E_Object *obj, const char *params); + void (*go_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev); + void (*go_wheel)(E_Object *obj, const char *params, E_Binding_Event_Wheel *ev); + void (*go_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev); + void (*go_signal)(E_Object *obj, const char *params, const char *sig, const char *src); + void (*end)(E_Object *obj, const char *params); + void (*end_mouse)(E_Object *obj, const char *params, E_Binding_Event_Mouse_Button *ev); + void (*end_key)(E_Object *obj, const char *params, Ecore_Event_Key *ev); + } func; +}; + +struct _E_Action_Description +{ + const char *act_name; + const char *act_cmd; + const char *act_params; + const char *param_example; + int editable; +}; + +struct _E_Action_Group +{ + const char *act_grp; + Eina_List *acts; +}; + +EINTERN int e_actions_init(void); +EINTERN int e_actions_shutdown(void); + +EINTERN E_Action *e_action_find(const char *name); + +#endif diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c index 0b949bb..60dc00c 100644 --- a/src/bin/e_bindings.c +++ b/src/bin/e_bindings.c @@ -1,4 +1,5 @@ #include "e.h" +#include "e_actions_intern.h" /* local subsystem functions */ static void _e_bindings_mouse_free(E_Binding_Mouse *bind); diff --git a/src/bin/e_client.c b/src/bin/e_client.c index ec2b9b1..8a4e55f 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -1,5 +1,6 @@ #include "e.h" #include "e_client_intern.h" +#include "e_actions_intern.h" #define PRI(ec) ((E_Client_Private *)e_object_data_get(E_OBJECT(ec))) diff --git a/src/bin/e_comp_wl_shell.c b/src/bin/e_comp_wl_shell.c index 4cccbc5..6561a5d 100644 --- a/src/bin/e_comp_wl_shell.c +++ b/src/bin/e_comp_wl_shell.c @@ -1,5 +1,6 @@ #include "e.h" #include "e_client_intern.h" +#include "e_actions_intern.h" #include #include #include diff --git a/src/bin/e_main.c b/src/bin/e_main.c index 97bad01..850a46a 100644 --- a/src/bin/e_main.c +++ b/src/bin/e_main.c @@ -1,4 +1,6 @@ #include "e.h" +#include "e_actions_intern.h" + #ifdef __linux__ # include #endif diff --git a/src/bin/e_zone.c b/src/bin/e_zone.c index e944cd0..71e7b04 100644 --- a/src/bin/e_zone.c +++ b/src/bin/e_zone.c @@ -1,6 +1,7 @@ #include "e.h" #include "e_client_intern.h" #include "e_desk_intern.h" +#include "e_actions_intern.h" #include #define ZONE_EC_DATA_KEY "E_Zone_Client" -- 2.7.4