init splash - make it default as it no longer needs an option

it used ot be a separate process to run to hide e starting in the bg
on a slow hdd loading modules etc. but due to compisitng and other
changes its all internal now, so keep it on always as it guarantees a
better smoother experience with less complexity to maintain.
This commit is contained in:
Carsten Haitzler 2020-06-09 15:54:58 +01:00
parent cf0a43b844
commit 1aad79dbe7
5 changed files with 16 additions and 23 deletions

View File

@ -462,7 +462,6 @@ _e_config_edd_init(Eina_Bool old)
/**/ /* == already configurable via ipc */ /**/ /* == already configurable via ipc */
E_CONFIG_VAL(D, T, config_version, INT); /**/ E_CONFIG_VAL(D, T, config_version, INT); /**/
E_CONFIG_VAL(D, T, config_type, UINT); /**/ E_CONFIG_VAL(D, T, config_type, UINT); /**/
E_CONFIG_VAL(D, T, show_splash, INT); /**/
E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/ E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/ E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/
E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/ E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/
@ -1630,7 +1629,6 @@ e_config_load(void)
/* limit values so they are sane */ /* limit values so they are sane */
E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0); E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
E_CONFIG_LIMIT(e_config->show_splash, 0, 1);
E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0); E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0); E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
E_CONFIG_LIMIT(e_config->window_maximize_animate, 0, 1); E_CONFIG_LIMIT(e_config->window_maximize_animate, 0, 1);

View File

@ -55,7 +55,6 @@ struct _E_Config
{ {
int config_version; // INTERNAL int config_version; // INTERNAL
E_Config_Profile_Type config_type; // INTERNAL E_Config_Profile_Type config_type; // INTERNAL
int show_splash; // GUI
const char *desktop_default_background; // GUI const char *desktop_default_background; // GUI
Eina_List *desktop_backgrounds; // GUI Eina_List *desktop_backgrounds; // GUI
const char *desktop_default_name; // DEAD const char *desktop_default_name; // DEAD

View File

@ -810,18 +810,15 @@ main(int argc, char **argv)
TS("E_Scale Init Done"); TS("E_Scale Init Done");
_e_main_shutdown_push(e_scale_shutdown); _e_main_shutdown_push(e_scale_shutdown);
if (e_config->show_splash) TS("E_Splash Init");
if (!e_init_init())
{ {
TS("E_Splash Init"); e_error_message_show(_("Enlightenment cannot set up its init screen.\n"));
if (!e_init_init()) _e_main_shutdown(-1);
{
e_error_message_show(_("Enlightenment cannot set up its init screen.\n"));
_e_main_shutdown(-1);
}
TS("E_Splash Init Done");
_e_main_shutdown_push(e_init_shutdown);
} }
if (!((!e_config->show_splash) || (after_restart))) TS("E_Splash Init Done");
_e_main_shutdown_push(e_init_shutdown);
if (!after_restart)
{ {
TS("E_Splash Show"); TS("E_Splash Show");
e_init_show(); e_init_show();
@ -1084,15 +1081,14 @@ main(int argc, char **argv)
_idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL); _idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL);
if (e_config->show_splash) e_init_status_set(_("Welcome to Enlightenment"));
e_init_status_set(_("Welcome to Enlightenment"));
starting = EINA_FALSE; starting = EINA_FALSE;
inloop = EINA_TRUE; inloop = EINA_TRUE;
e_util_env_set("E_RESTART", "1"); e_util_env_set("E_RESTART", "1");
if (e_config->show_splash && (!after_restart)) if (!after_restart)
ecore_timer_add(2.0, _e_main_cb_startup_fake_end, NULL); ecore_timer_add(2.0, _e_main_cb_startup_fake_end, NULL);
if (after_restart) if (after_restart)

View File

@ -31,6 +31,10 @@
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_MALLOC_H
# include <malloc.h>
#endif
#include <Eina.h> #include <Eina.h>
#define myasprintf(__b, __fmt, args...) do { \ #define myasprintf(__b, __fmt, args...) do { \
@ -799,6 +803,9 @@ main(int argc, char **argv)
/* now loop until done */ /* now loop until done */
not_done: not_done:
#ifdef HAVE_MALLOC_TRIM
malloc_trim(0);
#endif
result = waitpid(child, &status, WNOHANG); result = waitpid(child, &status, WNOHANG);
/* Wait for E */ /* Wait for E */
if (!result) result = waitpid(-1, &status, 0); if (!result) result = waitpid(-1, &status, 0);

View File

@ -23,7 +23,6 @@ struct _E_Config_Dialog_Data
Eio_File *init[2]; Eio_File *init[2];
Eina_List *theme_init; /* list of eio ops to load themes */ Eina_List *theme_init; /* list of eio ops to load themes */
Eina_List *themes; /* eet file refs to work around load locking */ Eina_List *themes; /* eet file refs to work around load locking */
int show_splash;
Eina_Bool free E_BITFIELD; Eina_Bool free E_BITFIELD;
/* Dialog */ /* Dialog */
@ -559,7 +558,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
char path[PATH_MAX]; char path[PATH_MAX];
size_t len; size_t len;
cfdata->show_splash = e_config->show_splash;
theme = elm_theme_get(NULL); theme = elm_theme_get(NULL);
if (theme) if (theme)
{ {
@ -777,8 +775,6 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
e_widget_table_object_align_append(il, o, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0); e_widget_table_object_align_append(il, o, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0);
} }
o = e_widget_check_add(evas, _("Show startup splash"), &cfdata->show_splash);
e_widget_table_object_align_append(il, o, 2, 0, 1, 1, 0, 0, 1, 0, 0, 0);
e_widget_list_object_append(of, il, 0, 0, 0.0); e_widget_list_object_append(of, il, 0, 0, 0.0);
{ {
@ -812,9 +808,6 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
file = ecore_file_file_get(cfdata->theme); file = ecore_file_file_get(cfdata->theme);
name = ecore_file_strip_ext(file); name = ecore_file_strip_ext(file);
if (!!e_config->show_splash != !!cfdata->show_splash)
e_config_save_queue();
e_config->show_splash = cfdata->show_splash;
if (name) if (name)
{ {
const char *theme = elm_theme_get(NULL); const char *theme = elm_theme_get(NULL);