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

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,7 +100,7 @@ _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);

View File

@ -3,29 +3,28 @@
#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"
};
@ -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;
}
@ -125,14 +123,15 @@ _cpu_init(E_Module *m)
Evas_List *mans, *l, *l2;
c = E_NEW(Cpu, 1);
if (!c)
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);
@ -141,6 +140,7 @@ _cpu_init(E_Module *m)
if (!c->conf)
{
c->conf = E_NEW(Config, 1);
c->conf->check_interval = 1;
c->conf->show_text = 1;
c->conf->show_graph = 1;
@ -164,13 +164,15 @@ _cpu_init(E_Module *m)
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
#undef T
#undef D
#define T Config_Face
#define D cf->conf_face_edd
E_CONFIG_VAL(D, T, enabled, UCHAR);
c->face = cf;
@ -179,6 +181,7 @@ _cpu_init(E_Module *m)
cf->evas = con->bg_evas;
cf->conf = E_NEW(Config_Face, 1);
cf->conf->enabled = 1;
if (!_cpu_face_init(cf))
@ -235,7 +238,7 @@ _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");
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);
@ -253,7 +256,7 @@ _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");
snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/cpu.edj");
edje_object_file_set(o, buf, "modules/cpu/text");
}
evas_object_layer_set(o, 2);
@ -274,10 +277,7 @@ _cpu_face_init(Cpu_Face *cf)
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_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);
@ -406,8 +406,7 @@ _cpu_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_in
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);
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);
}
}
@ -459,8 +458,7 @@ _cpu_face_update_values(void *data)
else
edje_object_part_text_set(cf->txt_obj, "in-text", "");
if ((cf->cpu->conf->show_graph) &&
(edje_object_part_exists (cf->cpu_obj,"lines")))
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);
@ -508,8 +506,7 @@ _cpu_face_get_load(Cpu_Face *cf)
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)
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;
@ -607,7 +604,7 @@ _cpu_face_graph_values(Cpu_Face *cf)
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++)
for (i = (x + w); l && (j - 2) < w; l = l->next, j++)
{
Evas_Coord oy;
Evas_Object *lo;
@ -643,6 +640,7 @@ _cpu_face_graph_clear(Cpu_Face *cf)
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);

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