remove trailingspaces

SVN revision: 31656
This commit is contained in:
doursse 2007-09-08 18:25:43 +00:00 committed by doursse
parent 5f24fc14bf
commit c63454baea
2 changed files with 123 additions and 123 deletions

View File

@ -63,7 +63,7 @@ void
_edje_edd_setup(void)
{
Eet_Data_Descriptor_Class eddc;
eddc.version = EET_DATA_DESCRIPTOR_CLASS_VERSION;
eddc.func.mem_alloc = NULL;
eddc.func.mem_free = NULL;
@ -78,38 +78,38 @@ _edje_edd_setup(void)
eddc.func.hash_free = evas_hash_free;
/* font directory */
NEWD("Edje_Font_Directory_Entry",
NEWD("Edje_Font_Directory_Entry",
Edje_Font_Directory_Entry);
_edje_edd_edje_font_directory_entry =
_edje_edd_edje_font_directory_entry =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_font_directory_entry, Edje_Font_Directory_Entry, "entry", entry, EET_T_STRING);
NEWD("Edje_Font_Directory",
NEWD("Edje_Font_Directory",
Edje_Font_Directory);
_edje_edd_edje_font_directory =
_edje_edd_edje_font_directory =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_font_directory, Edje_Font_Directory, "entries", entries, _edje_edd_edje_font_directory_entry);
/* image directory */
NEWD("Edje_Image_Directory_Entry",
NEWD("Edje_Image_Directory_Entry",
Edje_Image_Directory_Entry);
_edje_edd_edje_image_directory_entry =
_edje_edd_edje_image_directory_entry =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "entry", entry, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "source_type", source_type, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "source_param", source_param, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_image_directory_entry, Edje_Image_Directory_Entry, "id", id, EET_T_INT);
NEWD("Edje_Image_Directory",
NEWD("Edje_Image_Directory",
Edje_Image_Directory);
_edje_edd_edje_image_directory =
_edje_edd_edje_image_directory =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_image_directory, Edje_Image_Directory, "entries", entries, _edje_edd_edje_image_directory_entry);
/* spectrum directory */
NEWD("Edje_Spectrum_Color",
NEWD("Edje_Spectrum_Color",
Edje_Spectrum_Color);
_edje_edd_edje_spectrum_color =
_edje_edd_edje_spectrum_color =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "r", r, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "g", g, EET_T_INT);
@ -117,32 +117,32 @@ _edje_edd_setup(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "a", a, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_color, Edje_Spectrum_Color, "d", d, EET_T_INT);
NEWD("Edje_Spectrum_Directory_Entry",
NEWD("Edje_Spectrum_Directory_Entry",
Edje_Spectrum_Directory_Entry);
_edje_edd_edje_spectrum_directory_entry =
_edje_edd_edje_spectrum_directory_entry =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "entry", entry, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "filename", filename, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "color_list", color_list, _edje_edd_edje_spectrum_color);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_spectrum_directory_entry, Edje_Spectrum_Directory_Entry, "id", id, EET_T_INT);
NEWD("Edje_Spectrum_Directory",
NEWD("Edje_Spectrum_Directory",
Edje_Spectrum_Directory);
_edje_edd_edje_spectrum_directory =
_edje_edd_edje_spectrum_directory =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_spectrum_directory, Edje_Spectrum_Directory, "entries", entries, _edje_edd_edje_spectrum_directory_entry);
/* collection directory */
NEWD("Edje_Part_Collection_Directory_Entry",
Edje_Part_Collection_Directory_Entry);
_edje_edd_edje_part_collection_directory_entry =
_edje_edd_edje_part_collection_directory_entry =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection_directory_entry, Edje_Part_Collection_Directory_Entry, "entry", entry, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_collection_directory_entry, Edje_Part_Collection_Directory_Entry, "id", id, EET_T_INT);
NEWD("Edje_Part_Collection_Directory",
Edje_Part_Collection_Directory);
_edje_edd_edje_part_collection_directory =
_edje_edd_edje_part_collection_directory =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection_directory, Edje_Part_Collection_Directory, "entries", entries, _edje_edd_edje_part_collection_directory_entry);
@ -153,24 +153,24 @@ _edje_edd_setup(void)
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_data, Edje_Data, "key", key, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_data, Edje_Data, "value", value, EET_T_STRING);
NEWD("Edje_Style_Tag",
NEWD("Edje_Style_Tag",
Edje_Style_Tag);
_edje_edd_edje_style_tag =
_edje_edd_edje_style_tag =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_style_tag, Edje_Style_Tag, "key", key, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_style_tag, Edje_Style_Tag, "value", value, EET_T_STRING);
NEWD("Edje_Style",
NEWD("Edje_Style",
Edje_Style);
_edje_edd_edje_style =
_edje_edd_edje_style =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_style, Edje_Style, "name", name, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_style, Edje_Style, "tags", tags, _edje_edd_edje_style_tag);
NEWD("Edje_Color_Class",
NEWD("Edje_Color_Class",
Edje_Color_Class);
_edje_edd_edje_color_class =
_edje_edd_edje_color_class =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "name", name, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "r", r, EET_T_UCHAR);
@ -185,11 +185,11 @@ _edje_edd_setup(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "g3", g3, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "b3", b3, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_color_class, Edje_Color_Class, "a3", a3, EET_T_UCHAR);
/* the main file directory */
NEWD("Edje_File",
NEWD("Edje_File",
Edje_File);
_edje_edd_edje_file =
_edje_edd_edje_file =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "compiler", compiler, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_file, Edje_File, "version", version, EET_T_INT);
@ -197,7 +197,7 @@ _edje_edd_setup(void)
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "font_dir", font_dir, _edje_edd_edje_font_directory);
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "image_dir", image_dir, _edje_edd_edje_image_directory);
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "spectrum_dir", spectrum_dir, _edje_edd_edje_spectrum_directory);
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "collection_dir", collection_dir, _edje_edd_edje_part_collection_directory);
EET_DATA_DESCRIPTOR_ADD_SUB(_edje_edd_edje_file, Edje_File, "collection_dir", collection_dir, _edje_edd_edje_part_collection_directory);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_file, Edje_File, "data", data, _edje_edd_edje_data);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_file, Edje_File, "styles", styles, _edje_edd_edje_style);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_file, Edje_File, "color_classes", color_classes, _edje_edd_edje_color_class);
@ -205,7 +205,7 @@ _edje_edd_setup(void)
/* parts & programs - loaded induvidually */
NEWD("Edje_Program_Target",
Edje_Program_Target);
_edje_edd_edje_program_target =
_edje_edd_edje_program_target =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program_target, Edje_Program_Target, "id", id, EET_T_INT);
@ -218,7 +218,7 @@ _edje_edd_setup(void)
NEWD("Edje_Program",
Edje_Program);
_edje_edd_edje_program =
_edje_edd_edje_program =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "id", id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_program, Edje_Program, "name", name, EET_T_STRING);
@ -238,13 +238,13 @@ _edje_edd_setup(void)
NEWD("Edje_Part_Image_Id",
Edje_Part_Image_Id);
_edje_edd_edje_part_image_id =
_edje_edd_edje_part_image_id =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_image_id, Edje_Part_Image_Id, "id", id, EET_T_INT);
NEWD("Edje_Part_Description",
Edje_Part_Description);
_edje_edd_edje_part_description =
_edje_edd_edje_part_description =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "state.name", state.name, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "state.value", state.value, EET_T_DOUBLE);
@ -334,10 +334,10 @@ _edje_edd_setup(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "gradient.rel2.relative_y", gradient.rel2.relative_y, EET_T_DOUBLE);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "gradient.rel2.offset_x", gradient.rel2.offset_x, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description, Edje_Part_Description, "gradient.rel2.offset_y", gradient.rel2.offset_y, EET_T_INT);
NEWD("Edje_Part",
Edje_Part);
_edje_edd_edje_part =
_edje_edd_edje_part =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "name", name, EET_T_STRING);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "id", id, EET_T_INT);
@ -360,10 +360,10 @@ _edje_edd_setup(void)
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.counfine_id", dragable.confine_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "dragable.events_id", dragable.events_id, EET_T_INT);
EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part, Edje_Part, "source", source, EET_T_STRING);
NEWD("Edje_Part_Collection",
NEWD("Edje_Part_Collection",
Edje_Part_Collection);
_edje_edd_edje_part_collection =
_edje_edd_edje_part_collection =
eet_data_descriptor2_new(&eddc);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection, Edje_Part_Collection, "programs", programs, _edje_edd_edje_program);
EET_DATA_DESCRIPTOR_ADD_LIST(_edje_edd_edje_part_collection, Edje_Part_Collection, "parts", parts, _edje_edd_edje_part);

