Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : monitor
Dir : e_modules/monitor
Modified Files:
e_mod_main.h e_mod_main.c e_mod_config.c
Log Message:
Formatting. E_Config_Dialog_Data fixes. Function Proto fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_main.h 14 Jan 2006 11:56:45 -0000 1.7
+++ e_mod_main.h 15 Jan 2006 08:05:09 -0000 1.8
@@ -78,8 +78,7 @@
EAPI int e_modapi_about (E_Module *m);
EAPI int e_modapi_config (E_Module *m);
-static void _monitor_cb_config_updated(void *data);
-static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void rebuild_monitor(Monitor_Face *face);
+void _monitor_cb_config_updated(void *data);
+void rebuild_monitor(Monitor_Face *face);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c 14 Jan 2006 12:54:30 -0000 1.12
+++ e_mod_main.c 15 Jan 2006 08:05:09 -0000 1.13
@@ -13,8 +13,7 @@
static Monitor_Face *_monitor_face_new(E_Container *con, Config *config);
static void _monitor_face_free(Monitor_Face *face);
static void _monitor_face_menu_new(Monitor_Face *face);
-static void _monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
- E_Gadman_Change change);
+static void _monitor_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
Config_Face * _monitor_face_config_init(Config_Face *conf);
static int _monitor_face_config_cb_timer(void *data);
@@ -29,6 +28,8 @@
static void _add_sensor(Monitor_Face *face, Evas_Object *o, int VerHor);
static int _date_cb_check(void *data);
+static void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
+
static int _monitor_count;
static int num_sensors;
@@ -224,7 +225,7 @@
face = _monitor_face_new(con,monitor->conf);
if (face)
{
- face->mon = monitor;
+ face->mon = monitor;
monitor->faces = evas_list_append(monitor->faces, face);
/* Config */
if (!cl)
@@ -282,6 +283,8 @@
flow_chart_update_rate_set(flow_chart_net_out,
face->conf->net_interval);
if (monitor->conf->wlan)
flow_chart_update_rate_set(flow_chart_wlan_link,
face->conf->wlan_interval);
+
+ rebuild_monitor(face);
}
}
}
@@ -322,7 +325,6 @@
char u_date_time[256];
struct sysinfo s_info;
sysinfo (&s_info);
- char buff[4096];
long minute = 60;
long hour = minute * 60;
@@ -350,13 +352,13 @@
evas_event_freeze(con->bg_evas);
- snprintf(buff, sizeof(buff), PACKAGE_DATA_DIR"/monitor.edj");
/* setup monitor object */
o = edje_object_add(con->bg_evas);
face->monitor_object = o;
if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/main"))
- edje_object_file_set(o, buff, "monitor/main");
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/main");
evas_object_show(o);
+
/* setup res table */
o = e_table_add(con->bg_evas);
face->table_object = o;
@@ -369,7 +371,7 @@
{
face->hostname = edje_object_add(con->bg_evas);
if (!e_theme_edje_object_set(face->hostname,
"base/theme/modules/monitor", "modules/monitor/host"))
- edje_object_file_set(face->hostname, buff, "modules/monitor/host");
+ edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/host");
_add_sensor(face,face->hostname,config->Horz);
edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname);
edje_object_part_text_set(face->hostname,"release",u_buf.release);
@@ -384,8 +386,9 @@
o = edje_object_add(con->bg_evas);
face->cpu = o;
if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/cpu"))
- edje_object_file_set(o, buff, "modules/monitor/cpu");
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/cpu");
_add_sensor(face, face->cpu,config->Horz);
+
/* add cpu chart */
chart_con = chart_container_new(con->bg_evas,0,0,0,0);
flow_chart_cpu = flow_chart_new();
@@ -395,16 +398,17 @@
chart_container_chart_add(chart_con, flow_chart_cpu);
face->chart_cpu = chart_con;
flow_chart_callback_set(flow_chart_cpu,
_monitor_cpu_text_update_callcack, face);
-
}
+
if (config->mem)
{
/* setup mem */
o = edje_object_add(con->bg_evas);
face->mem = o;
if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/mem"))
- edje_object_file_set(o, buff, "modules/monitor/mem");
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/mem");
_add_sensor(face, face->mem,config->Horz);
+
/* add mem charts */
chart_con = chart_container_new(con->bg_evas,0,0,0,0);
flow_chart_mem_real = flow_chart_new();
@@ -423,14 +427,16 @@
chart_container_chart_add(chart_con, flow_chart_mem_swap);
flow_chart_callback_set(flow_chart_mem_swap,
_monitor_mem_swap_text_update_callback, face);
}
+
if (config->net)
{
/* setup net */
o = edje_object_add(con->bg_evas);
face->net = o;
if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/net"))
- edje_object_file_set(o, buff, "modules/monitor/net");
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/net");
_add_sensor(face, face->net, config->Horz);
+
/* add net charts */
chart_con = chart_container_new(con->bg_evas,0,0,0,0);
flow_chart_net_in = flow_chart_new();
@@ -456,8 +462,9 @@
o = edje_object_add(con->bg_evas);
face->wlan = o;
if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/wlan"))
- edje_object_file_set(o, buff, "modules/monitor/wlan");
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/wlan");
_add_sensor(face, face->wlan,config->Horz);
+
/* add wlan charts */
chart_con = chart_container_new(con->bg_evas,0,0,0,0);
flow_chart_wlan_link = flow_chart_new();
@@ -468,11 +475,12 @@
face->chart_wlan = chart_con;
flow_chart_callback_set(flow_chart_wlan_link,
_monitor_wlan_link_text_update_callcack, face);
}
+
if (config->uptime)
{
face->uptime = edje_object_add(con->bg_evas);
if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor",
"modules/monitor/uptime"))
- edje_object_file_set(face->uptime, buff, "modules/monitor/uptime");
+ edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/uptime");
_add_sensor(face, face->uptime,config->Horz);
sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld",
s_info.uptime / day, (s_info.uptime % day) / hour,
@@ -480,6 +488,7 @@
edje_object_part_text_set(face->uptime,"uptime",u_date_time);
face->date_check_timer = ecore_timer_add(1, _date_cb_check,face);
}
+
if (config->time)
{
time_t now;
@@ -490,7 +499,7 @@
date = *localtime(&now);
face->time = edje_object_add(con->bg_evas);
if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor",
"modules/monitor/time"))
- edje_object_file_set(face->time, buff, "modules/monitor/time");
+ edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/time");
_add_sensor(face, face->time,config->Horz);
sprintf
(curr_time,"%02d:%02d:%02d",date.tm_hour,date.tm_min,date.tm_sec);
edje_object_part_text_set(face->time,"time",curr_time);
@@ -772,7 +781,7 @@
e_menu_item_callback_set(mi, _monitor_face_cb_menu_edit, face);
}
-static void
+void
_monitor_cb_config_updated(void *data)
{
Monitor_Face *face;
@@ -827,7 +836,7 @@
num_sensors++;
}
-static void
+void
rebuild_monitor(Monitor_Face *face)
{
struct utsname u_buf;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_config.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_mod_config.c 14 Jan 2006 15:55:42 -0000 1.5
+++ e_mod_config.c 15 Jan 2006 08:05:09 -0000 1.6
@@ -1,9 +1,8 @@
-#include "e.h"
+#include <e.h>
#include "e_mod_main.h"
#include "e_mod_config.h"
#include "config.h"
-typedef struct _cfdata CFData;
typedef struct _Cfg_File_Data Cfg_File_Data;
int net_interface_count;
@@ -14,7 +13,7 @@
int wlan_interface_number;
Ecore_List *wlan_interfaces = NULL;
-struct _cfdata
+struct _E_Config_Dialog_Data
{
double cpu_interval;
double mem_interval;
@@ -36,11 +35,11 @@
/* Protos */
static void *_create_data(E_Config_Dialog *cfd);
-static void _free_data(E_Config_Dialog *cfd, void *data);
-static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
-static int _basic_apply_data(E_Config_Dialog *cfd, void *data);
-static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas
*evas, void *data);
-static int _advanced_apply_data(E_Config_Dialog *cfd, void *data);
+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 Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas
*evas, E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *cfdata);
void
_config_monitor_module(E_Container *con, Monitor_Face *f)
@@ -59,7 +58,7 @@
}
static void
-_fill_data(Monitor_Face *f, CFData *cfdata)
+_fill_data(Monitor_Face *f, E_Config_Dialog_Data *cfdata)
{
char *tmp;
int i = 0;
@@ -94,39 +93,34 @@
}
}
-static void
-*_create_data(E_Config_Dialog *cfd)
+static void *
+_create_data(E_Config_Dialog *cfd)
{
- CFData *cfdata;
+ E_Config_Dialog_Data *cfdata;
Monitor_Face *f;
f = cfd->data;
- cfdata = E_NEW(CFData, 1);
+ cfdata = E_NEW(E_Config_Dialog_Data, 1);
_fill_data(f, cfdata);
return cfdata;
}
static void
-_free_data(E_Config_Dialog *cfd, void *data)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- CFData *cfdata;
- cfdata = data;
free(cfdata);
}
-static Evas_Object
-*_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
+static Evas_Object *
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
Evas_Object *o, *of, *ob, *ob1, *ob2, *ob3, *ob4, *ob5, *ob6, *ob7,*ot;
E_Radio_Group *rg;
- CFData *cfdata;
- cfdata = data;
char *tmp;
int i;
Monitor_Face *f;
Monitor *mon;
-
f = cfd->data;
mon = f->mon;
@@ -157,22 +151,20 @@
}
static int
-_basic_apply_data(E_Config_Dialog *cfd, void *data)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- CFData *cfdata;
- cfdata = data;
Monitor_Face *face;
+
face = cfd->data;
rebuild_monitor(face);
return 1;
}
+
static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, void *data)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob, *ot;
E_Radio_Group *rg;
- CFData *cfdata;
- cfdata = data;
char *tmp;
int i;
Monitor_Face *f;
@@ -248,15 +240,14 @@
return o;
}
+
static int
-_advanced_apply_data(E_Config_Dialog *cfd, void *data)
+_advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Monitor_Face *f;
- CFData *cfdata;
char *tmp;
int i;
- cfdata = data;
f = cfd->data;
e_border_button_bindings_ungrab_all();
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
