Enlightenment CVS committal
Author : mej
Project : e_modules
Module : net
Dir : e_modules/net
Modified Files:
e_mod_config.c e_mod_main.c e_mod_main.h
Log Message:
Wed Apr 5 13:48:36 2006 Michael Jennings (mej)
Indent!
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/e_modules/net/e_mod_config.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_config.c 12 Mar 2006 18:45:42 -0000 1.9
+++ e_mod_config.c 5 Apr 2006 17:48:49 -0000 1.10
@@ -9,18 +9,18 @@
int check_interval;
int show_text;
int show_graph;
-
+
Ecore_List *devs;
int dev_num;
};
/* 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 (Net_Face *nf,
E_Config_Dialog_Data *cfdata);
-static void _net_config_get_devices (Ecore_List *devs);
+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(Net_Face *nf, E_Config_Dialog_Data *cfdata);
+static void _net_config_get_devices(Ecore_List *devs);
/* Config Calls */
void
@@ -35,7 +35,7 @@
v->free_cfdata = _free_data;
v->basic.apply_cfdata = _basic_apply_data;
v->basic.create_widgets = _basic_create_widgets;
-
+
cfd = e_config_dialog_new(nf->con, D_("Net Configuration"), NULL, 0, v, nf);
nf->net->cfd = cfd;
}
@@ -49,32 +49,32 @@
cfdata->check_interval = nf->conf->check_interval;
cfdata->show_text = nf->conf->show_text;
cfdata->show_graph = nf->conf->show_graph;
-
+
if (nf->conf->device != NULL)
- cfdata->device = strdup(nf->conf->device);
+ cfdata->device = strdup(nf->conf->device);
else
- cfdata->device = NULL;
-
+ cfdata->device = NULL;
+
if (!cfdata->device)
- return;
+ return;
cfdata->devs = ecore_list_new();
_net_config_get_devices(cfdata->devs);
if (!cfdata->devs)
- return;
-
+ return;
+
i = 0;
ecore_list_goto_first(cfdata->devs);
- while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
+ while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
{
- if (!strcmp(cfdata->device, tmp))
- {
- cfdata->dev_num = i;
- break;
- }
- i++;
- }
+ if (!strcmp(cfdata->device, tmp))
+ {
+ cfdata->dev_num = i;
+ break;
+ }
+ i++;
+ }
}
static void *
@@ -85,6 +85,7 @@
nf = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
_fill_data(nf, cfdata);
return cfdata;
}
@@ -98,7 +99,7 @@
nf->net->cfd = NULL;
E_FREE(cfdata->device);
if (cfdata->devs)
- ecore_list_destroy(cfdata->devs);
+ ecore_list_destroy(cfdata->devs);
free(cfdata);
}
@@ -109,25 +110,25 @@
E_Radio_Group *rg;
char *tmp;
int i;
-
- o = e_widget_list_add(evas, 0, 0);
+
+ o = e_widget_list_add(evas, 0, 0);
of = e_widget_framelist_add(evas, D_("General Settings"), 0);
ob = e_widget_check_add(evas, D_("Show Text"), (&(cfdata->show_text)));
e_widget_framelist_object_append(of, ob);
ob = e_widget_check_add(evas, D_("Show Graph"), (&(cfdata->show_graph)));
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
-
+
of = e_widget_framelist_add(evas, D_("Device Settings"), 0);
- ot = e_widget_table_add(evas, 0);
+ ot = e_widget_table_add(evas, 0);
rg = e_widget_radio_group_new(&(cfdata->dev_num));
i = 0;
ecore_list_goto_first(cfdata->devs);
- while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
+ while ((tmp = ecore_list_next(cfdata->devs)) != NULL)
{
- ob = e_widget_radio_add(evas, tmp, i, rg);
- e_widget_table_object_append (ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
- i++;
+ ob = e_widget_radio_add(evas, tmp, i, rg);
+ e_widget_table_object_append(ot, ob, 0, i, 1, 1, 1, 0, 1, 0);
+ i++;
}
i++;
ob = e_widget_label_add(evas, D_("Check Interval:"));
@@ -149,52 +150,52 @@
nf = cfd->data;
tmp = ecore_list_goto_index(cfdata->devs, cfdata->dev_num);
- if (tmp != NULL)
+ if (tmp != NULL)
{
- if (strcmp(tmp, nf->conf->device))
- {
- _net_face_graph_clear(nf);
- nf->conf->device = (char *)evas_stringshare_add(strdup(tmp));
- }
+ if (strcmp(tmp, nf->conf->device))
+ {
+ _net_face_graph_clear(nf);
+ nf->conf->device = (char *)evas_stringshare_add(strdup(tmp));
+ }
}
-
+
nf->conf->check_interval = cfdata->check_interval;
nf->conf->show_text = cfdata->show_text;
nf->conf->show_graph = cfdata->show_graph;
- e_config_save_queue ();
+ e_config_save_queue();
if (nf->monitor)
- ecore_timer_interval_set(nf->monitor, (double)cfdata->check_interval);
-
+ ecore_timer_interval_set(nf->monitor, (double)cfdata->check_interval);
+
return 1;
}
static void
-_net_config_get_devices(Ecore_List *devs)
+_net_config_get_devices(Ecore_List *devs)
{
FILE *stat;
char dev[64];
char buf[256];
unsigned long dummy;
-
+
stat = fopen("/proc/net/dev", "r");
if (!stat)
- return;
+ return;
- while (fgets(buf, 256, stat))
+ while (fgets(buf, 256, stat))
{
- int i = 0;
- for (; buf[i] != 0; i++)
- {
- if (buf[i] == ':')
- buf[i] = ' ';
- }
+ int i = 0;
+
+ for (; buf[i] != 0; i++)
+ {
+ if (buf[i] == ':')
+ buf[i] = ' ';
+ }
if (sscanf(buf, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu "
"%lu %lu %lu %lu\n", dev, &dummy, &dummy, &dummy,
- &dummy, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
- &dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 16)
+ &dummy, &dummy, &dummy, &dummy, &dummy, &dummy, &dummy,
&dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 16)
continue;
- ecore_list_append(devs, strdup(dev));
+ ecore_list_append(devs, strdup(dev));
}
fclose(stat);
}
===================================================================
RCS file: /cvs/e/e_modules/net/e_mod_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_main.c 4 Apr 2006 10:22:47 -0000 1.23
+++ e_mod_main.c 5 Apr 2006 17:48:49 -0000 1.24
@@ -3,35 +3,34 @@
#include "e_mod_config.h"
#include "config.h"
-static Net *_net_init(E_Module *m);
-static void _net_shutdown(Net *n);
-static void _net_config_menu_new(Net *n);
+static Net *_net_init(E_Module *m);
+static void _net_shutdown(Net *n);
+static void _net_config_menu_new(Net *n);
static Net_Face *_net_face_init(Net *n, E_Container *con);
-static void _net_face_menu_new(Net_Face *nf);
-static void _net_face_enable(Net_Face *nf);
-static void _net_face_disable(Net_Face *nf);
-static void _net_face_free(Net_Face *nf);
-static void _net_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
-static void _net_face_cb_mouse_down(void *data, Evas *evas, Evas_Object
*obj, void *event_info);
-static void _net_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item
*mi);
-static void _net_face_cb_menu_configure(void *data, E_Menu *mn,
E_Menu_Item *mi);
-static int _net_face_update_values(void *data);
-static void _net_face_graph_values(Net_Face *nf, int tx_val, int rx_val);
+static void _net_face_menu_new(Net_Face *nf);
+static void _net_face_enable(Net_Face *nf);
+static void _net_face_disable(Net_Face *nf);
+static void _net_face_free(Net_Face *nf);
+static void _net_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
+static void _net_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj,
void *event_info);
+static void _net_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi);
+static void _net_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item
*mi);
+static int _net_face_update_values(void *data);
+static void _net_face_graph_values(Net_Face *nf, int tx_val, int rx_val);
static int net_count;
static E_Config_DD *conf_edd;
static E_Config_DD *conf_face_edd;
-EAPI E_Module_Api e_modapi =
-{
+EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
- "Net"
+ "Net"
};
EAPI void *
-e_modapi_init(E_Module *m)
+e_modapi_init(E_Module *m)
{
Net *n;
@@ -41,236 +40,239 @@
n = _net_init(m);
if (!n)
- return NULL;
-
+ return NULL;
+
m->config_menu = n->config_menu;
return n;
}
EAPI int
-e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
{
Net *n;
-
+
n = m->data;
if (!n)
- return 0;
-
- if (m->config_menu)
- {
- e_menu_deactivate(m->config_menu);
- e_object_del(E_OBJECT(m->config_menu));
- m->config_menu = NULL;
+ return 0;
+
+ if (m->config_menu)
+ {
+ e_menu_deactivate(m->config_menu);
+ e_object_del(E_OBJECT(m->config_menu));
+ m->config_menu = NULL;
}
- if (n->cfd)
+ if (n->cfd)
{
- e_object_del(E_OBJECT(n->cfd));
- n->cfd = NULL;
+ e_object_del(E_OBJECT(n->cfd));
+ n->cfd = NULL;
}
_net_shutdown(n);
return 1;
}
EAPI int
-e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m)
{
Net *n;
-
+
n = m->data;
if (!n)
- return 0;
+ return 0;
e_config_domain_save("module.net", conf_edd, n->conf);
return 1;
}
EAPI int
-e_modapi_info(E_Module *m)
+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_modapi_about(E_Module *m)
{
- e_module_dialog_show(D_("Enlightenment Network Monitor Module"),
- D_("This module is used to monitor a network device."));
+ e_module_dialog_show(D_("Enlightenment Network Monitor Module"), D_("This
module is used to monitor a network device."));
return 1;
}
EAPI int
-e_modapi_config(E_Module *m)
+e_modapi_config(E_Module *m)
{
Net *n;
Evas_List *l;
E_Container *con;
-
+
n = m->data;
if (!n)
- return 0;
+ return 0;
if (!n->faces)
- return 0;
-
- for (l = n->faces; l; l = l->next)
- {
- Net_Face *nf;
-
- nf = l->data;
- if (!nf)
- continue;
-
- con = e_container_current_get(e_manager_current_get());
- if (nf->con == con)
- {
- _configure_net_module(nf);
- break;
- }
+ return 0;
+
+ for (l = n->faces; l; l = l->next)
+ {
+ Net_Face *nf;
+
+ nf = l->data;
+ if (!nf)
+ continue;
+
+ con = e_container_current_get(e_manager_current_get());
+ if (nf->con == con)
+ {
+ _configure_net_module(nf);
+ break;
+ }
}
return 1;
}
static Net *
-_net_init(E_Module *m)
+_net_init(E_Module *m)
{
Net *n;
E_Menu_Item *mi;
Evas_List *mans, *l, *l2, *fl;
-
+
n = E_NEW(Net, 1);
+
if (!n)
- return NULL;
-
+ return NULL;
+
conf_face_edd = E_CONFIG_DD_NEW("Net_Config_Face", Config_Face);
- #undef T
- #undef D
- #define T Config_Face
- #define D conf_face_edd
+#undef T
+#undef D
+#define T Config_Face
+#define D conf_face_edd
E_CONFIG_VAL(D, T, enabled, UCHAR);
E_CONFIG_VAL(D, T, device, STR);
E_CONFIG_VAL(D, T, check_interval, INT);
E_CONFIG_VAL(D, T, show_text, INT);
E_CONFIG_VAL(D, T, show_graph, INT);
-
+
conf_edd = E_CONFIG_DD_NEW("Net_Config", Config);
- #undef T
- #undef D
- #define T Config
- #define D conf_edd
+
+#undef T
+#undef D
+#define T Config
+#define D conf_edd
E_CONFIG_LIST(D, T, faces, conf_face_edd);
-
+
n->conf = e_config_domain_load("module.net", conf_edd);
- if (!n->conf)
- n->conf = E_NEW(Config, 1);
-
+ if (!n->conf)
+ n->conf = E_NEW(Config, 1);
+
_net_config_menu_new(n);
-
+
mans = e_manager_list();
fl = n->conf->faces;
- for (l = mans; l; l = l->next)
+ for (l = mans; l; l = l->next)
{
- E_Manager *man;
-
- man = l->data;
- for (l2 = man->containers; l2; l2 = l2->next)
- {
- E_Container *con;
- Net_Face *nf;
-
- con = l2->data;
- nf = _net_face_init(n, con);
- if (nf)
- {
- if (!fl)
- {
- nf->conf = E_NEW(Config_Face, 1);
- nf->conf->enabled = 1;
- nf->conf->device = (char *)evas_stringshare_add("eth0");
- nf->conf->check_interval = 30;
- nf->conf->show_text = 1;
- nf->conf->show_graph = 1;
- n->conf->faces = evas_list_append(n->conf->faces,
nf->conf);
- }
- else
- {
- nf->conf = fl->data;
- fl = fl->next;
- }
- E_CONFIG_LIMIT(nf->conf->check_interval, 0, 60);
- E_CONFIG_LIMIT(nf->conf->show_text, 0, 1);
- E_CONFIG_LIMIT(nf->conf->show_graph, 0, 1);
-
- nf->monitor =
ecore_timer_add((double)nf->conf->check_interval, _net_face_update_values, nf);
-
- _net_face_menu_new(nf);
-
- mi = e_menu_item_new(n->config_menu);
- e_menu_item_label_set(mi, _("Configuration"));
- e_menu_item_callback_set(mi, _net_face_cb_menu_configure, nf);
-
- mi = e_menu_item_new(n->config_menu);
- e_menu_item_label_set(mi, con->name);
- e_menu_item_submenu_set(mi, nf->menu);
-
- if (!nf->conf->enabled)
- _net_face_disable(nf);
- }
- }
+ E_Manager *man;
+
+ man = l->data;
+ for (l2 = man->containers; l2; l2 = l2->next)
+ {
+ E_Container *con;
+ Net_Face *nf;
+
+ con = l2->data;
+ nf = _net_face_init(n, con);
+ if (nf)
+ {
+ if (!fl)
+ {
+ nf->conf = E_NEW(Config_Face, 1);
+
+ nf->conf->enabled = 1;
+ nf->conf->device = (char *)evas_stringshare_add("eth0");
+ nf->conf->check_interval = 30;
+ nf->conf->show_text = 1;
+ nf->conf->show_graph = 1;
+ n->conf->faces = evas_list_append(n->conf->faces,
nf->conf);
+ }
+ else
+ {
+ nf->conf = fl->data;
+ fl = fl->next;
+ }
+ E_CONFIG_LIMIT(nf->conf->check_interval, 0, 60);
+ E_CONFIG_LIMIT(nf->conf->show_text, 0, 1);
+ E_CONFIG_LIMIT(nf->conf->show_graph, 0, 1);
+
+ nf->monitor =
ecore_timer_add((double)nf->conf->check_interval, _net_face_update_values, nf);
+
+ _net_face_menu_new(nf);
+
+ mi = e_menu_item_new(n->config_menu);
+ e_menu_item_label_set(mi, _("Configuration"));
+ e_menu_item_callback_set(mi, _net_face_cb_menu_configure,
nf);
+
+ mi = e_menu_item_new(n->config_menu);
+ e_menu_item_label_set(mi, con->name);
+ e_menu_item_submenu_set(mi, nf->menu);
+
+ if (!nf->conf->enabled)
+ _net_face_disable(nf);
+ }
+ }
}
return n;
}
static void
-_net_shutdown(Net *n)
+_net_shutdown(Net *n)
{
E_CONFIG_DD_FREE(conf_edd);
E_CONFIG_DD_FREE(conf_face_edd);
while (n->faces)
- _net_face_free(n->faces->data);
+ _net_face_free(n->faces->data);
e_object_del(E_OBJECT(n->config_menu));
evas_list_free(n->conf->faces);
-
+
E_FREE(n->conf);
E_FREE(n);
}
static void
-_net_config_menu_new(Net *n)
+_net_config_menu_new(Net *n)
{
E_Menu *mn;
-
+
mn = e_menu_new();
n->config_menu = mn;
}
static Net_Face *
-_net_face_init(Net *n, E_Container *con)
+_net_face_init(Net *n, E_Container *con)
{
Net_Face *nf;
Evas_Object *o;
char buf[4096];
nf = E_NEW(Net_Face, 1);
+
if (!nf)
- return NULL;
+ return NULL;
nf->net = n;
n->faces = evas_list_append(n->faces, nf);
nf->con = con;
e_object_ref(E_OBJECT(con));
nf->evas = con->bg_evas;
-
+
evas_event_freeze(nf->evas);
-
+
o = edje_object_add(nf->evas);
nf->net_obj = o;
-
- if (!e_theme_edje_object_set(o, "base/theme/modules/net",
"modules/net/main"))
+
+ if (!e_theme_edje_object_set(o, "base/theme/modules/net",
"modules/net/main"))
{
- snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/net.edj");
- edje_object_file_set(o, buf, "modules/net/main");
- }
+ snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/net.edj");
+ edje_object_file_set(o, buf, "modules/net/main");
+ }
evas_object_show(o);
o = edje_object_add(nf->evas);
@@ -282,28 +284,28 @@
o = edje_object_add(nf->evas);
nf->rtxt_obj = o;
- if (!e_theme_edje_object_set(o, "base/theme/modules/net",
"modules/net/rx_text"))
+ if (!e_theme_edje_object_set(o, "base/theme/modules/net",
"modules/net/rx_text"))
{
- snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/net.edj");
- edje_object_file_set(o, buf, "modules/net/rx_text");
- }
+ snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/net.edj");
+ edje_object_file_set(o, buf, "modules/net/rx_text");
+ }
evas_object_layer_set(o, 2);
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 255, 255, 255, 255);
evas_object_show(o);
-
+
o = edje_object_add(nf->evas);
nf->ttxt_obj = o;
- if (!e_theme_edje_object_set(o, "base/theme/modules/net",
"modules/net/tx_text"))
+ if (!e_theme_edje_object_set(o, "base/theme/modules/net",
"modules/net/tx_text"))
{
- snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR"/net.edj");
- edje_object_file_set(o, buf, "modules/net/tx_text");
- }
+ snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/net.edj");
+ edje_object_file_set(o, buf, "modules/net/tx_text");
+ }
evas_object_layer_set(o, 2);
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 255, 255, 255, 255);
evas_object_show(o);
-
+
o = evas_object_rectangle_add(nf->evas);
nf->event_obj = o;
evas_object_layer_set(o, 3);
@@ -311,15 +313,12 @@
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_net_face_cb_mouse_down, nf);
evas_object_show(o);
-
+
nf->gmc = e_gadman_client_new(nf->con->gadman);
e_gadman_client_domain_set(nf->gmc, "module.net", net_count++);
e_gadman_client_policy_set(nf->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_min_size_set(nf->gmc, 40, 40);
//e_gadman_client_max_size_set(nf->gmc, 128, 128);
e_gadman_client_auto_size_set(nf->gmc, 40, 40);
@@ -328,32 +327,32 @@
e_gadman_client_change_func_set(nf->gmc, _net_face_cb_gmc_change, nf);
e_gadman_client_load(nf->gmc);
evas_event_thaw(nf->evas);
-
+
return nf;
}
static void
-_net_face_menu_new(Net_Face *nf)
+_net_face_menu_new(Net_Face *nf)
{
E_Menu *mn;
E_Menu_Item *mi;
-
+
mn = e_menu_new();
nf->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_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _net_face_cb_menu_configure, nf);
-
+
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_util_menu_item_edje_icon_set(mi, "enlightenment/gadgets");
e_menu_item_callback_set(mi, _net_face_cb_menu_edit, nf);
}
static void
-_net_face_enable(Net_Face *nf)
+_net_face_enable(Net_Face *nf)
{
nf->conf->enabled = 1;
e_config_save_queue();
@@ -361,11 +360,11 @@
evas_object_show(nf->event_obj);
evas_object_show(nf->chart_obj);
evas_object_show(nf->rtxt_obj);
- evas_object_show(nf->ttxt_obj);
+ evas_object_show(nf->ttxt_obj);
}
static void
-_net_face_disable(Net_Face *nf)
+_net_face_disable(Net_Face *nf)
{
nf->conf->enabled = 0;
e_config_save_queue();
@@ -376,117 +375,116 @@
evas_object_hide(nf->ttxt_obj);
}
-static void
-_net_face_free(Net_Face *nf)
+static void
+_net_face_free(Net_Face *nf)
{
e_object_unref(E_OBJECT(nf->con));
e_object_del(E_OBJECT(nf->menu));
-
+
if (nf->monitor)
- ecore_timer_del(nf->monitor);
+ ecore_timer_del(nf->monitor);
if (nf->menu)
- e_object_del(E_OBJECT(nf->menu));
+ e_object_del(E_OBJECT(nf->menu));
if (nf->event_obj)
- evas_object_del(nf->event_obj);
+ evas_object_del(nf->event_obj);
if (nf->net_obj)
- evas_object_del(nf->net_obj);
+ evas_object_del(nf->net_obj);
if (nf->chart_obj)
- evas_object_del(nf->chart_obj);
+ evas_object_del(nf->chart_obj);
if (nf->rtxt_obj)
- evas_object_del(nf->rtxt_obj);
+ evas_object_del(nf->rtxt_obj);
if (nf->ttxt_obj)
- evas_object_del(nf->ttxt_obj);
+ evas_object_del(nf->ttxt_obj);
if (nf->old_rx || nf->old_tx)
- _net_face_graph_clear(nf);
-
- if (nf->gmc)
+ _net_face_graph_clear(nf);
+
+ if (nf->gmc)
{
- e_gadman_client_save(nf->gmc);
- e_object_del(E_OBJECT(nf->gmc));
+ e_gadman_client_save(nf->gmc);
+ e_object_del(E_OBJECT(nf->gmc));
}
-
+
nf->net->faces = evas_list_remove(nf->net->faces, nf);
-
+
E_FREE(nf->conf);
E_FREE(nf);
net_count--;
}
-static void
-_net_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
+static void
+_net_face_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
{
Net_Face *nf;
Evas_Coord x, y, w, h;
-
+
nf = data;
- switch (change)
+ switch (change)
{
- case E_GADMAN_CHANGE_MOVE_RESIZE:
- e_gadman_client_geometry_get(nf->gmc, &x, &y, &w, &h);
- evas_object_move(nf->net_obj, x, y);
- evas_object_move(nf->event_obj, x, y);
- evas_object_move(nf->chart_obj, x, y);
- evas_object_move(nf->rtxt_obj, x, y);
- evas_object_move(nf->ttxt_obj, x, y);
- evas_object_resize(nf->net_obj, w, h);
- evas_object_resize(nf->event_obj, w, h);
- evas_object_resize(nf->chart_obj, w, h);
- evas_object_resize(nf->rtxt_obj, w, h);
- evas_object_resize(nf->ttxt_obj, w, h);
- _net_face_graph_clear(nf);
- break;
- case E_GADMAN_CHANGE_RAISE:
- evas_object_raise(nf->net_obj);
- evas_object_raise(nf->event_obj);
- evas_object_raise(nf->chart_obj);
- evas_object_raise(nf->rtxt_obj);
- evas_object_raise(nf->ttxt_obj);
- break;
- default:
- break;
+ case E_GADMAN_CHANGE_MOVE_RESIZE:
+ e_gadman_client_geometry_get(nf->gmc, &x, &y, &w, &h);
+ evas_object_move(nf->net_obj, x, y);
+ evas_object_move(nf->event_obj, x, y);
+ evas_object_move(nf->chart_obj, x, y);
+ evas_object_move(nf->rtxt_obj, x, y);
+ evas_object_move(nf->ttxt_obj, x, y);
+ evas_object_resize(nf->net_obj, w, h);
+ evas_object_resize(nf->event_obj, w, h);
+ evas_object_resize(nf->chart_obj, w, h);
+ evas_object_resize(nf->rtxt_obj, w, h);
+ evas_object_resize(nf->ttxt_obj, w, h);
+ _net_face_graph_clear(nf);
+ break;
+ case E_GADMAN_CHANGE_RAISE:
+ evas_object_raise(nf->net_obj);
+ evas_object_raise(nf->event_obj);
+ evas_object_raise(nf->chart_obj);
+ evas_object_raise(nf->rtxt_obj);
+ evas_object_raise(nf->ttxt_obj);
+ break;
+ default:
+ break;
}
}
-static void
-_net_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void
*event_info)
+static void
+_net_face_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void
*event_info)
{
Net_Face *nf;
Evas_Event_Mouse_Down *ev;
-
+
ev = event_info;
nf = data;
- if (ev->button == 3)
+ if (ev->button == 3)
{
- e_menu_activate_mouse(nf->menu, e_zone_current_get(nf->con),
- ev->output.x, ev->output.y, 1, 1,
- E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
- e_util_container_fake_mouse_up_all_later(nf->con);
+ e_menu_activate_mouse(nf->menu, e_zone_current_get(nf->con),
+ ev->output.x, ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev->timestamp);
+ e_util_container_fake_mouse_up_all_later(nf->con);
}
}
-static void
-_net_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi)
+static void
+_net_face_cb_menu_edit(void *data, E_Menu *mn, E_Menu_Item *mi)
{
Net_Face *nf;
-
+
nf = data;
e_gadman_mode_set(nf->gmc->gadman, E_GADMAN_MODE_EDIT);
}
-static void
-_net_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi)
+static void
+_net_face_cb_menu_configure(void *data, E_Menu *mn, E_Menu_Item *mi)
{
Net_Face *nf;
nf = data;
if (!nf)
- return;
-
+ return;
+
_configure_net_module(nf);
}
-static int
-_net_face_update_values(void *data)
+static int
+_net_face_update_values(void *data)
{
Net_Face *nf;
FILE *stat;
@@ -505,122 +503,122 @@
int in_use = 0;
int out_use = 0;
Edje_Message_Float msg;
-
+
nf = data;
-
+
stat = fopen("/proc/net/dev", "r");
if (!stat)
- return 1;
+ return 1;
- found = 0;
- while (fgets(buf, 256, stat))
+ found = 0;
+ while (fgets(buf, 256, stat))
{
- int i = 0;
- for (; buf[i] != 0; i++)
- {
- if (buf[i] == ':')
- buf[i] = ' ';
- }
+ int i = 0;
+
+ for (; buf[i] != 0; i++)
+ {
+ if (buf[i] == ':')
+ buf[i] = ' ';
+ }
if (sscanf(buf, "%s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu "
"%lu %lu %lu %lu\n", dev, &in, &dummy, &dummy,
- &dummy, &dummy, &dummy, &dummy, &dummy, &out, &dummy,
- &dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 17)
+ &dummy, &dummy, &dummy, &dummy, &dummy, &out, &dummy,
&dummy, &dummy, &dummy, &dummy, &dummy, &dummy) < 17)
continue;
- if (!strcmp(dev, strdup(nf->conf->device)))
- {
- found = 1;
- break;
- }
+ if (!strcmp(dev, strdup(nf->conf->device)))
+ {
+ found = 1;
+ break;
+ }
}
fclose(stat);
-
- if (!found)
- return 1;
-
- if (old_in && old_out)
- {
- bytes_in = in - old_in;
- bytes_out = out - old_out;
-
- if (bytes_in < 0)
- bytes_in = 0;
- if (bytes_out < 0)
- bytes_out = 0;
-
- in_use = (int)((bytes_in * 100L) / max_in);
- out_use = (int)((bytes_out * 100L) / max_out);
+
+ if (!found)
+ return 1;
+
+ if (old_in && old_out)
+ {
+ bytes_in = in - old_in;
+ bytes_out = out - old_out;
+
+ if (bytes_in < 0)
+ bytes_in = 0;
+ if (bytes_out < 0)
+ bytes_out = 0;
+
+ in_use = (int)((bytes_in * 100L) / max_in);
+ out_use = (int)((bytes_out * 100L) / max_out);
}
- else
+ else
{
- in_use = 0;
- out_use = 0;
+ in_use = 0;
+ out_use = 0;
}
-
+
old_in = in;
old_out = out;
-
+
/* Update the modules text */
char in_str[100];
char out_str[100];
-
- if (!nf->conf->show_text)
+
+ if (!nf->conf->show_text)
{
- edje_object_part_text_set(nf->ttxt_obj, "tx-text", "");
- edje_object_part_text_set(nf->rtxt_obj, "rx-text", "");
+ edje_object_part_text_set(nf->ttxt_obj, "tx-text", "");
+ edje_object_part_text_set(nf->rtxt_obj, "rx-text", "");
}
else if ((bytes_in < 0) || (bytes_out < 0))
{
- edje_object_part_text_set(nf->ttxt_obj, "tx-text", "Tx: 0 B");
- edje_object_part_text_set(nf->rtxt_obj, "rx-text", "Rx: 0 B");
+ edje_object_part_text_set(nf->ttxt_obj, "tx-text", "Tx: 0 B");
+ edje_object_part_text_set(nf->rtxt_obj, "rx-text", "Rx: 0 B");
}
- else
+ else
{
- if (bytes_in > 1048576)
- {
- bytes_in = bytes_in / 1048576;
- snprintf(in_str, sizeof(in_str), "Rx: %d Mb", bytes_in);
- }
- else if (bytes_in > 1024 && bytes_in < 1048576)
- {
- bytes_in = bytes_in / 1024;
- snprintf(in_str, sizeof(in_str), "Rx: %d Kb", bytes_in);
- }
- else
- snprintf(in_str, sizeof(in_str), "Rx: %d B", bytes_in);
-
- if (bytes_out > 1048576)
- {
- bytes_out = bytes_out / 1048576;
- snprintf(out_str, sizeof(out_str), "Tx: %d Mb", bytes_out);
- }
- else if (bytes_out > 1024 && bytes_out < 1048576)
- {
- bytes_out = bytes_out / 1024;
- snprintf(out_str, sizeof(out_str), "Tx: %d Kb", bytes_out);
- }
- else
- snprintf(out_str, sizeof(out_str), "Tx: %d B", bytes_out);
+ if (bytes_in > 1048576)
+ {
+ bytes_in = bytes_in / 1048576;
+ snprintf(in_str, sizeof(in_str), "Rx: %d Mb", bytes_in);
+ }
+ else if (bytes_in > 1024 && bytes_in < 1048576)
+ {
+ bytes_in = bytes_in / 1024;
+ snprintf(in_str, sizeof(in_str), "Rx: %d Kb", bytes_in);
+ }
+ else
+ snprintf(in_str, sizeof(in_str), "Rx: %d B", bytes_in);
+
+ if (bytes_out > 1048576)
+ {
+ bytes_out = bytes_out / 1048576;
+ snprintf(out_str, sizeof(out_str), "Tx: %d Mb", bytes_out);
+ }
+ else if (bytes_out > 1024 && bytes_out < 1048576)
+ {
+ bytes_out = bytes_out / 1024;
+ snprintf(out_str, sizeof(out_str), "Tx: %d Kb", bytes_out);
+ }
+ else
+ snprintf(out_str, sizeof(out_str), "Tx: %d B", bytes_out);
- edje_object_part_text_set(nf->ttxt_obj, "tx-text", out_str);
- edje_object_part_text_set(nf->rtxt_obj, "rx-text", in_str);
+ edje_object_part_text_set(nf->ttxt_obj, "tx-text", out_str);
+ edje_object_part_text_set(nf->rtxt_obj, "rx-text", in_str);
}
-
+
msg.val = in_use;
edje_object_message_send(nf->net_obj, EDJE_MESSAGE_FLOAT, 1, &msg);
msg.val = out_use;
- edje_object_message_send(nf->net_obj, EDJE_MESSAGE_FLOAT, 2, &msg);
-
- if (nf->conf->show_graph)
- _net_face_graph_values(nf, out_use, in_use);
- else
- _net_face_graph_clear(nf);
-
+ edje_object_message_send(nf->net_obj, EDJE_MESSAGE_FLOAT, 2, &msg);
+
+ if (nf->conf->show_graph)
+ _net_face_graph_values(nf, out_use, in_use);
+ else
+ _net_face_graph_clear(nf);
+
return 1;
}
-static void
-_net_face_graph_values(Net_Face *nf, int tx_val, int rx_val)
+static void
+_net_face_graph_values(Net_Face *nf, int tx_val, int rx_val)
{
int x, y, w, h;
Evas_Object *o;
@@ -629,48 +627,48 @@
int i, j = 0;
evas_event_freeze(nf->evas);
-
+
evas_object_geometry_get(nf->chart_obj, &x, &y, &w, &h);
if (rx_val > 100)
- rx_val = 100;
+ rx_val = 100;
if (tx_val > 100)
- tx_val = 100;
-
- rx_val = (int)(((double)rx_val) * (((double)h) / ((double)100)));
- tx_val = (int)(((double)tx_val) * (((double)h) / ((double)100)));
-
+ tx_val = 100;
+
+ rx_val = (int)(((double)rx_val) * (((double)h) / ((double)100)));
+ tx_val = (int)(((double)tx_val) * (((double)h) / ((double)100)));
+
o = evas_object_line_add(nf->evas);
edje_object_part_swallow(nf->chart_obj, "lines", o);
evas_object_layer_set(o, 1);
if (rx_val == 0)
- evas_object_hide(o);
- else
+ evas_object_hide(o);
+ else
{
- evas_object_line_xy_set(o, (x + w), (y + h), (x + w), (y + h - rx_val));
- evas_object_color_set(o, 255, 0, 0, 100);
- evas_object_pass_events_set(o, 1);
- evas_object_show(o);
+ evas_object_line_xy_set(o, (x + w), (y + h), (x + w), (y + h -
rx_val));
+ evas_object_color_set(o, 255, 0, 0, 100);
+ evas_object_pass_events_set(o, 1);
+ evas_object_show(o);
}
nf->old_rx = evas_list_prepend(nf->old_rx, o);
l = nf->old_rx;
- 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;
-
- 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)
- {
- nf->old_rx = evas_list_remove(nf->old_rx, last);
- edje_object_part_unswallow(nf->chart_obj, last);
- evas_object_del(last);
- }
+ 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)
+ {
+ nf->old_rx = evas_list_remove(nf->old_rx, last);
+ edje_object_part_unswallow(nf->chart_obj, last);
+ evas_object_del(last);
+ }
j = 0;
last = NULL;
@@ -678,64 +676,65 @@
edje_object_part_swallow(nf->chart_obj, "lines", o);
evas_object_layer_set(o, 1);
if (tx_val == 0)
- evas_object_hide(o);
- else
+ evas_object_hide(o);
+ else
{
- evas_object_line_xy_set(o, (x + w), y, (x + w), (y + tx_val));
- evas_object_color_set(o, 0, 255, 0, 100);
- evas_object_pass_events_set(o, 1);
- evas_object_show(o);
+ evas_object_line_xy_set(o, (x + w), y, (x + w), (y + tx_val));
+ evas_object_color_set(o, 0, 255, 0, 100);
+ evas_object_pass_events_set(o, 1);
+ evas_object_show(o);
}
-
+
nf->old_tx = evas_list_prepend(nf->old_tx, o);
l = nf->old_tx;
- 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;
-
- 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)
- {
- nf->old_tx = evas_list_remove(nf->old_tx, last);
- edje_object_part_unswallow(nf->chart_obj, last);
- evas_object_del(last);
- }
-
+ 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)
+ {
+ nf->old_tx = evas_list_remove(nf->old_tx, last);
+ edje_object_part_unswallow(nf->chart_obj, last);
+ evas_object_del(last);
+ }
+
evas_event_thaw(nf->evas);
}
-void
-_net_face_graph_clear(Net_Face *nf)
+void
+_net_face_graph_clear(Net_Face *nf)
{
Evas_List *l;
-
+
evas_event_freeze(nf->evas);
-
- for (l = nf->old_rx; l; l = l->next)
+
+ for (l = nf->old_rx; l; l = l->next)
{
- Evas_Object *o;
- o = evas_list_data(l);
- edje_object_part_unswallow(nf->chart_obj, o);
- evas_object_del(o);
+ Evas_Object *o;
+
+ o = evas_list_data(l);
+ edje_object_part_unswallow(nf->chart_obj, o);
+ evas_object_del(o);
}
evas_list_free(nf->old_rx);
nf->old_rx = NULL;
- for (l = nf->old_tx; l; l = l->next)
+ for (l = nf->old_tx; l; l = l->next)
{
- Evas_Object *o;
- o = evas_list_data(l);
- edje_object_part_unswallow(nf->chart_obj, o);
- evas_object_del(o);
+ Evas_Object *o;
+
+ o = evas_list_data(l);
+ edje_object_part_unswallow(nf->chart_obj, o);
+ evas_object_del(o);
}
evas_list_free(nf->old_tx);
nf->old_tx = NULL;
-
+
evas_event_thaw(nf->evas);
}
-
===================================================================
RCS file: /cvs/e/e_modules/net/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 12 Mar 2006 18:45:41 -0000 1.7
+++ e_mod_main.h 5 Apr 2006 17:48:49 -0000 1.8
@@ -8,12 +8,12 @@
typedef struct _Net Net;
typedef struct _Net_Face Net_Face;
-struct _Config
+struct _Config
{
Evas_List *faces;
};
-struct _Config_Face
+struct _Config_Face
{
unsigned char enabled;
char *device;
@@ -22,7 +22,7 @@
int show_graph;
};
-struct _Net
+struct _Net
{
E_Menu *config_menu;
Evas_List *faces;
@@ -30,7 +30,7 @@
E_Config_Dialog *cfd;
};
-struct _Net_Face
+struct _Net_Face
{
Evas *evas;
E_Container *con;
@@ -38,27 +38,27 @@
Net *net;
Evas_List *old_rx, *old_tx;
Config_Face *conf;
-
+
Evas_Object *net_obj;
Evas_Object *event_obj;
Evas_Object *chart_obj;
Evas_Object *rtxt_obj;
Evas_Object *ttxt_obj;
-
+
Ecore_Timer *monitor;
-
+
E_Gadman_Client *gmc;
};
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);
-void _net_face_graph_clear(Net_Face *nf);
+void _net_face_graph_clear(Net_Face *nf);
#endif
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs