Enlightenment CVS committal
Author : mej
Project : e_modules
Module : flame
Dir : e_modules/flame
Modified Files:
e_mod_config.c e_mod_main.c
Log Message:
Wed Apr 5 13:48:36 2006 Michael Jennings (mej)
Indent!
----------------------------------------------------------------------
===================================================================
RCS file: /cvs/e/e_modules/flame/e_mod_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_config.c 1 Apr 2006 19:35:59 -0000 1.21
+++ e_mod_config.c 5 Apr 2006 17:48:49 -0000 1.22
@@ -12,14 +12,10 @@
/* 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 Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
- E_Config_Dialog_Data *cfdata);
-static int _advanced_apply_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 Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata);
+static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data
*cfdata);
static void _fill_data(Flame *f, E_Config_Dialog_Data *cfdata);
void
@@ -49,6 +45,7 @@
f = cfd->data;
cfdata = E_NEW(E_Config_Dialog_Data, 1);
+
_fill_data(f, cfdata);
return cfdata;
@@ -74,8 +71,7 @@
}
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;
@@ -149,8 +145,7 @@
}
static Evas_Object *
-_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
- E_Config_Dialog_Data *cfdata)
+_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
Evas_Object *o, *of, *ob;
@@ -159,20 +154,17 @@
ob = e_widget_label_add(evas, D_("Red Amount"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 300, 10, 0, NULL,
- &(cfdata->r), 200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 300, 10, 0, NULL,
&(cfdata->r), 200);
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, D_("Blue Amount"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 300, 10, 0, NULL,
- &(cfdata->b), 200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 300, 10, 0, NULL,
&(cfdata->b), 200);
e_widget_framelist_object_append(of, ob);
ob = e_widget_label_add(evas, D_("Green Amount"));
e_widget_framelist_object_append(of, ob);
- ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 300, 10, 0, NULL,
- &(cfdata->g), 200);
+ ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 0, 300, 10, 0, NULL,
&(cfdata->g), 200);
e_widget_framelist_object_append(of, ob);
e_widget_list_object_append(o, of, 1, 1, 0.5);
===================================================================
RCS file: /cvs/e/e_modules/flame/e_mod_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.c 1 Apr 2006 19:35:59 -0000 1.18
+++ e_mod_main.c 5 Apr 2006 17:48:49 -0000 1.19
@@ -103,8 +103,7 @@
EAPI int
e_modapi_about(E_Module *m)
{
- e_module_dialog_show(D_("Enlightenment Flame Module"),
- D_("A simple module to display flames."));
+ e_module_dialog_show(D_("Enlightenment Flame Module"), D_("A simple module
to display flames."));
return 1;
}
@@ -224,7 +223,7 @@
mn = e_menu_new();
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, _("Configuration"));
- e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
+ e_util_menu_item_edje_icon_set(mi, "enlightenment/configuration");
e_menu_item_callback_set(mi, _flame_menu_cb_configure, f);
f->config_menu = mn;
return mn;
@@ -266,9 +265,7 @@
int size;
int flame_width, flame_height;
- ff->ev_handler_container_resize =
- ecore_event_handler_add(E_EVENT_CONTAINER_RESIZE,
- _flame_cb_event_container_resize, ff);
+ ff->ev_handler_container_resize =
ecore_event_handler_add(E_EVENT_CONTAINER_RESIZE,
_flame_cb_event_container_resize, ff);
/* set up the flame object */
o = evas_object_image_add(ff->evas);
evas_output_viewport_get(ff->evas, NULL, NULL, &ww, &hh);
@@ -296,8 +293,7 @@
/* allocation of the image */
ff->ims = powerof(ff->ww);
- evas_object_image_size_set(ff->flame_object,
- 1 << ff->ims, ff->flame->conf->height);
+ evas_object_image_size_set(ff->flame_object, 1 << ff->ims,
ff->flame->conf->height);
evas_object_image_fill_set(o, 0, 0, 1 << ff->ims, ff->flame->conf->height);
ff->im = (unsigned int *)evas_object_image_data_get(ff->flame_object, 1);
@@ -406,16 +402,14 @@
"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
"\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
- "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
- "\377\377\377\377";
+ "\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377\377"
"\377\377\377\377";
int i;
for (i = 0; i < 300; i++)
{
ff->palette[i] =
(gold_cmap[(i * 4) + 3] << 24) |
- (gold_cmap[(i * 4) + 0] << 16) |
- (gold_cmap[(i * 4) + 1] << 8) | (gold_cmap[(i * 4) + 2]);
+ (gold_cmap[(i * 4) + 0] << 16) | (gold_cmap[(i * 4) + 1] << 8) |
(gold_cmap[(i * 4) + 2]);
}
}
@@ -443,9 +437,7 @@
if (b > 255)
b = 255;
a = (int)((r * 0.299) + (g * 0.587) + (b * 0.114));
- ff->palette[i] = ((((unsigned char)a) << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((((unsigned char)a) << 24) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
}
}
@@ -461,9 +453,7 @@
g = 0;
b = (i * 255) / 80;
a = (int)((r * 0.299) + (g * 0.587) + (b * 0.114));
- ff->palette[i] = ((((unsigned char)a) << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((((unsigned char)a) << 24) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
}
for (i = 80; i < 160; i++)
{
@@ -472,13 +462,9 @@
b = 255;
if ((r * r + g * g + b * b) <= 100)
- ff->palette[i] = ((r * r + g * g + b * b) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((r * r + g * g + b * b) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
else
- ff->palette[i] = ((255 << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((255 << 24) | (((unsigned char)r) << 16) |
(((unsigned char)g) << 8) | ((unsigned char)b));
}
for (i = 160; i < 300; i++)
{
@@ -487,13 +473,9 @@
b = 255;
if ((r * r + g * g + b * b) <= 100)
- ff->palette[i] = ((r * r + g * g + b * b) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((r * r + g * g + b * b) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
else
- ff->palette[i] = ((255 << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((255 << 24) | (((unsigned char)r) << 16) |
(((unsigned char)g) << 8) | ((unsigned char)b));
}
}
@@ -521,9 +503,7 @@
if (b > 255)
b = 255;
a = (int)((r * 0.299) + (g * 0.587) + (b * 0.114));
- ff->palette[i] = ((((unsigned char)a) << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((((unsigned char)a) << 24) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
}
}
@@ -551,9 +531,7 @@
if (b > 255)
b = 255;
a = (int)((r * 0.299) + (g * 0.587) + (b * 0.114));
- ff->palette[i] = ((((unsigned char)a) << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((((unsigned char)a) << 24) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
}
}
@@ -583,9 +561,7 @@
if (b > 255)
b = 255;
a = (int)((r * 0.299) + (g * 0.587) + (b * 0.114));
- ff->palette[i] = ((((unsigned char)a) << 24) |
- (((unsigned char)r) << 16) |
- (((unsigned char)g) << 8) | ((unsigned char)b));
+ ff->palette[i] = ((((unsigned char)a) << 24) | (((unsigned char)r) <<
16) | (((unsigned char)g) << 8) | ((unsigned char)b));
}
}
@@ -644,8 +620,7 @@
for (x = 0; x < (ff->ww >> 1); x++)
{
ptr = ff->f_array1 + (y << ff->ws) + x;
- *ptr +=
- ((rand() % ff->flame->conf->variance) - ff->flame->conf->vartrend);
+ *ptr += ((rand() % ff->flame->conf->variance) -
ff->flame->conf->vartrend);
val = *ptr;
if (val > 300)
*ptr = 0;
@@ -735,8 +710,7 @@
}
evas_object_image_data_set(ff->flame_object, ff->im);
- evas_object_image_data_update_add(ff->flame_object, 0, 0, ff->ww,
- ff->flame->conf->height);
+ evas_object_image_data_update_add(ff->flame_object, 0, 0, ff->ww,
ff->flame->conf->height);
/* we loop indefinitely */
return 1;
@@ -777,8 +751,7 @@
/* allocation of the image */
ff->ims = powerof(ff->ww);
- evas_object_image_size_set(ff->flame_object, 1 << ff->ims,
- ff->flame->conf->height);
+ evas_object_image_size_set(ff->flame_object, 1 << ff->ims,
ff->flame->conf->height);
evas_object_image_fill_set(o, 0, 0, 1 << ff->ims, ff->flame->conf->height);
ff->im = (unsigned int *)evas_object_image_data_get(ff->flame_object, 1);
return 1;
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
