enlightenment
/
expedite
7
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: enlightenment:master
Branches Tags
enlightenment:master
enlightenment:devs/cedric/efl-1.8
enlightenment:devs/lauromoura/reporting
enlightenment:devs/cedric/evas_snapshot
enlightenment:devs/cedric/efl-1.15
enlightenment:devs/cedric/efl-1.14
enlightenment:devs/cedric/efl-1.13
enlightenment:devs/cedric/efl-1.11
enlightenment:devs/cedric/efl-1.10
enlightenment:devs/cedric/efl-1.9
enlightenment:devs/felipealmeida/expedite-cxx
enlightenment:devs/cedric/efl-1.12
enlightenment:expedite-1.7
enlightenment:expedite-1.2
enlightenment:expedite-1.1
...
pull from: enlightenment:devs/cedric/efl-1.8
Branches Tags
enlightenment:master
enlightenment:devs/cedric/efl-1.8
enlightenment:devs/lauromoura/reporting
enlightenment:devs/cedric/evas_snapshot
enlightenment:devs/cedric/efl-1.15
enlightenment:devs/cedric/efl-1.14
enlightenment:devs/cedric/efl-1.13
enlightenment:devs/cedric/efl-1.11
enlightenment:devs/cedric/efl-1.10
enlightenment:devs/cedric/efl-1.9
enlightenment:devs/felipealmeida/expedite-cxx
enlightenment:devs/cedric/efl-1.12
enlightenment:expedite-1.7
enlightenment:expedite-1.2
enlightenment:expedite-1.1

13 Commits
master ... devs/cedri

Author SHA1 Message Date
Hermet Park 44de6c5b7b text_style_different_string: increase a factor to update animation properly. 2019-12-27 11:19:39 -08:00
Hermet Park 75a808e226 add one more resolution item. 2019-12-27 11:17:11 -08:00
Hermet Park 4d683b635e compare list item count properly, 
and remove s9 resolution in the default list.
 2019-12-27 11:17:02 -08:00
Hermet Park 433b9e3833 image_blend_occlude_few: increase a factor to update animation properly. 2019-12-27 11:15:22 -08:00
Hermet Park 7d95c2f730 textblock_intl: increase a factor to update animation properly. 2019-12-27 11:10:35 -08:00
Hermet Park 5fe5110067 textblock_basic: increase an factor to update animation properly. 2019-12-27 11:07:24 -08:00
Hermet Park 91ce527eb4 add a resolution option 720p-p 2019-12-27 11:00:06 -08:00
Hermet Park 1804ba6a5b Setup before starting fps measurement 
It's not good to include the setup in fps measurement,
Also, animator tick occur immediately when test item is selected.
We need to setup before it in order to avoid invalid objects access.
 2019-12-27 10:59:09 -08:00
Hermet Park c54e4b7cdc ui: remove menu icon. 
Unnecessary decoration that may cause user look it as a wrong display.
 2019-12-27 10:55:42 -08:00
Jean-Philippe Andre 7aca5a4908 UI main loop: Fix indentation 2014-10-22 16:07:46 +09:00
Jean-Philippe Andre 08eccb3e60 Fix support of --count from command line 
expedite would never exit after N loops
 2014-10-22 16:00:09 +09:00
Cedric BAIL a048b7a762 fix wrong ordering of report. 2014-09-04 14:24:35 +02:00
Cedric BAIL 459f59169e fix build on 1.8.x branch. 2014-09-04 11:45:59 +02:00
101 changed files with 314 additions and 295 deletions
Show Stats Expand all files Collapse all files

4
src/bin/about.c
View File

