From 436ec81d5cf0a71841262a141939ee6beca6a84b Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Wed, 10 May 2023 16:30:54 +0900 Subject: [PATCH] e_init: remove e_init files It is deprecated. Change-Id: I5424385daa0e98fe4c55dd023337b16054657d36 --- src/bin/Makefile.mk | 2 - src/bin/e_includes.h | 1 - src/bin/e_init.c | 132 --------------------------------------------------- src/bin/e_init.h | 20 -------- src/bin/e_module.c | 3 -- 5 files changed, 158 deletions(-) delete mode 100644 src/bin/e_init.c delete mode 100644 src/bin/e_init.h diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk index 8d81167..611b1a3 100644 --- a/src/bin/Makefile.mk +++ b/src/bin/Makefile.mk @@ -53,7 +53,6 @@ src/bin/e_icon.h \ src/bin/e_includes.h \ src/bin/e_info_shared_types.h \ src/bin/e_info_server.h \ -src/bin/e_init.h \ src/bin/e_layout.h \ src/bin/e_log.h \ src/bin/e_main.h \ @@ -175,7 +174,6 @@ src/bin/e_grabinput.c \ src/bin/e_hints.c \ src/bin/e_icon.c \ src/bin/e_info_server.c \ -src/bin/e_init.c \ src/bin/e_layout.c \ src/bin/e_log.c \ src/bin/e_maximize.c \ diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h index 5cf020d..8cd570a 100644 --- a/src/bin/e_includes.h +++ b/src/bin/e_includes.h @@ -12,7 +12,6 @@ #include "e_config.h" #include "e_config_data.h" #include "e_icon.h" -#include "e_init.h" #include "e_module.h" #include "e_focus.h" #include "e_place.h" diff --git a/src/bin/e_init.c b/src/bin/e_init.c deleted file mode 100644 index f1e6ce7..0000000 --- a/src/bin/e_init.c +++ /dev/null @@ -1,132 +0,0 @@ -#include "e.h" - -E_API int E_EVENT_INIT_DONE = 0; - -/* local variables */ -static int done = 0; -static int undone = 0; -static Evas_Object *_e_init_object = NULL; -static Eina_List *splash_objs = NULL; -static Ecore_Timer *_e_init_timeout_timer = NULL; - -static Eina_Bool -_e_init_cb_timeout(void *data EINA_UNUSED) -{ - _e_init_timeout_timer = NULL; - e_init_hide(); - return ECORE_CALLBACK_CANCEL; -} - -static void -_e_init_cb_signal_done_ok(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *emission EINA_UNUSED, const char *source EINA_UNUSED) -{ - e_init_hide(); -} - -/* public functions */ -EINTERN int -e_init_init(void) -{ - E_EVENT_INIT_DONE = ecore_event_type_new(); - - done = 0; - return 1; -} - -EINTERN int -e_init_shutdown(void) -{ - /* if not killed, kill init */ - e_init_hide(); - return 1; -} - -E_API void -e_init_show(void) -{ - Evas_Object *o; - E_Zone *zone; - Eina_List *l; - /* exec init */ - - EINA_LIST_FOREACH(e_comp->zones, l, zone) - { - o = edje_object_add(e_comp->evas); - if (!zone->num) - { - e_theme_edje_object_set(o, NULL, "e/init/splash"); - evas_object_name_set(o, "_e_init_object"); - _e_init_object = o; - } - else - { - e_theme_edje_object_set(o, NULL, "e/init/extra_screen"); - evas_object_name_set(o, "_e_init_extra_screen"); - } - evas_object_clip_set(o, zone->bg_clip_object); - evas_object_move(o, zone->x, zone->y); - evas_object_resize(o, zone->w, zone->h); - evas_object_layer_set(o, E_LAYER_MAX - 1000); - evas_object_show(o); - splash_objs = eina_list_append(splash_objs, o); - } - edje_object_part_text_set(_e_init_object, "e.text.disable_text", - "Disable splash screen"); - edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e", - _e_init_cb_signal_done_ok, NULL); - _e_init_timeout_timer = ecore_timer_add(240.0, _e_init_cb_timeout, NULL); - e_init_title_set(_("Enlightenment")); - e_init_version_set(VERSION); -} - -E_API void -e_init_hide(void) -{ - E_FREE_LIST(splash_objs, evas_object_del); - _e_init_object = NULL; - E_FREE_FUNC(_e_init_timeout_timer, ecore_timer_del); -} - -E_API void -e_init_title_set(const char *str) -{ - if (!_e_init_object) return; - edje_object_part_text_set(_e_init_object, "e.text.title", str); -} - -E_API void -e_init_version_set(const char *str) -{ - if (!_e_init_object) return; - edje_object_part_text_set(_e_init_object, "e.text.version", str); -} - -E_API void -e_init_status_set(const char *str) -{ - if (!_e_init_object) return; - edje_object_part_text_set(_e_init_object, "e.text.status", str); -} - -E_API void -e_init_done(void) -{ - undone--; - if (undone > 0) return; - done = 1; - ecore_event_add(E_EVENT_INIT_DONE, NULL, NULL, NULL); -// printf("---DONE %p\n", client); - edje_object_signal_emit(_e_init_object, "e,state,done", "e"); -} - -E_API void -e_init_undone(void) -{ - undone++; -} - -E_API int -e_init_count_get(void) -{ - return undone; -} diff --git a/src/bin/e_init.h b/src/bin/e_init.h deleted file mode 100644 index 0dd3ae9..0000000 --- a/src/bin/e_init.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifdef E_TYPEDEFS -#else -#ifndef E_INIT_H -#define E_INIT_H - -EINTERN int e_init_init(void); -EINTERN int e_init_shutdown(void); -E_API void e_init_show(void); -E_API void e_init_hide(void); -E_API void e_init_title_set(const char *str); -E_API void e_init_version_set(const char *str); -E_API void e_init_status_set(const char *str); -E_API void e_init_done(void); -E_API void e_init_undone(void); -E_API int e_init_count_get(void); - -extern E_API int E_EVENT_INIT_DONE; - -#endif -#endif diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 7ac2e15..4771493 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -229,7 +229,6 @@ e_module_all_load(void) { Eina_List *l, *ll; E_Config_Module *em; - char buf[128]; TRACE_DS_BEGIN(MODULE:ALL LOAD); @@ -271,8 +270,6 @@ e_module_all_load(void) if (eina_hash_find(_e_modules_hash, em->name)) continue; e_util_env_set("E_MODULE_LOAD", em->name); - snprintf(buf, sizeof(buf), _("Loading Module: %s"), em->name); - e_init_status_set(buf); PRCTL("[Winsys] start of Loading Module: %s", em->name); TRACE_DS_BEGIN(MODULE:LOAD MODULE %s, em->name); -- 2.7.4