View File

@ -5,20 +5,20 @@
#include "Edje.h"
#include "edje_private.h"
/*
/*
* ALREADY EXPORTED BY EMBRYO:
*
*
* enum Float_Round_Method {
* ROUND, FLOOR, CEIL, TOZERO
* };
* enum Float_Angle_Mode {
* RADIAN, DEGREES, GRADES
* };
*
*
* numargs();
* getarg(arg, index=0);
* setarg(arg, index=0, value);
*
*
* Float:atof(string[]);
* Float:fract(Float:value);
* round(Float:value, Float_Round_Method:method=ROUND);
@ -49,19 +49,19 @@
* Float:randf();
* Float:seconds();
* date(&year, &month, &day, &yearday, &weekday, &hr, &min, &Float:sec);
*
*
*/
/* EDJE...
*
*
* implemented so far as examples:
*
*
* enum Msg_Type {
* MSG_NONE, MSG_STRING, MSG_INT, MSG_FLOAT, MSG_STRING_SET, MSG_INT_SET,
* MSG_FLOAT_SET, MSG_STRING_INT, MSG_INT_FLOAT, MSG_STRING_INT_SET,
* MSG_INT_FLOAT_SET
* };
*
*
* get_int(id)
* set_int(id, v)
* Float:get_float (id)
@ -158,7 +158,7 @@
* visible
*
* ** part_id and program_id need to be able to be "found" from strings
*
*
* get_drag_count(part_id, &Float:dx, &Float:&dy)
* set_drag_count(part_id, Float:dx, Float:dy)
* set_drag_confine(part_id, confine_part_id)
@ -174,9 +174,9 @@
* set_clip(part_id, clip_part_id)
* get_clip(part_id)
*
*
*
* ADD/DEL CUSTOM OBJECTS UNDER SOLE EMBRYO SCRIPT CONTROL
*
*
*/
#define CHKPARAM(n) if (params[0] != (sizeof(Embryo_Cell) * (n))) return 0;
@ -232,7 +232,7 @@ static Embryo_Cell
_edje_embryo_fn_get_int(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
return (Embryo_Cell)_edje_var_int_get(ed, (int)params[1]);
@ -243,7 +243,7 @@ static Embryo_Cell
_edje_embryo_fn_set_int(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
CHKPARAM(2);
ed = embryo_program_data_get(ep);
_edje_var_int_set(ed, (int)params[1], (int)params[2]);
@ -256,7 +256,7 @@ _edje_embryo_fn_get_float(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
float v;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
v = (float)_edje_var_float_get(ed, params[1]);
@ -269,7 +269,7 @@ _edje_embryo_fn_set_float(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
float v;
CHKPARAM(2);
ed = embryo_program_data_get(ep);
v = EMBRYO_CELL_TO_FLOAT(params[2]);
@ -283,7 +283,7 @@ _edje_embryo_fn_get_str(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
char *s;
CHKPARAM(3);
if (params[3] < 1) return 0;
ed = embryo_program_data_get(ep);
@ -297,7 +297,7 @@ _edje_embryo_fn_get_str(Embryo_Program *ep, Embryo_Cell *params)
else
{
char *ss;
ss = alloca(strlen(s));
strcpy(ss, s);
ss[params[3] - 1] = 0;
@ -317,7 +317,7 @@ _edje_embryo_fn_get_strlen(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
char *s;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
s = (char *)_edje_var_str_get(ed, (int)params[1]);
@ -334,7 +334,7 @@ _edje_embryo_fn_set_str(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
char *s;
CHKPARAM(2);
ed = embryo_program_data_get(ep);
GETSTR(s, params[2]);
@ -520,7 +520,7 @@ _edje_embryo_fn_fetch_str(Embryo_Program *ep, Embryo_Cell *params)
else
{
char *ss;
ss = alloca(strlen(s));
strcpy(ss, s);
ss[params[4] - 1] = 0;
@ -617,7 +617,7 @@ _edje_embryo_fn_timer(Embryo_Program *ep, Embryo_Cell *params)
float f;
double in;
int val;
CHKPARAM(3);
ed = embryo_program_data_get(ep);
GETSTR(fname, params[2]);
@ -634,7 +634,7 @@ _edje_embryo_fn_cancel_timer(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
int id;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
id = params[1];
@ -652,7 +652,7 @@ _edje_embryo_fn_anim(Embryo_Program *ep, Embryo_Cell *params)
float f;
double len;
int val;
CHKPARAM(3);
ed = embryo_program_data_get(ep);
GETSTR(fname, params[2]);
@ -669,7 +669,7 @@ _edje_embryo_fn_cancel_anim(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
int id;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
id = params[1];
@ -685,14 +685,14 @@ _edje_embryo_fn_set_min_size(Embryo_Program *ep, Embryo_Cell *params)
Edje *ed;
float f = 0.0;
double w = 0.0, h = 0.0;
CHKPARAM(2);
ed = embryo_program_data_get(ep);
f = EMBRYO_CELL_TO_FLOAT(params[1]);
w = (double)f;
f = EMBRYO_CELL_TO_FLOAT(params[2]);
h = (double)f;
if (w < 0.0) w = 0.0;
if (h < 0.0) h = 0.0;
ed->collection->prop.min.w = w;
@ -709,21 +709,21 @@ _edje_embryo_fn_set_max_size(Embryo_Program *ep, Embryo_Cell *params)
Edje *ed;
float f = 0.0;
double w = 0.0, h = 0.0;
CHKPARAM(2);
ed = embryo_program_data_get(ep);
f = EMBRYO_CELL_TO_FLOAT(params[1]);
w = (double)f;
f = EMBRYO_CELL_TO_FLOAT(params[2]);
h = (double)f;
if (w < 0.0) w = 0.0;
if (h < 0.0) h = 0.0;
ed->collection->prop.max.w = w;
ed->collection->prop.max.h = h;
ed->dirty = 1;
_edje_recalc(ed);
return 0;
}
@ -735,7 +735,7 @@ _edje_embryo_fn_stop_program(Embryo_Program *ep, Embryo_Cell *params)
int program_id = 0;
Edje_Running_Program *runp;
Evas_List *l;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
program_id = params[1];
@ -760,10 +760,10 @@ static Embryo_Cell
_edje_embryo_fn_stop_programs_on(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
int part_id = 0;
Edje_Real_Part *rp;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
part_id = params[1];
@ -800,7 +800,7 @@ _edje_embryo_fn_emit(Embryo_Program *ep, Embryo_Cell *params)
{
Edje *ed;
char *sig = NULL, *src = NULL;
CHKPARAM(2);
ed = embryo_program_data_get(ep);
GETSTR(sig, params[1]);
@ -820,7 +820,7 @@ _edje_embryo_fn_set_state(Embryo_Program *ep, Embryo_Cell *params)
float f = 0.0;
double value = 0.0;
Edje_Real_Part *rp;
CHKPARAM(3);
ed = embryo_program_data_get(ep);
GETSTR(state, params[2]);
@ -867,7 +867,7 @@ _edje_embryo_fn_get_state(Embryo_Program *ep, Embryo_Cell *params)
else
{
char *ss;
ss = alloca(strlen(s));
strcpy(ss, s);
ss[params[3] - 1] = 0;
@ -897,7 +897,7 @@ _edje_embryo_fn_set_tween_state(Embryo_Program *ep, Embryo_Cell *params)
float f = 0.0;
double tween = 0.0, value1 = 0.0, value2 = 0.0;
Edje_Real_Part *rp;
CHKPARAM(6);
ed = embryo_program_data_get(ep);
GETSTR(state1, params[3]);
@ -928,7 +928,7 @@ _edje_embryo_fn_run_program(Embryo_Program *ep, Embryo_Cell *params)
Edje *ed;
int program_id = 0;
Edje_Program *pr;
CHKPARAM(1);
ed = embryo_program_data_get(ep);
program_id = params[1];
@ -991,8 +991,8 @@ _edje_embryo_fn_set_drag(Embryo_Program *ep, Embryo_Cell *params)
part_id = params[1];
if (part_id < 0) return 0;
rp = ed->table_parts[part_id % ed->table_parts_size];
edje_object_part_drag_value_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
edje_object_part_drag_value_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
}
@ -1042,7 +1042,7 @@ _edje_embryo_fn_get_text(Embryo_Program *ep, Embryo_Cell *params)
else
{
char *ss;
ss = alloca(strlen(s));
strcpy(ss, s);
ss[params[3] - 1] = 0;
@ -1119,8 +1119,8 @@ _edje_embryo_fn_set_color_class(Embryo_Program *ep, Embryo_Cell *params)
ed = embryo_program_data_get(ep);
GETSTR(class, params[1]);
if (!class) return 0;
edje_object_color_class_set(ed->obj, class, params[2], params[3], params[4], params[5],
params[2], params[3], params[4], params[5],
edje_object_color_class_set(ed->obj, class, params[2], params[3], params[4], params[5],
params[2], params[3], params[4], params[5],
params[2], params[3], params[4], params[5]);
return 0;
}
@ -1196,8 +1196,8 @@ _edje_embryo_fn_set_drag_step(Embryo_Program *ep, Embryo_Cell *params)
part_id = params[1];
if (part_id < 0) return 0;
rp = ed->table_parts[part_id % ed->table_parts_size];
edje_object_part_drag_step_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
edje_object_part_drag_step_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
}
@ -1259,8 +1259,8 @@ _edje_embryo_fn_set_drag_page(Embryo_Program *ep, Embryo_Cell *params)
part_id = params[1];
if (part_id < 0) return 0;
rp = ed->table_parts[part_id % ed->table_parts_size];
edje_object_part_drag_page_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
edje_object_part_drag_page_set(ed->obj, rp->part->name,
(double)EMBRYO_CELL_TO_FLOAT(params[2]),
(double)EMBRYO_CELL_TO_FLOAT(params[3]));
return(0);
}
@ -1273,7 +1273,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
Edje_Message_Type type;
int id, i, n;
Embryo_Cell *ptr;
if (params[0] < (sizeof(Embryo_Cell) * (2))) return 0;
ed = embryo_program_data_get(ep);
type = params[1];
@ -1288,14 +1288,14 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_MESSAGE_STRING:
{
Embryo_Cell *cptr;
cptr = embryo_data_address_get(ep, params[3]);
if (cptr)
{
Edje_Message_String *emsg;
int l;
char *s;
l = embryo_data_string_length_get(ep, cptr);
s = alloca(l + 1);
embryo_data_string_get(ep, cptr, s);
@ -1308,7 +1308,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_MESSAGE_INT:
{
Edje_Message_Int *emsg;
emsg = alloca(sizeof(Edje_Message_Int));
ptr = embryo_data_address_get(ep, params[3]);
emsg->val = (int)*ptr;
@ -1319,7 +1319,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
{
Edje_Message_Float *emsg;
float f;
emsg = alloca(sizeof(Edje_Message_Float));
ptr = embryo_data_address_get(ep, params[3]);
f = EMBRYO_CELL_TO_FLOAT(*ptr);
@ -1330,20 +1330,20 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_MESSAGE_STRING_SET:
{
Edje_Message_String_Set *emsg;
n = (params[0] / sizeof(Embryo_Cell)) + 1;
emsg = alloca(sizeof(Edje_Message_String_Set) + ((n - 3 - 1) * sizeof(char *)));
emsg->count = n - 3;
for (i = 3; i < n; i++)
{
Embryo_Cell *cptr;
cptr = embryo_data_address_get(ep, params[i]);
if (cptr)
{
int l;
char *s;
l = embryo_data_string_length_get(ep, cptr);
s = alloca(l + 1);
embryo_data_string_get(ep, cptr, s);
@ -1356,7 +1356,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_MESSAGE_INT_SET:
{
Edje_Message_Int_Set *emsg;
n = (params[0] / sizeof(Embryo_Cell)) + 1;
emsg = alloca(sizeof(Edje_Message_Int_Set) + ((n - 3 - 1) * sizeof(int)));
emsg->count = n - 3;
@ -1371,14 +1371,14 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_MESSAGE_FLOAT_SET:
{
Edje_Message_Float_Set *emsg;
n = (params[0] / sizeof(Embryo_Cell)) + 1;
emsg = alloca(sizeof(Edje_Message_Float_Set) + ((n - 3 - 1) * sizeof(double)));
emsg->count = n - 3;
for (i = 3; i < n; i++)
{
float f;
ptr = embryo_data_address_get(ep, params[i]);
f = EMBRYO_CELL_TO_FLOAT(*ptr);
emsg->val[i - 3] = (double)f;
@ -1390,13 +1390,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
{
Edje_Message_String_Int *emsg;
Embryo_Cell *cptr;
cptr = embryo_data_address_get(ep, params[3]);
if (cptr)
{
int l;
char *s;
l = embryo_data_string_length_get(ep, cptr);
s = alloca(l + 1);
embryo_data_string_get(ep, cptr, s);
@ -1412,14 +1412,14 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
{
Edje_Message_String_Float *emsg;
Embryo_Cell *cptr;
cptr = embryo_data_address_get(ep, params[3]);
if (cptr)
{
int l;
char *s;
float f;
l = embryo_data_string_length_get(ep, cptr);
s = alloca(l + 1);
embryo_data_string_get(ep, cptr, s);
@ -1436,13 +1436,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
{
Edje_Message_String_Int_Set *emsg;
Embryo_Cell *cptr;
cptr = embryo_data_address_get(ep, params[3]);
if (cptr)
{
int l;
char *s;
l = embryo_data_string_length_get(ep, cptr);
s = alloca(l + 1);
embryo_data_string_get(ep, cptr, s);
@ -1463,13 +1463,13 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
{
Edje_Message_String_Float_Set *emsg;
Embryo_Cell *cptr;
cptr = embryo_data_address_get(ep, params[3]);
if (cptr)
{
int l;
char *s;
l = embryo_data_string_length_get(ep, cptr);
s = alloca(l + 1);
embryo_data_string_get(ep, cptr, s);
@ -1480,7 +1480,7 @@ _edje_embryo_fn_send_message(Embryo_Program *ep, Embryo_Cell *params)
for (i = 4; i < n; i++)
{
float f;
ptr = embryo_data_address_get(ep, params[i]);
f = EMBRYO_CELL_TO_FLOAT(*ptr);
emsg->val[i - 4] = (double)f;
@ -1625,7 +1625,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
case EDJE_STATE_PARAM_ASPECT_PREF:
CHKPARAM(3);
GETINT(rp->custom.description->aspect.prefer, params[3]);
break;
@ -1661,7 +1661,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETSTR(s, params[3]);
GETSTREVAS(s, rp->custom.description->color_class);
break;
case EDJE_STATE_PARAM_REL1:
CHKPARAM(4);
@ -1713,14 +1713,14 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom.description->rel2.offset_x, params[3]);
GETINT(rp->custom.description->rel2.offset_y, params[4]);
break;
case EDJE_STATE_PARAM_IMAGE:
if ( (rp->part->type != EDJE_PART_TYPE_IMAGE) ) return 0;
CHKPARAM(3);
GETINT(rp->custom.description->image.id, params[3]);
break;
case EDJE_STATE_PARAM_BORDER:
if ( (rp->part->type != EDJE_PART_TYPE_IMAGE) ) return 0;
@ -1805,7 +1805,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
case EDJE_STATE_PARAM_TEXT_FIT:
if ((rp->part->type != EDJE_PART_TYPE_TEXT)) return 0;
CHKPARAM(4);
GETINT(rp->custom.description->text.fit_x, params[3]);
GETINT(rp->custom.description->text.fit_y, params[4]);
@ -1843,7 +1843,7 @@ _edje_embryo_fn_set_state_val(Embryo_Program *ep, Embryo_Cell *params)
GETINT(rp->custom.description->visible, params[3]);
break;
break;
default:
break;
}
@ -1913,7 +1913,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
break;
case EDJE_STATE_PARAM_ASPECT_PREF:
CHKPARAM(3);
SETINT(rp->custom.description->aspect.prefer, params[3]);
break;
@ -1991,7 +1991,7 @@ _edje_embryo_fn_get_state_val(Embryo_Program *ep, Embryo_Cell *params)
SETINT(rp->custom.description->rel2.offset_x, params[3]);
SETINT(rp->custom.description->rel2.offset_y, params[4]);
break;
case EDJE_STATE_PARAM_IMAGE:
if ( (rp->part->type != EDJE_PART_TYPE_IMAGE) ) return 0;
@ -2133,7 +2133,7 @@ void
_edje_embryo_script_init(Edje *ed)
{
Embryo_Program *ep;
if (!ed) return;
if (!ed->collection) return;
if (!ed->collection->script) return;
@ -2167,10 +2167,10 @@ _edje_embryo_script_init(Edje *ed)
embryo_program_native_call_add(ep, "timer", _edje_embryo_fn_timer);
embryo_program_native_call_add(ep, "cancel_timer", _edje_embryo_fn_cancel_timer);
embryo_program_native_call_add(ep, "anim", _edje_embryo_fn_anim);
embryo_program_native_call_add(ep, "cancel_anim", _edje_embryo_fn_cancel_anim);
embryo_program_native_call_add(ep, "emit", _edje_embryo_fn_emit);
embryo_program_native_call_add(ep, "set_state", _edje_embryo_fn_set_state);
embryo_program_native_call_add(ep, "get_state", _edje_embryo_fn_get_state);
@ -2196,7 +2196,7 @@ _edje_embryo_script_init(Edje *ed)
embryo_program_native_call_add(ep, "stop_programs_on", _edje_embryo_fn_stop_programs_on);
embryo_program_native_call_add(ep, "set_min_size", _edje_embryo_fn_set_min_size);
embryo_program_native_call_add(ep, "set_max_size", _edje_embryo_fn_set_max_size);
embryo_program_native_call_add(ep, "send_message", _edje_embryo_fn_send_message);
embryo_program_native_call_add(ep, "get_geometry", _edje_embryo_fn_get_geometry);
embryo_program_native_call_add(ep, "custom_state", _edje_embryo_fn_custom_state);
@ -2292,13 +2292,13 @@ _edje_embryo_globals_init(Edje *ed)
{
int n, i;
Embryo_Program *ep;
ep = ed->collection->script;
n = embryo_program_variable_count_get(ep);
for (i = 0; i < n; i++)
{
Embryo_Cell cell, *cptr;
cell = embryo_program_variable_get(ep, i);
if (cell != EMBRYO_CELL_NONE)
{