Enlightenment CVS committal Author : mej Project : e_modules Module : rain
Dir : e_modules/rain Modified Files: e_mod_config.c e_mod_config.h e_mod_main.c e_mod_main.h Log Message: Sun Jan 29 12:51:47 2006 Michael Jennings (mej) I got sick of looking at badly-indented code because folks don't know not to indent with tabs, so I re-indented it all with raster's preferred style. Please indent with SPACES ONLY. Thanks. I also fixed "make dist" for emu. ---------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e_modules/rain/e_mod_config.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_mod_config.c 22 Jan 2006 18:18:34 -0000 1.11 +++ e_mod_config.c 29 Jan 2006 17:53:06 -0000 1.12 @@ -9,69 +9,70 @@ #define DENSITY_DRIZZLE 1 #define DENSITY_DOWNPOUR 2 -struct _E_Config_Dialog_Data -{ - int show_clouds; - int density; +struct _E_Config_Dialog_Data { + int show_clouds; + 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_rain_module(E_Container *con, Rain *r) +_config_rain_module(E_Container * con, Rain * r) { - E_Config_Dialog *cfd; + E_Config_Dialog *cfd; E_Config_Dialog_View *v; v = E_NEW(E_Config_Dialog_View, 1); if (v) - { - v->create_cfdata = _create_data; - v->free_cfdata = _free_data; - v->basic.apply_cfdata = _basic_apply_data; - v->basic.create_widgets = _basic_create_widgets; - - cfd = e_config_dialog_new(con, _("Rain Module"), NULL, 0, v, r); - r->config_dialog = cfd; - } + { + v->create_cfdata = _create_data; + v->free_cfdata = _free_data; + v->basic.apply_cfdata = _basic_apply_data; + v->basic.create_widgets = _basic_create_widgets; + + cfd = e_config_dialog_new(con, _("Rain Module"), NULL, 0, v, r); + r->config_dialog = cfd; + } } static void -_fill_data(Rain *rn, E_Config_Dialog_Data *cfdata) +_fill_data(Rain * rn, E_Config_Dialog_Data * cfdata) { cfdata->show_clouds = rn->conf->show_clouds; switch (rn->conf->cloud_count) { - case 5: - cfdata->density = DENSITY_SPRINKLE; - break; - case 10: - cfdata->density = DENSITY_DRIZZLE; - break; - case 20: - cfdata->density = DENSITY_DOWNPOUR; - break; - default: - break; + case 5: + cfdata->density = DENSITY_SPRINKLE; + break; + case 10: + cfdata->density = DENSITY_DRIZZLE; + break; + case 20: + cfdata->density = DENSITY_DOWNPOUR; + break; + default: + break; } } -static void * -_create_data(E_Config_Dialog *cfd) +static void * +_create_data(E_Config_Dialog * cfd) { E_Config_Dialog_Data *cfdata; - Rain *r; - + Rain *r; + r = cfd->data; cfdata = E_NEW(E_Config_Dialog_Data, 1); _fill_data(r, cfdata); @@ -79,20 +80,21 @@ } static void -_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) +_free_data(E_Config_Dialog * cfd, E_Config_Dialog_Data * cfdata) { - Rain *rn; - + Rain *rn; + rn = cfd->data; rn->config_dialog = NULL; free(cfdata); } 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); @@ -115,28 +117,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) { - Rain *rn; - + Rain *rn; + rn = cfd->data; e_border_button_bindings_ungrab_all(); switch (cfdata->density) { - case 0: - rn->conf->cloud_count = 5; - rn->conf->drop_count = 20; - break; - case 1: - rn->conf->cloud_count = 10; - rn->conf->drop_count = 60; - break; - case 2: - rn->conf->cloud_count = 20; - rn->conf->drop_count = 150; - break; - default: - break; + case 0: + rn->conf->cloud_count = 5; + rn->conf->drop_count = 20; + break; + case 1: + rn->conf->cloud_count = 10; + rn->conf->drop_count = 60; + break; + case 2: + rn->conf->cloud_count = 20; + rn->conf->drop_count = 150; + break; + default: + break; } rn->conf->show_clouds = cfdata->show_clouds; =================================================================== RCS file: /cvsroot/enlightenment/e_modules/rain/e_mod_config.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_mod_config.h 8 Jan 2006 10:31:05 -0000 1.4 +++ e_mod_config.h 29 Jan 2006 17:53:06 -0000 1.5 @@ -3,6 +3,6 @@ # ifndef E_MOD_CONFIG_H # define E_MOD_CONFIG_H # include "e_mod_main.h" -void _config_rain_module(E_Container *con, Rain *r); +void _config_rain_module(E_Container * con, Rain * r); # endif #endif =================================================================== RCS file: /cvsroot/enlightenment/e_modules/rain/e_mod_main.c,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- e_mod_main.c 14 Jan 2006 15:14:29 -0000 1.14 +++ e_mod_main.c 29 Jan 2006 17:53:06 -0000 1.15 @@ -4,114 +4,120 @@ #include "e_mod_config.h" /* module private routines */ -static Rain *_rain_init(E_Module *m); -static void _rain_shutdown(Rain *rain); -static E_Menu *_rain_config_menu_new(Rain *rain); -static int _rain_cb_animator(void *data); -static void _rain_clouds_load(Rain *rain); -static void _rain_drops_load(char type, Rain *rain); -static void _rain_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi); +static Rain *_rain_init(E_Module * m); +static void _rain_shutdown(Rain * rain); +static E_Menu *_rain_config_menu_new(Rain * rain); +static int _rain_cb_animator(void *data); +static void _rain_clouds_load(Rain * rain); +static void _rain_drops_load(char type, Rain * rain); +static void _rain_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, - "Rain" + "Rain" }; -EAPI void * -e_modapi_init(E_Module *m) +EAPI void * +e_modapi_init(E_Module * m) { - Rain *rain; + Rain *rain; rain = _rain_init(m); m->config_menu = _rain_config_menu_new(rain); return rain; } -EAPI int -e_modapi_shutdown(E_Module *m) +EAPI int +e_modapi_shutdown(E_Module * m) { - Rain *rain; + Rain *rain; rain = m->data; if (rain) { - if (m->config_menu) - { - e_menu_deactivate(m->config_menu); - e_object_del(E_OBJECT(m->config_menu)); - m->config_menu = NULL; - } - if (rain->config_dialog) - { - e_object_del(E_OBJECT(rain->config_dialog)); - rain->config_dialog = NULL; - } - _rain_shutdown(rain); + if (m->config_menu) + { + e_menu_deactivate(m->config_menu); + e_object_del(E_OBJECT(m->config_menu)); + m->config_menu = NULL; + } + if (rain->config_dialog) + { + e_object_del(E_OBJECT(rain->config_dialog)); + rain->config_dialog = NULL; + } + _rain_shutdown(rain); } return 1; } -EAPI int -e_modapi_save(E_Module *m) +EAPI int +e_modapi_save(E_Module * m) { - Rain *rain; + Rain *rain; rain = m->data; - if (!rain) return 1; + if (!rain) + return 1; e_config_domain_save("module.rain", rain->conf_edd, rain->conf); return 1; } -EAPI int -e_modapi_info(E_Module *m) +EAPI int +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) +EAPI int +e_modapi_about(E_Module * m) { e_module_dialog_show(_("Enlightenment Rain Module"), - _("This is a simple module to display some rain on the desktop.<br>It can display clouds too, if you like clouds.")); + _ + ("This is a simple module to display some rain on the desktop.<br>It can display clouds too, if you like clouds.")); return 1; } EAPI int -e_modapi_config(E_Module *m) +e_modapi_config(E_Module * m) { - Rain *r; - E_Container *con; - Evas_List *l; - + Rain *r; + E_Container *con; + Evas_List *l; + r = m->data; - if (!r) return 0; - if (!r->cons) return 0; + if (!r) + return 0; + if (!r->cons) + return 0; con = e_container_current_get(e_manager_current_get()); - for (l = r->cons; l; l = l->next) + for (l = r->cons; l; l = l->next) { - E_Container *c; - c = l->data; - if (c == con) - { - _config_rain_module(con, r); - break; - } + E_Container *c; + + c = l->data; + if (c == con) + { + _config_rain_module(con, r); + break; + } } return 1; } /* module private routines */ -static Rain * -_rain_init(E_Module *m) +static Rain * +_rain_init(E_Module * m) { - Rain *rain; - Evas_List *managers, *l, *l2; + Rain *rain; + Evas_List *managers, *l, *l2; rain = calloc(1, sizeof(Rain)); - if (!rain) return NULL; + if (!rain) + return NULL; rain->module = m; rain->conf_edd = E_CONFIG_DD_NEW("Rain_Config", Config); @@ -126,10 +132,10 @@ rain->conf = e_config_domain_load("module.rain", rain->conf_edd); if (!rain->conf) { - rain->conf = E_NEW(Config, 1); - rain->conf->cloud_count = 10; - rain->conf->drop_count = 60; - rain->conf->show_clouds = 1; + rain->conf = E_NEW(Config, 1); + rain->conf->cloud_count = 10; + rain->conf->drop_count = 60; + rain->conf->show_clouds = 1; } E_CONFIG_LIMIT(rain->conf->show_clouds, 0, 1); @@ -137,22 +143,24 @@ 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; - - con = l2->data; - rain->cons = evas_list_append(rain->cons, con); - rain->canvas = con->bg_evas; - } + man = l->data; + for (l2 = man->containers; l2; l2 = l2->next) + { + E_Container *con; + + con = l2->data; + rain->cons = evas_list_append(rain->cons, con); + rain->canvas = con->bg_evas; + } } - evas_output_viewport_get(rain->canvas, NULL, NULL, &rain->width, &rain->height); + evas_output_viewport_get(rain->canvas, NULL, NULL, &rain->width, + &rain->height); - if (rain->conf->show_clouds) _rain_clouds_load(rain); + if (rain->conf->show_clouds) + _rain_clouds_load(rain); _rain_drops_load('s', rain); _rain_drops_load('m', rain); _rain_drops_load('l', rain); @@ -162,58 +170,58 @@ return rain; } -static void -_rain_clouds_free(Rain *rain) +static void +_rain_clouds_free(Rain * rain) { while (rain->clouds) { - Evas_Object *cloud; + Evas_Object *cloud; - cloud = rain->clouds->data; - evas_object_del(cloud); - rain->clouds = evas_list_remove_list(rain->clouds, rain->clouds); + cloud = rain->clouds->data; + evas_object_del(cloud); + rain->clouds = evas_list_remove_list(rain->clouds, rain->clouds); } } -static void -_rain_drops_free(Rain *rain) +static void +_rain_drops_free(Rain * rain) { while (rain->drops) { - Rain_Drop *drop; + Rain_Drop *drop; - drop = rain->drops->data; - evas_object_del(drop->drop); - rain->drops = evas_list_remove_list(rain->drops, rain->drops); - free(drop); + drop = rain->drops->data; + evas_object_del(drop->drop); + rain->drops = evas_list_remove_list(rain->drops, rain->drops); + free(drop); } } -static void -_rain_shutdown(Rain *rain) +static void +_rain_shutdown(Rain * rain) { free(rain->conf); E_CONFIG_DD_FREE(rain->conf_edd); while (rain->cons) { - E_Container *con; + E_Container *con; - con = rain->cons->data; - rain->cons = evas_list_remove_list(rain->cons, rain->cons); + con = rain->cons->data; + rain->cons = evas_list_remove_list(rain->cons, rain->cons); } _rain_clouds_free(rain); _rain_drops_free(rain); if (rain->animator) - ecore_animator_del(rain->animator); + ecore_animator_del(rain->animator); free(rain); } -static E_Menu * -_rain_config_menu_new(Rain *rain) +static E_Menu * +_rain_config_menu_new(Rain * rain) { - E_Menu *mn; - E_Menu_Item *mi; + E_Menu *mn; + E_Menu_Item *mi; mn = e_menu_new(); @@ -224,23 +232,24 @@ return mn; } -static void -_rain_canvas_reset(Rain *rain) +static void +_rain_canvas_reset(Rain * rain) { _rain_clouds_free(rain); _rain_drops_free(rain); - if (rain->conf->show_clouds) _rain_clouds_load(rain); + if (rain->conf->show_clouds) + _rain_clouds_load(rain); _rain_drops_load('s', rain); _rain_drops_load('m', rain); _rain_drops_load('l', rain); } -static void -_rain_clouds_load(Rain *rain) +static void +_rain_clouds_load(Rain * rain) { - Evas_Object *o; - int tw, th, i; + Evas_Object *o; + int tw, th, i; o = evas_object_image_add(rain->canvas); evas_object_image_file_set(o, PACKAGE_DATA_DIR "/cloud.png", ""); @@ -248,33 +257,34 @@ for (i = 0; i < rain->conf->cloud_count; i++) { - Evas_Coord tx, ty; - if (i != 0) - { - o = evas_object_image_add(rain->canvas); - evas_object_image_file_set(o, PACKAGE_DATA_DIR "/cloud.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() % (rain->width - tw); - ty = random() % ((rain->height/3) - th); - evas_object_move(o, tx, ty); - evas_object_pass_events_set(o, 1); - evas_object_show(o); - rain->clouds = evas_list_append(rain->clouds, o); + Evas_Coord tx, ty; + + if (i != 0) + { + o = evas_object_image_add(rain->canvas); + evas_object_image_file_set(o, PACKAGE_DATA_DIR "/cloud.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() % (rain->width - tw); + ty = random() % ((rain->height / 3) - th); + evas_object_move(o, tx, ty); + evas_object_pass_events_set(o, 1); + evas_object_show(o); + rain->clouds = evas_list_append(rain->clouds, o); } } -static void -_rain_drops_load(char type, Rain *rain) +static void +_rain_drops_load(char type, Rain * rain) { - Evas_Object *o; - Evas_Coord xx, yy, ww, hh; - char buf[4096]; - int tw, th, i; - Rain_Drop *drop; + Evas_Object *o; + Evas_Coord xx, yy, ww, hh; + char buf[4096]; + int tw, th, i; + Rain_Drop *drop; evas_output_viewport_get(rain->canvas, &xx, &yy, &ww, &hh); snprintf(buf, sizeof(buf), PACKAGE_DATA_DIR "/drop-%c.png", type); @@ -285,87 +295,91 @@ for (i = 0; i < rain->conf->drop_count / 3; i++) { - Evas_Coord tx, ty; + Evas_Coord tx, ty; - drop = malloc(sizeof(Rain_Drop)); - if (i != 0) - { - o = evas_object_image_add(rain->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 - tw); - ty = random() % (hh - th); - - evas_object_move(o, tx, ty); - evas_object_pass_events_set(o, 1); - evas_object_show(o); - drop->drop = o; - drop->start_time = ecore_time_get() + (double)(random() % (th * 10)) / (double) th; - switch (type) - { - case 's': - drop->speed = 1; - break; - case 'm': - drop->speed = 2; - break; - case 'l': - drop->speed = 3; - break; - } - rain->drops = evas_list_append(rain->drops, drop); + drop = malloc(sizeof(Rain_Drop)); + if (i != 0) + { + o = evas_object_image_add(rain->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 - tw); + ty = random() % (hh - th); + + evas_object_move(o, tx, ty); + evas_object_pass_events_set(o, 1); + evas_object_show(o); + drop->drop = o; + drop->start_time = + ecore_time_get() + (double)(random() % (th * 10)) / (double)th; + switch (type) + { + case 's': + drop->speed = 1; + break; + case 'm': + drop->speed = 2; + break; + case 'l': + drop->speed = 3; + break; + } + rain->drops = evas_list_append(rain->drops, drop); } } -static int +static int _rain_cb_animator(void *data) { - Rain *rain; - Evas_List *next; - double d; + Rain *rain; + Evas_List *next; + double d; rain = data; next = rain->drops; while (next) { - Rain_Drop *drop; - Evas_Coord x, y; + Rain_Drop *drop; + Evas_Coord x, y; - drop = next->data; - d = ecore_time_get() - drop->start_time; - y = 300 * d * drop->speed; - evas_object_geometry_get(drop->drop, &x, NULL, NULL, NULL); - if (y > rain->height) - drop->start_time = ecore_time_get() + (double) (random() % 600) / (double) 600; - evas_object_move(drop->drop, x, y); + drop = next->data; + d = ecore_time_get() - drop->start_time; + y = 300 * d * drop->speed; + evas_object_geometry_get(drop->drop, &x, NULL, NULL, NULL); + if (y > rain->height) + drop->start_time = + ecore_time_get() + (double)(random() % 600) / (double)600; + evas_object_move(drop->drop, x, y); - next = evas_list_next(next); + next = evas_list_next(next); } return 1; } -static void -_rain_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi) +static void +_rain_menu_cb_configure(void *data, E_Menu * m, E_Menu_Item * mi) { - Rain *r; - E_Container *con; + Rain *r; + E_Container *con; - r = (Rain *)data; - if (!r) return; + r = (Rain *) data; + if (!r) + return; con = e_container_current_get(e_manager_current_get()); _config_rain_module(con, r); } -void +void _rain_cb_config_updated(void *data) { - Rain *r; + Rain *r; - r = (Rain *)data; - if (!r) return; + r = (Rain *) data; + if (!r) + return; _rain_canvas_reset(r); } =================================================================== RCS file: /cvsroot/enlightenment/e_modules/rain/e_mod_main.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_main.h 6 Jan 2006 21:08:10 -0000 1.6 +++ e_mod_main.h 29 Jan 2006 17:53:06 -0000 1.7 @@ -1,48 +1,45 @@ #ifndef E_MOD_MAIN_H #define E_MOD_MAIN_H -typedef struct _Config Config; -typedef struct _Rain Rain; +typedef struct _Config Config; +typedef struct _Rain Rain; typedef struct _Rain_Drop Rain_Drop; -struct _Config -{ - int cloud_count; - int drop_count; - int show_clouds; +struct _Config { + int cloud_count; + int drop_count; + int show_clouds; }; -struct _Rain -{ - E_Module *module; - Evas_List *cons; - Evas *canvas; - Ecore_Animator *animator; - Evas_List *clouds; - Evas_List *drops; - - E_Config_DD *conf_edd; - Config *conf; - Evas_Coord width, height; - E_Config_Dialog *config_dialog; +struct _Rain { + E_Module *module; + Evas_List *cons; + Evas *canvas; + Ecore_Animator *animator; + Evas_List *clouds; + Evas_List *drops; + + E_Config_DD *conf_edd; + Config *conf; + Evas_Coord width, height; + E_Config_Dialog *config_dialog; }; -struct _Rain_Drop -{ - Evas_Object *drop; - double start_time; - int speed; +struct _Rain_Drop { + Evas_Object *drop; + 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 _rain_cb_config_updated(void *data); +void _rain_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