diff --git a/src/bin/e_init.c b/src/bin/e_init.c index 99507f06e..202f104e9 100644 --- a/src/bin/e_init.c +++ b/src/bin/e_init.c @@ -69,8 +69,8 @@ e_init_show(void) snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_init \'%s\' \'%i\' \'%s\' \'%s\'", - e_prefix_lib_get(), theme, - e_config->font_hinting, tit, ver); + e_prefix_lib_get(), theme, + e_config->font_hinting, tit, ver); printf("RUN INIT: %s\n", buf); free(theme); free(tit); @@ -106,12 +106,12 @@ e_init_status_set(const char *str) // printf("---STAT %p %s\n", client, str); if (!client) { - stats = eina_list_append(stats, eina_stringshare_add(str)); - return; + stats = eina_list_append(stats, eina_stringshare_add(str)); + return; } // printf("---SEND\n"); ecore_ipc_client_send(client, E_IPC_DOMAIN_INIT, 1, 0, 0, 0, (void *)str, - strlen(str) + 1); + strlen(str) + 1); ecore_ipc_client_flush(client); } @@ -141,43 +141,43 @@ e_init_client_data(Ecore_Ipc_Event_Client_Data *e) if (!client) client = e->client; if (e->minor == 1) { - if (e->data) - { - int i, num; - Ecore_X_Window *initwins; + if (e->data) + { + int i, num; + Ecore_X_Window *initwins; - num = e->size / sizeof(Ecore_X_Window); - initwins = e->data; - for (i = 0; i < num; i+= 2) - { - Eina_List *l; - E_Manager *man; + num = e->size / sizeof(Ecore_X_Window); + initwins = e->data; + for (i = 0; i < num; i += 2) + { + Eina_List *l; + E_Manager *man; - EINA_LIST_FOREACH(e_manager_list(), l, man) - { - if (man->root == initwins[i + 0]) - { - man->initwin = initwins[i + 1]; - ecore_x_window_raise(man->initwin); - } - } - } - } - while (stats) - { - const char *s; + EINA_LIST_FOREACH(e_manager_list(), l, man) + { + if (man->root == initwins[i + 0]) + { + man->initwin = initwins[i + 1]; + ecore_x_window_raise(man->initwin); + } + } + } + } + while (stats) + { + const char *s; - s = stats->data; - stats = eina_list_remove_list(stats, stats); + s = stats->data; + stats = eina_list_remove_list(stats, stats); // printf("---SPOOL %s\n", s); - e_init_status_set(s); - eina_stringshare_del(s); - } + e_init_status_set(s); + eina_stringshare_del(s); + } } else if (e->minor == 2) { - e_config->show_splash = e->ref; - e_config_save_queue(); + e_config->show_splash = e->ref; + e_config_save_queue(); } if (done) e_init_done(); } @@ -188,14 +188,14 @@ e_init_client_del(Ecore_Ipc_Event_Client_Del *e) // printf("---del init client\n"); if (e->client == client) { - Eina_List *l; - E_Manager *man; + Eina_List *l; + E_Manager *man; - client = NULL; - EINA_LIST_FOREACH(e_manager_list(), l, man) - { - man->initwin = 0; - } + client = NULL; + EINA_LIST_FOREACH(e_manager_list(), l, man) + { + man->initwin = 0; + } } } @@ -214,9 +214,10 @@ _e_init_cb_exe_event_del(void *data __UNUSED__, int type __UNUSED__, void *event ev = event; if (ev->exe == init_exe) { - /* init exited */ + /* init exited */ // ecore_exe_free(init_exe); - init_exe = NULL; + init_exe = NULL; } return ECORE_CALLBACK_RENEW; } + diff --git a/src/bin/e_init_main.c b/src/bin/e_init_main.c index 5b6e40104..b8e4c6028 100644 --- a/src/bin/e_init_main.c +++ b/src/bin/e_init_main.c @@ -53,17 +53,17 @@ #undef E_TYPEDEFS #include "e_xinerama.h" -EINTERN int e_init_init(void); -EINTERN int e_init_shutdown(void); -EAPI void e_init_show(void); -EAPI void e_init_hide(void); -EAPI void e_init_title_set(const char *str); -EAPI void e_init_version_set(const char *str); -EAPI void e_init_status_set(const char *str); -EAPI void e_init_done(void); +EINTERN int e_init_init(void); +EINTERN int e_init_shutdown(void); +EAPI void e_init_show(void); +EAPI void e_init_hide(void); +EAPI void e_init_title_set(const char *str); +EAPI void e_init_version_set(const char *str); +EAPI void e_init_status_set(const char *str); +EAPI void e_init_done(void); /* local subsystem functions */ -static int _e_ipc_init(void); +static int _e_ipc_init(void); static Eina_Bool _e_ipc_cb_server_add(void *data, int type, void *event); static Eina_Bool _e_ipc_cb_server_del(void *data, int type, void *event); static Eina_Bool _e_ipc_cb_server_data(void *data, int type, void *event); @@ -95,22 +95,26 @@ main(int argc, char **argv) for (i = 1; i < argc; i++) { - if ((i == 1) && - ((!strcmp(argv[i], "-h")) || - (!strcmp(argv[i], "-help")) || - (!strcmp(argv[i], "--help")))) - { - printf( - "This is an internal tool for Enlightenment.\n" - "do not use it.\n" - ); - exit(0); - } - else if (!theme) theme = argv[i]; - else if (font_hinting < 0) font_hinting = atoi(argv[i]); - else if (!title) title = argv[i]; - else if (!verstr) verstr = argv[i]; - else fpath = eina_list_append(fpath, argv[i]); + if ((i == 1) && + ((!strcmp(argv[i], "-h")) || + (!strcmp(argv[i], "-help")) || + (!strcmp(argv[i], "--help")))) + { + printf( + "This is an internal tool for Enlightenment.\n" + "do not use it.\n" + ); + exit(0); + } + else if (!theme) + theme = argv[i]; + else if (font_hinting < 0) + font_hinting = atoi(argv[i]); + else if (!title) + title = argv[i]; + else if (!verstr) + verstr = argv[i]; + else fpath = eina_list_append(fpath, argv[i]); } ecore_init(); @@ -128,19 +132,19 @@ main(int argc, char **argv) if (_e_ipc_init()) { - e_init_init(); - e_init_show(); - 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(); + e_init_init(); + e_init_show(); + 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(); } if (_e_ipc_server) { - ecore_ipc_server_del(_e_ipc_server); - _e_ipc_server = NULL; + ecore_ipc_server_del(_e_ipc_server); + _e_ipc_server = NULL; } ecore_ipc_shutdown(); @@ -162,11 +166,11 @@ _e_ipc_init(void) sdir = getenv("E_IPC_SOCKET"); if (!sdir) { - printf("The E_IPC_SOCKET environment variable is not set. This is\n" - "exported by Enlightenment to all processes it launches.\n" - "This environment variable must be set and must point to\n" - "Enlightenment's IPC socket file (minus port number).\n"); - return 0; + printf("The E_IPC_SOCKET environment variable is not set. This is\n" + "exported by Enlightenment to all processes it launches.\n" + "This environment variable must be set and must point to\n" + "Enlightenment's IPC socket file (minus port number).\n"); + return 0; } _e_ipc_server = ecore_ipc_server_connect(ECORE_IPC_LOCAL_SYSTEM, sdir, 0, NULL); if (!_e_ipc_server) return 0; @@ -186,10 +190,10 @@ _e_ipc_cb_server_add(void *data __UNUSED__, int type __UNUSED__, void *event) e = event; server = e->server; ecore_ipc_server_send(server, - 7/*E_IPC_DOMAIN_INIT*/, - 1/*hello*/, - 0, 0, 0, - initwins, initwins_num * sizeof(Ecore_X_Window)); + 7 /*E_IPC_DOMAIN_INIT*/, + 1 /*hello*/, + 0, 0, 0, + initwins, initwins_num * sizeof(Ecore_X_Window)); ecore_ipc_server_flush(server); return ECORE_CALLBACK_PASS_ON; } @@ -208,27 +212,29 @@ _e_ipc_cb_server_data(void *data __UNUSED__, int type __UNUSED__, void *event) Ecore_Ipc_Event_Server_Data *e; e = event; - if (e->major != 7/*E_IPC_DOMAIN_INIT*/) return ECORE_CALLBACK_PASS_ON; + if (e->major != 7 /*E_IPC_DOMAIN_INIT*/) return ECORE_CALLBACK_PASS_ON; switch (e->minor) { case 1: - if (e->data) e_init_status_set(e->data); - break; + if (e->data) e_init_status_set(e->data); + break; + case 2: - /* quit now */ - e_init_done(); - break; + /* quit now */ + e_init_done(); + break; + default: - break; + break; } return ECORE_CALLBACK_PASS_ON; } -static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _e_init_cb_signal_enable(void *data, Evas_Object *obj, const char *emission, const char *source); -static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, const char *source); -static Eina_Bool _e_init_cb_window_configure(void *data, int ev_type, void *ev); -static Eina_Bool _e_init_cb_timeout(void *data); +static void _e_init_cb_signal_disable(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _e_init_cb_signal_enable(void *data, Evas_Object *obj, const char *emission, const char *source); +static void _e_init_cb_signal_done_ok(void *data, Evas_Object *obj, const char *emission, const char *source); +static Eina_Bool _e_init_cb_window_configure(void *data, int ev_type, void *ev); +static Eina_Bool _e_init_cb_timeout(void *data); static Ecore_Evas *_e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret); /* local subsystem globals */ @@ -254,7 +260,7 @@ e_init_init(void) _e_init_configure_handler = ecore_event_handler_add(ECORE_X_EVENT_WINDOW_CONFIGURE, - _e_init_cb_window_configure, NULL); + _e_init_cb_window_configure, NULL); num = 0; roots = ecore_x_window_root_list(&num); @@ -269,17 +275,17 @@ e_init_init(void) /* extra root windows/screens */ for (i = 1; i < num; i++) { - ecore_x_window_size_get(roots[i], &w, &h); - _e_init_ecore_evas = _e_init_evas_new(roots[i], w, h, &_e_init_win); - _e_init_evas = ecore_evas_get(_e_init_ecore_evas); - initwins[(i * 2) + 0] = roots[i]; - initwins[(i * 2) + 1] = _e_init_win; + ecore_x_window_size_get(roots[i], &w, &h); + _e_init_ecore_evas = _e_init_evas_new(roots[i], w, h, &_e_init_win); + _e_init_evas = ecore_evas_get(_e_init_ecore_evas); + initwins[(i * 2) + 0] = roots[i]; + initwins[(i * 2) + 1] = _e_init_win; - o = edje_object_add(_e_init_evas); - edje_object_file_set(o, s, "e/init/extra_screen"); - evas_object_move(o, 0, 0); - evas_object_resize(o, w, h); - evas_object_show(o); + o = edje_object_add(_e_init_evas); + edje_object_file_set(o, s, "e/init/extra_screen"); + evas_object_move(o, 0, 0); + evas_object_resize(o, w, h); + evas_object_show(o); } /* primary screen/root */ @@ -293,41 +299,41 @@ e_init_init(void) screens = (Eina_List *)e_xinerama_screens_get(); if (screens) { - E_Screen *scr; + E_Screen *scr; - EINA_LIST_FOREACH(screens, l, scr) - { - o = edje_object_add(_e_init_evas); - if (l == screens) - { - edje_object_file_set(o, s, "e/init/splash"); - _e_init_object = o; - } - else - edje_object_file_set(o, s, "e/init/extra_screen"); - evas_object_move(o, scr->x, scr->y); - evas_object_resize(o, scr->w, scr->h); - evas_object_show(o); - } + EINA_LIST_FOREACH(screens, l, scr) + { + o = edje_object_add(_e_init_evas); + if (l == screens) + { + edje_object_file_set(o, s, "e/init/splash"); + _e_init_object = o; + } + else + edje_object_file_set(o, s, "e/init/extra_screen"); + evas_object_move(o, scr->x, scr->y); + evas_object_resize(o, scr->w, scr->h); + evas_object_show(o); + } } else { - o = edje_object_add(_e_init_evas); - edje_object_file_set(o, s, "e/init/splash"); - _e_init_object = o; - evas_object_move(o, 0, 0); - evas_object_resize(o, w, h); - evas_object_show(o); + o = edje_object_add(_e_init_evas); + edje_object_file_set(o, s, "e/init/splash"); + _e_init_object = o; + evas_object_move(o, 0, 0); + evas_object_resize(o, w, h); + evas_object_show(o); } edje_object_part_text_set(_e_init_object, "e.text.disable_text", - "Disable splash screen"); + "Disable splash screen"); edje_object_signal_callback_add(_e_init_object, "e,action,init,disable", "e", - _e_init_cb_signal_disable, NULL); + _e_init_cb_signal_disable, NULL); edje_object_signal_callback_add(_e_init_object, "e,action,init,enable", "e", - _e_init_cb_signal_enable, NULL); + _e_init_cb_signal_enable, NULL); edje_object_signal_callback_add(_e_init_object, "e,state,done_ok", "e", - _e_init_cb_signal_done_ok, NULL); + _e_init_cb_signal_done_ok, NULL); free(roots); _e_init_timeout_timer = ecore_timer_add(240.0, _e_init_cb_timeout, NULL); @@ -395,16 +401,15 @@ e_init_done(void) _e_init_timeout_timer = ecore_timer_add(60.0, _e_init_cb_timeout, NULL); } - static void _e_init_cb_signal_disable(void *data __UNUSED__, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__) { if (!server) return; ecore_ipc_server_send(server, - 7/*E_IPC_DOMAIN_INIT*/, - 2/*set splash*/, - 0, 0, 0, - NULL, 0); + 7 /*E_IPC_DOMAIN_INIT*/, + 2 /*set splash*/, + 0, 0, 0, + NULL, 0); ecore_ipc_server_flush(server); } @@ -413,10 +418,10 @@ _e_init_cb_signal_enable(void *data __UNUSED__, Evas_Object *obj __UNUSED__, con { if (!server) return; ecore_ipc_server_send(server, - 7/*E_IPC_DOMAIN_INIT*/, - 2/*set splash*/, - 1, 0, 0, - NULL, 0); + 7 /*E_IPC_DOMAIN_INIT*/, + 2 /*set splash*/, + 1, 0, 0, + NULL, 0); ecore_ipc_server_flush(server); } @@ -426,8 +431,8 @@ _e_init_cb_signal_done_ok(void *data __UNUSED__, Evas_Object *obj __UNUSED__, co e_init_hide(); if (_e_init_timeout_timer) { - ecore_timer_del(_e_init_timeout_timer); - _e_init_timeout_timer = NULL; + ecore_timer_del(_e_init_timeout_timer); + _e_init_timeout_timer = NULL; } ecore_main_loop_quit(); } @@ -478,19 +483,19 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret) if (font_hinting == 0) { - if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_BYTECODE)) - evas_font_hinting_set(e, EVAS_FONT_HINTING_BYTECODE); - else if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_AUTO)) - evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO); - else - evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); + if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_BYTECODE)) + evas_font_hinting_set(e, EVAS_FONT_HINTING_BYTECODE); + else if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_AUTO)) + evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO); + else + evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); } else if (font_hinting == 1) { - if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_AUTO)) - evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO); - else - evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); + if (evas_font_hinting_can_hint(e, EVAS_FONT_HINTING_AUTO)) + evas_font_hinting_set(e, EVAS_FONT_HINTING_AUTO); + else + evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); } else if (font_hinting == 2) evas_font_hinting_set(e, EVAS_FONT_HINTING_NONE); @@ -503,3 +508,4 @@ _e_init_evas_new(Ecore_X_Window root, int w, int h, Ecore_X_Window *winret) return ee; } +