summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-09 15:54:58 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-06-09 15:54:58 +0100
commit1aad79dbe7110d3a13a3c7fdcf81320b9d530a14 (patch)
tree47d0bc46f7e373fefb82de57c62624b547cd1d23 /src
parentcf0a43b844b15444bc8e3b0be92ec76dd11c3614 (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/bin/e_config.c2
-rw-r--r--src/bin/e_config.h1
-rw-r--r--src/bin/e_main.c22
-rw-r--r--src/bin/e_start_main.c7
-rw-r--r--src/modules/conf_theme/e_int_config_theme.c7
5 files changed, 16 insertions, 23 deletions
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 11a0405ab..bbe845984 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -462,7 +462,6 @@ _e_config_edd_init(Eina_Bool old)
462 /**/ /* == already configurable via ipc */ 462 /**/ /* == already configurable via ipc */
463 E_CONFIG_VAL(D, T, config_version, INT); /**/ 463 E_CONFIG_VAL(D, T, config_version, INT); /**/
464 E_CONFIG_VAL(D, T, config_type, UINT); /**/ 464 E_CONFIG_VAL(D, T, config_type, UINT); /**/
465 E_CONFIG_VAL(D, T, show_splash, INT); /**/
466 E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/ 465 E_CONFIG_VAL(D, T, desktop_default_background, STR); /**/
467 E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/ 466 E_CONFIG_LIST(D, T, desktop_backgrounds, _e_config_desktop_bg_edd); /**/
468 E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/ 467 E_CONFIG_LIST(D, T, desktop_names, _e_config_desktop_name_edd); /**/
@@ -1630,7 +1629,6 @@ e_config_load(void)
1630 1629
1631 /* limit values so they are sane */ 1630 /* limit values so they are sane */
1632 E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0); 1631 E_CONFIG_LIMIT(e_config->menus_scroll_speed, 1.0, 20000.0);
1633 E_CONFIG_LIMIT(e_config->show_splash, 0, 1);
1634 E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0); 1632 E_CONFIG_LIMIT(e_config->menus_fast_mouse_move_threshhold, 1.0, 2000.0);
1635 E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0); 1633 E_CONFIG_LIMIT(e_config->menus_click_drag_timeout, 0.0, 10.0);
1636 E_CONFIG_LIMIT(e_config->window_maximize_animate, 0, 1); 1634 E_CONFIG_LIMIT(e_config->window_maximize_animate, 0, 1);
diff --git a/src/bin/e_config.h b/src/bin/e_config.h
index c761235c4..08922a498 100644
--- a/src/bin/e_config.h
+++ b/src/bin/e_config.h
@@ -55,7 +55,6 @@ struct _E_Config
55{ 55{
56 int config_version; // INTERNAL 56 int config_version; // INTERNAL
57 E_Config_Profile_Type config_type; // INTERNAL 57 E_Config_Profile_Type config_type; // INTERNAL
58 int show_splash; // GUI
59 const char *desktop_default_background; // GUI 58 const char *desktop_default_background; // GUI
60 Eina_List *desktop_backgrounds; // GUI 59 Eina_List *desktop_backgrounds; // GUI
61 const char *desktop_default_name; // DEAD 60 const char *desktop_default_name; // DEAD
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index e9a594468..a9bf081f8 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -810,18 +810,15 @@ main(int argc, char **argv)
810 TS("E_Scale Init Done"); 810 TS("E_Scale Init Done");
811 _e_main_shutdown_push(e_scale_shutdown); 811 _e_main_shutdown_push(e_scale_shutdown);
812 812
813 if (e_config->show_splash) 813 TS("E_Splash Init");
814 if (!e_init_init())
814 { 815 {
815 TS("E_Splash Init"); 816 e_error_message_show(_("Enlightenment cannot set up its init screen.\n"));
816 if (!e_init_init()) 817 _e_main_shutdown(-1);
817 {
818 e_error_message_show(_("Enlightenment cannot set up its init screen.\n"));
819 _e_main_shutdown(-1);
820 }
821 TS("E_Splash Init Done");
822 _e_main_shutdown_push(e_init_shutdown);
823 } 818 }
824 if (!((!e_config->show_splash) || (after_restart))) 819 TS("E_Splash Init Done");
820 _e_main_shutdown_push(e_init_shutdown);
821 if (!after_restart)
825 { 822 {
826 TS("E_Splash Show"); 823 TS("E_Splash Show");
827 e_init_show(); 824 e_init_show();
@@ -1084,15 +1081,14 @@ main(int argc, char **argv)
1084 1081
1085 _idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL); 1082 _idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL);
1086 1083
1087 if (e_config->show_splash) 1084 e_init_status_set(_("Welcome to Enlightenment"));
1088 e_init_status_set(_("Welcome to Enlightenment"));
1089 1085
1090 starting = EINA_FALSE; 1086 starting = EINA_FALSE;
1091 inloop = EINA_TRUE; 1087 inloop = EINA_TRUE;
1092 1088
1093 e_util_env_set("E_RESTART", "1"); 1089 e_util_env_set("E_RESTART", "1");
1094 1090
1095 if (e_config->show_splash && (!after_restart)) 1091 if (!after_restart)
1096 ecore_timer_add(2.0, _e_main_cb_startup_fake_end, NULL); 1092 ecore_timer_add(2.0, _e_main_cb_startup_fake_end, NULL);
1097 1093
1098 if (after_restart) 1094 if (after_restart)
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index b8c3a145c..a1777c7cd 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -31,6 +31,10 @@
31#include <signal.h> 31#include <signal.h>
32#include <errno.h> 32#include <errno.h>
33 33
34#ifdef HAVE_MALLOC_H
35# include <malloc.h>
36#endif
37
34#include <Eina.h> 38#include <Eina.h>
35 39
36#define myasprintf(__b, __fmt, args...) do { \ 40#define myasprintf(__b, __fmt, args...) do { \
@@ -799,6 +803,9 @@ main(int argc, char **argv)
799 803
800 /* now loop until done */ 804 /* now loop until done */
801not_done: 805not_done:
806#ifdef HAVE_MALLOC_TRIM
807 malloc_trim(0);
808#endif
802 result = waitpid(child, &status, WNOHANG); 809 result = waitpid(child, &status, WNOHANG);
803 /* Wait for E */ 810 /* Wait for E */
804 if (!result) result = waitpid(-1, &status, 0); 811 if (!result) result = waitpid(-1, &status, 0);
diff --git a/src/modules/conf_theme/e_int_config_theme.c b/src/modules/conf_theme/e_int_config_theme.c
index 1003bf0e1..b90210ed6 100644
--- a/src/modules/conf_theme/e_int_config_theme.c
+++ b/src/modules/conf_theme/e_int_config_theme.c
@@ -23,7 +23,6 @@ struct _E_Config_Dialog_Data
23 Eio_File *init[2]; 23 Eio_File *init[2];
24 Eina_List *theme_init; /* list of eio ops to load themes */ 24 Eina_List *theme_init; /* list of eio ops to load themes */
25 Eina_List *themes; /* eet file refs to work around load locking */ 25 Eina_List *themes; /* eet file refs to work around load locking */
26 int show_splash;
27 Eina_Bool free E_BITFIELD; 26 Eina_Bool free E_BITFIELD;
28 27
29 /* Dialog */ 28 /* Dialog */
@@ -559,7 +558,6 @@ _fill_data(E_Config_Dialog_Data *cfdata)
559 char path[PATH_MAX]; 558 char path[PATH_MAX];
560 size_t len; 559 size_t len;
561 560
562 cfdata->show_splash = e_config->show_splash;
563 theme = elm_theme_get(NULL); 561 theme = elm_theme_get(NULL);
564 if (theme) 562 if (theme)
565 { 563 {
@@ -777,8 +775,6 @@ _basic_create_widgets(E_Config_Dialog *cfd EINA_UNUSED, Evas *evas, E_Config_Dia
777 e_widget_table_object_align_append(il, o, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0); 775 e_widget_table_object_align_append(il, o, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0);
778 } 776 }
779 777
780 o = e_widget_check_add(evas, _("Show startup splash"), &cfdata->show_splash);
781 e_widget_table_object_align_append(il, o, 2, 0, 1, 1, 0, 0, 1, 0, 0, 0);
782 e_widget_list_object_append(of, il, 0, 0, 0.0); 778 e_widget_list_object_append(of, il, 0, 0, 0.0);
783 779
784 { 780 {
@@ -812,9 +808,6 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED, E_Config_Dialog_Data *cfdata
812 808
813 file = ecore_file_file_get(cfdata->theme); 809 file = ecore_file_file_get(cfdata->theme);
814 name = ecore_file_strip_ext(file); 810 name = ecore_file_strip_ext(file);
815 if (!!e_config->show_splash != !!cfdata->show_splash)
816 e_config_save_queue();
817 e_config->show_splash = cfdata->show_splash;
818 if (name) 811 if (name)
819 { 812 {
820 const char *theme = elm_theme_get(NULL); 813 const char *theme = elm_theme_get(NULL);