@ -8,7 +8,7 @@ _setup(void)
Evas_Object *o; Evas_Object *o;
Evas_Textblock_Style *st; Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
eo_do(o, evas_obj_position_set(10, 40), eo_do(o, evas_obj_position_set(10, 40),
evas_obj_size_set(win_w - 20, win_h - 50), evas_obj_size_set(win_w - 20, win_h - 50),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
@ -73,6 +73,6 @@ _key(char *key)
void void
about_start(void) about_start(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }

2
src/bin/expedite-cmp
View File

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
import sys import sys
import os import os

8
src/bin/font_effect_blur_alpha.c
View File

@ -1,3 +1,7 @@
#include <Evas.h>
#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 9
#undef FNAME #undef FNAME
#undef NAME #undef NAME
#undef ICON #undef ICON
@ -90,11 +94,13 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif
#undef FNAME #undef FNAME
#undef NAME #undef NAME
#undef ICON #undef ICON
#endif

9
src/bin/font_effect_blur_color.c
View File

@ -1,3 +1,7 @@
#include <Evas.h>
#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 9
#undef FNAME #undef FNAME
#undef NAME #undef NAME
#undef ICON #undef ICON
@ -92,11 +96,14 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif
#undef FNAME #undef FNAME
#undef NAME #undef NAME
#undef ICON #undef ICON
#endif

4
src/bin/image_blend_border.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL), evas_obj_image_file_set(build_path("bar.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_border_recolor.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("pan.png"), NULL), evas_obj_image_file_set(build_path("pan.png"), NULL),
@ -97,8 +97,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_fade_pow2_unscaled.c
View File

@ -25,7 +25,7 @@ static void _setup(void)
{ {
int a; int a;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -98,8 +98,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_fade_unscaled.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
int a; int a;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = rnd()&0xff; a = rnd()&0xff;
eo_do(o, eo_do(o,
@ -95,8 +95,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_many_smooth_same_scaled.c
View File

@ -25,7 +25,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < MANYNUM; i++) for (i = 0; i < MANYNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
n = rnd() % 100; n = rnd() % 100;
w = 3 + ((n * (60 - 3)) / 100); w = 3 + ((n * (60 - 3)) / 100);
@ -97,8 +97,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_nearest_same_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_nearest_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_nearest_solid_same_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_nearest_solid_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude1.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i < (OBNUM / 2)) if (i < (OBNUM / 2))
{ {
@ -109,8 +109,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

10
src/bin/image_blend_occlude1_few.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i < (OBNUM / 2)) if (i < (OBNUM / 2))
{ {
@ -61,6 +61,7 @@ static void _cleanup(void)
/* loop - do things */ /* loop - do things */
static void _loop(double t, int f) static void _loop(double t, int f)
{ {
static int k = 0;
int i; int i;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
@ -70,12 +71,13 @@ static void _loop(double t, int f)
w = 120; w = 120;
h = 160; h = 160;
x = (win_w / 2) - (w / 2); x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2); y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
eo_do(o_images[i], evas_obj_position_set(x, y)); eo_do(o_images[i], evas_obj_position_set(x, y));
} }
} }
++k;
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -112,8 +114,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude1_many.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i < (OBNUM / 2)) if (i < (OBNUM / 2))
{ {
@ -112,8 +112,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude1_very_many.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i < (OBNUM / 2)) if (i < (OBNUM / 2))
{ {
@ -112,8 +112,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude2.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i & 0x1) if (i & 0x1)
{ {
@ -109,8 +109,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

10
src/bin/image_blend_occlude2_few.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i & 0x1) if (i & 0x1)
{ {
@ -61,6 +61,7 @@ static void _cleanup(void)
/* loop - do things */ /* loop - do things */
static void _loop(double t, int f) static void _loop(double t, int f)
{ {
static int k = 0;
int i; int i;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
@ -70,12 +71,13 @@ static void _loop(double t, int f)
w = 120; w = 120;
h = 160; h = 160;
x = (win_w / 2) - (w / 2); x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2); y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
eo_do(o_images[i], evas_obj_position_set(x, y)); eo_do(o_images[i], evas_obj_position_set(x, y));
} }
} }
k++;
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -112,8 +114,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude2_many.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i & 0x1) if (i & 0x1)
{ {
@ -112,8 +112,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude2_very_many.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i & 0x1) if (i & 0x1)
{ {
@ -112,8 +112,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude3.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i > (OBNUM / 2)) if (i > (OBNUM / 2))
{ {
@ -109,8 +109,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

12
src/bin/image_blend_occlude3_few.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i > (OBNUM / 2)) if (i > (OBNUM / 2))
{ {
@ -61,21 +61,23 @@ static void _cleanup(void)
/* loop - do things */ /* loop - do things */
static void _loop(double t, int f) static void _loop(double t, int f)
{ {
static int k = 0;
int i; int i;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
if (i > (OBNUM / 2)) if (i < (OBNUM / 2))
{ {
w = 120; w = 120;
h = 160; h = 160;
x = (win_w / 2) - (w / 2); x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2); y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (h / 2);
eo_do(o_images[i], evas_obj_position_set(x, y)); eo_do(o_images[i], evas_obj_position_set(x, y));
} }
} }
++k;
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -112,8 +114,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude3_many.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i > (OBNUM / 2)) if (i > (OBNUM / 2))
{ {
@ -112,8 +112,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_occlude3_very_many.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
if (i > (OBNUM / 2)) if (i > (OBNUM / 2))
{ {
@ -112,8 +112,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_smooth_same_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_smooth_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_smooth_solid_same_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_smooth_solid_scaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_solid_border.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("frame.png"), NULL), evas_obj_image_file_set(build_path("frame.png"), NULL),
@ -96,8 +96,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_solid_fade_pow2_unscaled.c
View File

@ -25,7 +25,7 @@ static void _setup(void)
{ {
int a; int a;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -98,8 +98,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_solid_fade_unscaled.c
View File

@ -25,7 +25,7 @@ static void _setup(void)
{ {
int a; int a;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -97,8 +97,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_solid_middle_border.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL), evas_obj_image_file_set(build_path("bar.png"), NULL),
@ -97,8 +97,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_solid_middle_unscaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -94,8 +94,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_solid_unscaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),
@ -92,8 +92,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/image_blend_unscaled.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
@ -92,8 +92,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

6
src/bin/image_crossfade.c
View File

@ -22,7 +22,7 @@ static void _setup(void)
{ {
Evas_Object *o; Evas_Object *o;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[0] = o; o_images[0] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("im1.png"), NULL), evas_obj_image_file_set(build_path("im1.png"), NULL),
@ -30,7 +30,7 @@ static void _setup(void)
evas_obj_size_set(720, 420), evas_obj_size_set(720, 420),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[1] = o; o_images[1] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("im2.png"), NULL), evas_obj_image_file_set(build_path("im2.png"), NULL),
@ -92,8 +92,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

6
src/bin/image_data_argb.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -62,8 +62,8 @@ static void _loop(double t, int f)
evas_obj_position_set(x, y), evas_obj_position_set(x, y),
evas_obj_size_set(w, h), evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h), evas_obj_image_fill_set(0, 0, w, h),
data = evas_obj_image_data_get(1), evas_obj_image_data_get(1, &data),
st = evas_obj_image_stride_get()); evas_obj_image_stride_get(&st));
st = st >> 2; st = st >> 2;
p = data; p = data;
for (y = 0; y < h; y++) for (y = 0; y < h; y++)

6
src/bin/image_data_argb_alpha.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -62,8 +62,8 @@ static void _loop(double t, int f)
evas_obj_position_set(x, y), evas_obj_position_set(x, y),
evas_obj_size_set(w, h), evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h), evas_obj_image_fill_set(0, 0, w, h),
data = evas_obj_image_data_get(1), evas_obj_image_data_get(1, &data),
st = evas_obj_image_stride_get()); evas_obj_image_stride_get(&st));
st = st >> 2; st = st >> 2;
p = data; p = data;
for (y = 0; y < h; y++) for (y = 0; y < h; y++)

2
src/bin/image_data_ycbcr601pl.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

4
src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -140,8 +140,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

2
src/bin/image_data_ycbcr601pl_map_solid_rotate.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),

4
src/bin/image_data_ycbcr601pl_wide_stride.c
View File

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -170,8 +170,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

2
src/bin/image_map_3d_1.c
View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{ {
Evas_Object *o; Evas_Object *o;
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o; c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1); snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o, eo_do(o,

2
src/bin/image_map_3d_2.c
View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{ {
Evas_Object *o; Evas_Object *o;
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o; c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1); snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o, eo_do(o,

2
src/bin/image_map_3d_3.c
View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{ {
Evas_Object *o; Evas_Object *o;
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o; c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1); snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o, eo_do(o,

2
src/bin/image_map_3d_4.c
View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{ {
Evas_Object *o; Evas_Object *o;
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o; c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1); snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o, eo_do(o,

2
src/bin/image_map_3d_5.c
View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{ {
Evas_Object *o; Evas_Object *o;
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o; c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o, eo_do(o,

2
src/bin/image_map_3d_6.c
View File

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{ {
Evas_Object *o; Evas_Object *o;
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o; c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1); snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o, eo_do(o,

4
src/bin/image_map_3d_flow.c
View File

@ -29,7 +29,7 @@ static void _setup(void)
{ {
char buf[256]; char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o, eo_do(o,
@ -39,7 +39,7 @@ static void _setup(void)
evas_obj_image_smooth_scale_set(0), evas_obj_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_reflec[i] = o; o_reflec[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1); snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o, eo_do(o,

2
src/bin/image_map_color_alpha_nearest_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),

2
src/bin/image_map_color_alpha_nearest_solid_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),

2
src/bin/image_map_color_alpha_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),

2
src/bin/image_map_color_alpha_solid_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),

2
src/bin/image_map_color_nearest_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),

2
src/bin/image_map_color_nearest_solid_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),

2
src/bin/image_map_color_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),

2
src/bin/image_map_color_solid_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),

2
src/bin/image_map_nearest_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),

2
src/bin/image_map_nearest_solid_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),

2
src/bin/image_map_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_image_fill_set(0, 0, 120, 160),

2
src/bin/image_map_solid_rotate.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++) for (i = 0; i < (OBNUM / 2); i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL), evas_obj_image_file_set(build_path("image.png"), NULL),

4
src/bin/image_quality_scale.c
View File

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < 1; i++) for (i = 0; i < 1; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL), eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
evas_obj_image_fill_set(0, 0, 640, 480), evas_obj_image_fill_set(0, 0, 640, 480),
@ -94,8 +94,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/line_blend.c
View File

@ -26,7 +26,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_LINE_CLASS, evas); o = eo_add(EVAS_OBJ_LINE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = (rnd()&0xff) / 2; a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255; r = ((rnd()&0xff) * a) / 255;
@ -133,8 +133,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

9
src/bin/main.c
View File

@ -9,6 +9,7 @@ const char *profile = "n800";
const char *choosen_engine = NULL; const char *choosen_engine = NULL;
int win_w = 720, win_h = 420; int win_w = 720, win_h = 420;
int loops = LOOPS; int loops = LOOPS;
int one_test = 0;
Eina_Bool fullscreen = EINA_FALSE; Eina_Bool fullscreen = EINA_FALSE;
Eina_Bool cmp_report = EINA_FALSE; Eina_Bool cmp_report = EINA_FALSE;
@ -1161,11 +1162,12 @@ static const Expedite_Resolution resolutions[] = {
{ "pal", 720 , 576 }, { "pal", 720 , 576 },
{ "480p", 720 , 480 }, { "480p", 720 , 480 },
{ "720p", 1280, 720 }, { "720p", 1280, 720 },
{ "720p-p", 720, 1280 },
{ "1050p", 1680, 1050}, { "1050p", 1680, 1050},
{ "1080p", 1920, 1080}, { "1080p", 1920, 1080},
{ "wsvga", 1024, 600 }, { "wsvga", 1024, 600 },
{ "wsvga-p", 600 , 1024}, { "wsvga-p", 600 , 1024},
{ "s9", 1600, 900 }, { "watch-360", 360, 360},
{ NULL, 0, 0 } { NULL, 0, 0 }
}; };
@ -1252,7 +1254,7 @@ main(int argc, char **argv)
unsigned int i; unsigned int i;
fprintf(stderr, "Known resolution :\n"); fprintf(stderr, "Known resolution :\n");
for (i = 0; i < sizeof(resolutions)/sizeof(resolutions[0]); i++) for (i = 0; i < sizeof(resolutions)/sizeof(resolutions[0]) - 1; i++)
fprintf(stderr, " * %s\t%ix%i\n", resolutions[i].name, fprintf(stderr, " * %s\t%ix%i\n", resolutions[i].name,
resolutions[i].width, resolutions[i].height); resolutions[i].width, resolutions[i].height);
return 0; return 0;
@ -1262,7 +1264,7 @@ main(int argc, char **argv)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < sizeof(resolutions)/sizeof(resolutions[0]); i++) for (i = 0; i < sizeof(resolutions)/sizeof(resolutions[0]) - 1; i++)
if (!strcmp(resolutions[i].name, resolution)) if (!strcmp(resolutions[i].name, resolution))
break; break;
if (i == sizeof(resolutions)/sizeof(resolutions[0])) if (i == sizeof(resolutions)/sizeof(resolutions[0]))
@ -1322,6 +1324,7 @@ main(int argc, char **argv)
} }
else if (test > 0) else if (test > 0)
{ {
one_test = 1;
ui_num(test); ui_num(test);
} }

3
src/bin/main.h
View File

@ -47,6 +47,7 @@ extern "C"
extern Evas *evas; extern Evas *evas;
extern int win_w, win_h; extern int win_w, win_h;
extern int loops; extern int loops;
extern int one_test;
extern const char *choosen_engine; extern const char *choosen_engine;
extern Eina_Bool fullscreen; extern Eina_Bool fullscreen;
extern Eina_Bool cmp_report; extern Eina_Bool cmp_report;
@ -92,8 +93,8 @@ int engine_abort(void);
{ \ { \
double fps; \ double fps; \
fps = (double)f / t; \ fps = (double)f / t; \
ui_fps(fps); \
printf("%4.2f , %s\n", fps, x); \ printf("%4.2f , %s\n", fps, x); \
ui_fps(fps); \
done = 1; \ done = 1; \
} }

4
src/bin/poly_blend.c
View File

@ -73,7 +73,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_POLYGON_CLASS, evas); o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = (rnd()&0xff) / 2; a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255; r = ((rnd()&0xff) * a) / 255;
@ -149,8 +149,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

10
src/bin/proxy_image.c
View File

@ -22,7 +22,7 @@ static void _setup(void)
int i; int i;
Evas_Object *o,*src; Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_do(o, eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL), evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_image_fill_set(0, 0, 120, 160),
@ -33,10 +33,12 @@ static void _setup(void)
for (i = 1; i < OBNUM; i++) for (i = 1; i < OBNUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); Eina_Bool tmp;
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_source_set(src), evas_obj_image_source_set(src, &tmp),
evas_obj_size_set(120, 160), evas_obj_size_set(120, 160),
evas_obj_image_fill_set(0,0,120,160), evas_obj_image_fill_set(0,0,120,160),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
@ -102,8 +104,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

6
src/bin/proxy_image_offscreen.c
View File

@ -26,7 +26,7 @@ static void _setup(void)
int i; int i;
Evas_Object *o,*src; Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL), eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160), evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160), evas_obj_size_set(120, 160),
@ -35,7 +35,7 @@ static void _setup(void)
for (i = 0; i < OBNUM / 2; i++) for (i = 0; i < OBNUM / 2; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_source_set(src, NULL), eo_do(o, evas_obj_image_source_set(src, NULL),
evas_obj_size_set(120, 160), evas_obj_size_set(120, 160),
@ -103,8 +103,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

12
src/bin/proxy_text_fixed.c
View File

@ -27,11 +27,11 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW; st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++) for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
{ {
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20), evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"), evas_obj_text_text_set("This is a test string"),
evas_obj_text_style_set(st), evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255), evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24), evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -45,10 +45,12 @@ static void _setup(void)
for ( ; i < OBNUM ; i ++) for ( ; i < OBNUM ; i ++)
{ {
Eina_Bool result;
s = o_texts[i % st]; s = o_texts[i % st];
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_image_source_set(s)); eo_do(o, evas_obj_image_source_set(s, &result));
/* FIXME s == NULL*/ /* FIXME s == NULL*/
eo_do(s, evas_obj_size_get(&w, &h)); eo_do(s, evas_obj_size_get(&w, &h));
eo_do(o, eo_do(o,
@ -117,8 +119,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

14
src/bin/proxy_text_random.c
View File

@ -30,7 +30,7 @@ static void _setup(void)
"Fiddly", "Family", "Lair", "Monkeys", "Magazine" "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
}; };
srnd(); srnd();
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[0] = o; o_texts[0] = o;
snprintf(buf, sizeof(buf), "%s %s %s %s.", snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
@ -40,7 +40,7 @@ static void _setup(void)
eo_do(o, eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20), evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set(buf), evas_obj_text_text_set(buf),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_get(&w, &h)); evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2); x = (win_w / 2) - (w / 2);
@ -52,10 +52,12 @@ static void _setup(void)
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
for (i = 1 ; i < OBNUM ; i ++) for (i = 1 ; i < OBNUM ; i ++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); Eina_Bool result;
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, eo_do(o,
evas_obj_image_source_set(o_texts[0])); evas_obj_image_source_set(o_texts[0], &result));
eo_do(o_texts[0], evas_obj_size_get(&w, &h)); eo_do(o_texts[0], evas_obj_size_get(&w, &h));
eo_do(o, evas_obj_size_set(w, h), eo_do(o, evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h)); evas_obj_image_fill_set(0, 0, w, h));
@ -93,7 +95,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]); strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o_texts[0], eo_do(o_texts[0],
evas_obj_text_set(buf), evas_obj_text_text_set(buf),
evas_obj_size_get(&w, &h)); evas_obj_size_get(&w, &h));
for (i = 1; i < OBNUM; i++) for (i = 1; i < OBNUM; i++)
{ {
@ -137,8 +139,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/rect_blend.c
View File

@ -26,7 +26,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = rnd()&0xff; a = rnd()&0xff;
r = ((rnd()&0xff) * a) / 255; r = ((rnd()&0xff) * a) / 255;
@ -101,8 +101,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/rect_blend_few.c
View File

@ -29,7 +29,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = rnd()&0xff; a = rnd()&0xff;
r = ((rnd()&0xff) * a) / 255; r = ((rnd()&0xff) * a) / 255;
@ -102,8 +102,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/rect_blend_pow2.c
View File

@ -26,7 +26,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = 256 - (1 << ((rnd() % 8) + 1)); a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128; if (a < 128) a = 128;
@ -102,8 +102,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/rect_blend_pow2_few.c
View File

@ -29,7 +29,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = 256 - (1 << ((rnd() % 8) + 1)); a = 256 - (1 << ((rnd() % 8) + 1));
if (a < 128) a = 128; if (a < 128) a = 128;
@ -103,8 +103,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/rect_solid.c
View File

@ -26,7 +26,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = 0xff; a = 0xff;
r = ((rnd()&0xff) * a) / 255; r = ((rnd()&0xff) * a) / 255;
@ -101,8 +101,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/rect_solid_few.c
View File

@ -29,7 +29,7 @@ static void _setup(void)
{ {
int r, g, b, a; int r, g, b, a;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
a = 0xff; a = 0xff;
r = ((rnd()&0xff) * a) / 255; r = ((rnd()&0xff) * a) / 255;
@ -102,8 +102,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

6
src/bin/text_basic.c
View File

@ -25,10 +25,10 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 20), eo_do(o, evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"), evas_obj_text_text_set("This is a test string"),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -92,8 +92,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/text_change.c
View File

@ -32,7 +32,7 @@ static void _setup(void)
srnd(); srnd();
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 20)); eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.", snprintf(buf, sizeof(buf), "%s %s %s %s.",
@ -40,7 +40,7 @@ static void _setup(void)
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]); strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o, evas_obj_text_set(buf), eo_do(o, evas_obj_text_text_set(buf),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_get(&w, &h)); evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2); x = (win_w / 2) - (w / 2);
@ -77,7 +77,7 @@ static void _loop(double t, int f)
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]); strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o_texts[i], evas_obj_text_set(buf)); eo_do(o_texts[i], evas_obj_text_text_set(buf));
} }
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -115,8 +115,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

