enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

splash is back 

SVN revision: 13661
This commit is contained in:
Carsten Haitzler 2005-03-08 06:51:21 +00:00
parent ab9ec17cac
commit 1094849a20
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/e_error.c
View File

@ -242,9 +242,10 @@ e_error_message_manager_show(E_Manager *man, char *title, char *txt)
edje_object_part_text_set(o, "title", title); edje_object_part_text_set(o, "title", title);
snprintf(format, sizeof(format), "source='%s' font='%s' size=%d wrap=word", snprintf(format, sizeof(format),
e_path_find(path_themes, "default.eet"), "source='%s' font='%s' size=%d wrap=word",
"fonts/Edje Vera", 10); e_path_find(path_themes, "default.eet"),
"fonts/Edje Vera", 10);
text = evas_object_textblock_add(e); text = evas_object_textblock_add(e);
evas_object_color_set(text, 0, 0, 0, 255); evas_object_color_set(text, 0, 0, 0, 255);
evas_object_textblock_format_insert(text, format); evas_object_textblock_format_insert(text, format);

24
src/bin/e_init.c
View File

@ -49,38 +49,32 @@ e_init_init(void)
e_pointer_ecore_evas_set(_e_init_ecore_evas); e_pointer_ecore_evas_set(_e_init_ecore_evas);
ecore_evas_raise(_e_init_ecore_evas); ecore_evas_raise(_e_init_ecore_evas);
ecore_evas_show(_e_init_ecore_evas); ecore_evas_show(_e_init_ecore_evas);
screens = (Evas_List *)e_xinerama_screens_get(); screens = (Evas_List *)e_xinerama_screens_get();
for (l = screens; l; l = l->next) for (l = screens; l; l = l->next)
{ {
E_Screen *scr; E_Screen *scr;
scr = l->data; scr = l->data;
o = edje_object_add(_e_init_evas);
/* first screen */ /* first screen */
if (l == screens) if (l == screens)
{ {
o = edje_object_add(_e_init_evas);
edje_object_file_set(o, edje_object_file_set(o,
/* FIXME: "init.eet" needs to come from config */ /* FIXME: "init.eet" needs to come from config */
e_path_find(path_init, "init.eet"), e_path_find(path_init, "init.eet"),
"init/splash"); "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; _e_init_object = o;
} }
/* other screens */ /* other screens */
else else
{ edje_object_file_set(o,
o = edje_object_add(_e_init_evas); /* FIXME: "init.eet" needs to come from config */
edje_object_file_set(o, e_path_find(path_init, "init.eet"),
/* FIXME: "init.eet" needs to come from config */ "init/extra_screen");
e_path_find(path_init, "init.eet"), evas_object_move(o, scr->x, scr->y);
"init/extra_screen"); evas_object_resize(o, scr->w, scr->h);
evas_object_move(o, scr->x, scr->y); evas_object_show(o);
evas_object_resize(o, scr->w, scr->h);
evas_object_show(o);
}
} }
free(roots); free(roots);

9
src/bin/e_main.c
View File

@ -154,6 +154,13 @@ main(int argc, char **argv)
_e_main_shutdown(-1); _e_main_shutdown(-1);
} }
_e_main_shutdown_push(_e_main_x_shutdown); _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(); ecore_x_grab();
@ -490,7 +497,6 @@ _e_main_screens_init(void)
Ecore_X_Window *roots; Ecore_X_Window *roots;
int num, i; int num, i;
if (!e_xinerama_init()) return 0;
if (!e_atoms_init()) return 0; if (!e_atoms_init()) return 0;
if (!e_manager_init()) return 0; if (!e_manager_init()) return 0;
if (!e_container_init()) return 0; if (!e_container_init()) return 0;
@ -554,7 +560,6 @@ _e_main_screens_shutdown(void)
e_container_shutdown(); e_container_shutdown();
e_manager_shutdown(); e_manager_shutdown();
e_atoms_shutdown(); e_atoms_shutdown();
e_xinerama_shutdown();
return 1; return 1;
} }