Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : monitor
Dir : e_modules/monitor
Modified Files:
e_mod_main.h e_mod_main.c monitor.edc
Log Message:
Formatting. Should now be possible to use enlightenment_remote to set the
theme. EAPI fixes.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h 28 Dec 2005 16:47:12 -0000 1.6
+++ e_mod_main.h 14 Jan 2006 11:56:45 -0000 1.7
@@ -78,8 +78,8 @@
EAPI int e_modapi_about (E_Module *m);
EAPI int e_modapi_config (E_Module *m);
-void _monitor_cb_config_updated(void *data);
-void _monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-void rebuild_monitor(Monitor_Face *face);
+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);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 11 Jan 2006 13:41:55 -0000 1.10
+++ e_mod_main.c 14 Jan 2006 11:56:45 -0000 1.11
@@ -4,8 +4,6 @@
#include <linux/unistd.h> /* for _syscallX macros/related stuff */
#include <linux/kernel.h> /* for struct sysinfo */
-
-
/* module private routines */
static Monitor *_monitor_new();
@@ -45,13 +43,13 @@
static Flow_Chart *flow_chart_wlan_link;
/* public module routines. all modules must have these */
-E_Module_Api e_modapi =
+EAPI E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
"Monitor"
};
-void *
+EAPI void *
e_modapi_init(E_Module *module)
{
Monitor *monitor;
@@ -62,7 +60,7 @@
return monitor;
}
-int
+EAPI int
e_modapi_shutdown(E_Module *module)
{
Monitor *monitor;
@@ -77,7 +75,7 @@
return 1;
}
-int
+EAPI int
e_modapi_save(E_Module *module)
{
Monitor *monitor;
@@ -87,14 +85,14 @@
return 1;
}
-int
+EAPI int
e_modapi_info(E_Module *module)
{
module->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
-int
+EAPI int
e_modapi_about(E_Module *module)
{
e_module_dialog_show(_("Enlightenment Monitor Module"),
@@ -102,7 +100,7 @@
return 1;
}
-int
+EAPI int
e_modapi_config(E_Module *module)
{
Monitor *mon;
@@ -324,7 +322,8 @@
char u_date_time[256];
struct sysinfo s_info;
sysinfo (&s_info);
-
+ char buff[4096];
+
long minute = 60;
long hour = minute * 60;
long day = hour * 24;
@@ -351,10 +350,12 @@
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;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/main");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/main"))
+ edje_object_file_set(o, strdup(buff), "monitor/main");
evas_object_show(o);
/* setup res table */
o = e_table_add(con->bg_evas);
@@ -367,7 +368,8 @@
if (config->hostname)
{
face->hostname = edje_object_add(con->bg_evas);
- edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/host");
+ if (!e_theme_edje_object_set(face->hostname,
"base/theme/modules/monitor", "modules/monitor/host"))
+ edje_object_file_set(face->hostname, strdup(buff),
"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);
@@ -381,7 +383,8 @@
{
o = edje_object_add(con->bg_evas);
face->cpu = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/cpu");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/cpu"))
+ edje_object_file_set(o, strdup(buff), "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);
@@ -399,7 +402,8 @@
/* setup mem */
o = edje_object_add(con->bg_evas);
face->mem = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/mem");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/mem"))
+ edje_object_file_set(o, strdup(buff), "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);
@@ -424,7 +428,8 @@
/* setup net */
o = edje_object_add(con->bg_evas);
face->net = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/net");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/net"))
+ edje_object_file_set(o, strdup(buff), "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);
@@ -450,7 +455,8 @@
/* setup wlan */
o = edje_object_add(con->bg_evas);
face->wlan = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/wlan");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/wlan"))
+ edje_object_file_set(o, strdup(buff), "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);
@@ -465,7 +471,8 @@
if (config->uptime)
{
face->uptime = edje_object_add(con->bg_evas);
- edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/uptime");
+ if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor",
"modules/monitor/uptime"))
+ edje_object_file_set(face->uptime, strdup(buff),
"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,
@@ -482,7 +489,8 @@
date = *localtime(&now);
face->time = edje_object_add(con->bg_evas);
- edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/time");
+ if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor",
"modules/monitor/time"))
+ edje_object_file_set(face->time, strdup(buff), "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);
@@ -624,13 +632,13 @@
e_object_del(E_OBJECT(face->gmc));
if (face->date_check_timer) ecore_timer_del(face->date_check_timer);
- evas_object_del(face->cpu);
- evas_object_del(face->mem);
- evas_object_del(face->net);
- evas_object_del(face->wlan);
- evas_object_del(face->hostname);
- evas_object_del(face->uptime);
- evas_object_del(face->time);
+ if (face->cpu) evas_object_del(face->cpu);
+ if (face->mem) evas_object_del(face->mem);
+ if (face->net) evas_object_del(face->net);
+ if (face->wlan) evas_object_del(face->wlan);
+ if (face->hostname) evas_object_del(face->hostname);
+ if (face->uptime) evas_object_del(face->uptime);
+ if (face->time) evas_object_del(face->time);
chart_container_del(face->chart_cpu);
chart_container_del(face->chart_mem);
@@ -704,7 +712,7 @@
e_gadman_mode_set(face->gmc->gadman, E_GADMAN_MODE_EDIT);
}
-void
+static void
_monitor_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
Monitor_Face *face;
@@ -764,29 +772,36 @@
e_menu_item_callback_set(mi, _monitor_face_cb_menu_edit, face);
}
-void _monitor_cb_config_updated(void *data)
+static void
+_monitor_cb_config_updated(void *data)
{
Monitor_Face *face;
face = data;
- if (face->cpu) flow_chart_update_rate_set(flow_chart_cpu,
face->conf->cpu_interval);
+
+ if (face->cpu)
+ flow_chart_update_rate_set(flow_chart_cpu, face->conf->cpu_interval);
- if (face->mem)
mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached);
- {
+ if (face->mem)
+ {
+ mem_real_ignore_cached_set(face->conf->mem_real_ignore_cached);
mem_real_ignore_buffers_set(face->conf->mem_real_ignore_buffers);
flow_chart_update_rate_set(flow_chart_mem_real,
face->conf->mem_interval);
flow_chart_update_rate_set(flow_chart_mem_swap,
face->conf->mem_interval);
- }
-
- if (face->wlan) wlan_interface_set(face->conf->wlan_interface);
- if (face->wlan) flow_chart_update_rate_set(flow_chart_wlan_link,
face->conf->wlan_interval);
+ }
+ if (face->wlan)
+ {
+ wlan_interface_set(face->conf->wlan_interface);
+ flow_chart_update_rate_set(flow_chart_wlan_link,
face->conf->wlan_interval);
+ }
+
if (face->net)
- {
+ {
net_interface_set(face->conf->net_interface);
flow_chart_update_rate_set(flow_chart_net_in, face->conf->net_interval);
flow_chart_update_rate_set(flow_chart_net_out,
face->conf->net_interval);
- }
+ }
}
static void
@@ -798,6 +813,7 @@
if (!f) return;
_config_monitor_module(f->con, f);
}
+
static void
_add_sensor(Monitor_Face *face, Evas_Object *o, int VerHor)
{
@@ -811,7 +827,8 @@
num_sensors++;
}
-void rebuild_monitor(Monitor_Face *face)
+static void
+rebuild_monitor(Monitor_Face *face)
{
struct utsname u_buf;
uname (&u_buf);
@@ -868,7 +885,8 @@
/* setup monitor object */
o = edje_object_add(face->con->bg_evas);
face->monitor_object = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/main");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/main"))
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/main");
evas_object_show(o);
/* setup res table */
o = e_table_add(face->con->bg_evas);
@@ -880,7 +898,8 @@
if (face->mon->conf->hostname)
{
face->hostname = edje_object_add(face->con->bg_evas);
- edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/host");
+ if (!e_theme_edje_object_set(face->hostname,
"base/theme/modules/monitor", "modules/monitor/host"))
+ edje_object_file_set(face->hostname, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/host");
_add_sensor(face,face->hostname,face->mon->conf->Horz);
edje_object_part_text_set(face->hostname,"sysname",u_buf.sysname);
edje_object_part_text_set(face->hostname,"release",u_buf.release);
@@ -894,7 +913,8 @@
{
o = edje_object_add(face->con->bg_evas);
face->cpu = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/cpu");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/cpu"))
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/cpu");
_add_sensor(face, face->cpu,face->mon->conf->Horz);
/* add cpu chart */
chart_con = chart_container_new(face->con->bg_evas,0,0,0,0);
@@ -912,7 +932,8 @@
/* setup mem */
o = edje_object_add(face->con->bg_evas);
face->mem = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/mem");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/mem"))
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/mem");
_add_sensor(face, face->mem,face->mon->conf->Horz);
/* add mem charts */
chart_con = chart_container_new(face->con->bg_evas,0,0,0,0);
@@ -937,7 +958,8 @@
/* setup net */
o = edje_object_add(face->con->bg_evas);
face->net = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/net");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/net"))
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/net");
_add_sensor(face, face->net, face->mon->conf->Horz);
/* add net charts */
chart_con = chart_container_new(face->con->bg_evas,0,0,0,0);
@@ -963,7 +985,8 @@
/* setup wlan */
o = edje_object_add(face->con->bg_evas);
face->wlan = o;
- edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj", "monitor/wlan");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/monitor",
"modules/monitor/wlan"))
+ edje_object_file_set(o, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/wlan");
_add_sensor(face, face->wlan,face->mon->conf->Horz);
/* add wlan charts */
chart_con = chart_container_new(face->con->bg_evas,0,0,0,0);
@@ -980,7 +1003,8 @@
int num_days, num_hours, num_min;
char u_date_time[256];
face->uptime = edje_object_add(face->con->bg_evas);
- edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/uptime");
+ if (!e_theme_edje_object_set(face->uptime, "base/theme/modules/monitor",
"modules/monitor/uptime"))
+ edje_object_file_set(face->uptime, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/uptime");
sprintf (u_date_time,"uptime: %ld days, %ld:%02ld:%02ld",
s_info.uptime / day, (s_info.uptime % day) / hour,
(s_info.uptime % hour) / minute, s_info.uptime % minute);
@@ -997,7 +1021,8 @@
date = *localtime(&now);
face->time = edje_object_add(face->con->bg_evas);
- edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj",
"monitor/time");
+ if (!e_theme_edje_object_set(face->time, "base/theme/modules/monitor",
"modules/monitor/time"))
+ edje_object_file_set(face->time, PACKAGE_DATA_DIR"/monitor.edj",
"modules/monitor/time");
_add_sensor(face, face->time,face->mon->conf->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);
@@ -1025,14 +1050,15 @@
e_gadman_client_load(face->gmc);
evas_event_thaw(face->con->bg_evas);
-
}
-static int _date_cb_check(void *data)
+
+static int
+_date_cb_check(void *data)
{
Monitor_Face *face;
face = data;
-//Update uptime
+ //Update uptime
char u_date_time[256];
struct sysinfo s_info;
sysinfo (&s_info);
@@ -1047,7 +1073,7 @@
(s_info.uptime % hour) / minute, s_info.uptime % minute);
edje_object_part_text_set(face->uptime,"uptime",u_date_time);
-//Update time
+ //Update time
time_t now;
struct tm date;
time(&now);
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/monitor/monitor.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- monitor.edc 29 Dec 2005 01:48:09 -0000 1.2
+++ monitor.edc 14 Jan 2006 11:56:45 -0000 1.3
@@ -19,7 +19,7 @@
{
group {
- name, "monitor/menu/cpu";
+ name, "modules/monitor/menu/cpu";
parts {
part {
name, "background";
@@ -33,7 +33,7 @@
}
}//close group menu/cpu
group {
- name, "monitor/menu/mem";
+ name, "modules/monitor/menu/mem";
parts {
part {
name, "background";
@@ -47,7 +47,7 @@
}
}//close group mem
group {
- name, "monitor/menu/net";
+ name, "modules/monitor/menu/net";
parts {
part {
name, "background";
@@ -62,7 +62,7 @@
}//close group net
group {
- name, "monitor/menu/wlan";
+ name, "modules/monitor/menu/wlan";
parts {
part {
name, "background";
@@ -77,7 +77,7 @@
}//close group wlan
group {
- name, "monitor/main";
+ name, "modules/monitor/main";
parts {
part {
@@ -125,10 +125,8 @@
group
{
- name, "monitor/cpu";
-
+ name, "modules/monitor/cpu";
parts{
-
part {
name, "overlay";
mouse_events, 0;
@@ -150,7 +148,6 @@
}
}
-
part {
name, "cpu";
mouse_events, 0;
@@ -184,20 +181,14 @@
align, 1.0 0.0;
}
}
- }
-
-
+ }
}
-
}//close group cpu
-
group
{
- name, "monitor/mem";
-
+ name, "modules/monitor/mem";
parts{
-
part {
name, "overlay";
mouse_events, 0;
@@ -284,10 +275,8 @@
group
{
- name, "monitor/net";
-
+ name, "modules/monitor/net";
parts{
-
part {
name, "overlay";
mouse_events, 0;
@@ -373,7 +362,7 @@
}//close group net
group {
- name, "monitor/wlan";
+ name, "modules/monitor/wlan";
parts {
part {
name, "overlay";
@@ -433,7 +422,7 @@
}//close group wlan
group {
- name, "monitor/host";
+ name, "modules/monitor/host";
parts {
part {
name, "overlay";
@@ -516,7 +505,7 @@
}
}//close group hostname
group {
- name, "monitor/uptime";
+ name, "modules/monitor/uptime";
parts {
part {
name, "overlay";
@@ -562,7 +551,7 @@
}//close group uptime
group {
- name, "monitor/time";
+ name, "modules/monitor/time";
parts {
part {
name, "overlay";
-------------------------------------------------------
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