6
src/bin/text_styles.c
View File

@ -27,11 +27,11 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW; st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20), evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"), evas_obj_text_text_set("This is a test string"),
evas_obj_text_style_set(st), evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255), evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24), evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -102,8 +102,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

12
src/bin/text_styles_different_strings.c
View File

@ -34,7 +34,7 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW; st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 20)); eo_do(o, evas_obj_text_font_set("Vera-Bold", 20));
snprintf(buf, sizeof(buf), "%s %s %s %s.", snprintf(buf, sizeof(buf), "%s %s %s %s.",
@ -42,7 +42,7 @@ static void _setup(void)
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))], strs[rnd() % (sizeof(strs) / sizeof(char *))],
strs[rnd() % (sizeof(strs) / sizeof(char *))]); strs[rnd() % (sizeof(strs) / sizeof(char *))]);
eo_do(o, evas_obj_text_set(buf), eo_do(o, evas_obj_text_text_set(buf),
evas_obj_text_style_set(st), evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255), evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24), evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -66,17 +66,19 @@ static void _cleanup(void)
/* loop - do things */ /* loop - do things */
static void _loop(double t, int f) static void _loop(double t, int f)
{ {
static int k = 0;
int i; int i;
Evas_Coord x, y, w, h; Evas_Coord x, y, w, h;
for (i = 0; i < OBNUM; i++) for (i = 0; i < OBNUM; i++)
{ {
eo_do(o_texts[i], evas_obj_size_get(&w, &h)); eo_do(o_texts[i], evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2); x = (win_w / 2) - (w / 2);
x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); x += sin((double)(f + ((i + k) * 13)) / (36.7 * SLOW)) * (w / 2);
y = (win_h / 2) - (h / 2); y = (win_h / 2) - (h / 2);
y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); y += cos((double)(f + ((i + k) * 28)) / (43.8 * SLOW)) * (w / 2);
eo_do(o_texts[i], evas_obj_position_set(x, y)); eo_do(o_texts[i], evas_obj_position_set(x, y));
} }
++k;
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -113,8 +115,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

