batden
/
enlightenment-module-penguins
forked from enlightenment/enlightenment-module-penguins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename typedefs for better namespace

This commit is contained in:
Davide Andreoli 2014-01-19 21:59:05 +01:00
parent e827df78f8
commit 7d74cc4f96
4 changed files with 82 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/e_mod_config.c
View File

@ -18,7 +18,7 @@ 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 _fill_data(Population *pop, E_Config_Dialog_Data *cfdata);
static void _fill_data(Penguins_Population *pop, E_Config_Dialog_Data *cfdata);
E_Config_Dialog *
e_int_config_penguins_module(E_Comp *comp, const char *params)
@ -26,7 +26,7 @@ e_int_config_penguins_module(E_Comp *comp, const char *params)
E_Config_Dialog *cfd;
E_Config_Dialog_View *v;
char buf[4096];
Population *pop;
Penguins_Population *pop;
pop = penguins_mod->data;
if (e_config_dialog_find("Penguins", "appearance/penguins")) return NULL;
@ -47,7 +47,7 @@ e_int_config_penguins_module(E_Comp *comp, const char *params)
}
static void
_fill_data(Population *pop, E_Config_Dialog_Data *cfdata)
_fill_data(Penguins_Population *pop, E_Config_Dialog_Data *cfdata)
{
cfdata->penguins_count = pop->conf->penguins_count;
cfdata->zoom = pop->conf->zoom;
@ -59,7 +59,7 @@ static void *
_create_data(E_Config_Dialog *cfd)
{
E_Config_Dialog_Data *cfdata;
Population *pop;
Penguins_Population *pop;
pop = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
@ -71,7 +71,7 @@ _create_data(E_Config_Dialog *cfd)
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Population *pop;
Penguins_Population *pop;
pop = cfd->data;
pop->config_dialog = NULL;
@ -84,7 +84,7 @@ static Evas_Object *
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *ob, *ol;
Population *pop;
Penguins_Population *pop;
pop = cfd->data;
o = e_widget_list_add(evas, 0, 0);
@ -146,7 +146,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
static int
_basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
Population *pop;
Penguins_Population *pop;
pop = cfd->data;

4
src/e_mod_main.c
View File

@ -37,7 +37,7 @@ e_modapi_init(E_Module *m)
EAPI int
e_modapi_shutdown(E_Module *m)
{
Population *pop;
Penguins_Population *pop;
e_configure_registry_item_del("appearance/penguins");
e_configure_registry_category_del("appearance");
@ -53,7 +53,7 @@ e_modapi_shutdown(E_Module *m)
EAPI int
e_modapi_save(E_Module *m)
{
Population *pop;
Penguins_Population *pop;
pop = m->data;
if (!pop) return 1;

114
src/e_mod_penguins.c
View File

@ -16,43 +16,43 @@
#define _RAND(prob) ( ( random() % prob ) == 0 )
/* module private routines */
static int _is_inside_any_win(Population *pop, int x, int y, int ret_value);
static Population *_population_init(E_Module *m);
static void _population_shutdown(Population *pop);
static int _is_inside_any_win(Penguins_Population *pop, int x, int y, int ret_value);
static Penguins_Population *_population_init(E_Module *m);
static void _population_shutdown(Penguins_Population *pop);
static Eina_Bool _cb_animator(void *data);
static void _population_load(Population *pop);
static void _theme_load(Population *pop);
static void _start_walking_at(Penguin *tux, int at_y);
static void _start_climbing_at(Penguin *tux, int at_x);
static void _start_falling_at(Penguin *tux, int at_x);
static void _start_flying_at(Penguin *tux, int at_y);
static void _start_splatting_at(Penguin *tux, int at_y);
static void _start_custom_at(Penguin *tux, int at_y);
static void _reborn(Penguin *tux);
static void _population_load(Penguins_Population *pop);
static void _theme_load(Penguins_Population *pop);
static void _start_walking_at(Penguins_Actor *tux, int at_y);
static void _start_climbing_at(Penguins_Actor *tux, int at_x);
static void _start_falling_at(Penguins_Actor *tux, int at_x);
static void _start_flying_at(Penguins_Actor *tux, int at_y);
static void _start_splatting_at(Penguins_Actor *tux, int at_y);
static void _start_custom_at(Penguins_Actor *tux, int at_y);
static void _reborn(Penguins_Actor *tux);
static void _cb_custom_end(void *data, Evas_Object *o, const char *emi, const char *src);
static void _cb_click_l (void *data, Evas_Object *o, const char *emi, const char *src);
static void _cb_click_r (void *data, Evas_Object *o, const char *emi, const char *src);
static void _cb_click_c (void *data, Evas_Object *o, const char *emi, const char *src);
static void _start_bombing_at(Penguin *tux, int at_y);
static void _start_bombing_at(Penguins_Actor *tux, int at_y);
static Eina_Bool _delay_born(void *data);
Population *
Penguins_Population *
population_init(E_Module *m)
{
Population *pop;
Penguins_Population *pop;
Eina_List *managers, *l, *l2;
pop = calloc(1, sizeof(Population));
pop = calloc(1, sizeof(Penguins_Population));
if (!pop) return NULL;
pop->module = m;
pop->conf_edd = E_CONFIG_DD_NEW("Penguins_Config", Config);
pop->conf_edd = E_CONFIG_DD_NEW("Penguins_Config", Penguins_Config);
#undef T
#undef D
#define T Config
#define T Penguins_Config
#define D pop->conf_edd
E_CONFIG_VAL(D, T, zoom, DOUBLE);
E_CONFIG_VAL(D, T, penguins_count, INT);
@ -64,7 +64,7 @@ population_init(E_Module *m)
{
char buf[4096];
pop->conf = E_NEW(Config, 1);
pop->conf = E_NEW(Penguins_Config, 1);
pop->conf->zoom = 1;
pop->conf->penguins_count = 3;
pop->conf->alpha = 200;
@ -139,7 +139,7 @@ population_init(E_Module *m)
Eina_Bool
_action_free(const Eina_Hash *hash, const void *key, void *data, void *fdata)
{
Action *a;
Penguins_Action *a;
a = data;
//printf("PENGUINS: Free Action '%s' :(\n", a->name);
E_FREE(a->name);
@ -148,13 +148,13 @@ _action_free(const Eina_Hash *hash, const void *key, void *data, void *fdata)
}
static void
_population_free(Population *pop)
_population_free(Penguins_Population *pop)
{
//printf("PENGUINS: Free Population\n");
while (pop->penguins)
{
Penguin *tux;
Penguins_Actor *tux;
//printf("PENGUINS: Free TUX :)\n");
tux = pop->penguins->data;
evas_object_del(tux->obj);
@ -164,7 +164,7 @@ _population_free(Population *pop)
}
while (pop->customs)
{
Custom_Action *cus;
Penguins_Custom_Action *cus;
//printf("PENGUINS: Free Custom Action\n");
cus = pop->customs->data;
E_FREE(cus->name);
@ -182,13 +182,13 @@ _population_free(Population *pop)
}
/* static void
_real_population_shutdown(Population *pop)
_real_population_shutdown(Penguins_Population *pop)
{
} */
void
population_shutdown(Population *pop)
population_shutdown(Penguins_Population *pop)
{
//printf("PENGUINS: KILL 'EM ALL\n");
@ -222,9 +222,9 @@ population_shutdown(Population *pop)
void
_penguins_cb_config_updated(void *data)
{
Population *pop;
Penguins_Population *pop;
pop = (Population *)data;
pop = (Penguins_Population *)data;
if (!pop) return;
_population_free(pop);
@ -233,17 +233,17 @@ _penguins_cb_config_updated(void *data)
_population_load(pop);
}
static Action*
_load_action(Population *pop, const char *filename, char *name, int id)
static Penguins_Action *
_load_action(Penguins_Population *pop, const char *filename, char *name, int id)
{
Action *act;
Penguins_Action *act;
char *data;
data = edje_file_data_get(filename, name);
if (!data)
return NULL;
act = calloc(1, sizeof(Action));
act = calloc(1, sizeof(Penguins_Action));
if (!act)
return NULL;
@ -263,10 +263,10 @@ _load_action(Population *pop, const char *filename, char *name, int id)
return act;
}
static Custom_Action*
_load_custom_action(Population *pop, const char *filename, char *name)
static Penguins_Custom_Action *
_load_custom_action(Penguins_Population *pop, const char *filename, char *name)
{
Custom_Action *c;
Penguins_Custom_Action *c;
char *data;
char buf[25];
@ -274,7 +274,7 @@ _load_custom_action(Population *pop, const char *filename, char *name)
if (!data)
return NULL;
c = calloc(1, sizeof(Custom_Action));
c = calloc(1, sizeof(Penguins_Custom_Action));
if (!c)
return NULL;
@ -299,13 +299,13 @@ _load_custom_action(Population *pop, const char *filename, char *name)
Eina_Bool
hash_fn(const Eina_Hash *hash, const char *key, void *data, void *fdata)
{
Action *a = data;
Penguins_Action *a = data;
printf("PENGUINS: Load action: '%s' w:%d h:%d speed:%d\n", key, a->w, a->h, a->speed);
return 1;
}
static void
_theme_load(Population *pop)
_theme_load(Penguins_Population *pop)
{
char *name;
char buf[15];
@ -348,19 +348,19 @@ _theme_load(Population *pop)
}
static void
_population_load(Population *pop)
_population_load(Penguins_Population *pop)
{
Evas_Object *o;
Evas_Coord xx, yy, ww, hh;
int i;
Penguin *tux;
Penguins_Actor *tux;
evas_output_viewport_get(pop->canvas, &xx, &yy, &ww, &hh);
printf("PENGUINS: Creating %d penguins\n", pop->conf->penguins_count);
for (i = 0; i < pop->conf->penguins_count; i++)
{
tux = malloc(sizeof(Penguin));
tux = malloc(sizeof(Penguins_Actor));
o = edje_object_add(pop->canvas);
edje_object_file_set(o, pop->conf->theme, "anims");
@ -387,7 +387,7 @@ _population_load(Population *pop)
static Eina_Bool
_delay_born(void *data)
{
Penguin *tux = data;
Penguins_Actor *tux = data;
if (!tux) return ECORE_CALLBACK_CANCEL;
@ -400,7 +400,7 @@ _delay_born(void *data)
static void
_cb_click_l (void *data, Evas_Object *o, const char *emi, const char *src)
{
Penguin *tux = data;
Penguins_Actor *tux = data;
//printf("Left-click on TUX !!!\n");
_start_bombing_at(tux, tux->y + tux->action->h);
}
@ -417,7 +417,7 @@ _cb_click_c (void *data, Evas_Object *o, const char *emi, const char *src)
}
static void
_reborn(Penguin *tux)
_reborn(Penguins_Actor *tux)
{
//printf("PENGUINS: Reborn :)\n");
tux->reverse = random() % (2);
@ -434,13 +434,13 @@ _reborn(Penguin *tux)
static Eina_Bool
_cb_animator(void *data)
{
Population *pop;
Penguins_Population *pop;
Eina_List *l;
pop = data;
for (l = pop->penguins; l; l = l->next)
{
Penguin *tux;
Penguins_Actor *tux;
int touch;
tux = l->data;
@ -618,7 +618,7 @@ _cb_animator(void *data)
}
static int
_is_inside_any_win(Population *pop, int x, int y, int ret_value)
_is_inside_any_win(Penguins_Population *pop, int x, int y, int ret_value)
{
Eina_List *l;
E_Client *ec;
@ -702,7 +702,7 @@ _is_inside_any_win(Population *pop, int x, int y, int ret_value)
}
static void
_start_walking_at(Penguin *tux, int at_y)
_start_walking_at(Penguins_Actor *tux, int at_y)
{
//printf("PENGUINS: Start walking...at %d\n", at_y);
tux->action = eina_hash_find(tux->pop->actions, "Walker");
@ -718,7 +718,7 @@ _start_walking_at(Penguin *tux, int at_y)
}
static void
_start_climbing_at(Penguin *tux, int at_x)
_start_climbing_at(Penguins_Actor *tux, int at_x)
{
//printf("PENGUINS: Start climbing...at: %d\n", at_x);
tux->action = eina_hash_find(tux->pop->actions, "Climber");
@ -737,7 +737,7 @@ _start_climbing_at(Penguin *tux, int at_x)
}
static void
_start_falling_at(Penguin *tux, int at_x)
_start_falling_at(Penguins_Actor *tux, int at_x)
{
if (_RAND(FALLING_PROB))
{
@ -778,7 +778,7 @@ _start_falling_at(Penguin *tux, int at_x)
}
static void
_start_flying_at(Penguin *tux, int at_y)
_start_flying_at(Penguins_Actor *tux, int at_y)
{
tux->action = eina_hash_find(tux->pop->actions, "Flyer");
evas_object_resize(tux->obj, tux->action->w, tux->action->h);
@ -790,7 +790,7 @@ _start_flying_at(Penguin *tux, int at_y)
}
static void
_start_angel_at(Penguin *tux, int at_y)
_start_angel_at(Penguins_Actor *tux, int at_y)
{
tux->x = tux->x + (tux->action->w /2);
tux->action = eina_hash_find(tux->pop->actions, "Angel");
@ -812,13 +812,13 @@ _start_angel_at(Penguin *tux, int at_y)
static void
_cb_splatter_end(void *data, Evas_Object *o, const char *emi, const char *src)
{
Penguin *tux = data;
Penguins_Actor *tux = data;
edje_object_signal_callback_del(o,"splatting_done","edje", _cb_splatter_end);
_start_angel_at(tux, tux->y+tux->action->h+10);
}
static void
_start_splatting_at(Penguin *tux, int at_y)
_start_splatting_at(Penguins_Actor *tux, int at_y)
{
// printf("PENGUINS: Start splatting...\n");
evas_object_hide(tux->obj);
@ -841,13 +841,13 @@ _start_splatting_at(Penguin *tux, int at_y)
static void
_cb_bomber_end(void *data, Evas_Object *o, const char *emi, const char *src)
{
Penguin *tux = data;
Penguins_Actor *tux = data;
edje_object_signal_callback_del(o,"bombing_done","edje", _cb_bomber_end);
_start_angel_at(tux, tux->y);
}
static void
_start_bombing_at(Penguin *tux, int at_y)
_start_bombing_at(Penguins_Actor *tux, int at_y)
{
//printf("PENGUINS: Start bombing at %d...\n", at_y);
if (tux->action && (
@ -876,7 +876,7 @@ _start_bombing_at(Penguin *tux, int at_y)
static void
_cb_custom_end(void *data, Evas_Object *o, const char *emi, const char *src)
{
Penguin* tux = data;
Penguins_Actor* tux = data;
//printf("PENGUINS: Custom action end.\n");
if (!tux->custom)
return;
@ -898,7 +898,7 @@ _cb_custom_end(void *data, Evas_Object *o, const char *emi, const char *src)
}
static void
_start_custom_at(Penguin *tux, int at_y)
_start_custom_at(Penguins_Actor *tux, int at_y)
{
int ran;

48
src/e_mod_penguins.h
View File

@ -2,7 +2,6 @@
#define E_MOD_PENGUINS_H
#define _RET_NONE_VALUE 0
#define _RET_BOTTOM_VALUE 1
#define _RET_TOP_VALUE 2
@ -18,21 +17,16 @@
#define ID_BOMBER 7
#define ID_ANGEL 8
typedef struct _Config Config;
typedef struct _Population Population;
typedef struct _Penguin Penguin;
typedef struct _Action Action;
typedef struct _Custom_Action Custom_Action;
struct _Config
typedef struct _Penguins_Config
{
double zoom;
int penguins_count;
const char *theme;
int alpha;
};
} Penguins_Config;
struct _Population
typedef struct _Penguins_Population
{
E_Module *module;
Evas *canvas;
@ -44,20 +38,20 @@ struct _Population
Eina_List *themes;
E_Config_DD *conf_edd;
Config *conf;
Penguins_Config *conf;
Evas_Coord width, height;
E_Config_Dialog *config_dialog;
};
} Penguins_Population;
struct _Action
typedef struct _Penguins_Action
{
char *name;
int id;
Evas_Coord w,h;
int speed;
};
} Penguins_Action;
struct _Custom_Action
typedef struct _Penguins_Custom_Action
{
char *name;
Evas_Coord w,h;
@ -67,33 +61,23 @@ struct _Custom_Action
int r_max;
char *left_program_name;
char *right_program_name;
};
} Penguins_Custom_Action;
struct _Penguin
typedef struct _Penguins_Actor
{
Evas_Object *obj;
int reverse;
double x, y;
int faller_h;
int r_count;
Action *action;
Custom_Action *custom;
Population *pop;
};
Penguins_Action *action;
Penguins_Custom_Action *custom;
Penguins_Population *pop;
} Penguins_Actor;
Population *population_init(E_Module *m);
void population_shutdown(Population *pop);
Penguins_Population *population_init(E_Module *m);
void population_shutdown(Penguins_Population *pop);
// extern E_Module *penguins_mod;
// 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);
// void _penguins_cb_config_updated(void *data);
#endif