enlightenment
/
enlightenment-module-cpu
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wed Apr 5 13:48:36 2006 Michael Jennings (mej) 

Indent!
----------------------------------------------------------------------


SVN revision: 21859
This commit is contained in:
Michael Jennings 2006-04-05 17:48:50 +00:00
parent 9d018cd674
commit 52783331a4
3 changed files with 372 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e_mod_config.c
View File

@ -11,11 +11,11 @@ struct _E_Config_Dialog_Data
};
/* Protos */
static void *_create_data (E_Config_Dialog *cfd);
static void _free_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets (E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static void _fill_data (Cpu *c, E_Config_Dialog_Data *cfdata);
static void *_create_data(E_Config_Dialog *cfd);
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
static void _fill_data(Cpu *c, E_Config_Dialog_Data *cfdata);
/* Config Calls */
void
@ -51,6 +51,7 @@ _create_data(E_Config_Dialog *cfd)
c = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(c, cfdata);
return cfdata;
}
@ -99,9 +100,9 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
c->conf->check_interval = cfdata->check_interval;
c->conf->show_text = cfdata->show_text;
c->conf->show_graph = cfdata->show_graph;
e_config_save_queue ();
e_config_save_queue();
if (c->face->monitor)
ecore_timer_interval_set(c->face->monitor, (double)cfdata->check_interval);
ecore_timer_interval_set(c->face->monitor, (double)cfdata->check_interval);
return 1;
}

462
e_mod_main.c
View File