4
src/bin/textblock_auto_align.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
Evas_Textblock_Style *st; Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o; o_text = o;
st = evas_textblock_style_new(); st = evas_textblock_style_new();
evas_textblock_style_set evas_textblock_style_set
@ -116,8 +116,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

7
src/bin/textblock_basic.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
Evas_Textblock_Style *st; Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o; o_text = o;
st = evas_textblock_style_new(); st = evas_textblock_style_new();
evas_textblock_style_set evas_textblock_style_set
@ -129,7 +129,7 @@ static void _cleanup(void)
static void _loop(double t, int f) static void _loop(double t, int f)
{ {
Evas_Coord x, y, w, h, w0, h0; Evas_Coord x, y, w, h, w0, h0;
int i = 0; static int i = 0;
w0 = 160; w0 = 160;
h0 = 120; h0 = 120;
@ -142,6 +142,7 @@ static void _loop(double t, int f)
eo_do(o_text, eo_do(o_text,
evas_obj_position_set(x, y), evas_obj_position_set(x, y),
evas_obj_size_set(w, 5000)); evas_obj_size_set(w, 5000));
++i;
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -179,8 +180,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

7
src/bin/textblock_intl.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
Evas_Textblock_Style *st; Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o; o_text = o;
st = evas_textblock_style_new(); st = evas_textblock_style_new();
evas_textblock_style_set evas_textblock_style_set
@ -100,7 +100,7 @@ static void _cleanup(void)
static void _loop(double t, int f) static void _loop(double t, int f)
{ {
Evas_Coord x, y, w, h, w0, h0; Evas_Coord x, y, w, h, w0, h0;
int i = 0; static int i = 0;
eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0)); eo_do(o_text, evas_obj_textblock_size_native_get(&w0, &h0));
w = w0; w = w0;
@ -112,6 +112,7 @@ static void _loop(double t, int f)
eo_do(o_text, eo_do(o_text,
evas_obj_position_set(x, y), evas_obj_position_set(x, y),
evas_obj_size_set(w, h)); evas_obj_size_set(w, h));
++i;
FPS_STD(NAME); FPS_STD(NAME);
} }
@ -149,8 +150,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/textblock_text_append.c
View File

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
Evas_Textblock_Style *st; Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas); o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
o_text = o; o_text = o;
st = evas_textblock_style_new(); st = evas_textblock_style_new();
evas_textblock_style_set evas_textblock_style_set
@ -113,14 +113,14 @@ static void _loop(double t, int f)
{ {
Evas_Textblock_Cursor *cur; Evas_Textblock_Cursor *cur;
static Evas_Textblock_Cursor *cur2; static Evas_Textblock_Cursor *cur2;
eo_do(o_text, cur = evas_obj_textblock_cursor_get()); eo_do(o_text, evas_obj_textblock_cursor_get(&cur));
evas_textblock_cursor_text_append(cur, "*"); evas_textblock_cursor_text_append(cur, "*");
evas_textblock_cursor_char_delete(cur); evas_textblock_cursor_char_delete(cur);
evas_textblock_cursor_paragraph_char_first(cur); evas_textblock_cursor_paragraph_char_first(cur);
if (!cur2) if (!cur2)
{ {
eo_do(o_text, cur2 = evas_obj_textblock_cursor_new()); eo_do(o_text, evas_obj_textblock_cursor_new(&cur2));
evas_textblock_cursor_paragraph_last(cur2); evas_textblock_cursor_paragraph_last(cur2);
evas_textblock_cursor_paragraph_char_first(cur2); evas_textblock_cursor_paragraph_char_first(cur2);
} }
@ -165,8 +165,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

92
src/bin/ui.c
View File

@ -22,7 +22,6 @@ static Evas_Object *o_wallpaper = NULL;
static Evas_Object *o_title = NULL; static Evas_Object *o_title = NULL;
static Evas_Object *o_byline = NULL; static Evas_Object *o_byline = NULL;
static Evas_Object *o_menu_logo = NULL; static Evas_Object *o_menu_logo = NULL;
static Evas_Object *o_menu_icon = NULL;
static Evas_Object *o_menu_icon_sel = NULL; static Evas_Object *o_menu_icon_sel = NULL;
static Evas_Object *o_menu_icon_sel2 = NULL; static Evas_Object *o_menu_icon_sel2 = NULL;
static Evas_Object *o_menu_text_sel = NULL; static Evas_Object *o_menu_text_sel = NULL;
@ -222,7 +221,6 @@ _ui_menu_show(Eina_Bool visibility)
{ {
eo_do(o_menu_logo, evas_obj_visibility_set(visibility)); eo_do(o_menu_logo, evas_obj_visibility_set(visibility));
eo_do(o_menu_title, evas_obj_visibility_set(visibility)); eo_do(o_menu_title, evas_obj_visibility_set(visibility));
eo_do(o_menu_icon, evas_obj_visibility_set(visibility));
eo_do(o_menu_icon_sel, evas_obj_visibility_set(visibility)); eo_do(o_menu_icon_sel, evas_obj_visibility_set(visibility));
/* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */ /* FIXME: ask if it's ok o_menu_icon_sel2 == NULL */
eo_do(o_menu_icon_sel2, evas_obj_visibility_set(visibility)); eo_do(o_menu_icon_sel2, evas_obj_visibility_set(visibility));
@ -360,7 +358,7 @@ _ui_menu_item_full_add(Eina_Bool test,
Menu_Item *mi; Menu_Item *mi;
mi = malloc(sizeof(Menu_Item)); mi = malloc(sizeof(Menu_Item));
mi->o_icon = eo_add(EVAS_IMAGE_CLASS, evas); mi->o_icon = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_unref(mi->o_icon); eo_unref(mi->o_icon);
eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL), eo_do(mi->o_icon, evas_obj_image_file_set(build_path(icon), NULL),
evas_obj_size_set(32, 32), evas_obj_size_set(32, 32),
@ -390,7 +388,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
win_w = ui_w; win_w = ui_w;
win_h = ui_h; win_h = ui_h;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_position_set(0, 0), eo_do(o, evas_obj_position_set(0, 0),
evas_obj_size_set(win_w, win_h), evas_obj_size_set(win_w, win_h),
@ -401,7 +399,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
eo_event_callback_array_add(ui_callbacks(), NULL)); eo_event_callback_array_add(ui_callbacks(), NULL));
o_bg = o; o_bg = o;
o = eo_add(EVAS_RECTANGLE_CLASS, evas); o = eo_add(EVAS_OBJ_RECTANGLE_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_position_set(0, 0), eo_do(o, evas_obj_position_set(0, 0),
evas_obj_size_set(win_w, win_h), evas_obj_size_set(win_w, win_h),
@ -410,10 +408,10 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o_wallpaper = o; o_wallpaper = o;
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set("EXPEDITE"), evas_obj_text_text_set("EXPEDITE"),
evas_obj_layer_set(100), evas_obj_layer_set(100),
evas_obj_color_set(0, 0, 0, 100), evas_obj_color_set(0, 0, 0, 100),
evas_obj_pass_events_set(1), evas_obj_pass_events_set(1),
@ -424,10 +422,10 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o_title = o; o_title = o;
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_text_font_set("Vera", 9), eo_do(o, evas_obj_text_font_set("Vera", 9),
evas_obj_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."), evas_obj_text_text_set("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."),
evas_obj_layer_set(100), evas_obj_layer_set(100),
evas_obj_color_set(0, 0, 0, 60), evas_obj_color_set(0, 0, 0, 60),
evas_obj_pass_events_set(1), evas_obj_pass_events_set(1),
@ -438,7 +436,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o_byline = o; o_byline = o;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)), eo_do(o, evas_obj_position_set((win_w - 120) / 2, ((win_h - 160) / 2)),
evas_obj_image_file_set(build_path("e-logo.png"), NULL), evas_obj_image_file_set(build_path("e-logo.png"), NULL),
@ -449,15 +447,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o_menu_logo = o; o_menu_logo = o;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_unref(o);
eo_do(o, evas_obj_position_set(win_w - 128, - 128),
evas_obj_image_fill_set(0, 0, 256, 256),
evas_obj_size_set(256, 256),
evas_obj_visibility_set(EINA_TRUE));
o_menu_icon = o;
o = eo_add(EVAS_IMAGE_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_position_set(0, 0), eo_do(o, evas_obj_position_set(0, 0),
evas_obj_image_file_set(build_path("icon_sel.png"), NULL), evas_obj_image_file_set(build_path("icon_sel.png"), NULL),
@ -465,7 +455,7 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
evas_obj_image_fill_set(0, 0, 48, 48)); evas_obj_image_fill_set(0, 0, 48, 48));
o_menu_icon_sel = o; o_menu_icon_sel = o;
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_position_set(0, 0), eo_do(o, evas_obj_position_set(0, 0),
evas_obj_image_file_set(build_path("text_sel.png"), NULL), evas_obj_image_file_set(build_path("text_sel.png"), NULL),
@ -474,10 +464,10 @@ ui_setup(unsigned int ui_w, unsigned int ui_h)
evas_obj_image_border_set(7, 7, 7, 7)); evas_obj_image_border_set(7, 7, 7, 7));
o_menu_text_sel = o; o_menu_text_sel = o;
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
eo_unref(o); eo_unref(o);
eo_do(o, evas_obj_text_font_set("Vera", 10), eo_do(o, evas_obj_text_font_set("Vera", 10),
evas_obj_text_set(""), evas_obj_text_text_set(""),
evas_obj_color_set(0, 0, 0, 100), evas_obj_color_set(0, 0, 0, 100),
evas_obj_pass_events_set(1), evas_obj_pass_events_set(1),
evas_obj_size_get(&w, &h)); evas_obj_size_get(&w, &h));
@ -514,6 +504,7 @@ ui_num(int n)
if (!mi->test) if (!mi->test)
return; return;
menu_sel = n; menu_sel = n;
if (one_test) test_item = menu_sel;
_ui_select(); _ui_select();
} }
} }
@ -610,7 +601,7 @@ ui_loop(void *data EINA_UNUSED)
o = o_menu_title; o = o_menu_title;
eo_do(o, evas_obj_color_set(a, a, a, a), eo_do(o, evas_obj_color_set(a, a, a, a),
evas_obj_text_set(mi->text), evas_obj_text_text_set(mi->text),
evas_obj_size_get(&tw, &th)); evas_obj_size_get(&tw, &th));
x = (win_w - tw) / 2; x = (win_w - tw) / 2;
y = (win_h / 2) + len + 48; y = (win_h / 2) + len + 48;
@ -625,11 +616,6 @@ ui_loop(void *data EINA_UNUSED)
evas_obj_size_set(w, h), evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h), evas_obj_image_fill_set(0, 0, w, h),
evas_obj_color_set(a, a, a, a)); evas_obj_color_set(a, a, a, a));
o = o_menu_icon;
snprintf(buf, 4096, "%s%s", data_dir, mi->icon);
eo_do(o, evas_obj_image_file_set(buf, NULL),
evas_obj_color_set(a / 2, a / 2, a / 2, a / 2));
} }
i++; i++;
} }
@ -649,7 +635,7 @@ ui_menu(void)
{ {
eo_do(o_title, evas_obj_visibility_set(EINA_TRUE)); eo_do(o_title, evas_obj_visibility_set(EINA_TRUE));
eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE), eo_do(o_byline, evas_obj_visibility_set(EINA_TRUE),
evas_obj_text_set evas_obj_text_text_set
("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit.")); ("LEFT/RIGHT - select, ENTER - select, ESCAPE - exit."));
menu_active = 1; menu_active = 1;
key_func = NULL; key_func = NULL;
@ -724,7 +710,7 @@ ui_fps(double fps)
test_item++; test_item++;
mi = eina_list_nth(menu, test_item); mi = eina_list_nth(menu, test_item);
if (!mi->test) if (one_test || !mi->test)
{ {
char datestr[1024]; char datestr[1024];
struct tm *tim; struct tm *tim;
@ -766,29 +752,29 @@ ui_fps(double fps)
loops, loops,
choosen_engine, choosen_engine,
fullscreen); fullscreen);
else else
printf("\n#####Test Result#####\n" printf("\n#####Test Result#####\n"
"evas fps speed: %5.2f\n" "evas fps speed: %5.2f\n"
"evas fps speed(weighted): %5.2f\n" "evas fps speed(weighted): %5.2f\n"
"testcase count: %i\n" "testcase count: %i\n"
"date: %s\n" "date: %s\n"
"evas version: %i.%i.%i.%i\n" "evas version: %i.%i.%i.%i\n"
"profile: %s\n" "profile: %s\n"
"window size: %i, %i\n" "window size: %i, %i\n"
"loop count: %i\n" "loop count: %i\n"
"engine: %s\n" "engine: %s\n"
"full screen: %i\n", "full screen: %i\n",
(fps / t_count), (fps / t_count),
(wfps / avgw) / t_count, (wfps / avgw) / t_count,
t_count, t_count,
datestr, datestr,
evas_version->major, evas_version->minor, evas_version->micro, evas_version->major, evas_version->minor, evas_version->micro,
evas_version->revision, evas_version->revision,
profile, profile,
win_w, win_h, win_w, win_h,
loops, loops,
choosen_engine, choosen_engine,
fullscreen); fullscreen);
ecore_main_loop_quit(); ecore_main_loop_quit();
} }

