Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/temperature
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
- Move functions from face to main object.
- Add menu on each face.
- Save config.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.c 7 Feb 2005 11:29:36 -0000 1.8
+++ e_mod_main.c 10 Feb 2005 11:58:14 -0000 1.9
@@ -1,30 +1,41 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#include "e.h"
#include "e_mod_main.h"
/* TODO List:
*
- * should support proepr resize and move handles in the edje.
- *
+ * which options should be in main menu, and which in face menu?
*/
/* module private routines */
-static Temperature *_temperature_init(E_Module *m);
+static Temperature *_temperature_new();
static void _temperature_shutdown(Temperature *e);
-static E_Menu *_temperature_config_menu_new(Temperature *e);
-static void _temperature_config_menu_del(Temperature *e, E_Menu *m);
-static void _temperature_face_init(Temperature_Face *ef);
-static void _temperature_face_free(Temperature_Face *ef);
-static void _temperature_cb_face_down(void *data, Evas *e, Evas_Object
*obj, void *event_info);
-static void _temperature_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change);
+static void _temperature_config_menu_new(Temperature *e);
static int _temperature_cb_check(void *data);
-static void _temperature_level_set(Temperature_Face *ef, double level);
+
+static Temperature_Face *_temperature_face_new(E_Container *con);
+static void _temperature_face_free(Temperature_Face *ef);
+static void _temperature_face_enable(Temperature_Face *face);
+static void _temperature_face_disable(Temperature_Face *face);
+static void _temperature_face_menu_new(Temperature_Face *face);
+static void _temperature_face_cb_gmc_change(void *data, E_Gadman_Client
*gmc, E_Gadman_Change change);
+static void _temperature_face_cb_mouse_down(void *data, Evas *e,
Evas_Object *obj, void *event_info);
+static void _temperature_face_level_set(Temperature_Face *ef, double
level);
+static void _temperature_face_cb_menu_enabled(void *data, E_Menu *m,
E_Menu_Item *mi);
+
+static E_Config_DD *conf_edd;
+static E_Config_DD *conf_face_edd;
+
+static int temperature_count;
/* public module routines. all modules must have these */
void *
init(E_Module *m)
{
Temperature *e;
-
+
/* check module api version */
if (m->api->version < E_MODULE_API_VERSION)
{
@@ -38,8 +49,8 @@
return NULL;
}
/* actually init temperature */
- e = _temperature_init(m);
- m->config_menu = _temperature_config_menu_new(e);
+ e = _temperature_new(m);
+ m->config_menu = e->config_menu;
return e;
}
@@ -47,20 +58,13 @@
shutdown(E_Module *m)
{
Temperature *e;
-
+
+ if (m->config_menu)
+ m->config_menu = NULL;
+
e = m->data;
if (e)
- {
- if (m->config_menu)
- {
- _temperature_config_menu_del(e, e->config_menu1);
- _temperature_config_menu_del(e, e->config_menu2);
- _temperature_config_menu_del(e, e->config_menu3);
- _temperature_config_menu_del(e, m->config_menu);
- m->config_menu = NULL;
- }
- _temperature_shutdown(e);
- }
+ _temperature_shutdown(e);
return 1;
}
@@ -70,7 +74,7 @@
Temperature *e;
e = m->data;
- e_config_domain_save("module.temperature", e->conf_edd, e->conf);
+ e_config_domain_save("module.temperature", conf_edd, e->conf);
return 1;
}
@@ -78,7 +82,7 @@
info(E_Module *m)
{
char buf[4096];
-
+
m->label = strdup("Temperature");
snprintf(buf, sizeof(buf), "%s/module_icon.png", e_module_dir_get(m));
m->icon_file = strdup(buf);
@@ -97,24 +101,35 @@
/* module private routines */
static Temperature *
-_temperature_init(E_Module *m)
+_temperature_new()
{
Temperature *e;
- Evas_List *managers, *l, *l2;
-
- e = calloc(1, sizeof(Temperature));
+ Evas_List *managers, *l, *l2, *cl, *ml;
+ E_Menu *mn;
+ E_Menu_Item *mi;
+
+ temperature_count = 0;
+ e = E_NEW(Temperature, 1);
if (!e) return NULL;
-
- e->conf_edd = E_CONFIG_DD_NEW("Temperature_Config", Config);
+
+ conf_face_edd = E_CONFIG_DD_NEW("Temperature_Config_Face", Config_Face);
+#undef T
+#undef D
+#define T Config_Face
+#define D conf_face_edd
+ E_CONFIG_VAL(D, T, enabled, INT);
+
+ conf_edd = E_CONFIG_DD_NEW("Temperature_Config", Config);
#undef T
#undef D
#define T Config
-#define D e->conf_edd
+#define D conf_edd
E_CONFIG_VAL(D, T, poll_time, DOUBLE);
E_CONFIG_VAL(D, T, low, INT);
E_CONFIG_VAL(D, T, high, INT);
+ E_CONFIG_LIST(D, T, faces, conf_face_edd);
- e->conf = e_config_domain_load("module.temperature", e->conf_edd);
+ e->conf = e_config_domain_load("module.temperature", conf_edd);
if (!e->conf)
{
e->conf = E_NEW(Config, 1);
@@ -125,40 +140,93 @@
E_CONFIG_LIMIT(e->conf->poll_time, 0.5, 1000.0);
E_CONFIG_LIMIT(e->conf->low, 0, 100);
E_CONFIG_LIMIT(e->conf->high, 0, 200);
-
+
+ _temperature_config_menu_new(e);
+ e->have_temp = -1;
+ e->temperature_check_timer = ecore_timer_add(e->conf->poll_time,
_temperature_cb_check, e);
+
managers = e_manager_list();
+ cl = e->conf->faces;
for (l = managers; l; l = l->next)
{
E_Manager *man;
-
+
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
Temperature_Face *ef;
-
+
con = l2->data;
- ef = calloc(1, sizeof(Temperature_Face));
+ ef = _temperature_face_new(con);
if (ef)
{
- ef->temp = e;
- ef->con = con;
- ef->evas = con->bg_evas;
- _temperature_face_init(ef);
- e->face = ef;
+ e->faces = evas_list_append(e->faces, ef);
+ /* Config */
+ if (!cl)
+ {
+ ef->conf = E_NEW(Config_Face, 1);
+ ef->conf->enabled = 1;
+ e->conf->faces = evas_list_append(e->conf->faces,
ef->conf);
+ }
+ else
+ {
+ ef->conf = cl->data;
+ cl = cl->next;
+ }
+
+ /* Menu */
+ /* This menu must be initialized after conf */
+ _temperature_face_menu_new(ef);
+
+ /* Add main menu to face menu */
+ /*
+ for (ml = e->menus; ml; ml = ml->next)
+ {
+ mn = ml->data;
+ mi = e_menu_item_new(ef->menu);
+ e_menu_item_label_set(mi, "????");
+ e_menu_item_submenu_set(mi, mn);
+ }
+ */
+
+ mi = e_menu_item_new(e->config_menu);
+ e_menu_item_label_set(mi, con->name);
+
+ e_menu_item_submenu_set(mi, ef->menu);
+
+ /* Setup */
+ if (!ef->conf->enabled)
+ _temperature_face_disable(ef);
}
}
}
+
+ _temperature_cb_check(e);
+
return e;
}
static void
_temperature_shutdown(Temperature *e)
{
+ Evas_List *l;
+
+ E_CONFIG_DD_FREE(conf_edd);
+ E_CONFIG_DD_FREE(conf_face_edd);
+
+ for (l = e->faces; l; l = l->next)
+ _temperature_face_free(l->data);
+ evas_list_free(e->faces);
+
+ for (l = e->menus; l; l = l->next)
+ e_object_del(E_OBJECT(l->data));
+ evas_list_free(e->menus);
+ e_object_del(E_OBJECT(e->config_menu));
+
+ ecore_timer_del(e->temperature_check_timer);
+
free(e->conf);
- E_CONFIG_DD_FREE(e->conf_edd);
-
- _temperature_face_free(e->face);
free(e);
}
@@ -166,11 +234,11 @@
_temperature_menu_fast(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->poll_time = 1.0;
- ecore_timer_del(e->face->temperature_check_timer);
- e->face->temperature_check_timer =
ecore_timer_add(e->face->temp->conf->poll_time, _temperature_cb_check, e->face);
+ ecore_timer_del(e->temperature_check_timer);
+ e->temperature_check_timer = ecore_timer_add(e->conf->poll_time,
_temperature_cb_check, e);
e_config_save_queue();
}
@@ -178,11 +246,11 @@
_temperature_menu_medium(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->poll_time = 5.0;
- ecore_timer_del(e->face->temperature_check_timer);
- e->face->temperature_check_timer =
ecore_timer_add(e->face->temp->conf->poll_time, _temperature_cb_check, e->face);
+ ecore_timer_del(e->temperature_check_timer);
+ e->temperature_check_timer = ecore_timer_add(e->conf->poll_time,
_temperature_cb_check, e);
e_config_save_queue();
}
@@ -190,11 +258,11 @@
_temperature_menu_normal(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->poll_time = 10.0;
- ecore_timer_del(e->face->temperature_check_timer);
- e->face->temperature_check_timer =
ecore_timer_add(e->face->temp->conf->poll_time, _temperature_cb_check, e->face);
+ ecore_timer_del(e->temperature_check_timer);
+ e->temperature_check_timer = ecore_timer_add(e->conf->poll_time,
_temperature_cb_check, e);
e_config_save_queue();
}
@@ -202,11 +270,11 @@
_temperature_menu_slow(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->poll_time = 30.0;
- ecore_timer_del(e->face->temperature_check_timer);
- e->face->temperature_check_timer =
ecore_timer_add(e->face->temp->conf->poll_time, _temperature_cb_check, e->face);
+ ecore_timer_del(e->temperature_check_timer);
+ e->temperature_check_timer = ecore_timer_add(e->conf->poll_time,
_temperature_cb_check, e);
e_config_save_queue();
}
@@ -214,11 +282,11 @@
_temperature_menu_very_slow(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->poll_time = 60.0;
- ecore_timer_del(e->face->temperature_check_timer);
- e->face->temperature_check_timer =
ecore_timer_add(e->face->temp->conf->poll_time, _temperature_cb_check, e->face);
+ ecore_timer_del(e->temperature_check_timer);
+ e->temperature_check_timer = ecore_timer_add(e->conf->poll_time,
_temperature_cb_check, e);
e_config_save_queue();
}
@@ -226,10 +294,10 @@
_temperature_menu_low_10(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->low = 10;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -237,10 +305,10 @@
_temperature_menu_low_20(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->low = 20;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -248,10 +316,10 @@
_temperature_menu_low_30(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->low = 30;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -259,10 +327,10 @@
_temperature_menu_low_40(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->low = 40;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -270,10 +338,10 @@
_temperature_menu_low_50(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->low = 50;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -281,10 +349,10 @@
_temperature_menu_high_20(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 20;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -292,10 +360,10 @@
_temperature_menu_high_30(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 30;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -303,10 +371,10 @@
_temperature_menu_high_40(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 40;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -314,10 +382,10 @@
_temperature_menu_high_50(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 50;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -325,10 +393,10 @@
_temperature_menu_high_60(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 60;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -336,10 +404,10 @@
_temperature_menu_high_70(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 70;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -347,10 +415,10 @@
_temperature_menu_high_80(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 80;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -358,10 +426,10 @@
_temperature_menu_high_90(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 90;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
@@ -369,35 +437,36 @@
_temperature_menu_high_100(void *data, E_Menu *m, E_Menu_Item *mi)
{
Temperature *e;
-
+
e = data;
e->conf->high = 100;
- _temperature_cb_check(e->face);
+ _temperature_cb_check(e);
e_config_save_queue();
}
-static E_Menu *
+static void
_temperature_config_menu_new(Temperature *e)
{
- E_Menu *mn;
+ E_Menu *mn, *config_menu1, *config_menu2, *config_menu3;
E_Menu_Item *mi;
+ /* Check interval */
mn = e_menu_new();
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Fast (1 sec)");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->poll_time == 1.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_fast, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Medium (5 sec)");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->poll_time == 5.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_medium, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Normal (10 sec)");
e_menu_item_radio_set(mi, 1);
@@ -418,25 +487,26 @@
e_menu_item_radio_group_set(mi, 1);
if (e->conf->poll_time == 60.0) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_very_slow, e);
-
- e->config_menu1 = mn;
+ config_menu1 = mn;
+
+ /* Low temperature */
mn = e_menu_new();
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "10°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->low == 10) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_low_10, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "20°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->low == 20) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_low_20, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "30°C");
e_menu_item_radio_set(mi, 1);
@@ -457,25 +527,26 @@
e_menu_item_radio_group_set(mi, 1);
if (e->conf->low == 50) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_low_50, e);
-
- e->config_menu2 = mn;
-
+
+ config_menu2 = mn;
+
+ /* High temperature */
mn = e_menu_new();
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "20°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 20) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_20, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "30°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 30) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_30, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "40°C");
e_menu_item_radio_set(mi, 1);
@@ -496,69 +567,72 @@
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 60) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_60, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "70°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 70) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_70, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "80°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 80) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_80, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "90°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 90) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_90, e);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "100°C");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 1);
if (e->conf->high == 100) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _temperature_menu_high_100, e);
-
- e->config_menu3 = mn;
-
+
+ config_menu3 = mn;
+
+ /* Main */
mn = e_menu_new();
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Check Interval");
- e_menu_item_submenu_set(mi, e->config_menu1);
-
+ e_menu_item_submenu_set(mi, config_menu1);
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Low Temperature");
- e_menu_item_submenu_set(mi, e->config_menu2);
-
+ e_menu_item_submenu_set(mi, config_menu2);
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "High Temperature");
- e_menu_item_submenu_set(mi, e->config_menu3);
-
- e->config_menu = mn;
-
- return mn;
-}
+ e_menu_item_submenu_set(mi, config_menu3);
-static void
-_temperature_config_menu_del(Temperature *e, E_Menu *m)
-{
- e_object_del(E_OBJECT(m));
+ e->config_menu = mn;
+ e->menus = evas_list_append(e->menus, config_menu1);
+ e->menus = evas_list_append(e->menus, config_menu2);
+ e->menus = evas_list_append(e->menus, config_menu3);
}
-static void
-_temperature_face_init(Temperature_Face *ef)
+static Temperature_Face *
+_temperature_face_new(E_Container *con)
{
Evas_Object *o;
-
- evas_event_freeze(ef->evas);
- o = edje_object_add(ef->evas);
+ Temperature_Face *ef;
+
+ ef = E_NEW(Temperature_Face, 1);
+ if (!ef) return NULL;
+
+ ef->con = con;
+ e_object_ref(E_OBJECT(con));
+
+ evas_event_freeze(con->bg_evas);
+ o = edje_object_add(con->bg_evas);
ef->temp_object = o;
edje_object_file_set(o,
@@ -566,19 +640,17 @@
e_path_find(path_themes, "default.eet"),
"modules/temperature/main");
evas_object_show(o);
-
- o = evas_object_rectangle_add(ef->evas);
+
+ o = evas_object_rectangle_add(con->bg_evas);
ef->event_object = o;
evas_object_layer_set(o, 2);
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 0, 0, 0, 0);
- evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_temperature_cb_face_down, ef);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_temperature_face_cb_mouse_down, ef);
evas_object_show(o);
-
- ef->have_temp = -1;
ef->gmc = e_gadman_client_new(ef->con->gadman);
- e_gadman_client_domain_set(ef->gmc, "module.temperature", 0);
+ e_gadman_client_domain_set(ef->gmc, "module.temperature",
temperature_count++);
e_gadman_client_policy_set(ef->gmc,
E_GADMAN_POLICY_ANYWHERE |
E_GADMAN_POLICY_HMOVE |
@@ -590,28 +662,64 @@
e_gadman_client_auto_size_set(ef->gmc, 64, 64);
e_gadman_client_align_set(ef->gmc, 0.9, 1.0);
e_gadman_client_resize(ef->gmc, 64, 64);
- e_gadman_client_change_func_set(ef->gmc, _temperature_cb_gmc_change, ef);
+ e_gadman_client_change_func_set(ef->gmc, _temperature_face_cb_gmc_change,
ef);
e_gadman_client_load(ef->gmc);
-
- ef->temperature_check_timer = ecore_timer_add(ef->temp->conf->poll_time,
_temperature_cb_check, ef);
-
- _temperature_cb_check(ef);
-
- evas_event_thaw(ef->evas);
+
+ evas_event_thaw(con->bg_evas);
+
+ return ef;
}
static void
_temperature_face_free(Temperature_Face *ef)
{
- ecore_timer_del(ef->temperature_check_timer);
+ e_object_unref(E_OBJECT(ef->con));
e_object_del(E_OBJECT(ef->gmc));
evas_object_del(ef->temp_object);
evas_object_del(ef->event_object);
+ e_object_del(E_OBJECT(ef->menu));
+
free(ef);
+ temperature_count--;
+}
+
+static void
+_temperature_face_enable(Temperature_Face *face)
+{
+ face->conf->enabled = 1;
+ evas_object_show(face->temp_object);
+ evas_object_show(face->event_object);
+ e_config_save_queue();
}
static void
-_temperature_cb_gmc_change(void *data, E_Gadman_Client *gmc, E_Gadman_Change
change)
+_temperature_face_disable(Temperature_Face *face)
+{
+ face->conf->enabled = 0;
+ evas_object_hide(face->temp_object);
+ evas_object_hide(face->event_object);
+ e_config_save_queue();
+}
+
+static void
+_temperature_face_menu_new(Temperature_Face *face)
+{
+ E_Menu *mn;
+ E_Menu_Item *mi;
+
+ mn = e_menu_new();
+
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, "Enabled");
+ e_menu_item_check_set(mi, 1);
+ if (face->conf->enabled) e_menu_item_toggle_set(mi, 1);
+ e_menu_item_callback_set(mi, _temperature_face_cb_menu_enabled, face);
+
+ face->menu = mn;
+}
+
+static void
+_temperature_face_cb_gmc_change(void *data, E_Gadman_Client *gmc,
E_Gadman_Change change)
{
Temperature_Face *ef;
Evas_Coord x, y, w, h;
@@ -633,16 +741,16 @@
}
static void
-_temperature_cb_face_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+_temperature_face_cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info)
{
Evas_Event_Mouse_Down *ev;
Temperature_Face *ef;
-
+
ev = event_info;
ef = data;
if (ev->button == 3)
{
- e_menu_activate_mouse(ef->temp->config_menu,
e_zone_current_get(ef->con),
+ e_menu_activate_mouse(ef->menu, e_zone_current_get(ef->con),
ev->output.x, ev->output.y, 1, 1,
E_MENU_POP_DIRECTION_DOWN);
e_util_container_fake_mouse_up_all_later(ef->con);
@@ -652,18 +760,19 @@
static int
_temperature_cb_check(void *data)
{
- Temperature_Face *ef;
+ Temperature *ef;
+ Temperature_Face *face;
int ret = 0;
- Evas_List *therms;
+ Evas_List *therms, *l;
int temp = 0;
char buf[4096];
-
+
ef = data;
therms = e_file_ls("/proc/acpi/thermal_zone");
if (!therms)
{
FILE *f;
-
+
f = fopen("/sys/devices/temperatures/cpu_temperature", "rb");
if (f)
{
@@ -675,18 +784,12 @@
}
else
{
- if (ef->have_temp != 1)
- {
- /* disable therm object */
- edje_object_signal_emit(ef->temp_object, "known", "");
- ef->have_temp = 1;
- }
while (therms)
{
char units[32];
char *name;
FILE *f;
-
+
name = therms->data;
therms = evas_list_remove_list(therms, therms);
snprintf(buf, sizeof(buf),
"/proc/acpi/thermal_zone/%s/temperature", name);
@@ -704,26 +807,39 @@
}
if (ret)
{
- if (ef->have_temp == 0)
+ if (ef->have_temp != 1)
{
/* enable therm object */
- edje_object_signal_emit(ef->temp_object, "known", "");
+ for (l = ef->faces; l; l = l->next)
+ {
+ face = l->data;
+ edje_object_signal_emit(face->temp_object, "known", "");
+ }
ef->have_temp = 1;
}
- _temperature_level_set(ef,
- (double)(temp - ef->temp->conf->low) /
- (double)(ef->temp->conf->high -
ef->temp->conf->low));
- snprintf(buf, sizeof(buf), "%i°C", temp);
- edje_object_part_text_set(ef->temp_object, "reading", buf);
+
+ for (l = ef->faces; l; l = l->next)
+ {
+ face = l->data;
+ _temperature_face_level_set(face,
+ (double)(temp - ef->conf->low) /
+ (double)(ef->conf->high - ef->conf->low));
+ snprintf(buf, sizeof(buf), "%i°C", temp);
+ edje_object_part_text_set(face->temp_object, "reading", buf);
+ }
}
else
{
if (ef->have_temp != 0)
{
/* disable therm object */
- edje_object_signal_emit(ef->temp_object, "unknown", "");
- edje_object_part_text_set(ef->temp_object, "reading", "NO TEMP");
- _temperature_level_set(ef, 0.5);
+ for (l = ef->faces; l; l = l->next)
+ {
+ face = l->data;
+ edje_object_signal_emit(face->temp_object, "unknown", "");
+ edje_object_part_text_set(face->temp_object, "reading", "NO
TEMP");
+ _temperature_face_level_set(face, 0.5);
+ }
ef->have_temp = 0;
}
}
@@ -731,12 +847,31 @@
}
static void
-_temperature_level_set(Temperature_Face *ef, double level)
+_temperature_face_level_set(Temperature_Face *ef, double level)
{
Edje_Message_Float msg;
-
+
if (level < 0.0) level = 0.0;
else if (level > 1.0) level = 1.0;
msg.val = level;
edje_object_message_send(ef->temp_object, EDJE_MESSAGE_FLOAT, 1, &msg);
}
+
+static void
+_temperature_face_cb_menu_enabled(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ Temperature_Face *face;
+ unsigned char enabled;
+
+ face = data;
+ enabled = e_menu_item_toggle_get(mi);
+ if ((face->conf->enabled) && (!enabled))
+ {
+ _temperature_face_disable(face);
+ }
+ else if ((!face->conf->enabled) && (enabled))
+ {
+ _temperature_face_enable(face);
+ }
+ e_menu_item_toggle_set(mi, face->conf->enabled);
+}
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e/src/modules/temperature/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h 25 Jan 2005 14:24:38 -0000 1.3
+++ e_mod_main.h 10 Feb 2005 11:58:14 -0000 1.4
@@ -1,7 +1,11 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
#ifndef E_MOD_MAIN_H
#define E_MOD_MAIN_H
typedef struct _Config Config;
+typedef struct _Config_Face Config_Face;
typedef struct _Temperature Temperature;
typedef struct _Temperature_Face Temperature_Face;
@@ -9,33 +13,35 @@
{
double poll_time;
int low, high;
+ Evas_List *faces;
+};
+
+struct _Config_Face
+{
+ unsigned char enabled;
};
struct _Temperature
{
E_Menu *config_menu;
- E_Menu *config_menu1;
- E_Menu *config_menu2;
- E_Menu *config_menu3;
- Temperature_Face *face;
-
- E_Config_DD *conf_edd;
- Config *conf;
+ Evas_List *menus;
+ Evas_List *faces;
+
+ Config *conf;
+ Ecore_Timer *temperature_check_timer;
+
+ unsigned char have_temp;
};
struct _Temperature_Face
{
- Temperature *temp;
E_Container *con;
- Evas *evas;
-
+ E_Menu *menu;
+ Config_Face *conf;
+
Evas_Object *temp_object;
Evas_Object *event_object;
-
- int have_temp;
-
- Ecore_Timer *temperature_check_timer;
-
+
E_Gadman_Client *gmc;
};
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