@ -3,31 +3,30 @@
#include "e_mod_config.h"
#include "config.h"
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_update_values (void *data);
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 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_update_values(void *data);
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_stats[4];
EAPI E_Module_Api e_modapi =
{
EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
"Cpu"
"Cpu"
};
EAPI void *
@ -41,7 +40,7 @@ e_modapi_init(E_Module *m)
c = _cpu_init(m);
if (!c)
return NULL;
return NULL;
m->config_menu = c->config_menu;
return c;
@ -54,18 +53,18 @@ e_modapi_shutdown(E_Module *m)
c = m->data;
if (!c)
return 0;
return 0;
if (m->config_menu)
{
e_menu_deactivate(m->config_menu);
e_object_del(E_OBJECT(m->config_menu));
m->config_menu = NULL;
e_menu_deactivate(m->config_menu);
e_object_del(E_OBJECT(m->config_menu));
m->config_menu = NULL;
}
if (c->cfd)
{
e_object_del(E_OBJECT(c->cfd));
c->cfd = NULL;
e_object_del(E_OBJECT(c->cfd));
c->cfd = NULL;
}
_cpu_shutdown(c);
return 1;
@ -78,7 +77,7 @@ e_modapi_save(E_Module *m)
c = m->data;
if (!c)
return 0;
return 0;
e_config_domain_save("module.cpu", c->conf_edd, c->conf);
return 1;
}
@ -86,15 +85,14 @@ e_modapi_save(E_Module *m)
EAPI int
e_modapi_info(E_Module *m)
{
m->icon_file = strdup(PACKAGE_DATA_DIR"/module_icon.png");
m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
EAPI int
e_modapi_about(E_Module *m)
{
e_module_dialog_show(D_("Enlightenment Cpu Monitor Module"),
D_("This module is used to monitor a cpu."));
e_module_dialog_show(D_("Enlightenment Cpu Monitor Module"), D_("This module is used to monitor a cpu."));
return 1;
}
@ -106,13 +104,13 @@ e_modapi_config(E_Module *m)
c = m->data;
if (!c)
return 0;
return 0;
if (!c->face)
return 0;
return 0;
con = e_container_current_get(e_manager_current_get());
if (c->face->con == con)
_configure_cpu_module(con, c);
_configure_cpu_module(con, c);
return 1;
}
@ -125,14 +123,15 @@ _cpu_init(E_Module *m)
Evas_List *mans, *l, *l2;
c = E_NEW(Cpu, 1);
if (!c)
return NULL;
return NULL;
c->conf_edd = E_CONFIG_DD_NEW("Cpu_Config", Config);
#undef T
#undef D
#define T Config
#define D c->conf_edd
#undef T
#undef D
#define T Config
#define D c->conf_edd
E_CONFIG_VAL(D, T, check_interval, INT);
E_CONFIG_VAL(D, T, show_text, INT);
E_CONFIG_VAL(D, T, show_graph, INT);
@ -140,10 +139,11 @@ _cpu_init(E_Module *m)
c->conf = e_config_domain_load("module.cpu", c->conf_edd);
if (!c->conf)
{
c->conf = E_NEW(Config, 1);
c->conf->check_interval = 1;
c->conf->show_text = 1;
c->conf->show_graph = 1;
c->conf = E_NEW(Config, 1);
c->conf->check_interval = 1;
c->conf->show_text = 1;
c->conf->show_graph = 1;
}
E_CONFIG_LIMIT(c->conf->check_interval, 0, 60);
E_CONFIG_LIMIT(c->conf->show_text, 0, 1);
@ -154,52 +154,55 @@ _cpu_init(E_Module *m)
mans = e_manager_list();
for (l = mans; l; l = l->next)
{
E_Manager *man;
E_Manager *man;
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Cpu_Face *cf;
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Cpu_Face *cf;
con = l2->data;
cf = E_NEW(Cpu_Face, 1);
if (cf)
{
cf->conf_face_edd = E_CONFIG_DD_NEW("Cpu_Face_Config", Config_Face);
#undef T
#undef D
#define T Config_Face
#define D cf->conf_face_edd
E_CONFIG_VAL(D, T, enabled, UCHAR);
con = l2->data;
cf = E_NEW(Cpu_Face, 1);
c->face = cf;
cf->cpu = c;
cf->con = con;
cf->evas = con->bg_evas;
if (cf)
{
cf->conf_face_edd = E_CONFIG_DD_NEW("Cpu_Face_Config", Config_Face);
cf->conf = E_NEW(Config_Face, 1);
cf->conf->enabled = 1;
#undef T
#undef D
#define T Config_Face
#define D cf->conf_face_edd
E_CONFIG_VAL(D, T, enabled, UCHAR);
if (!_cpu_face_init(cf))
return NULL;
c->face = cf;
cf->cpu = c;
cf->con = con;
cf->evas = con->bg_evas;
_cpu_face_menu_new(cf);
cf->conf = E_NEW(Config_Face, 1);
mi = e_menu_item_new(c->config_menu);
e_menu_item_label_set(mi, _("Configuration"));
e_menu_item_callback_set(mi, _cpu_face_cb_menu_configure, cf);
cf->conf->enabled = 1;
mi = e_menu_item_new(c->config_menu);
e_menu_item_label_set(mi, con->name);
e_menu_item_submenu_set(mi, cf->menu);
if (!_cpu_face_init(cf))
return NULL;
if (!cf->conf->enabled)
_cpu_face_disable(cf);
else
_cpu_face_enable(cf);
}
}
_cpu_face_menu_new(cf);
mi = e_menu_item_new(c->config_menu);
e_menu_item_label_set(mi, _("Configuration"));
e_menu_item_callback_set(mi, _cpu_face_cb_menu_configure, cf);
mi = e_menu_item_new(c->config_menu);
e_menu_item_label_set(mi, con->name);
e_menu_item_submenu_set(mi, cf->menu);
if (!cf->conf->enabled)
_cpu_face_disable(cf);
else
_cpu_face_enable(cf);
}
}
}
return c;
}
@ -235,8 +238,8 @@ _cpu_face_init(Cpu_Face *cf)
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");
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);
@ -253,8 +256,8 @@ _cpu_face_init(Cpu_Face *cf)
cf->txt_obj = o;
if (!e_theme_edje_object_set(o, "base/theme/modules/cpu", "modules/cpu/text"))
{
snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/cpu.edj");
edje_object_file_set(o, buf, "modules/cpu/text");
snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/cpu.edj");
edje_object_file_set(o, buf, "modules/cpu/text");
}
evas_object_layer_set(o, 2);
evas_object_repeat_events_set(o, 0);
@ -273,11 +276,8 @@ _cpu_face_init(Cpu_Face *cf)
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_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);
@ -318,9 +318,9 @@ _cpu_face_enable(Cpu_Face *cf)
evas_object_show(cf->cpu_obj);
evas_object_show(cf->event_obj);
if (cf->cpu->conf->show_graph)
evas_object_show(cf->chart_obj);
evas_object_show(cf->chart_obj);
if (cf->cpu->conf->show_text)
evas_object_show(cf->txt_obj);
evas_object_show(cf->txt_obj);
}
static void
@ -338,24 +338,24 @@ static void
_cpu_face_free(Cpu_Face *cf)
{
if (cf->monitor)
ecore_timer_del(cf->monitor);
ecore_timer_del(cf->monitor);
if (cf->menu)
e_object_del(E_OBJECT(cf->menu));
e_object_del(E_OBJECT(cf->menu));
if (cf->event_obj)
evas_object_del(cf->event_obj);
evas_object_del(cf->event_obj);
if (cf->cpu_obj)
evas_object_del(cf->cpu_obj);
evas_object_del(cf->cpu_obj);
if (cf->old_values)
_cpu_face_graph_clear(cf);
_cpu_face_graph_clear(cf);
if (cf->chart_obj)
evas_object_del(cf->chart_obj);
evas_object_del(cf->chart_obj);
if (cf->txt_obj)
evas_object_del(cf->txt_obj);
evas_object_del(cf->txt_obj);
if (cf->gmc)
{
e_gadman_client_save(cf->gmc);
e_object_del(E_OBJECT(cf->gmc));
e_gadman_client_save(cf->gmc);
e_object_del(E_OBJECT(cf->gmc));
}
E_FREE(cf->conf);
@ -372,26 +372,26 @@ _cpu_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change change
cf = data;
switch (change)
{
case E_GADMAN_CHANGE_MOVE_RESIZE:
e_gadman_client_geometry_get(cf->gmc, &x, &y, &w, &h);
evas_object_move(cf->chart_obj, x, y);
evas_object_move(cf->event_obj, x, y);
evas_object_move(cf->cpu_obj, x, y);
evas_object_move(cf->txt_obj, x, y);
evas_object_resize(cf->chart_obj, w, h);
evas_object_resize(cf->event_obj, w, h);
evas_object_resize(cf->cpu_obj, w, h);
evas_object_resize(cf->txt_obj, w, h);
_cpu_face_graph_clear(cf);
break;
case E_GADMAN_CHANGE_RAISE:
evas_object_raise(cf->cpu_obj);
evas_object_raise(cf->chart_obj);
evas_object_raise(cf->event_obj);
evas_object_raise(cf->txt_obj);
break;
default:
break;
case E_GADMAN_CHANGE_MOVE_RESIZE:
e_gadman_client_geometry_get(cf->gmc, &x, &y, &w, &h);
evas_object_move(cf->chart_obj, x, y);
evas_object_move(cf->event_obj, x, y);
evas_object_move(cf->cpu_obj, x, y);
evas_object_move(cf->txt_obj, x, y);
evas_object_resize(cf->chart_obj, w, h);
evas_object_resize(cf->event_obj, w, h);
evas_object_resize(cf->cpu_obj, w, h);
evas_object_resize(cf->txt_obj, w, h);
_cpu_face_graph_clear(cf);
break;
case E_GADMAN_CHANGE_RAISE:
evas_object_raise(cf->cpu_obj);
evas_object_raise(cf->chart_obj);
evas_object_raise(cf->event_obj);
evas_object_raise(cf->txt_obj);
break;
default:
break;
}
}
@ -405,10 +405,9 @@ _cpu_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
cf = data;
if (ev->button == 3)
{
e_menu_activate_mouse(cf->menu, e_zone_current_get(cf->con),
ev->output.x, ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_container_fake_mouse_up_all_later(cf->con);
e_menu_activate_mouse(cf->menu, e_zone_current_get(cf->con),
ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
e_util_container_fake_mouse_up_all_later(cf->con);
}
}
@ -442,28 +441,27 @@ _cpu_face_update_values(void *data)
_cpu_face_get_load(cf);
if (cpu_stats[0] == -1)
return 1;
return 1;
if (cf->cpu->conf->show_text)
{
snprintf(str, sizeof(str), "%d%%", cpu_stats[0]);
i = 1;
while (i < cpu_count)
{
snprintf(str_tmp, sizeof(str_tmp), " / %d%%", cpu_stats[i]);
strncat(str, str_tmp, sizeof(str));
i++;
}
edje_object_part_text_set(cf->txt_obj, "in-text", str);
snprintf(str, sizeof(str), "%d%%", cpu_stats[0]);
i = 1;
while (i < cpu_count)
{
snprintf(str_tmp, sizeof(str_tmp), " / %d%%", cpu_stats[i]);
strncat(str, str_tmp, sizeof(str));
i++;
}
edje_object_part_text_set(cf->txt_obj, "in-text", str);
}
else
edje_object_part_text_set(cf->txt_obj, "in-text", "");
edje_object_part_text_set(cf->txt_obj, "in-text", "");
if ((cf->cpu->conf->show_graph) &&
(edje_object_part_exists (cf->cpu_obj,"lines")))
_cpu_face_graph_values(cf);
if ((cf->cpu->conf->show_graph) && (edje_object_part_exists(cf->cpu_obj, "lines")))
_cpu_face_graph_values(cf);
else
_cpu_face_graph_clear(cf);
_cpu_face_graph_clear(cf);
return 1;
}
@ -476,10 +474,10 @@ _cpu_face_get_cpu_count(Cpu_Face *cf)
int cpu = -1;
if (!(f = fopen("/proc/stat", "r")))
return -1;
return -1;
while (fscanf(f, "cp%s %*u %*u %*u %*u %*u %*u %*u %*u\n", (char *)&tmp) == 1)
cpu++;
cpu++;
fclose(f);
return cpu;
@ -498,60 +496,59 @@ _cpu_face_get_load(Cpu_Face *cf)
cpu_count = _cpu_face_get_cpu_count(cf);
if (cpu_count == -1)
return;
return;
if (!(stat = fopen("/proc/stat", "r")))
return;
return;
int i = 0;
while (i < cpu_count)
{
{
if (fscanf(stat, "%s %lu %lu %lu %lu %lu %lu %lu", dummy,
&new_u, &new_n, &new_s, &new_i, &new_wa, &new_hi, &new_si) < 5)
{
fclose(stat);
return;
}
if (fscanf(stat, "%s %lu %lu %lu %lu %lu %lu %lu", dummy, &new_u, &new_n, &new_s, &new_i, &new_wa, &new_hi, &new_si) < 5)
{
fclose(stat);
return;
}
ticks_past = ((new_u + new_n + new_s + new_i + new_wa + new_hi + new_si) -
(old_u[i] + old_n[i] + old_s[i] + old_i[i] + old_wa[i] + old_hi[i] + old_si[i]));
ticks_past = ((new_u + new_n + new_s + new_i + new_wa + new_hi + new_si) -
(old_u[i] + old_n[i] + old_s[i] + old_i[i] + old_wa[i] + old_hi[i] + old_si[i]));
if (ticks_past)
{
tmp_u = ((new_u - old_u[i]));
tmp_n = ((new_n - old_n[i]));
tmp_s = ((new_s - old_s[i]));
tmp_i = ((new_i - old_i[i]));
}
else
{
tmp_u = 0;
tmp_n = 0;
tmp_s = 0;
tmp_i = 0;
}
if (ticks_past)
{
tmp_u = ((new_u - old_u[i]));
tmp_n = ((new_n - old_n[i]));
tmp_s = ((new_s - old_s[i]));
tmp_i = ((new_i - old_i[i]));
}
else
{
tmp_u = 0;
tmp_n = 0;
tmp_s = 0;
tmp_i = 0;
}
/* Update the values */
cpu_stats[i] = (tmp_u + tmp_n + tmp_s) / cpu_count;
/* Update the values */
cpu_stats[i] = (tmp_u + tmp_n + tmp_s) / cpu_count;
old_u[i] = new_u;
old_n[i] = new_n;
old_s[i] = new_s;
old_i[i] = new_i;
old_wa[i] = new_wa;
old_hi[i] = new_hi;
old_si[i] = new_si;
old_u[i] = new_u;
old_n[i] = new_n;
old_s[i] = new_s;
old_i[i] = new_i;
old_wa[i] = new_wa;
old_hi[i] = new_hi;
old_si[i] = new_si;
if (cpu_stats[i] >= 100)
cpu_stats[i] = 100;
if (cpu_stats[i] >= 100)
cpu_stats[i] = 100;
msg.val = cpu_stats[i];
edje_object_message_send(cf->cpu_obj, EDJE_MESSAGE_FLOAT, i, &msg);
msg.val = cpu_stats[i];
edje_object_message_send(cf->cpu_obj, EDJE_MESSAGE_FLOAT, i, &msg);
i++;
}
i++;
}
fclose(stat);
}
@ -575,56 +572,56 @@ _cpu_face_graph_values(Cpu_Face *cf)
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:
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:
case 2:
evas_object_color_set(o, b, b, a, c);
break;
case 3:
case 3:
evas_object_color_set(o, a, a, b, c);
break;
default:
default:
break;
}
evas_object_pass_events_set(o, 1);
evas_object_show(o);
}
}
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;
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;
}
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++;
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);
@ -640,20 +637,21 @@ _cpu_face_graph_clear(Cpu_Face *cf)
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++;
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_object_hide(cf->chart_obj);
evas_event_thaw(cf->evas);
}

12
e_mod_main.h
View File

@ -53,11 +53,11 @@ struct _Cpu_Face
EAPI extern E_Module_Api e_modapi;
EAPI void *e_modapi_init (E_Module *m);
EAPI int e_modapi_shutdown (E_Module *m);
EAPI int e_modapi_save (E_Module *m);
EAPI int e_modapi_info (E_Module *m);
EAPI int e_modapi_about (E_Module *m);
EAPI int e_modapi_config (E_Module *m);
EAPI void *e_modapi_init(E_Module *m);
EAPI int e_modapi_shutdown(E_Module *m);
EAPI int e_modapi_save(E_Module *m);
EAPI int e_modapi_info(E_Module *m);
EAPI int e_modapi_about(E_Module *m);
EAPI int e_modapi_config(E_Module *m);
#endif