Enlightenment CVS committal
Author : mej
Project : e_modules
Module : snow
Dir : e_modules/snow
Modified Files:
e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h
Log Message:
Mon Jan 30 14:31:30 2006 Michael Jennings (mej)
Indent snow and re-sort data types for indent.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_config.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_config.c 30 Jan 2006 03:16:42 -0000 1.12
+++ e_mod_config.c 30 Jan 2006 19:31:34 -0000 1.13
@@ -9,29 +9,30 @@
#define DENSITY_MEDIUM 1
#define DENSITY_DENSE 2
-struct _E_Config_Dialog_Data {
- int show_trees;
- int density;
+struct _E_Config_Dialog_Data
+{
+ int show_trees;
+ int density;
};
-struct _Cfg_File_Data {
- E_Config_Dialog *cfd;
- char *file;
+struct _Cfg_File_Data
+{
+ E_Config_Dialog *cfd;
+ char *file;
};
/* Protos */
-static void *_create_data(E_Config_Dialog * cfd);
-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 void *_create_data(E_Config_Dialog *cfd);
+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);
void
-_config_snow_module(E_Container * con, Snow * s)
+_config_snow_module(E_Container *con, Snow * s)
{
- E_Config_Dialog *cfd;
+ E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
v = E_NEW(E_Config_Dialog_View, 1);
@@ -48,41 +49,42 @@
}
static void
-_fill_data(Snow * sn, E_Config_Dialog_Data * cfdata)
+_fill_data(Snow * sn, E_Config_Dialog_Data *cfdata)
{
cfdata->show_trees = sn->conf->show_trees;
switch (sn->conf->flake_count)
{
- case 5:
- cfdata->density = DENSITY_SPARSE;
- break;
- case 10:
- cfdata->density = DENSITY_MEDIUM;
- break;
- case 20:
- cfdata->density = DENSITY_DENSE;
- break;
- default:
- break;
+ case 5:
+ cfdata->density = DENSITY_SPARSE;
+ break;
+ case 10:
+ cfdata->density = DENSITY_MEDIUM;
+ break;
+ case 20:
+ cfdata->density = DENSITY_DENSE;
+ break;
+ default:
+ break;
}
}
-static void *
-_create_data(E_Config_Dialog * cfd)
+static void *
+_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
- Snow *s;
+ Snow *s;
s = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
_fill_data(s, cfdata);
return cfdata;
}
static void
-_free_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
+_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Snow *sn;
+ Snow *sn;
sn = cfd->data;
sn->config_dialog = NULL;
@@ -90,11 +92,11 @@
}
static Evas_Object *
-_basic_create_widgets(E_Config_Dialog * cfd, Evas * evas,
- E_Config_Dialog_Data * cfdata)
+_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas,
+ E_Config_Dialog_Data *cfdata)
{
- Evas_Object *o, *of, *ob;
- E_Radio_Group *rg;
+ Evas_Object *o, *of, *ob;
+ E_Radio_Group *rg;
o = e_widget_list_add(evas, 0, 0);
@@ -117,28 +119,28 @@
}
static int
-_basic_apply_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata)
+_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
- Snow *sn;
+ Snow *sn;
sn = cfd->data;
e_border_button_bindings_ungrab_all();
switch (cfdata->density)
{
- case 0:
- sn->conf->tree_count = 5;
- sn->conf->flake_count = 20;
- break;
- case 1:
- sn->conf->tree_count = 10;
- sn->conf->flake_count = 60;
- break;
- case 2:
- sn->conf->tree_count = 20;
- sn->conf->flake_count = 150;
- break;
- default:
- break;
+ case 0:
+ sn->conf->tree_count = 5;
+ sn->conf->flake_count = 20;
+ break;
+ case 1:
+ sn->conf->tree_count = 10;
+ sn->conf->flake_count = 60;
+ break;
+ case 2:
+ sn->conf->tree_count = 20;
+ sn->conf->flake_count = 150;
+ break;
+ default:
+ break;
}
sn->conf->show_trees = cfdata->show_trees;
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_config.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_config.h 30 Jan 2006 03:16:42 -0000 1.4
+++ e_mod_config.h 30 Jan 2006 19:31:34 -0000 1.5
@@ -3,6 +3,6 @@
#ifndef E_MOD_CONFIG_H
#define E_MOD_CONFIG_H
#include "e_mod_main.h"
-void _config_snow_module(E_Container * con, Snow * s);
+void _config_snow_module(E_Container *con, Snow * s);
#endif
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c 30 Jan 2006 03:16:42 -0000 1.12
+++ e_mod_main.c 30 Jan 2006 19:31:34 -0000 1.13
@@ -9,25 +9,24 @@
*/
/* module private routines */
-static Snow *_snow_init(E_Module * m);
-static void _snow_shutdown(Snow * snow);
-static E_Menu *_snow_config_menu_new(Snow * snow);
-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 Snow *_snow_init(E_Module *m);
+static void _snow_shutdown(Snow * snow);
+static E_Menu *_snow_config_menu_new(Snow * snow);
+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);
/* public module routines. all modules must have these */
-EAPI E_Module_Api e_modapi = {
+EAPI E_Module_Api e_modapi = {
E_MODULE_API_VERSION,
"Snow"
};
-EAPI void *
-e_modapi_init(E_Module * m)
+EAPI void *
+e_modapi_init(E_Module *m)
{
- Snow *snow;
+ Snow *snow;
snow = _snow_init(m);
m->config_menu = _snow_config_menu_new(snow);
@@ -35,9 +34,9 @@
}
EAPI int
-e_modapi_shutdown(E_Module * m)
+e_modapi_shutdown(E_Module *m)
{
- Snow *snow;
+ Snow *snow;
snow = m->data;
if (snow)
@@ -59,9 +58,9 @@
}
EAPI int
-e_modapi_save(E_Module * m)
+e_modapi_save(E_Module *m)
{
- Snow *snow;
+ Snow *snow;
snow = m->data;
if (!snow)
@@ -71,14 +70,14 @@
}
EAPI 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;
}
EAPI 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."));
@@ -86,11 +85,11 @@
}
EAPI int
-e_modapi_config(E_Module * m)
+e_modapi_config(E_Module *m)
{
- Snow *s;
- Evas_List *l;
- E_Container *con;
+ Snow *s;
+ Evas_List *l;
+ E_Container *con;
s = m->data;
if (!s)
@@ -100,7 +99,7 @@
con = e_container_current_get(e_manager_current_get());
for (l = s->cons; l; l = l->next)
{
- E_Container *c;
+ E_Container *c;
c = l->data;
if (c == con)
@@ -113,11 +112,11 @@
}
/* module private routines */
-static Snow *
-_snow_init(E_Module * m)
+static Snow *
+_snow_init(E_Module *m)
{
- Snow *snow;
- Evas_List *managers, *l, *l2;
+ Snow *snow;
+ Evas_List *managers, *l, *l2;
snow = calloc(1, sizeof(Snow));
if (!snow)
@@ -137,6 +136,7 @@
if (!snow->conf)
{
snow->conf = E_NEW(Config, 1);
+
snow->conf->tree_count = 10;
snow->conf->flake_count = 60;
snow->conf->show_trees = 1;
@@ -147,12 +147,12 @@
managers = e_manager_list();
for (l = managers; l; l = l->next)
{
- E_Manager *man;
+ E_Manager *man;
man = l->data;
for (l2 = man->containers; l2; l2 = l2->next)
{
- E_Container *con;
+ E_Container *con;
con = l2->data;
snow->cons = evas_list_append(snow->cons, con);
@@ -179,7 +179,7 @@
{
while (snow->trees)
{
- Evas_Object *tree;
+ Evas_Object *tree;
tree = snow->trees->data;
evas_object_del(tree);
@@ -192,7 +192,7 @@
{
while (snow->flakes)
{
- Snow_Flake *flake;
+ Snow_Flake *flake;
flake = snow->flakes->data;
evas_object_del(flake->flake);
@@ -208,7 +208,7 @@
E_CONFIG_DD_FREE(snow->conf_edd);
while (snow->cons)
{
- E_Container *con;
+ E_Container *con;
con = snow->cons->data;
snow->cons = evas_list_remove_list(snow->cons, snow->cons);
@@ -220,11 +220,11 @@
free(snow);
}
-static E_Menu *
+static E_Menu *
_snow_config_menu_new(Snow * snow)
{
- E_Menu *mn;
- E_Menu_Item *mi;
+ E_Menu *mn;
+ E_Menu_Item *mi;
mn = e_menu_new();
@@ -250,8 +250,8 @@
static void
_snow_trees_load(Snow * snow)
{
- Evas_Object *o;
- int tw, th, i;
+ Evas_Object *o;
+ int tw, th, i;
o = evas_object_image_add(snow->canvas);
evas_object_image_file_set(o, PACKAGE_DATA_DIR "/tree.png", "");
@@ -259,7 +259,7 @@
for (i = 0; i < snow->conf->tree_count; i++)
{
- Evas_Coord tx, ty;
+ Evas_Coord tx, ty;
if (i != 0)
{
@@ -282,11 +282,11 @@
static void
_snow_flakes_load(char type, Snow * snow)
{
- Evas_Object *o;
- Evas_Coord xx, yy, ww, hh;
- char buf[4096];
- int tw, th, i;
- Snow_Flake *flake;
+ Evas_Object *o;
+ Evas_Coord xx, yy, ww, hh;
+ char buf[4096];
+ int tw, th, i;
+ Snow_Flake *flake;
evas_output_viewport_get(snow->canvas, &xx, &yy, &ww, &hh);
snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/flake-%c.png", type);
@@ -297,7 +297,7 @@
for (i = 0; i < snow->conf->flake_count / 3; i++)
{
- Evas_Coord tx, ty;
+ Evas_Coord tx, ty;
flake = malloc(sizeof(Snow_Flake));
if (i != 0)
@@ -315,18 +315,18 @@
evas_object_show(o);
flake->flake = o;
flake->start_time =
- ecore_time_get() + (double)(random() % (th * 10)) / (double)th;
+ 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;
+ 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);
}
@@ -336,16 +336,16 @@
static int
_snow_cb_animator(void *data)
{
- Snow *snow;
- Evas_List *next;
- double d;
+ Snow *snow;
+ Evas_List *next;
+ double d;
snow = data;
next = snow->flakes;
while (next)
{
- Snow_Flake *flake;
- Evas_Coord x, y;
+ Snow_Flake *flake;
+ Evas_Coord x, y;
flake = next->data;
d = ecore_time_get() - flake->start_time;
@@ -353,7 +353,7 @@
evas_object_geometry_get(flake->flake, &x, NULL, NULL, NULL);
if (y > snow->height)
flake->start_time =
- ecore_time_get() + (double)(random() % 100) / (double)100;
+ ecore_time_get() + (double)(random() % 100) / (double)100;
evas_object_move(flake->flake, x, y);
next = evas_list_next(next);
@@ -362,10 +362,10 @@
}
static void
-_snow_menu_cb_configure(void *data, E_Menu * m, E_Menu_Item * mi)
+_snow_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
- Snow *s;
- E_Container *con;
+ Snow *s;
+ E_Container *con;
s = (Snow *) data;
if (!s)
@@ -377,7 +377,7 @@
void
_snow_cb_config_updated(void *data)
{
- Snow *s;
+ Snow *s;
s = (Snow *) data;
if (!s)
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/snow/e_mod_main.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_mod_main.h 30 Jan 2006 03:16:42 -0000 1.6
+++ e_mod_main.h 30 Jan 2006 19:31:34 -0000 1.7
@@ -5,40 +5,43 @@
typedef struct _Snow Snow;
typedef struct _Snow_Flake Snow_Flake;
-struct _Config {
- int tree_count;
- int flake_count;
- int show_trees;
+struct _Config
+{
+ int tree_count;
+ int flake_count;
+ int show_trees;
};
-struct _Snow {
- E_Module *module;
- Evas_List *cons;
- Evas *canvas;
- Ecore_Animator *animator;
- Evas_List *trees;
- Evas_List *flakes;
-
- E_Config_DD *conf_edd;
- Config *conf;
- Evas_Coord width, height;
- E_Config_Dialog *config_dialog;
+struct _Snow
+{
+ E_Module *module;
+ Evas_List *cons;
+ Evas *canvas;
+ Ecore_Animator *animator;
+ Evas_List *trees;
+ Evas_List *flakes;
+
+ E_Config_DD *conf_edd;
+ Config *conf;
+ Evas_Coord width, height;
+ E_Config_Dialog *config_dialog;
};
-struct _Snow_Flake {
- Evas_Object *flake;
- double start_time;
- int speed;
+struct _Snow_Flake
+{
+ Evas_Object *flake;
+ double start_time;
+ int speed;
};
EAPI extern E_Module_Api e_modapi;
-EAPI void *e_modapi_init(E_Module * m);
-EAPI int e_modapi_shutdown(E_Module * m);
-EAPI int e_modapi_save(E_Module * m);
-EAPI int e_modapi_info(E_Module * m);
-EAPI int e_modapi_about(E_Module * m);
-EAPI int e_modapi_config(E_Module * m);
+EAPI void *e_modapi_init(E_Module *m);
+EAPI int e_modapi_shutdown(E_Module *m);
+EAPI int e_modapi_save(E_Module *m);
+EAPI int e_modapi_info(E_Module *m);
+EAPI int e_modapi_about(E_Module *m);
+EAPI int e_modapi_config(E_Module *m);
-void _snow_cb_config_updated(void *data);
+void _snow_cb_config_updated(void *data);
#endif
-------------------------------------------------------
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://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
