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 e7f0a25157
commit c478ee9a73
3 changed files with 437 additions and 437 deletions

View File

@ -9,18 +9,18 @@ struct _E_Config_Dialog_Data
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 @@ _configure_net_module(Net_Face *nf)
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 @@ _fill_data(Net_Face *nf, E_Config_Dialog_Data *cfdata)
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 @@ _create_data(E_Config_Dialog *cfd)
nf = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(nf, cfdata);
return cfdata;
}
@ -98,7 +99,7 @@ _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
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 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
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 @@ _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
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);
}

File diff suppressed because it is too large Load Diff

View File

@ -8,12 +8,12 @@ typedef struct _Config_Face Config_Face;
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 @@ struct _Config_Face
int show_graph;
};
struct _Net
struct _Net
{
E_Menu *config_menu;
Evas_List *faces;
@ -30,7 +30,7 @@ struct _Net
E_Config_Dialog *cfd;
};
struct _Net_Face
struct _Net_Face
{
Evas *evas;
E_Container *con;
@ -38,27 +38,27 @@ struct _Net_Face
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