Enlightenment CVS committal Author : devilhorns Project : e_modules Module : cpu
Dir : e_modules/cpu Modified Files: e_mod_main.c Log Message: Removed lots of commented old code. =================================================================== RCS file: /cvs/e/e_modules/cpu/e_mod_main.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_mod_main.c 1 Sep 2006 10:57:19 -0000 1.24 +++ e_mod_main.c 3 Sep 2006 02:01:42 -0000 1.25 @@ -530,223 +530,3 @@ _("This module is used to monitor cpu load.")); return 1; } - - - - - - - - - - - -/* -static Cpu *_cpu_init (E_Module * m); -static void _cpu_shutdown (Cpu * n); -static void _cpu_config_menu_new (Cpu * n); -static int _cpu_face_init (Cpu_Face * cf); -static void _cpu_face_menu_new (Cpu_Face * cf); -static void _cpu_face_enable (Cpu_Face * cf); -static void _cpu_face_disable (Cpu_Face * cf); -static void _cpu_face_free (Cpu_Face * cf); -static void _cpu_face_cb_gmc_change (void *data, E_Gadman_Client * gmc, - E_Gadman_Change change); -static void _cpu_face_cb_mouse_down (void *data, Evas * evas, - Evas_Object * obj, void *event_info); -static void _cpu_face_cb_menu_edit (void *data, E_Menu * mn, - E_Menu_Item * mi); -static void _cpu_face_cb_menu_configure (void *data, E_Menu * mn, - E_Menu_Item * mi); -static int _cpu_face_get_cpu_count (Cpu_Face * cf); -static void _cpu_face_get_load (Cpu_Face * cf); -static void _cpu_face_graph_values (Cpu_Face * cf); -static void _cpu_face_graph_clear (Cpu_Face * cf); - -static int cpu_count; - - -static int -_cpu_face_init (Cpu_Face * cf) -{ - Evas_Object *o; - char buf[4096]; - - evas_event_freeze (cf->evas); - - o = edje_object_add (cf->evas); - cf->cpu_obj = o; - if (!e_theme_edje_object_set - (o, "base/theme/modules/cpu", "modules/cpu/main")) - { - snprintf (buf, sizeof (buf), PACKAGE_DATA_DIR "/cpu.edj"); - edje_object_file_set (o, buf, "modules/cpu/main"); - } - evas_object_pass_events_set (o, 1); - evas_object_show (o); - - o = edje_object_add (cf->evas); - cf->chart_obj = o; - evas_object_layer_set (o, 1); - evas_object_repeat_events_set (o, 0); - evas_object_pass_events_set (o, 1); - evas_object_color_set (o, 255, 255, 255, 255); - evas_object_show (o); - - - o = evas_object_rectangle_add (cf->evas); - cf->event_obj = o; - evas_object_layer_set (o, 3); - evas_object_repeat_events_set (o, 1); - evas_object_color_set (o, 0, 0, 0, 0); - evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN, - _cpu_face_cb_mouse_down, cf); - evas_object_show (o); - - cf->gmc = e_gadman_client_new (cf->con->gadman); - e_gadman_client_domain_set (cf->gmc, "module.cpu", cpu_count++); - e_gadman_client_policy_set (cf->gmc, - E_GADMAN_POLICY_ANYWHERE | - E_GADMAN_POLICY_HMOVE | E_GADMAN_POLICY_HSIZE | - E_GADMAN_POLICY_VMOVE | E_GADMAN_POLICY_VSIZE); - e_gadman_client_auto_size_set (cf->gmc, 45, 50); - e_gadman_client_align_set (cf->gmc, 1.0, 1.0); - e_gadman_client_resize (cf->gmc, 45, 50); - e_gadman_client_change_func_set (cf->gmc, _cpu_face_cb_gmc_change, cf); - e_gadman_client_load (cf->gmc); - - evas_event_thaw (cf->evas); - - cf->monitor = - ecore_timer_add ((double) cf->cpu->conf->check_interval, - _cpu_face_update_values, cf); - return 1; -} - -static void -_cpu_face_menu_new (Cpu_Face * cf) -{ - E_Menu *mn; - E_Menu_Item *mi; - - mn = e_menu_new (); - cf->menu = mn; - - mi = e_menu_item_new (mn); - e_menu_item_label_set (mi, _("Configuration")); - e_util_menu_item_edje_icon_set (mi, "enlightenment/configuration"); - e_menu_item_callback_set (mi, _cpu_face_cb_menu_configure, cf); - - mi = e_menu_item_new (mn); - e_menu_item_label_set (mi, _("Edit Mode")); - e_util_menu_item_edje_icon_set (mi, "enlightenment/gadgets"); - e_menu_item_callback_set (mi, _cpu_face_cb_menu_edit, cf); -} - - -static void -_cpu_face_graph_values (Cpu_Face * cf) -{ - int x, y, w, h; - Evas_Object *o; - Evas_Object *last = NULL; - Evas_List *l; - int i, j = 0; - int v; - int a = 255; - int b = 0; - int c = 100; - int d = 0; - - evas_event_freeze (cf->evas); - - evas_object_geometry_get (cf->chart_obj, &x, &y, &w, &h); - - while (d < cpu_count) - { - v = (int) ((double) cpu_stats[d] * ((double) h / (double) 100)); - o = evas_object_line_add (cf->evas); - edje_object_part_swallow (cf->chart_obj, "lines", o); - evas_object_layer_set (o, 1); - if (cpu_stats[d] == 0) - evas_object_hide (o); - else - { - evas_object_line_xy_set (o, (x + w), (y + h), (x + w), - ((y + h) - v)); - switch (d) - { - case 0: - evas_object_color_set (o, a, b, b, c); - break; - case 1: - evas_object_color_set (o, b, a, b, c); - break; - case 2: - evas_object_color_set (o, b, b, a, c); - break; - case 3: - evas_object_color_set (o, a, a, b, c); - break; - default: - break; - } - evas_object_pass_events_set (o, 1); - evas_object_show (o); - } - - cf->old_values[d] = evas_list_prepend (cf->old_values[d], o); - l = cf->old_values[d]; - for (i = (x + w); l && (j - 2) < w; l = l->next, j++) - { - Evas_Coord oy; - Evas_Object *lo; - - lo = (Evas_Object *) evas_list_data (l); - evas_object_geometry_get (lo, NULL, &oy, NULL, NULL); - evas_object_move (lo, i--, oy); - last = lo; - } - - if ((j - 2) >= w) - { - cf->old_values[d] = evas_list_remove (cf->old_values[d], last); - edje_object_part_unswallow (cf->chart_obj, last); - evas_object_del (last); - } - d++; - } - - evas_event_thaw (cf->evas); -} - -static void -_cpu_face_graph_clear (Cpu_Face * cf) -{ - int i = 0; - Evas_List *l; - - evas_event_freeze (cf->evas); - - while (i < cpu_count) - { - for (l = cf->old_values[i]; l; l = l->next) - { - Evas_Object *o; - - o = evas_list_data (l); - edje_object_part_unswallow (cf->chart_obj, o); - evas_object_del (o); - } - evas_list_free (cf->old_values[i]); - cf->old_values[i] = NULL; - i++; - } - - if (!cf->cpu->conf->show_graph) - evas_object_hide (cf->chart_obj); - - evas_event_thaw (cf->evas); -} - -*/ ------------------------------------------------------------------------- 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