Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e_modules
Dir : e17/apps/e_modules/src/modules/snow
Modified Files:
e_mod_main.c
Log Message:
Fix about code to use new e_module_dialog_show. Fix to allow clicking on the
trees to bring up the E menu.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/e_modules/src/modules/snow/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c 19 Oct 2005 05:41:18 -0000 1.10
+++ e_mod_main.c 19 Oct 2005 06:24:22 -0000 1.11
@@ -3,8 +3,8 @@
#include "e_mod_main.h"
/* TODO List:
- *
- *
+ *
+ *
*/
/* module private routines */
@@ -14,10 +14,10 @@
static int _snow_cb_animator(void *data);
static void _snow_trees_load(Snow *snow);
static void _snow_flakes_load(char type, Snow *snow);
-
+
static void _snow_cb_density_sparse(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _snow_cb_density_medium(void *data, E_Menu *m, E_Menu_Item *
-i);
+ i);
static void _snow_cb_density_dense(void *data, E_Menu *m, E_Menu_Item
*mi);
static void _snow_cb_show_trees(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -25,11 +25,11 @@
E_Module_Api e_modapi =
{
E_MODULE_API_VERSION,
- "Snow"
+ "Snow"
};
void *
-e_modapi_init(E_Module *m)
+ e_modapi_init(E_Module *m)
{
Snow *snow;
@@ -39,10 +39,10 @@
}
int
-e_modapi_shutdown(E_Module *m)
+ e_modapi_shutdown(E_Module *m)
{
Snow *snow;
-
+
snow = m->data;
if (snow)
{
@@ -58,10 +58,10 @@
}
int
-e_modapi_save(E_Module *m)
+ e_modapi_save(E_Module *m)
{
Snow *snow;
-
+
snow = m->data;
if (!snow) return 1;
e_config_domain_save("module.snow", snow->conf_edd, snow->conf);
@@ -69,27 +69,27 @@
}
int
-e_modapi_info(E_Module *m)
+ e_modapi_info(E_Module *m)
{
m->icon_file = strdup(PACKAGE_LIB_DIR "/e_modules/snow/module_icon.png");
return 1;
}
int
-e_modapi_about(E_Module *m)
+ e_modapi_about(E_Module *m)
{
- e_error_dialog_show("Enlightenment Snow Module",
- "This is a snow module that may replace xsnow.");
+ e_module_dialog_show(_("Enlightenment Snow Module"),
+ _("This is a snow module that may replace xsnow."));
return 1;
}
/* module private routines */
static Snow *
-_snow_init(E_Module *m)
+ _snow_init(E_Module *m)
{
Snow *snow;
Evas_List *managers, *l, *l2;
-
+
snow = calloc(1, sizeof(Snow));
if (!snow) return NULL;
@@ -102,7 +102,7 @@
E_CONFIG_VAL(D, T, tree_count, INT);
E_CONFIG_VAL(D, T, flake_count, INT);
E_CONFIG_VAL(D, T, show_trees, INT);
-
+
snow->conf = e_config_domain_load("module.snow", snow->conf_edd);
if (!snow->conf)
{
@@ -113,17 +113,17 @@
}
E_CONFIG_LIMIT(snow->conf->show_trees, 0, 1);
-
+
managers = e_manager_list();
for (l = managers; l; l = l->next)
{
E_Manager *man;
-
+
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
E_Container *con;
-
+
con = l2->data;
snow->cons = evas_list_append(snow->cons, con);
snow->canvas = con->bg_evas;
@@ -138,17 +138,17 @@
_snow_flakes_load('l', snow);
snow->animator = ecore_animator_add(_snow_cb_animator, snow);
-
+
return snow;
}
static void
-_snow_trees_free(Snow *snow)
+ _snow_trees_free(Snow *snow)
{
while (snow->trees)
{
Evas_Object *tree;
-
+
tree = snow->trees->data;
evas_object_del(tree);
snow->trees = evas_list_remove_list(snow->trees, snow->trees);
@@ -156,7 +156,7 @@
}
static void
-_snow_flakes_free(Snow *snow)
+ _snow_flakes_free(Snow *snow)
{
while (snow->flakes)
{
@@ -170,14 +170,14 @@
}
static void
-_snow_shutdown(Snow *snow)
+ _snow_shutdown(Snow *snow)
{
free(snow->conf);
E_CONFIG_DD_FREE(snow->conf_edd);
while (snow->cons)
{
E_Container *con;
-
+
con = snow->cons->data;
snow->cons = evas_list_remove_list(snow->cons, snow->cons);
}
@@ -189,13 +189,13 @@
}
static E_Menu *
-_snow_config_menu_new(Snow *snow)
+ _snow_config_menu_new(Snow *snow)
{
E_Menu *mn;
E_Menu_Item *mi;
-
+
mn = e_menu_new();
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Sparse");
e_menu_item_radio_set(mi, 1);
@@ -209,14 +209,14 @@
e_menu_item_radio_group_set(mi, 2);
if (snow->conf->tree_count == 10) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _snow_cb_density_medium, snow);
-
+
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, "Dense");
e_menu_item_radio_set(mi, 1);
e_menu_item_radio_group_set(mi, 2);
if (snow->conf->tree_count == 20) e_menu_item_toggle_set(mi, 1);
e_menu_item_callback_set(mi, _snow_cb_density_dense, snow);
-
+
mi = e_menu_item_new(mn);
e_menu_item_separator_set(mi, 1);
@@ -230,19 +230,19 @@
}
static void
-_snow_canvas_reset(Snow *snow)
+ _snow_canvas_reset(Snow *snow)
{
_snow_trees_free(snow);
_snow_flakes_free(snow);
if (snow->conf->show_trees) _snow_trees_load(snow);
- _snow_flakes_load('s', snow);
+ _snow_flakes_load('s', snow);
_snow_flakes_load('m', snow);
- _snow_flakes_load('l', snow);
+ _snow_flakes_load('l', snow);
}
static void
-_snow_cb_density_sparse(void *data, E_Menu *m, E_Menu_Item *mi)
+ _snow_cb_density_sparse(void *data, E_Menu *m, E_Menu_Item *mi)
{
Snow *snow;
@@ -254,7 +254,7 @@
}
static void
-_snow_cb_density_medium(void *data, E_Menu *m, E_Menu_Item *mi)
+ _snow_cb_density_medium(void *data, E_Menu *m, E_Menu_Item *mi)
{
Snow *snow;
@@ -265,7 +265,7 @@
}
static void
-_snow_cb_density_dense(void *data, E_Menu *m, E_Menu_Item *mi)
+ _snow_cb_density_dense(void *data, E_Menu *m, E_Menu_Item *mi)
{
Snow *snow;
@@ -276,7 +276,7 @@
}
static void
-_snow_cb_show_trees(void *data, E_Menu *m, E_Menu_Item *mi)
+ _snow_cb_show_trees(void *data, E_Menu *m, E_Menu_Item *mi)
{
Snow *snow;
@@ -286,7 +286,8 @@
}
static void
-_snow_trees_load(Snow *snow) {
+ _snow_trees_load(Snow *snow)
+{
Evas_Object *o;
int tw, th, i;
@@ -294,29 +295,31 @@
evas_object_image_file_set(o, PACKAGE_LIB_DIR "/e_modules/snow/tree.png",
"");
evas_object_image_size_get(o, &tw, &th);
-for (i = 0; i < snow->conf->tree_count; i++)
- {
- Evas_Coord tx, ty;
-if (i != 0) {
- o = evas_object_image_add(snow->canvas);
- evas_object_image_file_set(o, PACKAGE_LIB_DIR "/e_modules/snow/tree.png",
"");
-}
- evas_object_resize(o, tw, th);
- evas_object_image_alpha_set(o, 1);
- evas_object_image_fill_set(o, 0, 0, tw, th);
-
- tx = random() % (snow->width - tw);
- ty = random() % (snow->height - th);
- evas_object_move(o, tx, ty);
- evas_object_show(o);
- snow->trees = evas_list_append(snow->trees, o);
- }
-
+ for (i = 0; i < snow->conf->tree_count; i++)
+ {
+ Evas_Coord tx, ty;
+ if (i != 0)
+ {
+ o = evas_object_image_add(snow->canvas);
+ evas_object_image_file_set(o, PACKAGE_LIB_DIR
"/e_modules/snow/tree.png", "");
+ }
+ evas_object_resize(o, tw, th);
+ evas_object_image_alpha_set(o, 1);
+ evas_object_image_fill_set(o, 0, 0, tw, th);
+
+ tx = random() % (snow->width - tw);
+ ty = random() % (snow->height - th);
+ evas_object_move(o, tx, ty);
+ evas_object_pass_events_set(o, 1);
+ evas_object_show(o);
+ snow->trees = evas_list_append(snow->trees, o);
+ }
}
static void
-_snow_flakes_load(char type, Snow *snow) {
+ _snow_flakes_load(char type, Snow *snow)
+{
Evas_Object *o;
Evas_Coord xx, yy, ww, hh;
char buf[4096];
@@ -330,45 +333,45 @@
evas_object_image_file_set(o, buf, "");
evas_object_image_size_get(o, &tw, &th);
-for (i = 0; i < snow->conf->flake_count / 3; i++)
- {
- Evas_Coord tx, ty;
-
- flake = malloc(sizeof(Snow_Flake));
-if (i != 0) {
- o = evas_object_image_add(snow->canvas);
- evas_object_image_file_set(o, buf, "");
-}
- evas_object_resize(o, tw, th);
- evas_object_image_alpha_set(o, 1);
- evas_object_image_fill_set(o, 0, 0, tw, th);
-
- tx = random() % ww;
- ty = random() % hh;
- evas_object_move(o, tx, ty);
- evas_object_show(o);
- flake->flake = o;
- flake->start_time = ecore_time_get() + (double)(random() % (th * 10)) /
(double) th;
- switch (type) {
- case 's':
- flake->speed = 1;
- break;
- case 'm':
- flake->speed = 2;
- break;
- case 'l':
- flake->speed = 3;
- break;
- }
- snow->flakes = evas_list_append(snow->flakes, flake);
- }
+ for (i = 0; i < snow->conf->flake_count / 3; i++)
+ {
+ Evas_Coord tx, ty;
+ flake = malloc(sizeof(Snow_Flake));
+ if (i != 0)
+ {
+ o = evas_object_image_add(snow->canvas);
+ evas_object_image_file_set(o, buf, "");
+ }
+ evas_object_resize(o, tw, th);
+ evas_object_image_alpha_set(o, 1);
+ evas_object_image_fill_set(o, 0, 0, tw, th);
+
+ tx = random() % ww;
+ ty = random() % hh;
+ evas_object_move(o, tx, ty);
+ evas_object_show(o);
+ flake->flake = o;
+ flake->start_time = ecore_time_get() + (double)(random() % (th * 10)) /
(double) th;
+ switch (type)
+ {
+ case 's':
+ flake->speed = 1;
+ break;
+ case 'm':
+ flake->speed = 2;
+ break;
+ case 'l':
+ flake->speed = 3;
+ break;
+ }
+ snow->flakes = evas_list_append(snow->flakes, flake);
+ }
}
-
static int
-_snow_cb_animator(void *data)
+ _snow_cb_animator(void *data)
{
Snow *snow;
Evas_List *next;
@@ -391,6 +394,6 @@
next = evas_list_next(next);
}
-
+
return 1;
}
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