8
src/bin/widgets_file_icons.c
View File

@ -46,17 +46,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 13]), evas_obj_text_text_set(icons[i % 13]),
evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW), evas_obj_text_style_set(EVAS_TEXT_STYLE_FAR_SOFT_SHADOW),
evas_obj_color_set(255, 255, 255, 255), evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24), evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -132,8 +132,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_file_icons_2.c
View File

@ -46,17 +46,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 13]), evas_obj_text_text_set(icons[i % 13]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -130,8 +130,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_file_icons_2_grouped.c
View File

@ -46,17 +46,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 13]), evas_obj_text_text_set(icons[i % 13]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -139,8 +139,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_file_icons_2_same.c
View File

@ -31,17 +31,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 1]), evas_obj_text_text_set(icons[i % 1]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -115,8 +115,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_file_icons_2_same_grouped.c
View File

@ -31,17 +31,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 1]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 1]), evas_obj_text_text_set(icons[i % 1]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -119,8 +119,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_file_icons_3.c
View File

@ -46,17 +46,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 13]), evas_obj_text_text_set(icons[i % 13]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -130,8 +130,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_file_icons_4.c
View File

@ -46,17 +46,17 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL), eo_do(o, evas_obj_image_file_set(build_path(icons[i % 13]), NULL),
evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE), evas_obj_image_fill_set(0, 0, ICON_SIZE, ICON_SIZE),
evas_obj_size_set(ICON_SIZE, ICON_SIZE), evas_obj_size_set(ICON_SIZE, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(icons[i % 13]), evas_obj_text_text_set(icons[i % 13]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -130,8 +130,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_list_1.c
View File

@ -62,7 +62,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -142,8 +142,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_list_1_grouped.c
View File

@ -62,7 +62,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -150,8 +150,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_list_2.c
View File

@ -62,7 +62,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -142,8 +142,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

8
src/bin/widgets_list_2_grouped.c
View File

@ -62,7 +62,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -70,10 +70,10 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -150,8 +150,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

10
src/bin/widgets_list_3.c
View File

@ -83,7 +83,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -91,7 +91,7 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_icons[i] = o; o_icons[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -99,10 +99,10 @@ static void _setup(void)
evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -173,8 +173,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

10
src/bin/widgets_list_3_grouped.c
View File

@ -83,7 +83,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -91,7 +91,7 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_icons[i] = o; o_icons[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -99,10 +99,10 @@ static void _setup(void)
evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -190,8 +190,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

10
src/bin/widgets_list_4.c
View File

@ -83,7 +83,7 @@ static void _setup(void)
Evas_Object *o; Evas_Object *o;
for (i = 0; i < NUM; i++) for (i = 0; i < NUM; i++)
{ {
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o; o_images[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -91,7 +91,7 @@ static void _setup(void)
evas_obj_size_set(win_w, ICON_SIZE), evas_obj_size_set(win_w, ICON_SIZE),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas); o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_icons[i] = o; o_icons[i] = o;
eo_do(o, evas_obj_image_filled_set(1), eo_do(o, evas_obj_image_filled_set(1),
evas_obj_image_border_set(2, 2, 2, 2), evas_obj_image_border_set(2, 2, 2, 2),
@ -99,10 +99,10 @@ static void _setup(void)
evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8), evas_obj_size_set(ICON_SIZE - 8, ICON_SIZE - 8),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_TEXT_CLASS, evas); o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o; o_texts[i] = o;
eo_do(o, evas_obj_text_font_set("Vera-Bold", 10), eo_do(o, evas_obj_text_font_set("Vera-Bold", 10),
evas_obj_text_set(labels[i % 26]), evas_obj_text_text_set(labels[i % 26]),
evas_obj_color_set(0, 0, 0, 255), evas_obj_color_set(0, 0, 0, 255),
evas_obj_visibility_set(EINA_TRUE)); evas_obj_visibility_set(EINA_TRUE));
} }
@ -170,8 +170,8 @@ void FNAME(void);
# ifndef UI # ifndef UI
void FNAME(void) void FNAME(void)
{ {
ui_func_set(_key, _loop);
_setup(); _setup();
ui_func_set(_key, _loop);
} }
# endif # endif
#endif #endif

Some files were not shown because too many files have changed in this diff Show More