Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_container.c e_init.c e_init_main.c e_main.c e_startup.c
e_sys.c
Log Message:
and make the init splash use the right engine!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_container.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -3 -r1.117 -r1.118
--- e_container.c 24 Sep 2007 01:16:47 -0000 1.117
+++ e_container.c 24 Sep 2007 10:53:44 -0000 1.118
@@ -123,6 +123,7 @@
for (i = 0; i < 7; i++)
{
con->layers[i].win = ecore_x_window_input_new(con->win, 0, 0, 1, 1);
+ ecore_x_window_lower(con->layers[i].win);
if (i > 0)
ecore_x_window_configure(con->layers[i].win,
@@ -130,8 +131,6 @@
ECORE_X_WINDOW_CONFIGURE_MASK_STACK_MODE,
0, 0, 0, 0, 0,
con->layers[i - 1].win,
ECORE_X_WINDOW_STACK_ABOVE);
- else
- ecore_x_window_raise(con->layers[i].win);
}
/* Put init win on top */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- e_init.c 24 Sep 2007 01:16:47 -0000 1.44
+++ e_init.c 24 Sep 2007 10:53:44 -0000 1.45
@@ -12,6 +12,7 @@
static Ecore_Ipc_Client *client = NULL;
static int done = 0;
static int undone = 0;
+static Evas_List *stats = NULL;
static int
_e_init_cb_exe_event_del(void *data, int type, void *event)
@@ -115,8 +116,14 @@
EAPI void
e_init_status_set(const char *str)
{
+ if (!init_exe) return;
printf("---STAT %p %s\n", client, str);
- if (!client) return;
+ if (!client)
+ {
+ stats = evas_list_append(stats, evas_stringshare_add(str));
+ return;
+ }
+ printf("---SEND\n");
ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 1, 0, 0, 0, str,
strlen(str) + 1);
ecore_ipc_client_flush(client);
}
@@ -170,6 +177,16 @@
}
}
}
+ }
+ while (stats)
+ {
+ const char *s;
+
+ s = stats->data;
+ stats = evas_list_remove_list(stats, stats);
+ printf("---SPOOL %s\n", s);
+ e_init_status_set(s);
+ evas_stringshare_del(s);
}
}
else if (e->minor == 2)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_init_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_init_main.c 24 Sep 2007 01:16:47 -0000 1.1
+++ e_init_main.c 24 Sep 2007 10:53:44 -0000 1.2
@@ -48,6 +48,13 @@
static int initwins_num = 0;
static Ecore_Ipc_Server *server = NULL;
+static int
+delayed_ok(void *data)
+{
+ kill(getppid(), SIGUSR2);
+ return 0;
+}
+
int
main(int argc, char **argv)
{
@@ -81,6 +88,7 @@
evas_init();
ecore_evas_init();
edje_init();
+ edje_frametime_set(1.0 / 60.0);
ecore_file_init();
ecore_ipc_init();
@@ -91,6 +99,7 @@
e_init_title_set(title);
e_init_version_set(verstr);
e_init_status_set("");
+ ecore_timer_add(0.2, delayed_ok, NULL);
ecore_main_loop_begin();
}
@@ -430,26 +439,26 @@
Evas *e;
Evas_List *l;
- if (engine == 0)
+ if ((engine == 0) || (engine == 1))
{
ee = ecore_evas_software_x11_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_software_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_software_x11_window_get(ee);
}
- else if (engine == 1)
- {
- ee = ecore_evas_xrender_x11_new(NULL, root, 0, 0, w, h);
- ecore_evas_override_set(ee, 1);
- ecore_evas_xrender_x11_direct_resize_set(ee, 1);
- *winret = ecore_evas_xrender_x11_window_get(ee);
- }
else if (engine == 2)
{
ee = ecore_evas_gl_x11_new(NULL, root, 0, 0, w, h);
ecore_evas_override_set(ee, 1);
ecore_evas_gl_x11_direct_resize_set(ee, 1);
*winret = ecore_evas_gl_x11_window_get(ee);
+ }
+ else if (engine == 3)
+ {
+ ee = ecore_evas_xrender_x11_new(NULL, root, 0, 0, w, h);
+ ecore_evas_override_set(ee, 1);
+ ecore_evas_xrender_x11_direct_resize_set(ee, 1);
+ *winret = ecore_evas_xrender_x11_window_get(ee);
}
e = ecore_evas_get(ee);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.231
retrieving revision 1.232
diff -u -3 -r1.231 -r1.232
--- e_main.c 24 Sep 2007 01:16:47 -0000 1.231
+++ e_main.c 24 Sep 2007 10:53:44 -0000 1.232
@@ -446,50 +446,6 @@
"Ecore and check they support the Software
Buffer rendering engine."));
_e_main_shutdown(-1);
}
- TS("test file format support");
- {
- Ecore_Evas *ee;
- Evas_Object *im;
- char buf[4096];
-
- ee = ecore_evas_buffer_new(1, 1);
- if (!ee)
- {
- e_error_message_show(_("Enlightenment found Evas can't create a
buffer canvas. Please check\n"
- "Evas has Software Buffer engine
support.\n"));
- _e_main_shutdown(-1);
- }
- im = evas_object_image_add(ecore_evas_get(ee));
-
- snprintf(buf, sizeof(buf), "%s/data/images/test.png",
e_prefix_data_get());
- evas_object_image_file_set(im, buf, NULL);
- if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
- {
- e_error_message_show(_("Enlightenment found Evas can't load PNG
files. Check Evas has PNG\n"
- "loader support.\n"));
- _e_main_shutdown(-1);
- }
-
- snprintf(buf, sizeof(buf), "%s/data/images/test.jpg",
e_prefix_data_get());
- evas_object_image_file_set(im, buf, NULL);
- if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
- {
- e_error_message_show(_("Enlightenment found Evas can't load JPEG
files. Check Evas has JPEG\n"
- "loader support.\n"));
- _e_main_shutdown(-1);
- }
-
- snprintf(buf, sizeof(buf), "%s/data/images/test.edj",
e_prefix_data_get());
- evas_object_image_file_set(im, buf, "images/0");
- if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
- {
- e_error_message_show(_("Enlightenment found Evas can't load EET
files. Check Evas has EET\n"
- "loader support.\n"));
- _e_main_shutdown(-1);
- }
- evas_object_del(im);
- ecore_evas_free(ee);
- }
// ecore_evas closes evas - deletes objs - deletes fm widgets which tries to
// ipc to slave to stop monitoring - but ipc has been shut down. dont shut
// down.
@@ -532,14 +488,6 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_path_shutdown);
- TS("intl post");
- /* init intl system */
- if (!e_intl_post_init())
- {
- e_error_message_show(_("Enlightenment cannot set up its intl system."));
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(e_intl_post_shutdown);
TS("ipc");
/* setup e ipc service */
if (e_ipc_init())
@@ -582,8 +530,64 @@
e_init_version_set(VERSION);
e_init_show();
_e_main_shutdown_push(e_init_shutdown);
+ pause();
}
+ e_init_status_set(_("Testing Format Support"));
+ TS("test file format support");
+ {
+ Ecore_Evas *ee;
+ Evas_Object *im;
+ char buf[4096];
+
+ ee = ecore_evas_buffer_new(1, 1);
+ if (!ee)
+ {
+ e_error_message_show(_("Enlightenment found Evas can't create a
buffer canvas. Please check\n"
+ "Evas has Software Buffer engine
support.\n"));
+ _e_main_shutdown(-1);
+ }
+ im = evas_object_image_add(ecore_evas_get(ee));
+
+ snprintf(buf, sizeof(buf), "%s/data/images/test.png",
e_prefix_data_get());
+ evas_object_image_file_set(im, buf, NULL);
+ if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+ {
+ e_error_message_show(_("Enlightenment found Evas can't load PNG
files. Check Evas has PNG\n"
+ "loader support.\n"));
+ _e_main_shutdown(-1);
+ }
+
+ snprintf(buf, sizeof(buf), "%s/data/images/test.jpg",
e_prefix_data_get());
+ evas_object_image_file_set(im, buf, NULL);
+ if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+ {
+ e_error_message_show(_("Enlightenment found Evas can't load JPEG
files. Check Evas has JPEG\n"
+ "loader support.\n"));
+ _e_main_shutdown(-1);
+ }
+
+ snprintf(buf, sizeof(buf), "%s/data/images/test.edj",
e_prefix_data_get());
+ evas_object_image_file_set(im, buf, "images/0");
+ if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
+ {
+ e_error_message_show(_("Enlightenment found Evas can't load EET
files. Check Evas has EET\n"
+ "loader support.\n"));
+ _e_main_shutdown(-1);
+ }
+ evas_object_del(im);
+ ecore_evas_free(ee);
+ }
+
+ e_init_status_set(_("Starting International Support"));
+ TS("intl post");
+ /* init intl system */
+ if (!e_intl_post_init())
+ {
+ e_error_message_show(_("Enlightenment cannot set up its intl system."));
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(e_intl_post_shutdown);
TS("efreet");
e_init_status_set(_("Starting Efreet"));
/* init FDO desktop */
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_startup.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_startup.c 24 Sep 2007 01:16:47 -0000 1.13
+++ e_startup.c 24 Sep 2007 10:53:44 -0000 1.14
@@ -29,6 +29,7 @@
else if (mode == E_STARTUP_RESTART)
snprintf(buf, sizeof(buf), "%s/.e/e/applications/restart/.order",
homedir);
startup_apps = e_order_new(buf);
+ printf("startup_apps = %p\n", startup_apps);
if (!startup_apps) return;
start_app_pos = 0;
e_init_undone();
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_sys.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_sys.c 24 Mar 2007 12:54:45 -0000 1.10
+++ e_sys.c 24 Sep 2007 10:53:44 -0000 1.11
@@ -41,8 +41,8 @@
/* this is not optimal - but it does work cleanly */
_e_sys_exe_exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL,
_e_sys_cb_exit, NULL);
- /* delay this for 2.0 seconds while the rest of e starts up */
- ecore_timer_add(2.0, _e_sys_cb_timer, NULL);
+ /* delay this for 1.0 seconds while the rest of e starts up */
+ ecore_timer_add(1.0, _e_sys_cb_timer, NULL);
return 1;
}
@@ -124,7 +124,8 @@
* things
*/
char buf[4096];
-
+
+ e_init_status_set(_("Checking System Permissions"));
snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t halt",
e_prefix_bin_get());
_e_sys_halt_check_exe = ecore_exe_run(buf, NULL);
snprintf(buf, sizeof(buf), "%s/enlightenment_sys -t reboot",
e_prefix_bin_get());
@@ -161,6 +162,7 @@
}
if ((_e_sys_halt_check_exe) && (ev->exe == _e_sys_halt_check_exe))
{
+ e_init_status_set(_("System Check Done"));
/* exit_code: 0 == OK, 5 == suid root removed, 7 == group id error
* 10 == permission denied, 20 == action undefined */
if (ev->exit_code == 0)
@@ -171,6 +173,7 @@
}
else if ((_e_sys_reboot_check_exe) && (ev->exe == _e_sys_reboot_check_exe))
{
+ e_init_status_set(_("System Check Done"));
if (ev->exit_code == 0)
{
_e_sys_can_reboot = 1;
@@ -179,6 +182,7 @@
}
else if ((_e_sys_suspend_check_exe) && (ev->exe ==
_e_sys_suspend_check_exe))
{
+ e_init_status_set(_("System Check Done"));
if (ev->exit_code == 0)
{
_e_sys_can_suspend = 1;
@@ -187,6 +191,7 @@
}
else if ((_e_sys_hibernate_check_exe) && (ev->exe ==
_e_sys_hibernate_check_exe))
{
+ e_init_status_set(_("System Check Done"));
if (ev->exit_code == 0)
{
_e_sys_can_hibernate = 1;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
