summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-10-14 14:11:26 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2019-10-14 22:59:37 +0100
commit34a427e2a1f4a6ac03a54b523cb3ad7047753e87 (patch)
tree31f452cae244edbfaf2ac7a0669f2566a887b083 /src/bin
parentb3e7009d65889f61c62f0126343da56e9da88297 (diff)
e init splash - remove almost all status strings as they are not needed
since now we basically bring everything up THEN start rendering once we hit the main loop there is no point having init splash strings anymore. it is no longer an external process. until e's compositor is up you will see nothing anyway. if it is up these days we've finished init as a smoothing out of startup has move everything before main loop starts. so this code is all kind of useless, thus remove. cleanup code.
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/e_main.c66
-rw-r--r--src/bin/e_module.c1
-rw-r--r--src/bin/e_startup.c3
-rw-r--r--src/bin/e_sys.c5
4 files changed, 1 insertions, 74 deletions
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index f1b5989..972f689 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -733,8 +733,6 @@ main(int argc, char **argv)
733 TS("E_Moveresize Init Done"); 733 TS("E_Moveresize Init Done");
734 _e_main_shutdown_push(e_moveresize_shutdown); 734 _e_main_shutdown_push(e_moveresize_shutdown);
735 735
736 if (e_config->show_splash)
737 e_init_status_set(_("Setup Message Bus"));
738 TS("E_Msgbus Init"); 736 TS("E_Msgbus Init");
739 if (!e_msgbus_init()) 737 if (!e_msgbus_init())
740 { 738 {
@@ -761,8 +759,6 @@ main(int argc, char **argv)
761 TS("Efreet Init Done"); 759 TS("Efreet Init Done");
762 _e_main_shutdown_push(efreet_shutdown); 760 _e_main_shutdown_push(efreet_shutdown);
763 761
764 if (e_config->show_splash)
765 e_init_status_set(_("Starting International Support"));
766 TS("E_Intl Post Init"); 762 TS("E_Intl Post Init");
767 if (!e_intl_post_init()) 763 if (!e_intl_post_init())
768 { 764 {
@@ -778,8 +774,6 @@ main(int argc, char **argv)
778 774
779 e_screensaver_preinit(); 775 e_screensaver_preinit();
780 776
781 if (e_config->show_splash)
782 e_init_status_set(_("Setup Actions"));
783 TS("E_Actions Init"); 777 TS("E_Actions Init");
784 if (!e_actions_init()) 778 if (!e_actions_init())
785 { 779 {
@@ -796,8 +790,6 @@ main(int argc, char **argv)
796 e_desk_init(); 790 e_desk_init();
797 e_exehist_init(); 791 e_exehist_init();
798 792
799 if (e_config->show_splash)
800 e_init_status_set(_("Setup Powersave Modes"));
801 TS("E_Powersave Init"); 793 TS("E_Powersave Init");
802 if (!e_powersave_init()) 794 if (!e_powersave_init())
803 { 795 {
@@ -807,11 +799,6 @@ main(int argc, char **argv)
807 TS("E_Powersave Init Done"); 799 TS("E_Powersave Init Done");
808 _e_main_shutdown_push(e_powersave_shutdown); 800 _e_main_shutdown_push(e_powersave_shutdown);
809 801
810 if (e_config->show_splash)
811 e_init_status_set(_("Setup Screensaver"));
812
813 if (e_config->show_splash)
814 e_init_status_set(_("Setup Screens"));
815 TS("Screens Init"); 802 TS("Screens Init");
816 if (!_e_main_screens_init()) 803 if (!_e_main_screens_init())
817 { 804 {
@@ -869,15 +856,11 @@ main(int argc, char **argv)
869 efreet_icon_extension_add(".edj"); 856 efreet_icon_extension_add(".edj");
870 TS("Add Icon Extensions Done"); 857 TS("Add Icon Extensions Done");
871 858
872 if (e_config->show_splash)
873 e_init_status_set(_("Setup ACPI"));
874 TS("E_Acpi Init"); 859 TS("E_Acpi Init");
875 e_acpi_init(); 860 e_acpi_init();
876 TS("E_Acpi Init Done"); 861 TS("E_Acpi Init Done");
877 _e_main_shutdown_push(e_acpi_shutdown); 862 _e_main_shutdown_push(e_acpi_shutdown);
878 863
879 if (e_config->show_splash)
880 e_init_status_set(_("Setup Backlight"));
881 TS("E_Backlight Init"); 864 TS("E_Backlight Init");
882 if (!e_backlight_init()) 865 if (!e_backlight_init())
883 { 866 {
@@ -886,8 +869,6 @@ main(int argc, char **argv)
886 } 869 }
887 TS("E_Backlight Init Done"); 870 TS("E_Backlight Init Done");
888 871
889 if (e_config->show_splash)
890 e_init_status_set(_("Setup DPMS"));
891 TS("E_Dpms Init"); 872 TS("E_Dpms Init");
892 if (!e_dpms_init()) 873 if (!e_dpms_init())
893 { 874 {
@@ -897,8 +878,6 @@ main(int argc, char **argv)
897 TS("E_Dpms Init Done"); 878 TS("E_Dpms Init Done");
898 _e_main_shutdown_push(e_dpms_shutdown); 879 _e_main_shutdown_push(e_dpms_shutdown);
899 880
900 if (e_config->show_splash)
901 e_init_status_set(_("Setup Desklock"));
902 TS("E_Desklock Init"); 881 TS("E_Desklock Init");
903 if (!e_desklock_init()) 882 if (!e_desklock_init())
904 { 883 {
@@ -914,14 +893,10 @@ main(int argc, char **argv)
914 e_screensaver_update(); 893 e_screensaver_update();
915 } 894 }
916 895
917 if (e_config->show_splash)
918 e_init_status_set(_("Setup Paths"));
919 TS("Efreet Paths"); 896 TS("Efreet Paths");
920 _e_main_efreet_paths_init(); 897 _e_main_efreet_paths_init();
921 TS("Efreet Paths Done"); 898 TS("Efreet Paths Done");
922 899
923 if (e_config->show_splash)
924 e_init_status_set(_("Setup System Controls"));
925 TS("E_Sys Init"); 900 TS("E_Sys Init");
926 if (!e_sys_init()) 901 if (!e_sys_init())
927 { 902 {
@@ -931,8 +906,6 @@ main(int argc, char **argv)
931 TS("E_Sys Init Done"); 906 TS("E_Sys Init Done");
932 _e_main_shutdown_push(e_sys_shutdown); 907 _e_main_shutdown_push(e_sys_shutdown);
933 908
934 if (e_config->show_splash)
935 e_init_status_set(_("Setup Execution System"));
936 TS("E_Exec Init"); 909 TS("E_Exec Init");
937 if (!e_exec_init()) 910 if (!e_exec_init())
938 { 911 {
@@ -945,8 +918,6 @@ main(int argc, char **argv)
945 e_comp_all_freeze(); 918 e_comp_all_freeze();
946 TS("E_Comp Freeze Done"); 919 TS("E_Comp Freeze Done");
947 920
948 if (e_config->show_splash)
949 e_init_status_set(_("Setup Filemanager"));
950 TS("E_Fm2 Init"); 921 TS("E_Fm2 Init");
951 if (!e_fm2_init()) 922 if (!e_fm2_init())
952 { 923 {
@@ -956,8 +927,6 @@ main(int argc, char **argv)
956 TS("E_Fm2 Init Done"); 927 TS("E_Fm2 Init Done");
957 _e_main_shutdown_push(e_fm2_shutdown); 928 _e_main_shutdown_push(e_fm2_shutdown);
958 929
959 if (e_config->show_splash)
960 e_init_status_set(_("Setup Message System"));
961 TS("E_Msg Init"); 930 TS("E_Msg Init");
962 if (!e_msg_init()) 931 if (!e_msg_init())
963 { 932 {
@@ -967,8 +936,6 @@ main(int argc, char **argv)
967 TS("E_Msg Init Done"); 936 TS("E_Msg Init Done");
968 _e_main_shutdown_push(e_msg_shutdown); 937 _e_main_shutdown_push(e_msg_shutdown);
969 938
970 if (e_config->show_splash)
971 e_init_status_set(_("Setup Grab Input Handling"));
972 TS("E_Grabinput Init"); 939 TS("E_Grabinput Init");
973 if (!e_grabinput_init()) 940 if (!e_grabinput_init())
974 { 941 {
@@ -978,8 +945,6 @@ main(int argc, char **argv)
978 TS("E_Grabinput Init Done"); 945 TS("E_Grabinput Init Done");
979 _e_main_shutdown_push(e_grabinput_shutdown); 946 _e_main_shutdown_push(e_grabinput_shutdown);
980 947
981 if (e_config->show_splash)
982 e_init_status_set(_("Setup Modules"));
983 TS("E_Module Init"); 948 TS("E_Module Init");
984 if (!e_module_init()) 949 if (!e_module_init())
985 { 950 {
@@ -989,8 +954,6 @@ main(int argc, char **argv)
989 TS("E_Module Init Done"); 954 TS("E_Module Init Done");
990 _e_main_shutdown_push(e_module_shutdown); 955 _e_main_shutdown_push(e_module_shutdown);
991 956
992 if (e_config->show_splash)
993 e_init_status_set(_("Setup Remembers"));
994 TS("E_Remember Init"); 957 TS("E_Remember Init");
995 if (!e_remember_init(after_restart ? E_STARTUP_RESTART : E_STARTUP_START)) 958 if (!e_remember_init(after_restart ? E_STARTUP_RESTART : E_STARTUP_START))
996 { 959 {
@@ -1000,15 +963,11 @@ main(int argc, char **argv)
1000 TS("E_Remember Init Done"); 963 TS("E_Remember Init Done");
1001 _e_main_shutdown_push(e_remember_shutdown); 964 _e_main_shutdown_push(e_remember_shutdown);
1002 965
1003 if (e_config->show_splash)
1004 e_init_status_set(_("Setup Gadgets"));
1005 TS("E_Gadget Init"); 966 TS("E_Gadget Init");
1006 e_gadget_init(); 967 e_gadget_init();
1007 TS("E_Gadget Init Done"); 968 TS("E_Gadget Init Done");
1008 _e_main_shutdown_push((void*)e_gadget_shutdown); 969 _e_main_shutdown_push((void*)e_gadget_shutdown);
1009 970
1010 if (e_config->show_splash)
1011 e_init_status_set(_("Setup Gadcon"));
1012 TS("E_Gadcon Init"); 971 TS("E_Gadcon Init");
1013 if (!e_gadcon_init()) 972 if (!e_gadcon_init())
1014 { 973 {
@@ -1018,8 +977,6 @@ main(int argc, char **argv)
1018 TS("E_Gadcon Init Done"); 977 TS("E_Gadcon Init Done");
1019 _e_main_shutdown_push(e_gadcon_shutdown); 978 _e_main_shutdown_push(e_gadcon_shutdown);
1020 979
1021 if (e_config->show_splash)
1022 e_init_status_set(_("Setup Toolbars"));
1023 TS("E_Toolbar Init"); 980 TS("E_Toolbar Init");
1024 if (!e_toolbar_init()) 981 if (!e_toolbar_init())
1025 { 982 {
@@ -1029,8 +986,6 @@ main(int argc, char **argv)
1029 TS("E_Toolbar Init Done"); 986 TS("E_Toolbar Init Done");
1030 _e_main_shutdown_push(e_toolbar_shutdown); 987 _e_main_shutdown_push(e_toolbar_shutdown);
1031 988
1032 if (e_config->show_splash)
1033 e_init_status_set(_("Setup Wallpaper"));
1034 TS("E_Bg Init"); 989 TS("E_Bg Init");
1035 if (!e_bg_init()) 990 if (!e_bg_init())
1036 { 991 {
@@ -1040,8 +995,6 @@ main(int argc, char **argv)
1040 TS("E_Bg Init Done"); 995 TS("E_Bg Init Done");
1041 _e_main_shutdown_push(e_bg_shutdown); 996 _e_main_shutdown_push(e_bg_shutdown);
1042 997
1043 if (e_config->show_splash)
1044 e_init_status_set(_("Setup Mouse"));
1045 TS("E_Mouse Init"); 998 TS("E_Mouse Init");
1046 if (!e_mouse_update()) 999 if (!e_mouse_update())
1047 { 1000 {
@@ -1050,8 +1003,6 @@ main(int argc, char **argv)
1050 } 1003 }
1051 TS("E_Mouse Init Done"); 1004 TS("E_Mouse Init Done");
1052 1005
1053 if (e_config->show_splash)
1054 e_init_status_set(_("Setup Bindings"));
1055 TS("E_Bindings Init"); 1006 TS("E_Bindings Init");
1056 if (!e_bindings_init()) 1007 if (!e_bindings_init())
1057 { 1008 {
@@ -1061,8 +1012,6 @@ main(int argc, char **argv)
1061 TS("E_Bindings Init Done"); 1012 TS("E_Bindings Init Done");
1062 _e_main_shutdown_push(e_bindings_shutdown); 1013 _e_main_shutdown_push(e_bindings_shutdown);
1063 1014
1064 if (e_config->show_splash)
1065 e_init_status_set(_("Setup Thumbnailer"));
1066 TS("E_Thumb Init"); 1015 TS("E_Thumb Init");
1067 if (!e_thumb_init()) 1016 if (!e_thumb_init())
1068 { 1017 {
@@ -1090,8 +1039,6 @@ main(int argc, char **argv)
1090 TS("E_Update Init Done"); 1039 TS("E_Update Init Done");
1091 _e_main_shutdown_push(e_update_shutdown); 1040 _e_main_shutdown_push(e_update_shutdown);
1092 1041
1093 if (e_config->show_splash)
1094 e_init_status_set(_("Setup Desktop Environment"));
1095 TS("E_Deskenv Init"); 1042 TS("E_Deskenv Init");
1096 if (!e_deskenv_init()) 1043 if (!e_deskenv_init())
1097 { 1044 {
@@ -1101,8 +1048,6 @@ main(int argc, char **argv)
1101 TS("E_Deskenv Init Done"); 1048 TS("E_Deskenv Init Done");
1102 _e_main_shutdown_push(e_deskenv_shutdown); 1049 _e_main_shutdown_push(e_deskenv_shutdown);
1103 1050
1104 if (e_config->show_splash)
1105 e_init_status_set(_("Setup File Ordering"));
1106 TS("E_Order Init"); 1051 TS("E_Order Init");
1107 if (!e_order_init()) 1052 if (!e_order_init())
1108 { 1053 {
@@ -1116,9 +1061,6 @@ main(int argc, char **argv)
1116 e_comp_canvas_keys_grab(); 1061 e_comp_canvas_keys_grab();
1117 TS("E_Comp_Canvas Keys Grab Done"); 1062 TS("E_Comp_Canvas Keys Grab Done");
1118 1063
1119 if (e_config->show_splash)
1120 e_init_status_set(_("Load Modules"));
1121
1122 TS("Run Startup Apps"); 1064 TS("Run Startup Apps");
1123 if (!nostartup) 1065 if (!nostartup)
1124 { 1066 {
@@ -1143,16 +1085,12 @@ main(int argc, char **argv)
1143 1085
1144 if (E_EFL_VERSION_MINIMUM(1, 17, 99)) 1086 if (E_EFL_VERSION_MINIMUM(1, 17, 99))
1145 { 1087 {
1146 if (e_config->show_splash)
1147 e_init_status_set(_("Setup Bryces"));
1148 TS("Bryce Init"); 1088 TS("Bryce Init");
1149 e_bryce_init(); 1089 e_bryce_init();
1150 TS("Bryce Init Done"); 1090 TS("Bryce Init Done");
1151 _e_main_shutdown_push((void*)e_bryce_shutdown); 1091 _e_main_shutdown_push((void*)e_bryce_shutdown);
1152 } 1092 }
1153 1093
1154 if (e_config->show_splash)
1155 e_init_status_set(_("Setup Shelves"));
1156 TS("E_Shelf Init"); 1094 TS("E_Shelf Init");
1157 if (!e_shelf_init()) 1095 if (!e_shelf_init())
1158 { 1096 {
@@ -1165,7 +1103,7 @@ main(int argc, char **argv)
1165 _idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL); 1103 _idle_after = ecore_idle_enterer_add(_e_main_cb_idle_after, NULL);
1166 1104
1167 if (e_config->show_splash) 1105 if (e_config->show_splash)
1168 e_init_status_set(_("Almost Done")); 1106 e_init_status_set(_("Welcome to Enlightenment"));
1169 1107
1170 starting = EINA_FALSE; 1108 starting = EINA_FALSE;
1171 inloop = EINA_TRUE; 1109 inloop = EINA_TRUE;
@@ -1653,8 +1591,6 @@ _e_main_screens_init(void)
1653 TS("Desk Restore Done"); 1591 TS("Desk Restore Done");
1654 1592
1655#ifndef HAVE_WAYLAND_ONLY 1593#ifndef HAVE_WAYLAND_ONLY
1656 if (e_config->show_splash)
1657 e_init_status_set(_("Setup DND"));
1658 TS("E_Dnd Init"); 1594 TS("E_Dnd Init");
1659 if (!e_dnd_init()) 1595 if (!e_dnd_init())
1660 { 1596 {
diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 9217662..548697a 100644
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -157,7 +157,6 @@ e_module_all_load(void)
157 157
158 e_util_env_set("E_MODULE_LOAD", em->name); 158 e_util_env_set("E_MODULE_LOAD", em->name);
159 snprintf(buf, sizeof(buf), _("Loading Module: %s"), em->name); 159 snprintf(buf, sizeof(buf), _("Loading Module: %s"), em->name);
160 e_init_status_set(buf);
161 160
162 m = e_module_new(em->name); 161 m = e_module_new(em->name);
163 if (m) e_module_enable(m); 162 if (m) e_module_enable(m);
diff --git a/src/bin/e_startup.c b/src/bin/e_startup.c
index 9881c5f..ccb37ee 100644
--- a/src/bin/e_startup.c
+++ b/src/bin/e_startup.c
@@ -95,7 +95,6 @@ static void
95_e_startup(void) 95_e_startup(void)
96{ 96{
97 Efreet_Desktop *desktop; 97 Efreet_Desktop *desktop;
98 char buf[1024];
99 const char *s; 98 const char *s;
100 double delay = 0.0; 99 double delay = 0.0;
101 100
@@ -130,8 +129,6 @@ _e_startup(void)
130 ecore_timer_add(delay, _e_startup_delay, desktop); 129 ecore_timer_add(delay, _e_startup_delay, desktop);
131 } 130 }
132 else e_exec(NULL, desktop, NULL, NULL, NULL); 131 else e_exec(NULL, desktop, NULL, NULL, NULL);
133 snprintf(buf, sizeof(buf), _("Starting %s"), desktop->name);
134 e_init_status_set(buf);
135 ecore_job_add(_e_startup_next_cb, NULL); 132 ecore_job_add(_e_startup_next_cb, NULL);
136} 133}
137 134
diff --git a/src/bin/e_sys.c b/src/bin/e_sys.c
index 671fbcd..6a6c024 100644
--- a/src/bin/e_sys.c
+++ b/src/bin/e_sys.c
@@ -700,7 +700,6 @@ _e_sys_cb_timer(void *data EINA_UNUSED)
700 */ 700 */
701 char buf[4096]; 701 char buf[4096];
702 702
703 e_init_status_set(_("Checking System Permissions"));
704 snprintf(buf, sizeof(buf), 703 snprintf(buf, sizeof(buf),
705 "%s/enlightenment/utils/enlightenment_sys -t halt", 704 "%s/enlightenment/utils/enlightenment_sys -t halt",
706 e_prefix_lib_get()); 705 e_prefix_lib_get());
@@ -735,7 +734,6 @@ _e_sys_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
735 } 734 }
736 if ((_e_sys_halt_check_exe) && (ev->exe == _e_sys_halt_check_exe)) 735 if ((_e_sys_halt_check_exe) && (ev->exe == _e_sys_halt_check_exe))
737 { 736 {
738 e_init_status_set(_("System Check Done"));
739 /* exit_code: 0 == OK, 5 == suid root removed, 7 == group id error 737 /* exit_code: 0 == OK, 5 == suid root removed, 7 == group id error
740 * 10 == permission denied, 20 == action undefined */ 738 * 10 == permission denied, 20 == action undefined */
741 if (ev->exit_code == 0) 739 if (ev->exit_code == 0)
@@ -746,7 +744,6 @@ _e_sys_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
746 } 744 }
747 else if ((_e_sys_reboot_check_exe) && (ev->exe == _e_sys_reboot_check_exe)) 745 else if ((_e_sys_reboot_check_exe) && (ev->exe == _e_sys_reboot_check_exe))
748 { 746 {
749 e_init_status_set(_("System Check Done"));
750 if (ev->exit_code == 0) 747 if (ev->exit_code == 0)
751 { 748 {
752 _e_sys_can_reboot = 1; 749 _e_sys_can_reboot = 1;
@@ -755,7 +752,6 @@ _e_sys_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
755 } 752 }
756 else if ((_e_sys_suspend_check_exe) && (ev->exe == _e_sys_suspend_check_exe)) 753 else if ((_e_sys_suspend_check_exe) && (ev->exe == _e_sys_suspend_check_exe))
757 { 754 {
758 e_init_status_set(_("System Check Done"));
759 if (ev->exit_code == 0) 755 if (ev->exit_code == 0)
760 { 756 {
761 _e_sys_can_suspend = 1; 757 _e_sys_can_suspend = 1;
@@ -764,7 +760,6 @@ _e_sys_cb_exit(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
764 } 760 }
765 else if ((_e_sys_hibernate_check_exe) && (ev->exe == _e_sys_hibernate_check_exe)) 761 else if ((_e_sys_hibernate_check_exe) && (ev->exe == _e_sys_hibernate_check_exe))
766 { 762 {
767 e_init_status_set(_("System Check Done"));
768 if (ev->exit_code == 0) 763 if (ev->exit_code == 0)
769 { 764 {
770 _e_sys_can_hibernate = 1; 765 _e_sys_can_hibernate = 1;