Enlightenment CVS committal Author : raster Project : e17 Module : apps/e
Dir : e17/apps/e/src/bin Modified Files: e_main.c e_manager.c Log Message: more instrumenting for e startup =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v retrieving revision 1.193 retrieving revision 1.194 diff -u -3 -r1.193 -r1.194 --- e_main.c 21 Oct 2006 10:28:01 -0000 1.193 +++ e_main.c 21 Oct 2006 10:52:43 -0000 1.194 @@ -44,6 +44,18 @@ #define TS_DO +#ifdef TS_DO +#define TS(x) \ + { \ + t1 = ecore_time_get(); \ + printf("ESTART: %1.5f [%1.5f] - %s\n", t1 - t0, t1 - t2, x); \ + t2 = t1; \ + } +static double t0, t1, t2; +#else +#define TS(x) +#endif + /* externally accessible functions */ int main(int argc, char **argv) @@ -57,19 +69,9 @@ struct sigaction action; double t, tstart, begin; -#ifdef TS_DO -#define TS(x) \ - { \ - t1 = ecore_time_get(); \ - printf("ESTART: %1.5f [%1.5f] - %s\n", t1 - t0, t1 - t2, x); \ - t2 = t1; \ - } - double t0, t1, t2; +#ifdef TS_DO t0 = t1 = t2 = ecore_time_get(); -#else -#define TS(x) #endif - TS("begin"); #if 0 @@ -1028,14 +1030,22 @@ Ecore_X_Window *roots; int num, i; + TS("screens: atoms"); if (!e_atoms_init()) return 0; + TS("screens: manager"); if (!e_manager_init()) return 0; + TS("screens: container"); if (!e_container_init()) return 0; + TS("screens: zone"); if (!e_zone_init()) return 0; + TS("screens: desk"); if (!e_desk_init()) return 0; + TS("screens: menu"); if (!e_menu_init()) return 0; + TS("screens: exehist"); if (!e_exehist_init()) return 0; + TS("screens: get roots"); num = 0; roots = ecore_x_window_root_list(&num); if ((!roots) || (num <= 0)) @@ -1044,9 +1054,13 @@ num); return 0; } + TS("screens: focus"); if (!e_focus_init()) return 0; + TS("screens: border"); if (!e_border_init()) return 0; + TS("screens: win"); if (!e_win_init()) return 0; + TS("screens: manage roots"); for (i = 0; i < num; i++) { E_Manager *man; @@ -1082,6 +1096,7 @@ return 0; } } + TS("screens: sync"); free(roots); ecore_x_sync(); =================================================================== RCS file: /cvs/e/e17/apps/e/src/bin/e_manager.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- e_manager.c 23 Aug 2006 03:39:02 -0000 1.56 +++ e_manager.c 21 Oct 2006 10:52:43 -0000 1.57 @@ -181,6 +181,7 @@ int ret; ecore_x_window_attributes_get(windows[i], &att); + if ((att.override) || (att.input_only)) continue; if (!ecore_x_window_prop_property_get(windows[i], atom_xmbed, atom_xmbed, 32, @@ -265,10 +266,10 @@ * should be seen */ E_Container *con; E_Border *bd; + con = e_container_current_get(man); bd = e_border_new(con, windows[i], 1, 0); - if (bd) - e_border_show(bd); + if (bd) e_border_show(bd); } } free(windows); ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs