Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_error.c e_init.c e_main.c
Log Message:
splash is back
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_error.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_error.c 7 Mar 2005 12:23:26 -0000 1.6
+++ e_error.c 8 Mar 2005 06:51:19 -0000 1.7
@@ -242,9 +242,10 @@
edje_object_part_text_set(o, "title", title);
- snprintf(format, sizeof(format), "source='%s' font='%s' size=%d
wrap=word",
- e_path_find(path_themes,
"default.eet"),
- "fonts/Edje Vera", 10);
+ snprintf(format, sizeof(format),
+ "source='%s' font='%s' size=%d wrap=word",
+ e_path_find(path_themes, "default.eet"),
+ "fonts/Edje Vera", 10);
text = evas_object_textblock_add(e);
evas_object_color_set(text, 0, 0, 0, 255);
evas_object_textblock_format_insert(text, format);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_init.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_init.c 7 Mar 2005 09:56:49 -0000 1.9
+++ e_init.c 8 Mar 2005 06:51:21 -0000 1.10
@@ -49,38 +49,32 @@
e_pointer_ecore_evas_set(_e_init_ecore_evas);
ecore_evas_raise(_e_init_ecore_evas);
ecore_evas_show(_e_init_ecore_evas);
-
+
screens = (Evas_List *)e_xinerama_screens_get();
for (l = screens; l; l = l->next)
{
E_Screen *scr;
scr = l->data;
+ o = edje_object_add(_e_init_evas);
/* first screen */
if (l == screens)
{
- o = edje_object_add(_e_init_evas);
edje_object_file_set(o,
/* FIXME: "init.eet" needs to come from
config */
e_path_find(path_init, "init.eet"),
"init/splash");
- evas_object_move(o, scr->x, scr->y);
- evas_object_resize(o, scr->w, scr->h);
- evas_object_show(o);
_e_init_object = o;
}
/* other screens */
else
- {
- o = edje_object_add(_e_init_evas);
- edje_object_file_set(o,
- /* FIXME: "init.eet" needs to come from
config */
- e_path_find(path_init, "init.eet"),
- "init/extra_screen");
- evas_object_move(o, scr->x, scr->y);
- evas_object_resize(o, scr->w, scr->h);
- evas_object_show(o);
- }
+ edje_object_file_set(o,
+ /* FIXME: "init.eet" needs to come from config */
+ e_path_find(path_init, "init.eet"),
+ "init/extra_screen");
+ evas_object_move(o, scr->x, scr->y);
+ evas_object_resize(o, scr->w, scr->h);
+ evas_object_show(o);
}
free(roots);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_main.c 7 Mar 2005 07:27:52 -0000 1.49
+++ e_main.c 8 Mar 2005 06:51:21 -0000 1.50
@@ -154,6 +154,13 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_x_shutdown);
+ if (!e_xinerama_init())
+ {
+ e_error_message_show("Enlightenment cannot setup xinerama wrapping.\n"
+ "This should not happen.");
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(e_xinerama_shutdown);
ecore_x_grab();
@@ -490,7 +497,6 @@
Ecore_X_Window *roots;
int num, i;
- if (!e_xinerama_init()) return 0;
if (!e_atoms_init()) return 0;
if (!e_manager_init()) return 0;
if (!e_container_init()) return 0;
@@ -554,7 +560,6 @@
e_container_shutdown();
e_manager_shutdown();
e_atoms_shutdown();
- e_xinerama_shutdown();
return 1;
}
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
