Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : snow
Dir : e_modules/snow
Modified Files:
e_mod_main.c e_mod_config.c
Log Message:
Update to use new e_modapi_config
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c 12 Dec 2005 21:17:46 -0000 1.2
+++ e_mod_main.c 17 Dec 2005 21:44:42 -0000 1.3
@@ -14,7 +14,7 @@
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_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
+static void _snow_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item
*mi);
/* public module routines. all modules must have these */
E_Module_Api e_modapi =
@@ -24,7 +24,7 @@
};
void *
- e_modapi_init(E_Module *m)
+e_modapi_init(E_Module *m)
{
Snow *snow;
@@ -34,7 +34,7 @@
}
int
- e_modapi_shutdown(E_Module *m)
+e_modapi_shutdown(E_Module *m)
{
Snow *snow;
@@ -53,7 +53,7 @@
}
int
- e_modapi_save(E_Module *m)
+e_modapi_save(E_Module *m)
{
Snow *snow;
@@ -64,23 +64,36 @@
}
int
- e_modapi_info(E_Module *m)
+e_modapi_info(E_Module *m)
{
m->icon_file = strdup(PACKAGE_DATA_DIR "/module_icon.png");
return 1;
}
int
- e_modapi_about(E_Module *m)
+e_modapi_about(E_Module *m)
{
e_module_dialog_show(_("Enlightenment Snow Module"),
_("This is a snow module that may replace xsnow."));
return 1;
}
+int
+e_modapi_config(E_Module *m)
+{
+ Snow *s;
+ E_Container *con;
+
+ s = m->data;
+ if (!s) return 0;
+ con = e_container_current_get(e_manager_current_get());
+ e_int_config_snow(con, s);
+ return 1;
+}
+
/* module private routines */
static Snow *
- _snow_init(E_Module *m)
+_snow_init(E_Module *m)
{
Snow *snow;
Evas_List *managers, *l, *l2;
@@ -138,7 +151,7 @@
}
static void
- _snow_trees_free(Snow *snow)
+_snow_trees_free(Snow *snow)
{
while (snow->trees)
{
@@ -151,7 +164,7 @@
}
static void
- _snow_flakes_free(Snow *snow)
+_snow_flakes_free(Snow *snow)
{
while (snow->flakes)
{
@@ -165,7 +178,7 @@
}
static void
- _snow_shutdown(Snow *snow)
+_snow_shutdown(Snow *snow)
{
free(snow->conf);
E_CONFIG_DD_FREE(snow->conf_edd);
@@ -184,7 +197,7 @@
}
static E_Menu *
- _snow_config_menu_new(Snow *snow)
+_snow_config_menu_new(Snow *snow)
{
E_Menu *mn;
E_Menu_Item *mi;
@@ -198,7 +211,7 @@
}
static void
- _snow_canvas_reset(Snow *snow)
+_snow_canvas_reset(Snow *snow)
{
_snow_trees_free(snow);
_snow_flakes_free(snow);
@@ -210,7 +223,7 @@
}
static void
- _snow_trees_load(Snow *snow)
+_snow_trees_load(Snow *snow)
{
Evas_Object *o;
int tw, th, i;
@@ -242,7 +255,7 @@
}
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;
@@ -295,7 +308,7 @@
}
static int
- _snow_cb_animator(void *data)
+_snow_cb_animator(void *data)
{
Snow *snow;
Evas_List *next;
@@ -321,7 +334,8 @@
return 1;
}
-static void _snow_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
+static void
+_snow_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Snow *s;
E_Container *con;
@@ -332,7 +346,8 @@
e_int_config_snow(con, s);
}
-void _snow_cb_config_updated(void *data)
+void
+_snow_cb_config_updated(void *data)
{
Snow *s;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_config.c 16 Dec 2005 17:55:40 -0000 1.2
+++ e_mod_config.c 17 Dec 2005 21:44:42 -0000 1.3
@@ -11,7 +11,6 @@
struct _cfdata
{
- /* Basic */
int show_trees;
int density;
};
@@ -29,15 +28,12 @@
static Evas_Object *_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
CFData *cfdata);
static int _basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata);
-Snow *sn = NULL;
-
void
e_int_config_snow(E_Container *con, Snow *s)
{
E_Config_Dialog *cfd;
E_Config_Dialog_View v;
- sn = s;
v.create_cfdata = _create_data;
v.free_cfdata = _free_data;
v.basic.apply_cfdata = _basic_apply_data;
@@ -49,7 +45,7 @@
}
static void
-_fill_data(CFData *cfdata)
+_fill_data(Snow *sn, CFData *cfdata)
{
cfdata->show_trees = sn->conf->show_trees;
switch (sn->conf->flake_count)
@@ -72,9 +68,11 @@
*_create_data(E_Config_Dialog *cfd)
{
CFData *cfdata;
+ Snow *s;
+ s = cfd->data;
cfdata = E_NEW(CFData, 1);
- _fill_data(cfdata);
+ _fill_data(s, cfdata);
return cfdata;
}
@@ -113,6 +111,9 @@
static int
_basic_apply_data(E_Config_Dialog *cfd, CFData *cfdata)
{
+ Snow *sn;
+
+ sn = cfd->data;
e_border_button_bindings_ungrab_all();
switch (cfdata->density)
{
-------------------------------------------------------
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
